Merge branch 'master' of github.com:catarse/mithril.postgrest

catarse · Nov 30, 2015 · f4ace7f · f4ace7f
2 parents 1340214 + e59ab55
commit f4ace7f
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/dist/mithril.postgrest.js b/dist/mithril.postgrest.js
diff --git a/dist/mithril.postgrest.min.js b/dist/mithril.postgrest.min.js
diff --git a/spec/filtersVM.spec.js b/spec/filtersVM.spec.js
@@ -34,6 +34,11 @@ describe("m.postgrest.filtersVM", function(){
     expect(vm.parameters()).toEqual({id: 'eq.7', name: 'ilike.*foo*', order: 'name.asc,id.desc', value: ['gte.1', 'lte.2'], full_text: '@@.foo&bar&qux', deactivated_at: 'not.is.null'});
   });
 
+  it("the chain function should build an object for the request using PostgREST syntax", function() {
+    var chain = vm.id(7).name('foo').value.gte(1).value.lte(2).full_text(' foo  bar qux ').deactivated_at(!null).order({name: 'asc', id: 'desc'}).parameters();
+    expect(chain).toEqual({id: 'eq.7', name: 'ilike.*foo*', order: 'name.asc,id.desc', value: ['gte.1', 'lte.2'], full_text: '@@.foo&bar&qux', deactivated_at: 'not.is.null'});
+  });
+
   it("should use custom .toFilter to get value from filter getters", function() {
     vm.name('foo');
     vm.name.toFilter = function(){

diff --git a/src/vms/filtersVM.js b/src/vms/filtersVM.js
@@ -40,7 +40,7 @@
                     }
                     return memo;
                 }, {
-                    order: m.prop()
+                    order: filter()
                 }
             ),
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ @@
                         }
                         return memo;
                     }, {
-                        order: m.prop()
+                        order: filter()
                     }
                 ),
@@ Expand Down @@