hal_api-rails 1.1.0 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 93692b389012f8d919478bd871f756f90118c517a1edde2a5ae6cbb463d644b1
-  data.tar.gz: b15713d0ba0c1e005044dc48cc0a737066d89e1de84f1233e8072e17cdabc6d6
+SHA1:
+  metadata.gz: a0316407b967e74603428b99f752626d6fa4a95f
+  data.tar.gz: 43b51a70a75c311fb0bd08196c7f6058ec9af7b2
 SHA512:
-  metadata.gz: 572d57798b5240e8e33032de9b74492548f4901bb3fc74e9f2c40b65c59fea32d59b51a958e62087609365302ceb6fc349532920fb779a9d3d35aab841e97be5
-  data.tar.gz: 8f2e81fe36e137287dab3492dc0636588c06ba3910fe9ddb682e3bfe42ddede2c4e79717229f12a6af8174bbde2fcf1cb222fbdc5aaadc1d64807f0c12e7e175
+  metadata.gz: a079010ce5c86f951791178cd5ab5516894ec76d7deb2de4e9a4b0570673083f1946ef0332d0c6ac10325564e08309474d22f5e48e4f8803d9890a2b023fb06c
+  data.tar.gz: 907505ccc54531e8a24ecd0180c170da9c2ddb3b25cd5e49372f7b8b0acf8456c22f3a1aee36229a82c6c695cc7dafec13e368fc985fe67c6d2ec588601431fe

data/.ruby-version

@@ -0,0 +1 @@
+2.4.9

data/lib/hal_api.rb

@@ -6,6 +6,6 @@ module HalApi
   require 'hal_api/responders/api_responder'
 
   def self.rails_major_version
-    ::Rails.version.split('.')[0].to_i
+    ::Rails::VERSION::MAJOR
   end
 end

data/lib/hal_api/controller.rb

@@ -36,8 +36,7 @@ module HalApi::Controller
   private
 
   def set_accepts
-    mime_comparator = case HalApi::rails_major_version
-                      when 5
+    mime_comparator = if HalApi::rails_major_version >= 5
                         Mime[:html]
                       else
                         Mime::HTML
@@ -46,8 +45,7 @@ module HalApi::Controller
   end
 
   def env
-    case HalApi.rails_major_version
-    when 5
+    if HalApi.rails_major_version >= 5
       request.env
     else
       super

data/lib/hal_api/controller/actions.rb

@@ -71,7 +71,9 @@ module HalApi::Controller::Actions
 
   def valid_params_for_action(action)
     (params.permit(*self.class.valid_params_list(action)) || {}).tap do |p|
-      p[:zoom] = zoom_param if zoom_param
+      if zoom_param
+        p[:user_options] = (p[:user_options] || {}).merge(zoom: zoom_param)
+      end
     end.
     to_h
   end

data/lib/hal_api/controller/exceptions.rb

@@ -7,8 +7,7 @@ module HalApi::Controller::Exceptions
   extend ActiveSupport::Concern
 
   def respond_with_error(exception)
-    wrapper = case HalApi.rails_major_version
-              when 5
+    wrapper = if HalApi.rails_major_version >= 5
                 ::ActionDispatch::ExceptionWrapper.new(ActiveSupport::BacktraceCleaner.new, exception)
               else
                 ::ActionDispatch::ExceptionWrapper.new(request.env, exception)

data/lib/hal_api/controller/resources.rb

@@ -102,7 +102,11 @@ module HalApi::Controller::Resources
   end
 
   def paged(arel)
-    arel.page(params[:page]).per(params[:per])
+    if params[:per].to_i <= 0
+      arel.page(params[:page]).per(Kaminari.config.default_per_page)
+    else
+      arel.page(params[:page]).per(params[:per])
+    end
   end
 
   def scoped(res)

data/lib/hal_api/rails/version.rb

@@ -1,5 +1,5 @@
 module HalApi
   module Rails
-    VERSION = "1.1.0"
+    VERSION = '1.1.5'
   end
 end

data/lib/hal_api/representer/collection_paging.rb

@@ -12,11 +12,11 @@ module HalApi::Representer::CollectionPaging
       embeds :items, decorator: lambda{|*| item_decorator }, class: lambda{|*| item_class }, zoom: :always
 
       link :prev do
-        href_url_helper(params.merge(page: represented.prev_page)) unless represented.first_page?
+        href_url_helper(params.merge(page: represented.prev_page)) if represented.prev_page
       end
 
       link :next do
-        href_url_helper(params.merge(page: represented.next_page)) unless represented.last_page?
+        href_url_helper(params.merge(page: represented.next_page)) if represented.next_page
       end
 
       link :first do

data/lib/hal_api/representer/embeds.rb

@@ -10,15 +10,6 @@ module HalApi::Representer::Embeds
     Representable::Binding.send(:include, HalApiRailsRenderPipeline) if !Representable::Binding.include?(HalApiRailsRenderPipeline)
   end
 
-  def normalize_options!(options)
-    propagated_options, private_options = super(options)
-
-    # we want this to propogate, and be available for `skip_property?`, so don't delete
-    private_options[:zoom] = options[:zoom] if options.key?(:zoom)
-
-    [propagated_options, private_options]
-  end
-
   module HalApiRailsRenderPipeline
 
     def skip_property?(binding, private_options)
@@ -37,8 +28,6 @@ module HalApi::Representer::Embeds
 
     # embed if zoomed
     def suppress_embed?(input, options)
-      user_options = options[:options]
-
       binding = options[:binding]
 
       # guard against non-hal representers
@@ -51,7 +40,8 @@ module HalApi::Representer::Embeds
       return false if !embedded
 
       ## check if it should be zoomed, suppress if not
-      !embed_zoomed?(name, binding[:zoom], user_options[:zoom])
+      user_zooms = options[:options].try(:[], :user_options).try(:[], :zoom)
+      !embed_zoomed?(name, binding[:zoom], user_zooms)
     end
 
     def embed_zoomed?(name, zoom_def = nil, zoom_param = nil)
@@ -95,7 +85,9 @@ module HalApi::Representer::Embeds
         options[:getter] ||= ->(*) do
           cnt = send(name).count
           per = getter_per == :all ? cnt : getter_per
-          if cnt <= per
+          if cnt == 0
+            items = send(name).page(1).per(Kaminari.config.default_per_page)
+          elsif cnt <= per
             items = Kaminari.paginate_array(send(name)).page(1).per(per)
           else
             items = send(name).page(1).per(per)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_api-rails
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.5
 platform: ruby
 authors:
 - Chris Rhoden
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -202,6 +202,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -254,7 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: JSON HAL APIs on Rails in the style of PRX