hal_api-rails 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93692b389012f8d919478bd871f756f90118c517a1edde2a5ae6cbb463d644b1
-  data.tar.gz: b15713d0ba0c1e005044dc48cc0a737066d89e1de84f1233e8072e17cdabc6d6
+  metadata.gz: e65263d5ce378a545b2d3567660f7e7794557d7709e325e34a493a683993ad36
+  data.tar.gz: a9ec78d859e620c476757e2e7885aafeb3b3cb3203e33b0d8666c9710074ec9c
 SHA512:
-  metadata.gz: 572d57798b5240e8e33032de9b74492548f4901bb3fc74e9f2c40b65c59fea32d59b51a958e62087609365302ceb6fc349532920fb779a9d3d35aab841e97be5
-  data.tar.gz: 8f2e81fe36e137287dab3492dc0636588c06ba3910fe9ddb682e3bfe42ddede2c4e79717229f12a6af8174bbde2fcf1cb222fbdc5aaadc1d64807f0c12e7e175
+  metadata.gz: 60c496246425fc92b38f6d495bd78d9f8ac4c30e0af0b925bb248f8b346b06a15c191ddd47a8c676417dbd224f067f15765155bd1aee5627be6a65c4772331ac
+  data.tar.gz: 3b96b70cad2e0845d70778361d69f69aadfb2711302123ddec2b03aa95ff16a6a98e961ff03a431f2a57659b49cadbcf8ed1d629764efb5758f8e9d7304bb0ef

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/rails/version.rb

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

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)

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.1
 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-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -254,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: JSON HAL APIs on Rails in the style of PRX