renamed kuzzleSecurity.js -> Security.js

Author: xbill82

src/Kuzzle.js

@@ -1,7 +1,7 @@
 var
   uuid = require('uuid'),
   Collection = require('./Collection.js'),
-  Security = require('./security/kuzzleSecurity'),
+  Security = require('./security/Security'),
   MemoryStorage = require('./MemoryStorage'),
   User = require('./security/kuzzleUser'),
   networkWrapper = require('./networkWrapper');

src/security/kuzzleSecurity.js renamed to src/security/Security.js

@@ -1,9 +1,9 @@
 var
   SecurityDocument = require('./kuzzleSecurityDocument');
 
-function Profile(kuzzleSecurity, id, content) {
+function Profile(Security, id, content) {
 
-  SecurityDocument.call(this, kuzzleSecurity, id, content);
+  SecurityDocument.call(this, Security, id, content);
 
   // Define properties
   Object.defineProperties(this, {
@@ -17,8 +17,8 @@ function Profile(kuzzleSecurity, id, content) {
   });
 
   // promisifying
-  if (kuzzleSecurity.kuzzle.bluebird) {
-    return kuzzleSecurity.kuzzle.bluebird.promisifyAll(this, {
+  if (Security.kuzzle.bluebird) {
+    return Security.kuzzle.bluebird.promisifyAll(this, {
       suffix: 'Promise',
       filter: function (name, func, target, passes) {
         var whitelist = ['hydrate', 'save'];
@@ -59,7 +59,7 @@ Profile.prototype.save = function (options, cb) {
 
   data = this.serialize();
 
-  self.kuzzle.query(self.kuzzleSecurity.buildQueryArgs('createOrReplaceProfile'), data, options, cb && function (error) {
+  self.kuzzle.query(self.Security.buildQueryArgs('createOrReplaceProfile'), data, options, cb && function (error) {
     cb(error, error ? undefined : self);
   });
 

src/security/kuzzleProfile.js

@@ -1,8 +1,8 @@
 var KuzzleSecurityDocument = require('./kuzzleSecurityDocument');
 
-function Role(kuzzleSecurity, id, content) {
+function Role(Security, id, content) {
 
-  KuzzleSecurityDocument.call(this, kuzzleSecurity, id, content);
+  KuzzleSecurityDocument.call(this, Security, id, content);
 
   // Define properties
   Object.defineProperties(this, {
@@ -16,8 +16,8 @@ function Role(kuzzleSecurity, id, content) {
   });
 
   // promisifying
-  if (kuzzleSecurity.kuzzle.bluebird) {
-    return kuzzleSecurity.kuzzle.bluebird.promisifyAll(this, {
+  if (Security.kuzzle.bluebird) {
+    return Security.kuzzle.bluebird.promisifyAll(this, {
       suffix: 'Promise',
       filter: function (name, func, target, passes) {
         var whitelist = ['save'];
@@ -56,7 +56,7 @@ Role.prototype.save = function (options, cb) {
     options = null;
   }
 
-  self.kuzzle.query(this.kuzzleSecurity.buildQueryArgs('createOrReplaceRole'), data, options, cb && function (error) {
+  self.kuzzle.query(this.Security.buildQueryArgs('createOrReplaceRole'), data, options, cb && function (error) {
     cb(error, error ? undefined : self);
   });
 

src/security/kuzzleRole.js

@@ -1,4 +1,4 @@
-function KuzzleSecurityDocument(kuzzleSecurity, id, content) {
+function KuzzleSecurityDocument(Security, id, content) {
 
   if (!id) {
     throw new Error('A security document must have an id');
@@ -8,10 +8,10 @@ function KuzzleSecurityDocument(kuzzleSecurity, id, content) {
   Object.defineProperties(this, {
     // private properties
     kuzzle: {
-      value: kuzzleSecurity.kuzzle
+      value: Security.kuzzle
     },
-    kuzzleSecurity: {
-      value: kuzzleSecurity
+    Security: {
+      value: Security
     },
     // read-only properties
     // writable properties
@@ -31,8 +31,8 @@ function KuzzleSecurityDocument(kuzzleSecurity, id, content) {
   }
 
   // promisifying
-  if (kuzzleSecurity.kuzzle.bluebird) {
-    return kuzzleSecurity.kuzzle.bluebird.promisifyAll(this, {
+  if (Security.kuzzle.bluebird) {
+    return Security.kuzzle.bluebird.promisifyAll(this, {
       suffix: 'Promise',
       filter: function (name, func, target, passes) {
         var whitelist = ['delete', 'update'];
@@ -88,7 +88,7 @@ KuzzleSecurityDocument.prototype.delete = function (options, cb) {
     options = null;
   }
 
-  self.kuzzle.query(this.kuzzleSecurity.buildQueryArgs(this.deleteActionName), {_id: this.id}, options, function (error, res) {
+  self.kuzzle.query(this.Security.buildQueryArgs(this.deleteActionName), {_id: this.id}, options, function (error, res) {
     if (error) {
       return cb ? cb(error) : false;
     }
@@ -124,7 +124,7 @@ KuzzleSecurityDocument.prototype.update = function (content, options, cb) {
   data._id = self.id;
   data.body = content;
 
-  self.kuzzle.query(this.kuzzleSecurity.buildQueryArgs(this.updateActionName), data, options, function (error, response) {
+  self.kuzzle.query(this.Security.buildQueryArgs(this.updateActionName), data, options, function (error, response) {
     if (error) {
       return cb ? cb(error) : false;
     }
@@ -139,4 +139,4 @@ KuzzleSecurityDocument.prototype.update = function (content, options, cb) {
   return this;
 };
 
-module.exports = KuzzleSecurityDocument;
+module.exports = KuzzleSecurityDocument;

src/security/kuzzleSecurityDocument.js

@@ -2,14 +2,14 @@ var
   KuzzleSecurityDocument = require('./kuzzleSecurityDocument');
 
 /**
- * @param {Security} kuzzleSecurity
+ * @param {Security} Security
  * @param {string} id
  * @param {Object} content
  * @constructor
  */
-function User(kuzzleSecurity, id, content) {
+function User(Security, id, content) {
 
-  KuzzleSecurityDocument.call(this, kuzzleSecurity, id, content);
+  KuzzleSecurityDocument.call(this, Security, id, content);
 
   // Define properties
   Object.defineProperties(this, {
@@ -23,8 +23,8 @@ function User(kuzzleSecurity, id, content) {
   });
 
   // promisifying
-  if (kuzzleSecurity.kuzzle.bluebird) {
-    return kuzzleSecurity.kuzzle.bluebird.promisifyAll(this, {
+  if (Security.kuzzle.bluebird) {
+    return Security.kuzzle.bluebird.promisifyAll(this, {
       suffix: 'Promise',
       filter: function (name, func, target, passes) {
         var whitelist = ['save', 'saveRestricted'];
@@ -100,7 +100,7 @@ User.prototype.save = function (options, cb) {
     options = null;
   }
 
-  self.kuzzle.query(this.kuzzleSecurity.buildQueryArgs('createOrReplaceUser'), data, options, cb && function (error) {
+  self.kuzzle.query(this.Security.buildQueryArgs('createOrReplaceUser'), data, options, cb && function (error) {
     cb(error, error ? undefined : self);
   });
 
@@ -128,7 +128,7 @@ User.prototype.saveRestricted = function (options, cb) {
     options = null;
   }
 
-  self.kuzzle.query(this.kuzzleSecurity.buildQueryArgs('createRestrictedUser'), data, options, cb && function (error) {
+  self.kuzzle.query(this.Security.buildQueryArgs('createRestrictedUser'), data, options, cb && function (error) {
     cb(error, error ? undefined : self);
   });
 

src/security/kuzzleUser.js

@@ -5,7 +5,7 @@ var
   sandbox = sinon.sandbox.create(),
   Kuzzle = rewire('../../src/Kuzzle'),
   Collection = require('../../src/Collection.js'),
-  Security = require('../../src/security/kuzzleSecurity'),
+  Security = require('../../src/security/Security'),
   User = require('../../src/security/kuzzleUser');
 
 describe('Kuzzle methods', function () {

test/kuzzle/methods.test.js

@@ -3,10 +3,10 @@ var
   bluebird = require('bluebird'),
   rewire = require('rewire'),
   Kuzzle = rewire('../../../src/Kuzzle'),
-  Security = require('../../../src/security/kuzzleSecurity');
+  Security = require('../../../src/security/Security');
 
-describe('kuzzleSecurity constructor', function () {
-  it('should initialize properties and return a valid kuzzleSecurity object', function () {
+describe('Security constructor', function () {
+  it('should initialize properties and return a valid Security object', function () {
     var
       kuzzle = new Kuzzle('foo');
 

test/security/kuzzleSecurity/constructor.test.js

@@ -34,7 +34,7 @@ describe('KuzzleSecurityDocument constructor', function () {
     var securityDocument = new KuzzleSecurityDocument(kuzzle.security, 'test', {});
 
     should(securityDocument).have.propertyWithDescriptor('kuzzle', { enumerable: false, writable: false, configurable: false });
-    should(securityDocument).have.propertyWithDescriptor('kuzzleSecurity', { enumerable: false, writable: false, configurable: false });
+    should(securityDocument).have.propertyWithDescriptor('Security', { enumerable: false, writable: false, configurable: false });
     should(securityDocument).have.propertyWithDescriptor('id', { enumerable: true, writable: false, configurable: false });
     should(securityDocument).have.propertyWithDescriptor('content', { enumerable: true, writable: true, configurable: false });
   });