hal_api-rails 1.0.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 35f7ab8e051a6d7132ecf26800670c4e56489c7371539ac92fdcc6e88fb5d280
-  data.tar.gz: 5fd5ecbdd0ba0287c0c01e1e5ed24cd23b5cb10aa157be28224b7ec6c6c25698
+SHA1:
+  metadata.gz: 4d1af91c55bf42a53d4ecfe0c6ed673bd2856a57
+  data.tar.gz: 0f0dac6e3b4e33821d9c20b0efe5fa1ead07b30e
 SHA512:
-  metadata.gz: 653ca1b7461fd1c3b598904e85e430c4632485f6c390192deaab63dc8e0a13c3970ed4d94486d1cf749d09966edf4055602b00a71e3f54c7b83a08bdc21a57b2
-  data.tar.gz: 11ce89bb941bf1e9f83d377fe1bc7b0da9a6e94cd7d7e93fb8b516348ceb7550e37966c2cbb6b4357f90bed927130a5a44658de12572ac0a37e1a2f270890f05
+  metadata.gz: 9bdfb40d56cfac300c5b2263ab25eec3b6162420cb417897c558b3e4bdfbd556acefe32da9387939ced5cb35046ad9295a6c7889881f385d996621914c0f5f3a
+  data.tar.gz: 5c0745b9303bae2e66046fbda5ded266b0b642350968e5bbaf409a55d6c49186770217c22a2f80813e85f4f3e4b9e58b69c6a548689e44f55dba6c8def4b3e02

data/.ruby-version

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

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

@@ -25,11 +25,12 @@ module HalApi::Controller::Exceptions
 
     notice_error(exception) if error.status >= 500
 
-    json = {status: error.status, message: error.message}
-    if Rails.configuration.try(:consider_all_requests_local)
-      json[:backtrace] = error.backtrace
-    end
-    render status: error.status, json: json
+    respond_with(
+      error,
+      status: error.status,
+      location: nil, # for POST requests
+      represent_with: HalApi::Errors::Representer
+    )
   end
 
   def log_error(env, wrapper)

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/errors.rb

@@ -48,4 +48,12 @@ module HalApi::Errors
       super(msg, 400, hint)
     end
   end
+
+  module Representer
+    include Roar::JSON::HAL
+
+    property :status
+    property :message
+    property :backtrace, if: -> (*) { Rails.configuration.try(:consider_all_requests_local) }
+  end
 end

data/lib/hal_api/rails/version.rb

@@ -1,5 +1,5 @@
 module HalApi
   module Rails
-    VERSION = "1.0.0"
+    VERSION = '1.1.4'
   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,10 +28,11 @@ module HalApi::Representer::Embeds
 
     # embed if zoomed
     def suppress_embed?(input, options)
-      user_options = options[:options]
-
       binding = options[:binding]
 
+      # guard against non-hal representers
+      return false unless binding[:as].present?
+
       name = binding.evaluate_option(:as, input, options)
 
       embedded = binding[:embedded]
@@ -48,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)
@@ -92,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.0.0
+  version: 1.1.4
 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: 2020-06-10 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