hal_api-rails 0.7.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8ca09414db3082766a5b86ee83310563af05628
-  data.tar.gz: 002aceca75878356759760d73f5dd68cd6dc03d4
+  metadata.gz: 6582376382b79d5798d11a52efd471b1045a6f9b
+  data.tar.gz: a42dc149632a9204917a52324a77eb84d8e8a6aa
 SHA512:
-  metadata.gz: 25f710db7f628fbbd0b708c06e04f4b1f2eb8335ecbb8a48311e68ac4259ad5cfe80d5bbbd02df41d55ea846c8b0d4423055cf1fcbe64f09e37217d1d7c92d33
-  data.tar.gz: df4c7da616d62d01b5dddeb031b2e2c7bd94b61e6399452ab17fbe7a43ffe12c1909e5b138821de4e74dad83ac98295355a1550729a5a4220508f24faaa9f849
+  metadata.gz: 15d29307746ba71e20696715b029bd6596eedf0e2c2daec49cac50f96cfd7e85b2fdb88973ff39420547e0ca84e941fc7ff3129cb71aeaad7536190b9f95cffa
+  data.tar.gz: 9790fb8b62284d9292bb8fb6e29cbeac080c9d76511b1bceb9305fb26a6b99439c25597b53334e1bb2325eab3d0cb2e8d9b57f800f39a5b467f9079621aedfec

data/.ruby-version

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

data/.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.2.2
+  - 2.4.9

data/hal_api-rails.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency "actionpack", ">= 3.0.0"
   spec.add_dependency "rack-test"
   spec.add_dependency "activesupport", ">= 3.0.0"
-  spec.add_dependency "responders", "~> 2.0"
-  spec.add_dependency "roar-rails", "~> 1.0.2"
+  spec.add_dependency "responders", "~> 3.0"
+  spec.add_dependency "roar-rails", "~> 1.1.0"
   spec.add_dependency "multi_json"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rails", "~> 4.2.1"
+  spec.add_development_dependency "rails", "~> 5.2.4"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "kaminari"

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

@@ -11,10 +11,10 @@ module HalApi::Controller::Exceptions
               when 5
                 ::ActionDispatch::ExceptionWrapper.new(ActiveSupport::BacktraceCleaner.new, exception)
               else
-                ::ActionDispatch::ExceptionWrapper.new(env, exception)
+                ::ActionDispatch::ExceptionWrapper.new(request.env, exception)
               end
 
-    log_error(env, wrapper)
+    log_error(request.env, wrapper)
 
     error = exception
     if !error.is_a?(HalApi::Errors::ApiError)

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 = "0.7.0"
+    VERSION = '1.1.3'
   end
 end

data/lib/hal_api/representer/embeds.rb

@@ -1,39 +1,47 @@
 require 'active_support/concern'
 require 'hal_api/paged_collection'
+require "representable/pipeline_factories"
 
 # expects underlying model to have filename, class, and id attributes
 module HalApi::Representer::Embeds
   extend ActiveSupport::Concern
 
   included do
-    Representable::Mapper.send(:include, Resources) if !Representable::Mapper.include?(Resources)
+    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 Resources
+  module HalApiRailsRenderPipeline
 
     def skip_property?(binding, private_options)
       super(binding, private_options) || suppress_embed?(binding, private_options)
     end
 
+    def render_functions
+      funcs = super
+      f = ->(input, options) do
+        if suppress_embed?(input, options)
+          return Representable::Pipeline::Stop
+        end
+      end
+      [f] + funcs
+    end
+
     # embed if zoomed
-    def suppress_embed?(binding, options)
-      name = binding[:as].evaluate(self).to_s || binding.name
-      embedded = !!binding[:embedded]
+    def suppress_embed?(input, 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]
 
-      # not embedded, return false - nothing to suppress
       return false if !embedded
 
-      # check if it should be zoomed, suppress if not
-      !embed_zoomed?(name, binding[:zoom], options[:zoom])
+      ## check if it should be zoomed, suppress if not
+      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)
@@ -77,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)

data/lib/hal_api/representer/link_serialize.rb

@@ -15,8 +15,9 @@ module HalApi::Representer::LinkSerialize
       if options.is_a?(Hash) && (options.delete(:writeable) || options[:reader])
         name = options[:rel].to_s.split(':').last.split('/').last
         pname = "set_#{name}_uri"
-        reader = options.delete(:reader) || ->(doc, _args) do
+        reader = options.delete(:reader) || ->(represented:, doc:, **) do
           try("#{name}_id=", id_from_url(doc[pname])) if doc[pname]
+          Representable::Pipeline::Stop
         end
 
         property(pname, readable: false, reader: reader)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_api-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.1.3
 platform: ruby
 authors:
 - Chris Rhoden
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -73,28 +73,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: roar-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -143,14 +143,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 5.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 5.2.4
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -202,6 +202,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -255,7 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: JSON HAL APIs on Rails in the style of PRX