ocean-rails 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bb5b73ec236ad99108aeff9b8f85b9840d68b19
-  data.tar.gz: 6ba40090f25e11d957d0ccba50a5cdc1d70d8c77
+  metadata.gz: ddd77052a13c531215d5a319c731f04a71b52641
+  data.tar.gz: 1f6993cbf041b79efe6f58c7dca63fddd0a23ba4
 SHA512:
-  metadata.gz: a6060f4e6d31e077f10066e59a73e876f1e3874c88f53cebb6ed972fd2c94b133c99340137c344b5c4b96251020ec6b61ee5522412391f2f6168c930ba89d695
-  data.tar.gz: b8627857c7f60918750963f1f186962d5d411fd7c317beba1ece0d0330a842d2a56b7559f86c92ca8f4dd75bcf982d9bfcd82a3eafed9b365822fe6b2699f1ff
+  metadata.gz: d190b929b801a83006b50a2f97022f97b46241233059c5e2d6e2ff3c398eefd0f894e64a2c4ef353b860665ed1fd2accc4cd19b436837d6ab75304c7b4730cbe
+  data.tar.gz: 4c278e2e491ca601d85b5d1100223f80e3012dcb2d4a36c4c68cec5e50ce69bae167a17fbb673b2318d7bcfde2d4dc485239d70e3238b301fe301f0a74159fac

data/lib/ocean/api_resource.rb

@@ -73,9 +73,9 @@ module ApiResource
       # Pagination
       if page.present?
         page = page.to_i
-        page_size = page_size.to_i
         return query.none if page < 0
-        query = query.limit(page_size || collection_page_size).offset(page_size * page)
+        page_size = page_size.to_i || collection_page_size
+        query = query.limit(page_size).offset(page_size * page)
       end
       # Finally, return the accumulated Relation
       query

data/lib/ocean/ocean_application_controller.rb

@@ -176,12 +176,25 @@ module OceanApplicationController
     else
       resources = x.dup.collect { |m| render_to_string(partial: m.to_partial_path, 
                                                    locals: {m.class.model_name.i18n_key => m}) }
-      attrs = {count: resources.count,
-               total_count: x.unscope(:limit, :offset).count
+      count = resources.count
+      total_count = x.unscope(:limit, :offset).count
+      attrs = {count: count,
+               total_count: total_count
               }
       links = {}
       if href
         links['self'] =  {href: href, type: 'application/json'}
+        if params[:page]
+          page = params[:page].to_i
+          page_size = params[:page_size].to_i || x.collection_page_size
+          last_page = (total_count / page_size).ceil
+          prev_page = page > 0 && page - 1
+          next_page = page != last_page && page + 1
+          links['first_page'] = {href: url_for(params.merge(page: 0)), type: 'application/json'}
+          links['last_page'] = {href: url_for(params.merge(page: last_page)), type: 'application/json'}
+          links['previous_page'] = {href: url_for(params.merge(page: prev_page)), type: 'application/json'} if prev_page
+          links['next_page'] = {href: url_for(params.merge(page: next_page)), type: 'application/json'} if next_page
+        end
       end
       if links
         attrs['_links'] = links

data/lib/ocean/version.rb

@@ -1,3 +1,3 @@
 module Ocean
-  VERSION = "2.0.8"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Peter Bengtson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday