restpack_serializer 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e057f9443e4458620f07fe24d2c231caac2aab7
-  data.tar.gz: e84c048d7a562944581eaec14e353147df4b0398
+  metadata.gz: dfbd8796c92fa7467d0ffac9b47477668189212b
+  data.tar.gz: 41d7e43eb3cd37b6bebdd491e3c278d084effc1d
 SHA512:
-  metadata.gz: cc7334b9da94b802974a40351c7be43860d5691129cdd1d8f84aa56c3e7ea68ba83ce454144c192bd64d439f9fb36e32551361f852ef512d80d260d51ee04f9f
-  data.tar.gz: e08a930f72863feffacea046f8e5fbaacf6a941416f2302a68eef87ba0b7bbe99397fbff40f3d916e46fd2541d8ad21d1e74e1ed4355cfa49f22710c0a6fc492
+  metadata.gz: a0b65750fcc4de192ff9841a9c7f406a78339116fe6daa0c8ab94cf37f2d655140c87b06a23e923d4c493579e15e2a206e3f50982291783fde1e3e316ca9b533
+  data.tar.gz: 998f3f1cdd6cdcdfbfb7cf3678a37c677e468ea1163e632acdd27368b1925718d35d029dbc8f8290db9fc9ffb21f123c07d756003ba687475a2ac1d74b33f3d7

data/README.md

@@ -168,8 +168,10 @@ http://restpack-serializer-sample.herokuapp.com/api/v1/songs.json?page=2&page_si
             "page_count": 14,
             "previous_page": 1,
             "next_page": 3,
-            "previous_href": "/api/v1/songs?page_size=3",
-            "next_href": "/api/v1/songs?page=3&page_size=3"
+            "first_href": "/songs?page_size=3",
+            "previous_href": "/songs?page_size=3",
+            "next_href": "/songs?page=3&page_size=3",
+            "last_href": "/songs?page=14&page_size=3"
         }
     },
     "links": {
@@ -266,8 +268,10 @@ which yields:
             "page_count": 1,
             "previous_page": null,
             "next_page": null,
+            "first_href": '/albums',
             "previous_href": null,
-            "next_href": null
+            "next_href": null,
+            "last_href": '/albums'
         }
     },
     "links": {

data/lib/restpack_serializer/serializable/paging.rb

@@ -35,18 +35,19 @@ module RestPack::Serializer::Paging
 
     def serialize_meta(page, options)
       meta = {
-        page: options.page,
-        page_size: options.page_size,
-        count: page.total_count,
-        include: options.include
+          page: page.current_page,
+          page_size: page.limit_value,
+          count: page.total_count,
+          include: options.include,
+          page_count: page.total_pages,
+          previous_page: page.prev_page,
+          next_page: page.next_page
       }
 
-      meta[:page_count] = ((page.total_count - 1) / options.page_size) + 1
-      meta[:previous_page] = meta[:page] > 1 ? meta[:page] - 1 : nil
-      meta[:next_page] = meta[:page] < meta[:page_count] ? meta[:page] + 1 : nil
-
+      meta[:first_href] = page_href(1, options)
       meta[:previous_href] = page_href(meta[:previous_page], options)
       meta[:next_href] = page_href(meta[:next_page], options)
+      meta[:last_href] = page_href(meta[:page_count], options)
       meta
     end
 

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.5.2'
+    VERSION = '0.5.3'
   end
 end

data/restpack_serializer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'activesupport', ['>= 4.0.3', '< 5.0']
   gem.add_dependency 'activerecord', ['>= 4.0.3', '< 5.0']
-  gem.add_dependency 'kaminari', '~> 0.15.1'
+  gem.add_dependency 'kaminari', '~> 0.16.1'
 
   gem.add_development_dependency 'restpack_gem', '~> 0.0.9'
   gem.add_development_dependency 'rake', '~> 10.0.3'

data/spec/serializable/paging_spec.rb

@@ -22,10 +22,12 @@ describe RestPack::Serializer::Paging do
       it "includes valid paging meta data" do
         page[:meta][:songs][:count].should == 18
         page[:meta][:songs][:page_count].should == 2
+        page[:meta][:songs][:first_href].should == '/songs'
         page[:meta][:songs][:previous_page].should == nil
         page[:meta][:songs][:previous_href].should == nil
         page[:meta][:songs][:next_page].should == 2
         page[:meta][:songs][:next_href].should == '/songs?page=2'
+        page[:meta][:songs][:last_href].should == '/songs?page=2'
       end
       it "includes links" do
         page[:links].should == {
@@ -44,6 +46,7 @@ describe RestPack::Serializer::Paging do
       it "includes the custom page size in the page hrefs" do
         page[:meta][:songs][:next_page].should == 2
         page[:meta][:songs][:next_href].should == '/songs?page=2&page_size=3'
+        page[:meta][:songs][:last_href].should == '/songs?page=6&page_size=3'
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-14 00:00:00.000000000 Z
+date: 2014-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,14 +56,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: restpack_gem
   requirement: !ruby/object:Gem::Requirement