grape-entity 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c0080bab47d3cd3667c29ef580dcca4977ba5572d95c56304dd55cc444456fc
-  data.tar.gz: 40b564ee118de1a2a5b36dcff7526ca6bb1c54d738b7ac2191b1a208a583add1
+  metadata.gz: 9e3db71fd839585d80faac0980ec028b1204def600b6ce36101e2986e0be3cbf
+  data.tar.gz: 7bfcb78548991ed3ab73bfc1f23a51e1e32c2af7ccba472e87b9a767a9499c79
 SHA512:
-  metadata.gz: 06564de07c6a909a3dbd4c3839902f529c5c44291f1a0669bcbc3dca7ea1e015db71887ca9f46132ef5bf4bb01fd10fced74b09ac392f3678903d39875816b63
-  data.tar.gz: 3e22b1382012b543d50a256e1792f9f79e3b02d49e42420353a351d49f549f021cd3dede90c576f657f0e61df862c0d8879cfb9c0a1d4578ef77a5648845ff6e
+  metadata.gz: 1ba1bf0a642f56275e8279b34d433591a21c7849ede46d0718fd6496831d4f5b5bd676bda0af6bf435beebe5c717ace6c0b53c1c90db92fdecccb8d88cdbe044
+  data.tar.gz: c06a650f7c29dd918fa8b83ab62dd04b91448bcddc440a43e48d055f5499982b6c4532f18abc7429f71f464895b083f8e551748c9d9fdf0f8072c2cd1af0e438

data/.rspec

@@ -1,2 +1,3 @@
---format documentation
 --color
+--profile
+--format documentation

data/CHANGELOG.md

@@ -9,6 +9,13 @@
 * Your contribution here.
 
 
+### 0.10.1 (2021-10-22)
+
+#### Fixes
+
+* [#359](https://github.com/ruby-grape/grape-entity/pull/359): Respect `hash_access` setting when using `expose_nil: false` option - [@magni-](https://github.com/magni-).
+
+
 ### 0.10.0 (2021-09-15)
 
 #### Features

data/README.md

@@ -111,6 +111,20 @@ The field lookup takes several steps
 * next try `object.fetch(exposure)`
 * last raise an Exception
 
+`exposure` is a Symbol by default. If `object` is a Hash with stringified keys, you can set the hash accessor at the entity-class level to properly expose its members:
+
+```ruby
+class Status < GrapeEntity
+  self.hash_access = :to_s
+
+  expose :code
+  expose :message
+end
+
+Status.represent({ 'code' => 418, 'message' => "I'm a teapot" }).as_json
+#=> { code: 418, message: "I'm a teapot" }
+```
+
 #### Exposing with a Presenter
 
 Don't derive your model classes from `Grape::Entity`, expose them using a presenter.

data/lib/grape_entity/delegator/base.rb

@@ -13,6 +13,11 @@ module Grape
         def delegatable?(_attribute)
           true
         end
+
+        def accepts_options?
+          # Why not `arity > 1`? It might be negative https://ruby-doc.org/core-2.6.6/Method.html#method-i-arity
+          method(:delegate).arity != 1
+        end
       end
     end
   end

data/lib/grape_entity/delegator.rb

@@ -11,10 +11,14 @@ module Grape
     module Delegator
       def self.new(object)
         delegator_klass =
-          if object.is_a?(Hash) then HashObject
-          elsif defined?(OpenStruct) && object.is_a?(OpenStruct) then OpenStructObject
-          elsif object.respond_to?(:fetch, true) then FetchableObject
-          else PlainObject
+          if object.is_a?(Hash)
+            HashObject
+          elsif defined?(OpenStruct) && object.is_a?(OpenStruct)
+            OpenStructObject
+          elsif object.respond_to?(:fetch, true)
+            FetchableObject
+          else
+            PlainObject
           end
 
         delegator_klass.new(object)

data/lib/grape_entity/entity.rb

@@ -481,9 +481,6 @@ module Grape
       @object = object
       @options = options.is_a?(Options) ? options : Options.new(options)
       @delegator = Delegator.new(object)
-
-      # Why not `arity > 1`? It might be negative https://ruby-doc.org/core-2.6.6/Method.html#method-i-arity
-      @delegator_accepts_opts = @delegator.method(:delegate).arity != 1
     end
 
     def root_exposures
@@ -541,7 +538,7 @@ module Grape
     def delegate_attribute(attribute)
       if is_defined_in_entity?(attribute)
         send(attribute)
-      elsif @delegator_accepts_opts
+      elsif delegator.accepts_options?
         delegator.delegate(attribute, **self.class.delegation_opts)
       else
         delegator.delegate(attribute)

data/lib/grape_entity/exposure.rb

@@ -56,7 +56,12 @@ module Grape
           Condition.new_unless(
             proc do |object, _options|
               if options[:proc].nil?
-                Delegator.new(object).delegate(attribute).nil?
+                delegator = Delegator.new(object)
+                if is_a?(Grape::Entity) && delegator.accepts_options?
+                  delegator.delegate(attribute, **self.class.delegation_opts).nil?
+                else
+                  delegator.delegate(attribute).nil?
+                end
               else
                 exec_with_object(options, &options[:proc]).nil?
               end

data/lib/grape_entity/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GrapeEntity
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/spec/grape_entity/hash_spec.rb

@@ -17,7 +17,7 @@ describe Grape::Entity do
         expose :post, if: :full
         expose :city
         expose :street
-        expose :house
+        expose :house, expose_nil: false
       end
 
       class Company < Grape::Entity
@@ -62,9 +62,23 @@ describe Grape::Entity do
       }
     }
 
+    company_without_house_with_string = {
+      'full_name' => 'full_name',
+      'name' => 'name',
+      'address' => {
+        'post' => '123456',
+        'city' => 'city',
+        'street' => 'street',
+        'something_else' => 'something_else'
+      }
+    }
+
     expect(EntitySpec::CompanyWithString.represent(company_with_string).serializable_hash).to eq \
       company.slice(:name).merge(address: company[:address].slice(:city, :street, :house))
 
+    expect(EntitySpec::CompanyWithString.represent(company_without_house_with_string).serializable_hash).to eq \
+      company.slice(:name).merge(address: company[:address].slice(:city, :street))
+
     expect(EntitySpec::CompanyWithString.represent(company_with_string, full: true).serializable_hash).to eq \
       company.slice(:full_name, :name).merge(address: company[:address].slice(:city, :street, :house))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-15 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport