ocean-rails 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddd77052a13c531215d5a319c731f04a71b52641
-  data.tar.gz: 1f6993cbf041b79efe6f58c7dca63fddd0a23ba4
+  metadata.gz: ee568551ab7cc1568b5a5f42ed9fb178059f454e
+  data.tar.gz: 8bcdd5311573411e7de5a5be71b7749a560c0986
 SHA512:
-  metadata.gz: d190b929b801a83006b50a2f97022f97b46241233059c5e2d6e2ff3c398eefd0f894e64a2c4ef353b860665ed1fd2accc4cd19b436837d6ab75304c7b4730cbe
-  data.tar.gz: 4c278e2e491ca601d85b5d1100223f80e3012dcb2d4a36c4c68cec5e50ce69bae167a17fbb673b2318d7bcfde2d4dc485239d70e3238b301fe301f0a74159fac
+  metadata.gz: 3d8ad03e2440314d32da75347424f88519f576190d269dd5157b0e0365f62a891231afe15962dee612e1682e562cf0eb3850a3bc5dcc1bd1257b06bfa96840c6
+  data.tar.gz: 511d8a48333a4b1309031a1e82c290b31fed9f2c35b2608a407e26c081cd170ad1eeec3ba6cf173bbb496db5fafd2322b20a12ab7b55ee1cfd61f6433fa86ed8

data/lib/ocean/ocean_application_controller.rb

@@ -178,6 +178,10 @@ module OceanApplicationController
                                                    locals: {m.class.model_name.i18n_key => m}) }
       count = resources.count
       total_count = x.unscope(:limit, :offset).count
+      # page = nil
+      # page_size = nil
+      # prev_page = nil
+      # next_page = nil
       attrs = {count: count,
                total_count: total_count
               }
@@ -187,7 +191,8 @@ module OceanApplicationController
         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
+          total_pages = (total_count.to_f / page_size.to_f).ceil
+          last_page = total_pages - 1
           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'}
@@ -196,9 +201,12 @@ module OceanApplicationController
           links['next_page'] = {href: url_for(params.merge(page: next_page)), type: 'application/json'} if next_page
         end
       end
-      if links
-        attrs['_links'] = links
-      end
+      
+      attrs['_links'] = links if links
+      attrs['page'] = page if page
+      attrs['page_size'] = page_size if page_size
+      attrs['total_pages'] = total_pages if total_pages
+
       render text: '{"_collection":{"resources":[' + resources.join(',') + ']' + 
         (attrs.collect do |k, v|
            ',"' + k.to_s + '":' + v.to_json

data/lib/ocean/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ocean-rails
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Peter Bengtson