grape-entity 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6316984d3c73b100e20294679aa32bf4a9fccffd
-  data.tar.gz: 8f687c1d19b89540afb58a9a5c83b4b4a51e0fb1
+  metadata.gz: 37f12961d0bb27814ea3e9276b02b41ea1ed798b
+  data.tar.gz: 00a68c4665543223ecbd8e3d11f901981ef3960a
 SHA512:
-  metadata.gz: 0639798ea31a230451bc8480cf6bd97818d703d3b978c204d519237ef9accf2aff1834335d749a018a9f476c927355b5e804043680b2237aa11495cdead86bcf
-  data.tar.gz: daff836f74b47ad4b321b647387100bced7b484d734dfa7c2627f5b1d487b4307ed5cdbf4cd0c02018e2b3be3decea9d66d2dd8c08585c2f5bc1355e42aee71d
+  metadata.gz: b034eb40a7a12229251c4d87e31cf365c7282d4b7016859baa8ca3409cb308191594d59ddb838b6ab2f1607cdb1d3e6478267eb735c41d3c63d3a612a4cf6418
+  data.tar.gz: 8c2d400de75c142e64d1bce531d0433c19f1312700893a49a5ff893888221ec73d0d00b193374b3f03d374cfa4af6424ab5af0fb7985cbd2f4dcf677fdba72f8

data/.travis.yml

@@ -4,18 +4,23 @@ language: ruby
 
 cache: bundler
 
+bundler_args: --without development
+
 rvm:
-  - ruby-head
+  - 2.3.1
   - 2.3.0
   - 2.2
   - 2.1
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+  - ruby-head
   - jruby-head
   - rbx-2
 
 matrix:
+  include:
+    - rvm: 2.3.1
+      script:
+        - bundle exec danger
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head

data/CHANGELOG.md

@@ -1,38 +1,74 @@
-0.5.1 (2016-4-4)
-================
+### Next
+
+#### Features
+
+* Your contribution here.
+
+#### Fixes
+
+* Your contribution here.
+
+### 0.5.2 (2016-11-14)
+
+#### Features
+
+* [#226](https://github.com/ruby-grape/grape-entity/pull/226): Added `fetch` from `opts_hash` - [@alanjcfs](https://github.com/alanjcfs).
+* [#232](https://github.com/ruby-grape/grape-entity/pull/232), [#213](https://github.com/ruby-grape/grape-entity/issues/213): Added `#kind_of?` and `#is_a?` to `OutputBuilder` to get an exact class of an `output` object - [@avyy](https://github.com/avyy).
+* [#234](https://github.com/ruby-grape/grape-entity/pull/234), [#233](https://github.com/ruby-grape/grape-entity/issues/233): Added ruby version checking in `Gemfile` to install needed gems versions for supporting old rubies too - [@avyy](https://github.com/avyy).
+* [#237](https://github.com/ruby-grape/grape-entity/pull/237): Added Danger, PR linter - [@dblock](https://github.com/dblock).
+
+#### Fixes
+
+* [#215](https://github.com/ruby-grape/grape-entity/pull/217): `#delegate_attribute` no longer delegates to methods included with `Kernel` - [@maltoe](https://github.com/maltoe).
+* [#219](https://github.com/ruby-grape/grape-entity/pull/219): Double pass options in `serializable_hash` - [@sbatykov](https://github.com/sbatykov).
+* [#231](https://github.com/ruby-grape/grape-entity/pull/231), [#215](https://github.com/ruby-grape/grape-entity/issues/215): Allow `delegate_attribute` for derived entity - [@sbatykov](https://github.com/sbatykov).
+
+### 0.5.1 (2016-4-4)
+
+#### Features
 
-* [#202](https://github.com/ruby-grape/grape-entity/pull/202): Fix: Reset `@using_class` memoization on `.setup` - [@rngtng](https://github.com/rngtng).
 * [#203](https://github.com/ruby-grape/grape-entity/pull/203): `Grape::Entity::Exposure::NestingExposure::NestedExposures.delete_if` always returns exposures - [@rngtng](https://github.com/rngtng).
 * [#204](https://github.com/ruby-grape/grape-entity/pull/204), [#138](https://github.com/ruby-grape/grape-entity/issues/138): Added ability to merge fields into hashes/root (`:merge` option for `.expose`) - [@avyy](https://github.com/avyy).
 
-0.5.0 (2015-12-07)
-==================
+#### Fixes
+
+* [#202](https://github.com/ruby-grape/grape-entity/pull/202): Reset `@using_class` memoization on `.setup` - [@rngtng](https://github.com/rngtng).
+
+### 0.5.0 (2015-12-07)
+
+#### Features
 
 * [#139](https://github.com/ruby-grape/grape-entity/pull/139): Keep a track of attribute nesting path during condition check or runtime exposure - [@calfzhou](https://github.com/calfzhou).
 * [#151](https://github.com/ruby-grape/grape-entity/pull/151): `.exposures` is removed and substituted with `.root_exposures` array - [@marshall-lee](https://github.com/marshall-lee).
 * [#151](https://github.com/ruby-grape/grape-entity/pull/151): `.nested_exposures` is removed too - [@marshall-lee](https://github.com/marshall-lee).
 * [#151](https://github.com/ruby-grape/grape-entity/pull/151): `#should_return_attribute?`, `#only_fields` and `#except_fields` are moved to other classes - [@marshall-lee](https://github.com/marshall-lee).
-* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Fix: double exposures with conditions does not rewrite previously defined now: [#56](https://github.com/ruby-grape/grape-entity/issues/56) - [@marshall-lee](https://github.com/marshall-lee).
-* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Fix: nested exposures were flattened in `.documentation`: [#112](https://github.com/ruby-grape/grape-entity/issues/112) - [@marshall-lee](https://github.com/marshall-lee).
-* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Fix: `@only_fields` and `@except_fields` memoization: [#149](https://github.com/ruby-grape/grape-entity/issues/149) - [@marshall-lee](https://github.com/marshall-lee).
-* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Fix: `:unless` condition with `Hash` argument logic: [#150](https://github.com/ruby-grape/grape-entity/issues/150) - [@marshall-lee](https://github.com/marshall-lee).
 * [#151](https://github.com/ruby-grape/grape-entity/pull/151): Nested `unexpose` now raises an exception: [#152](https://github.com/ruby-grape/grape-entity/issues/152) - [@marshall-lee](https://github.com/marshall-lee).
-* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Fix: `@documentation` memoization: [#153](https://github.com/ruby-grape/grape-entity/issues/153) - [@marshall-lee](https://github.com/marshall-lee).
-* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Fix: serializing of deeply nested presenter exposures: [#155](https://github.com/ruby-grape/grape-entity/issues/155) - [@marshall-lee](https://github.com/marshall-lee).
-* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Fix: deep projections (`:only`, `:except`) were unaware of nesting: [#156](https://github.com/ruby-grape/grape-entity/issues/156) - [@marshall-lee](https://github.com/marshall-lee).
 
-0.4.8 (2015-08-10)
-==================
+#### Fixes
+
+* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Double exposures with conditions does not rewrite previously defined now: [#56](https://github.com/ruby-grape/grape-entity/issues/56) - [@marshall-lee](https://github.com/marshall-lee).
+* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Nested exposures were flattened in `.documentation`: [#112](https://github.com/ruby-grape/grape-entity/issues/112) - [@marshall-lee](https://github.com/marshall-lee).
+* [#151](https://github.com/ruby-grape/grape-entity/pull/151): `@only_fields` and `@except_fields` memoization: [#149](https://github.com/ruby-grape/grape-entity/issues/149) - [@marshall-lee](https://github.com/marshall-lee).
+* [#151](https://github.com/ruby-grape/grape-entity/pull/151): `:unless` condition with `Hash` argument logic: [#150](https://github.com/ruby-grape/grape-entity/issues/150) - [@marshall-lee](https://github.com/marshall-lee).
+* [#151](https://github.com/ruby-grape/grape-entity/pull/151): `@documentation` memoization: [#153](https://github.com/ruby-grape/grape-entity/issues/153) - [@marshall-lee](https://github.com/marshall-lee).
+* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Serializing of deeply nested presenter exposures: [#155](https://github.com/ruby-grape/grape-entity/issues/155) - [@marshall-lee](https://github.com/marshall-lee).
+* [#151](https://github.com/ruby-grape/grape-entity/pull/151): Deep projections (`:only`, `:except`) were unaware of nesting: [#156](https://github.com/ruby-grape/grape-entity/issues/156) - [@marshall-lee](https://github.com/marshall-lee).
+
+### 0.4.8 (2015-08-10)
+
+#### Features
 
-* [#167](https://github.com/ruby-grape/grape-entity/pull/167): Regression: global settings (exposures, formatters) on `Grape::Entity` should work: [#166](https://github.com/ruby-grape/grape-entity/issues/166) - [@marshall-lee](http://github.com/marshall-lee).
+* [#167](https://github.com/ruby-grape/grape-entity/pull/167), [#166](https://github.com/ruby-grape/grape-entity/issues/166): Regression with global settings (exposures, formatters) on `Grape::Entity` - [@marshall-lee](https://github.com/marshall-lee).
 
-0.4.7 (2015-08-03)
-==================
+### 0.4.7 (2015-08-03)
 
-* [#164](https://github.com/ruby-grape/grape-entity/pull/164): Regression: entity instance methods were exposed with `NoMethodError`: [#163](https://github.com/ruby-grape/grape-entity/issues/163) - [@marshall-lee](http://github.com/marshall-lee).
+#### Features
 
-0.4.6 (2015-07-27)
-==================
+* [#164](https://github.com/ruby-grape/grape-entity/pull/164): Regression: entity instance methods were exposed with `NoMethodError`: [#163](https://github.com/ruby-grape/grape-entity/issues/163) - [@marshall-lee](https://github.com/marshall-lee).
+
+### 0.4.6 (2015-07-27)
+
+#### Features
 
 * [#114](https://github.com/ruby-grape/grape-entity/pull/114): Added 'only' option that selects which attributes should be returned - [@estevaoam](https://github.com/estevaoam).
 * [#115](https://github.com/ruby-grape/grape-entity/pull/115): Allowing 'root' to be inherited from parent to child entities - [@guidoprincess](https://github.com/guidoprincess).
@@ -40,46 +76,61 @@
 * [#134](https://github.com/ruby-grape/grape-entity/pull/134): Subclasses no longer affected in all cases by `unexpose` in parent - [@etehtsea](https://github.com/etehtsea).
 * [#135](https://github.com/ruby-grape/grape-entity/pull/135): Added `except` option - [@dan-corneanu](https://github.com/dan-corneanu).
 * [#136](https://github.com/ruby-grape/grape-entity/pull/136): Allow for strings in `only` and `except` options - [@bswinnerton](https://github.com/bswinnerton).
-* [#147](https://github.com/ruby-grape/grape-entity/pull/147): Expose `safe` attributes as `nil` if they cannot be evaluated: [#140](https://github.com/ruby-grape/grape-entity/issues/140) - [@marshall-lee](http://github.com/marshall-lee).
-* [#147](https://github.com/ruby-grape/grape-entity/pull/147): Fix: private method values were not exposed with `safe` option: [#142](https://github.com/ruby-grape/grape-entity/pull/142) - [@marshall-lee](http://github.com/marshall-lee).
-* [#147](https://github.com/ruby-grape/grape-entity/pull/147): Remove catching of `NoMethodError` because it can occur deep inside in a method call so this exception does not mean that attribute not exist - [@marshall-lee](http://github.com/marshall-lee).
-* [#147](https://github.com/ruby-grape/grape-entity/pull/147): `valid_exposures` is removed - [@marshall-lee](http://github.com/marshall-lee).
+* [#147](https://github.com/ruby-grape/grape-entity/pull/147), [#140](https://github.com/ruby-grape/grape-entity/issues/140): Expose `safe` attributes as `nil` if they cannot be evaluated - [@marshall-lee](https://github.com/marshall-lee).
+* [#147](https://github.com/ruby-grape/grape-entity/pull/147): Remove catching of `NoMethodError` because it can occur deep inside in a method call so this exception does not mean that attribute not exist - [@marshall-lee](https://github.com/marshall-lee).
+* [#147](https://github.com/ruby-grape/grape-entity/pull/147): The `valid_exposures` method was removed - [@marshall-lee](https://github.com/marshall-lee).
+
+#### Fixes
+
+* [#147](https://github.com/ruby-grape/grape-entity/pull/147), [#142](https://github.com/ruby-grape/grape-entity/pull/142): Private method values were not exposed with `safe` option - [@marshall-lee](https://github.com/marshall-lee).
 
-0.4.5 (2015-03-10)
-==================
+### 0.4.5 (2015-03-10)
+
+#### Features
 
 * [#109](https://github.com/ruby-grape/grape-entity/pull/109): Added `unexpose` method - [@jonmchan](https://github.com/jonmchan).
 * [#98](https://github.com/ruby-grape/grape-entity/pull/98): Added nested conditionals - [@zbelzer](https://github.com/zbelzer).
 * [#105](https://github.com/ruby-grape/grape-entity/pull/105): Specify which attribute is missing in which Entity - [@jhollinger](https://github.com/jhollinger).
-* [#111](https://github.com/ruby-grape/grape-entity/pull/111): Fix: allow usage of attributes with name 'key' if `Hash` objects are used - [@croeck](https://github.com/croeck).
-* [#110](https://github.com/ruby-grape/grape-entity/pull/110): Fix: safe exposure when using `Hash` models - [@croeck](https://github.com/croeck).
-* [#91](https://github.com/ruby-grape/grape-entity/pull/91): Fix: OpenStruct serializing - [@etehtsea](https://github.com/etehtsea).
 
-0.4.4 (2014-08-17)
-==================
+#### Fixes
+
+* [#111](https://github.com/ruby-grape/grape-entity/pull/111): Allow usage of attributes with name 'key' if `Hash` objects are used - [@croeck](https://github.com/croeck).
+* [#110](https://github.com/ruby-grape/grape-entity/pull/110): Safe exposure when using `Hash` models - [@croeck](https://github.com/croeck).
+* [#91](https://github.com/ruby-grape/grape-entity/pull/91): OpenStruct serializing - [@etehtsea](https://github.com/etehtsea).
+
+### 0.4.4 (2014-08-17)
+
+#### Features
 
 * [#85](https://github.com/ruby-grape/grape-entity/pull/85): Added `present_collection` to indicate that an `Entity` presents an entire Collection - [@dspaeth-faber](https://github.com/dspaeth-faber).
-* [#85](https://guthub.com/ruby-grape/grape-entity/pull/85): Hashes can now be passed as object to be presented and the `Hash` keys can be referenced by expose - [@dspaeth-faber](https://github.com/dspaeth-faber).
+* [#85](https://github.com/ruby-grape/grape-entity/pull/85): Hashes can now be passed as object to be presented and the `Hash` keys can be referenced by expose - [@dspaeth-faber](https://github.com/dspaeth-faber).
 
-0.4.3 (2014-06-12)
-==================
+### 0.4.3 (2014-06-12)
 
-* [#77](https://github.com/ruby-grape/grape-entity/pull/77): Fix: compatibility with Rspec 3 - [@justfalter](https://github.com/justfalter).
-* [#76](https://github.com/ruby-grape/grape-entity/pull/76): Improve performance of entity serialization - [@justfalter](https://github.com/justfalter)
+#### Features
 
-0.4.2 (2014-04-03)
-==================
+* [#76](https://github.com/ruby-grape/grape-entity/pull/76): Improve performance of entity serialization - [@justfalter](https://github.com/justfalter).
+
+#### Fixes
+
+* [#77](https://github.com/ruby-grape/grape-entity/pull/77): Compatibility with Rspec 3 - [@justfalter](https://github.com/justfalter).
+
+### 0.4.2 (2014-04-03)
+
+#### Features
 
 * [#60](https://github.com/ruby-grape/grape-entity/issues/59): Performance issues introduced by nested exposures - [@AlexYankee](https://github.com/AlexYankee).
 * [#60](https://github.com/ruby-grape/grape-entity/issues/57): Nested exposure double-exposes a field - [@AlexYankee](https://github.com/AlexYankee).
 
-0.4.1 (2014-02-13)
-==================
+### 0.4.1 (2014-02-13)
+
+#### Fixes
 
 * [#54](https://github.com/ruby-grape/grape-entity/issues/54): Fix: undefined method `to_set` - [@aj0strow](https://github.com/aj0strow).
 
-0.4.0 (2014-01-27)
-==================
+### 0.4.0 (2014-01-27)
+
+#### Features
 
 * Ruby 1.8.x is no longer supported - [@dblock](https://github.com/dblock).
 * [#36](https://github.com/ruby-grape/grape-entity/pull/36): Enforcing Ruby style guidelines via Rubocop - [@dblock](https://github.com/dblock).
@@ -96,19 +147,20 @@
 * [#51](https://github.com/ruby-grape/grape-entity/pull/51): Raise `ArgumentError` if an unknown option is used with `expose` - [@aj0strow](https://github.com/aj0strow).
 * [#51](https://github.com/ruby-grape/grape-entity/pull/51): Alias `:with` to `:using`, consistently with the Grape api endpoints - [@aj0strow](https://github.com/aj0strow).
 
-0.3.0 (2013-03-29)
-==================
+### 0.3.0 (2013-03-29)
+
+#### Features
 
 * [#9](https://github.com/ruby-grape/grape-entity/pull/9): Added `with_options` for block-level exposure setting - [@SegFaultAX](https://github.com/SegFaultAX).
 * The `instance.entity` method now optionally accepts `options` - [@mbleigh](https://github.com/mbleigh).
 * You can pass symbols to `:if` and `:unless` to simply check for truthiness/falsiness of the specified options key - [@mbleigh](https://github.com/mbleigh).
 
-0.2.0 (2013-01-11)
-==================
+### 0.2.0 (2013-01-11)
+
+#### Features
 
 * Moved the namespace back to `Grape::Entity` to preserve compatibility with Grape - [@dblock](https://github.com/dblock).
 
-0.1.0 (2013-01-11)
-==================
+### 0.1.0 (2013-01-11)
 
 * Initial public release - [@agileanimal](https://github.com/agileanimal).

data/Dangerfile

@@ -0,0 +1 @@
+danger.import_dangerfile(gem: 'ruby-grape-danger')

data/Gemfile

@@ -2,15 +2,34 @@ source 'http://rubygems.org'
 
 gemspec
 
-group :development, :test do
+current_ruby_version = Gem::Version.new(RUBY_VERSION)
+
+if Gem::Requirement.new('>= 2.2.2').satisfied_by? current_ruby_version
+  gem 'activesupport', '~> 5.0'
+  gem 'rack', '~> 2.0', group: [:development, :test]
+else
+  gem 'activesupport', '~> 4.0'
+  gem 'rack', '< 2', group: [:development, :test]
+end
+
+gem 'json', '< 2', group: [:development, :test]
+
+group :development do
   gem 'pry'
   gem 'guard'
   gem 'guard-rspec'
   gem 'guard-bundler'
   gem 'rb-fsevent'
   gem 'growl'
-  gem 'json'
+end
+
+group :development, :test do
+  gem 'rake'
   gem 'rspec'
   gem 'rack-test', '~> 0.6.2', require: 'rack/test'
   gem 'rubocop', '0.31.0'
 end
+
+group :test do
+  gem 'ruby-grape-danger', '~> 0.1.0', require: false
+end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Michael Bleigh and Intridea, Inc.
+Copyright (c) 2010-2016 Michael Bleigh, Intridea, Inc., ruby-grape and Contributors.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -212,7 +212,7 @@ on the object the entity wraps.
 class ExampleEntity < Grape::Entity
   expose :attr_not_on_wrapped_object
   # ...
-private
+  private
 
   def attr_not_on_wrapped_object
     42
@@ -226,7 +226,7 @@ You have always access to the presented instance with `object`
 class ExampleEntity < Grape::Entity
   expose :formatted_value
   # ...
-private
+  private
 
   def formatted_value
     "+ X #{object.value}"
@@ -311,10 +311,41 @@ expose :replies, using: API::Entities::Status, as: :responses
 Apply a formatter before exposing a value.
 
 ```ruby
-format_with(:iso_timestamp) { |dt| dt.iso8601 }
-with_options(format_with: :iso_timestamp) do
-  expose :created_at
-  expose :updated_at
+module Entities
+  class MyModel < Grape::Entity
+    format_with(:iso_timestamp) do |date|
+      date.iso8601
+    end
+
+    with_options(format_with: :iso_timestamp) do
+      expose :created_at
+      expose :updated_at
+    end    
+  end
+end
+```
+
+Defining a reusable formatter between multiples entities:
+
+```ruby
+module ApiHelpers
+  extend Grape::API::Helpers
+
+  Grape::Entity.format_with :utc do |date|
+    date.utc if date
+  end
+end
+```
+
+```ruby
+module Entities
+  class MyModel < Grape::Entity
+    expose :updated_at, format_with: :utc
+  end
+
+  class AnotherModel < Grape::Entity
+    expose :created_at, format_with: :utc
+  end
 end
 ```
 
@@ -413,7 +444,7 @@ The above will automatically create a `Status::Entity` class and define properti
 
 ### Using Entities
 
-With Grape, once an entity is defined, it can be used within endpoints, by calling `present`. The `present` method accepts two arguments, the `object` to be presented and the `options` associated with it. The options hash must always include `:with`, which defines the entity to expose.
+With Grape, once an entity is defined, it can be used within endpoints, by calling `present`. The `present` method accepts two arguments, the `object` to be presented and the `options` associated with it. The options hash must always include `:with`, which defines the entity to expose (unless namespaced entity classes are used, see [next section](#entity-organization)).
 If the entity includes documentation it can be included in an endpoint's description.
 
 ```ruby
@@ -516,4 +547,4 @@ MIT License. See [LICENSE](LICENSE) for details.
 
 ## Copyright
 
-Copyright (c) 2010-2014 Michael Bleigh, Intridea, Inc., and contributors.
+Copyright (c) 2010-2016 Michael Bleigh, Intridea, Inc., ruby-grape and Contributors.

data/grape-entity.gemspec

@@ -14,10 +14,8 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = 'grape-entity'
 
-  s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'multi_json', '>= 1.3.2'
 
-  s.add_development_dependency 'rake'
   s.add_development_dependency 'maruku'
   s.add_development_dependency 'yard'
   s.add_development_dependency 'rspec', '~> 2.9'

data/lib/grape_entity/entity.rb

@@ -478,7 +478,7 @@ module Grape
     end
 
     def delegate_attribute(attribute)
-      if respond_to?(attribute, true)
+      if respond_to?(attribute, true) && Grape::Entity > method(attribute).owner
         send(attribute)
       else
         delegator.delegate(attribute)

data/lib/grape_entity/exposure/base.rb

@@ -63,7 +63,7 @@ module Grape
           partial_output = valid_value(entity, options)
 
           if partial_output.respond_to?(:serializable_hash)
-            partial_output.serializable_hash(options)
+            partial_output.serializable_hash
           elsif partial_output.is_a?(Array) && partial_output.all? { |o| o.respond_to?(:serializable_hash) }
             partial_output.map(&:serializable_hash)
           elsif partial_output.is_a?(Hash)

data/lib/grape_entity/exposure/nesting_exposure/output_builder.rb

@@ -25,6 +25,11 @@ module Grape
             end
           end
 
+          def kind_of?(klass)
+            klass == output.class || super
+          end
+          alias_method :is_a?, :kind_of?
+
           def __getobj__
             output
           end

data/lib/grape_entity/options.rb

@@ -15,6 +15,10 @@ module Grape
         @opts_hash[key]
       end
 
+      def fetch(*args)
+        @opts_hash.fetch(*args)
+      end
+
       def key?(key)
         @opts_hash.key? key
       end

data/lib/grape_entity/version.rb

@@ -1,3 +1,3 @@
 module GrapeEntity
-  VERSION = '0.5.1'
+  VERSION = '0.5.2'.freeze
 end

data/spec/grape_entity/entity_spec.rb

@@ -905,6 +905,7 @@ describe Grape::Entity do
 
         representation = subject.represent(4.times.map { Object.new }, serializable: true)
         expect(representation).to be_kind_of(Grape::Entity::Exposure::NestingExposure::OutputBuilder)
+        expect(representation).to be_kind_of(Hash)
         expect(representation).to have_key :my_items
         expect(representation[:my_items]).to be_kind_of Array
         expect(representation[:my_items].size).to be 4
@@ -1523,12 +1524,13 @@ describe Grape::Entity do
         expect(subject.value_for(:fantasies)).to eq ['Nessy', 'Double Rainbows', 'Unicorns']
       end
 
-      it 'tries instance methods on the entity first' do
+      context 'delegate_attribute' do
         module EntitySpec
           class DelegatingEntity < Grape::Entity
             root 'friends', 'friend'
             expose :name
             expose :email
+            expose :system
 
             private
 
@@ -1538,14 +1540,33 @@ describe Grape::Entity do
           end
         end
 
-        friend = double('Friend', name: 'joe', email: 'joe@example.com')
-        rep = EntitySpec::DelegatingEntity.new(friend)
-        expect(rep.value_for(:name)).to eq 'cooler name'
-        expect(rep.value_for(:email)).to eq 'joe@example.com'
+        it 'tries instance methods on the entity first' do
+          friend = double('Friend', name: 'joe', email: 'joe@example.com')
+          rep = EntitySpec::DelegatingEntity.new(friend)
+          expect(rep.value_for(:name)).to eq 'cooler name'
+          expect(rep.value_for(:email)).to eq 'joe@example.com'
 
-        another_friend = double('Friend', email: 'joe@example.com')
-        rep = EntitySpec::DelegatingEntity.new(another_friend)
-        expect(rep.value_for(:name)).to eq 'cooler name'
+          another_friend = double('Friend', email: 'joe@example.com')
+          rep = EntitySpec::DelegatingEntity.new(another_friend)
+          expect(rep.value_for(:name)).to eq 'cooler name'
+        end
+
+        it 'does not delegate Kernel methods' do
+          foo = double 'Foo', system: 'System'
+          rep = EntitySpec::DelegatingEntity.new foo
+          expect(rep.value_for(:system)).to eq 'System'
+        end
+
+        module EntitySpec
+          class DerivedEntity < DelegatingEntity
+          end
+        end
+
+        it 'derived entity get methods from base entity' do
+          foo = double 'Foo', name: 'joe'
+          rep = EntitySpec::DerivedEntity.new foo
+          expect(rep.value_for(:name)).to eq 'cooler name'
+        end
       end
 
       context 'using' do
@@ -1717,5 +1738,39 @@ describe Grape::Entity do
         end
       end
     end
+
+    describe Grape::Entity::Options do
+      module EntitySpec
+        class Crystalline
+          attr_accessor :prop1, :prop2
+
+          def initialize
+            @prop1 = 'value1'
+            @prop2 = 'value2'
+          end
+        end
+
+        class CrystallineEntity < Grape::Entity
+          expose :prop1, if: ->(_, options) { options.fetch(:signal) }
+          expose :prop2, if: ->(_, options) { options.fetch(:beam, 'destructive') == 'destructive' }
+        end
+      end
+
+      context '#fetch' do
+        it 'without passing in a required option raises KeyError' do
+          expect { EntitySpec::CrystallineEntity.represent(EntitySpec::Crystalline.new).as_json }.to raise_error KeyError
+        end
+
+        it 'passing in a required option will expose the values' do
+          crystalline_entity = EntitySpec::CrystallineEntity.represent(EntitySpec::Crystalline.new, signal: true)
+          expect(crystalline_entity.as_json).to eq(prop1: 'value1', prop2: 'value2')
+        end
+
+        it 'with an option that is not default will not expose that value' do
+          crystalline_entity = EntitySpec::CrystallineEntity.represent(EntitySpec::Crystalline.new, signal: true, beam: 'intermittent')
+          expect(crystalline_entity.as_json).to eq(prop1: 'value1')
+        end
+      end
+    end
   end
 end

data/spec/grape_entity/hash_spec.rb

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Grape::Entity do
+  it 'except option for nested entity' do
+    module EntitySpec
+      class Address < Grape::Entity
+        expose :post, if: :full
+        expose :city
+        expose :street
+        expose :house
+      end
+
+      class Company < Grape::Entity
+        expose :full_name, if: :full
+        expose :name
+        expose :address do |c, o|
+          Address.represent c[:address], Grape::Entity::Options.new(o.opts_hash.except(:full))
+        end
+      end
+    end
+
+    company = {
+      full_name: 'full_name',
+      name: 'name',
+      address: {
+        post: '123456',
+        city: 'city',
+        street: 'street',
+        house: 'house',
+        something_else: 'something_else'
+      }
+    }
+
+    expect(EntitySpec::Company.represent(company).serializable_hash).to eq \
+      company.slice(:name).merge(address: company[:address].slice(:city, :street, :house))
+
+    expect(EntitySpec::Company.represent(company, full: true).serializable_hash).to eq \
+      company.slice(:full_name, :name).merge(address: company[:address].slice(:city, :street, :house))
+  end
+end

data/spec/spec_helper.rb

@@ -7,6 +7,4 @@ require 'bundler'
 
 Bundler.require :default, :test
 
-require 'pry'
-
 RSpec.configure(&:raise_errors_for_deprecations!)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -38,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
@@ -124,6 +96,7 @@ files:
 - ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
+- Dangerfile
 - Gemfile
 - Guardfile
 - LICENSE
@@ -163,6 +136,7 @@ files:
 - spec/grape_entity/exposure/nesting_exposure/nested_exposures_spec.rb
 - spec/grape_entity/exposure/represent_exposure_spec.rb
 - spec/grape_entity/exposure_spec.rb
+- spec/grape_entity/hash_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ruby-grape/grape-entity
 licenses:
@@ -184,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: grape-entity
-rubygems_version: 2.4.8
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: A simple facade for managing the relationship between your model and API.
@@ -193,5 +167,5 @@ test_files:
 - spec/grape_entity/exposure/nesting_exposure/nested_exposures_spec.rb
 - spec/grape_entity/exposure/represent_exposure_spec.rb
 - spec/grape_entity/exposure_spec.rb
+- spec/grape_entity/hash_spec.rb
 - spec/spec_helper.rb
-has_rdoc: