Add hasTrait to ModelClass, & model instances (resolves #377)

Author: ClickerMonkey

Gulpfile.js

@@ -133,7 +133,8 @@ var modularized = {
     './src/lib/plugins/methods.js',
     './src/lib/plugins/ready.js',
     './src/lib/plugins/refresh.js',
-    './src/lib/plugins/traits.js'
+    './src/lib/plugins/traits.js',
+    './src/lib/plugins/hasTrait.js'
   ],
   modules: {
     S: [ // searching

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "rekord",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "homepage": "https://github.com/Rekord/rekord",
   "authors": [
     "Philip Diffenderfer <pdiffenderfer@gmail.com>"

build/rekord.js

@@ -1,4 +1,4 @@
-/* rekord 1.5.6 - A javascript REST ORM that is offline and real-time capable http://rekord.github.io/rekord/ by Philip Diffenderfer */
+/* rekord 1.5.7 - A javascript REST ORM that is offline and real-time capable http://rekord.github.io/rekord/ by Philip Diffenderfer */
 // UMD (Universal Module Definition)
 (function (root, factory)
 {
@@ -3881,6 +3881,7 @@ var Defaults = Database.Defaults =
   comparator:           null,
   comparatorNullsFirst: null,
   revision:             null,
+  traits:               [],
   cascade:              Cascade.All,
   load:                 Load.None,
   allComplete:          false,
@@ -4940,6 +4941,26 @@ Class.create( Database,
     return filtered;
   },
 
+  hasTrait: function(trait, comparator)
+  {
+    var cmp = comparator || equals;
+
+    return isArray( this.traits ) && indexOf( this.traits, trait, cmp ) !== false;
+  },
+
+  hasTraits: function(traits, comparator)
+  {
+    for (var i = 0; i < traits.length; i++)
+    {
+      if ( !this.hasTrait( traits[ i ], comparator ) )
+      {
+        return false;
+      }
+    }
+
+    return true;
+  },
+
   liveSave: function(key, encoded)
   {
     this.putRemoteData( encoded, key );
@@ -18244,6 +18265,22 @@ addPlugin(function(model, db, options)
 });
 
 
+addPlugin( function(model, db, options)
+{
+
+  model.hasTrait = function(trait, comparator)
+  {
+    return db.hasTrait(trait, comparator);
+  };
+
+  model.hasTraits = function(traits, comparator)
+  {
+    return db.hasTraits(traits, comparator);
+  };
+
+});
+
+
 addPlugin( function(model, db, options)
 {
   if ( options.keyChanges )

build/rekord.min.js

@@ -1,6 +1,6 @@
 {
   "name": "rekord",
-  "version": "1.5.6",
+  "version": "1.5.7",
   "description": "A javascript REST ORM that is offline and real-time capable http://rekord.github.io/rekord/",
   "author": "Philip Diffenderfer",
   "license": "MIT",

build/rekord.min.js.map

@@ -202,6 +202,7 @@ var Defaults = Database.Defaults =
   comparator:           null,
   comparatorNullsFirst: null,
   revision:             null,
+  traits:               [],
   cascade:              Cascade.All,
   load:                 Load.None,
   allComplete:          false,
@@ -1261,6 +1262,26 @@ Class.create( Database,
     return filtered;
   },
 
+  hasTrait: function(trait, comparator)
+  {
+    var cmp = comparator || equals;
+
+    return isArray( this.traits ) && indexOf( this.traits, trait, cmp ) !== false;
+  },
+
+  hasTraits: function(traits, comparator)
+  {
+    for (var i = 0; i < traits.length; i++)
+    {
+      if ( !this.hasTrait( traits[ i ], comparator ) )
+      {
+        return false;
+      }
+    }
+
+    return true;
+  },
+
   liveSave: function(key, encoded)
   {
     this.putRemoteData( encoded, key );

package.json

@@ -0,0 +1,15 @@
+
+addPlugin( function(model, db, options)
+{
+
+  model.hasTrait = function(trait, comparator)
+  {
+    return db.hasTrait(trait, comparator);
+  };
+
+  model.hasTraits = function(traits, comparator)
+  {
+    return db.hasTraits(traits, comparator);
+  };
+
+});

src/lib/Database.js

@@ -785,3 +785,37 @@ test( 'reset_failure', function(assert)
 
   online();
 });
+
+test( 'hasTrait', function(assert)
+{
+  var prefix = 'Database_hasTrait_';
+
+  var Trait1 = {
+    load: Rekord.Load.All
+  };
+  var Trait2 = {
+    store: false
+  };
+  var TraitFunction = function(field, value) {
+    var trait = {};
+    trait[ field ] = value;
+    return trait;
+  };
+
+  var Task = Rekord({
+    name: prefix + 'task',
+    fields: ['name'],
+    traits: [
+      Trait1,
+      TraitFunction('rest', false)
+    ]
+  });
+
+  ok( Task.hasTrait( Trait1 ) );
+  notOk( Task.hasTrait( Trait2 ) );
+  ok( Task.hasTrait( TraitFunction('rest', false) ) );
+
+  ok( Task.Database.load === Rekord.Load.All );
+  ok( Task.Database.store !== false );
+  ok( Task.Database.rest instanceof TestRest === false );
+});