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

catarse · Oct 7, 2015 · 0a65bbf · 0a65bbf
2 parents bfffd70 + fd8e33c
commit 0a65bbf
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 12 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/paginationVM.spec.js b/spec/paginationVM.spec.js
@@ -11,9 +11,9 @@ describe("m.postgrest.paginationVM", function(){
 
   describe("when fetch fails", function(){
     beforeEach(function(){
-      vm = m.postgrest.paginationVM(model.getPage);
+      vm = m.postgrest.paginationVM(model, null, false);
       jasmine.Ajax.stubRequest(/foo.*/).andReturn({
-        'status' : 401, 
+        'status' : 401,
         'responseText' : 'Invalid user'
       });
     });
@@ -35,9 +35,9 @@ describe("m.postgrest.paginationVM", function(){
   describe("when fetch is successful", function(){
     beforeEach(function(){
       spyOn(model, "getPage").and.callThrough();
-      vm = m.postgrest.paginationVM(model.getPage);
+      vm = m.postgrest.paginationVM(model, null, false);
       jasmine.Ajax.stubRequest(/foo.*/).andReturn({
-        'responseText' : '["items"]'
+        'responseText' : '["items"]',
       });
     });
 
@@ -65,6 +65,7 @@ describe("m.postgrest.paginationVM", function(){
 
     describe("#firstPage", function() {
       it("should be a function", function(){
+        var lastRequest = jasmine.Ajax.requests.mostRecent();
         expect(vm.firstPage).toBeFunction();
       });
 
@@ -80,6 +81,17 @@ describe("m.postgrest.paginationVM", function(){
       });
     });
 
+    describe("#isLastPage", function() {
+      it("should be a function", function() {
+        expect(vm.isLastPage).toBeFunction();
+      });
+
+      it("should return false when  is not the last page", function() {
+        vm.firstPage();
+        expect(vm.isLastPage()).toEqual(false);
+      });
+    });
+
     describe("#nextPage", function() {
       it("should be a function", function(){
         expect(vm.nextPage).toBeFunction();

diff --git a/src/vms/paginationVM.js b/src/vms/paginationVM.js
@@ -7,12 +7,15 @@
     factory(window.m, window._);
   }
 }(function(m, _) {
-  m.postgrest.paginationVM = (pageRequest, order) => {
+  m.postgrest.paginationVM = (model, order, authenticate = true) => {
     let collection = m.prop([]),
+      rangeHeaderRgx = new RegExp("(\d+)-(\d+)?\/?(\d+)"),
       defaultOrder = order || 'id.desc',
       filters = m.prop({order: defaultOrder}),
       isLoading = m.prop(false),
       page = m.prop(1),
+      resultsCount = m.prop(10),
+      pageRequest = authenticate ? model.getPageWithToken : model.getPage,
       total = m.prop();
 
     const fetch = () => {
@@ -22,8 +25,11 @@
           return JSON.stringify({hint: null, details: null, code: 0, message: 'Connection error'});
         }
         let rangeHeader = xhr.getResponseHeader('Content-Range');
-        if (_.isString(rangeHeader) && rangeHeader.split('/').length > 1){
-          total(parseInt(rangeHeader.split('/')[1]));
+        if (_.isString(rangeHeader)){
+          let matches = rangeHeaderRgx.exec(rangeHeader);
+
+          total(parseInt(matches[2]));
+          resultsCount((parseInt(matches[0]) -  parseInt(matches[1])));
         }
         try {
           JSON.parse(xhr.responseText);
@@ -56,6 +62,10 @@
       return fetch();
     },
 
+    isLastPage = () => {
+      return (page() * model.pageSize() >= total());
+    },
+
     nextPage = () => {
       page(page() + 1);
       return fetch();
@@ -66,6 +76,7 @@
       firstPage: firstPage,
       isLoading: isLoading,
       nextPage: nextPage,
+      isLastPage: isLastPage,
       total: total
     };
   };