jest - npm Package Compare versions

Comparing version 0.0.74 to 0.0.75

mongoose_resource.js

 var _ = require('underscore'),
     Class = require('sji'),
-    Resource = require('./resource'),
-    Validation = require('./mongoose_validation');
+    Resource = require('./resource');
+   // Validation = require('./mongoose_validation');
 
@@ -14,3 +14,3 @@ var MongooseResource = module.exports = Resource.extend({
         };
-        this.validation = new Validation(model);
+      //  this.validation = new Validation(model);
     },
@@ -35,13 +35,32 @@
             var splt = filter.split('__');
+            var query_op = null;
+            var query_key = filter;
+            var query_value = filters[filter];
             if (splt.length > 1) {
-                query.where(splt[0])[splt[1]](filters[filter]);
-                count_query.where(splt[0])[splt[1]](filters[filter]);
+                query_key = splt[0];
+                query_op = splt[1];
             }
-            else {
-                query.where(filter, filters[filter]);
-                count_query.where(filter, filters[filter]);
+            if(self.model.schema.paths[query_key].options.type == Boolean)
+                query_value = query_value.toLowerCase().trim() == 'true';
+            if(self.model.schema.paths[query_key].options.type == Number)
+                query_value = Number(query_value.trim());
+            if(query_op)
+            {
+                query.where(query_key)[query_op](query_value);
+                count_query.where(query_key)[query_op](query_value);
             }
+            else
+            {
+                query.where(query_key, query_value);
+                count_query.where(query_key, query_value);
+            }
+            console.log(typeof(query_value));
+            console.log(query_value);
         }
+        var default_sort = query.options.sort || [];
+        query.options.sort = [];
         for (var i = 0; i < sorts.length; i++)
             query.sort(sorts[i].field, sorts[i].type);
+        for(var i=0; i<default_sort.length; i++)
+            query.options.sort.push(default_sort[i]);
         query.limit(limit);
@@ -48,0 +67,0 @@ query.skip(offset);

package.json

 {
 	"name":"jest",
 	"description":"JavaScriptational State Transfer. JS restful API layer with Mongoose based resources. Inspired by python Tastypie",
-	"version":"0.0.74",
+	"version":"0.0.75",
 	"author":"Ishai Jaffe <[e-mail]>",
@@ -6,0 +6,0 @@ "contributors": [

resource.js

@@ -325,7 +325,7 @@ var _ = require('underscore'),
         if (typeof(objs) == 'object' && 'meta' in objs && 'objects' in objs) {
-            objs.objects = this.dehydrate(objs.objects);
+            objs.objects = this.dehydrate(objs.objects,this.get_tree());
             return objs;
         }
         else
-            return this.dehydrate(objs);
+            return this.dehydrate(objs,this.get_tree());
     },
@@ -361,4 +361,2 @@ /**
         if (!tree)
-            tree = this.get_tree();
-        if (!tree)
             return object;
@@ -365,0 +363,0 @@ var new_object = {};

No alert changes

Improved metrics

Total package byte prevSize

4442544

increased by0.02%

Number of package files

306

increased by0.33%

Lines of code

34794

increased by0.05%

No dependency changes