grape-entity 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bca27e644c8d862751cbb573d3da20ec58fa9a1a
-  data.tar.gz: 40aa499604d5a7941fc13016c58c9a2fda9de787
+  metadata.gz: 77619537334dd75647477a452a937b672ca248cb
+  data.tar.gz: f7c7659bd6f13e2f65efb8091b2ca00a37dfcd74
 SHA512:
-  metadata.gz: b02bedc0adc756dec9fb93c0ae527eb4251e21882aedefb30f3f973fd867ee9589a61702d0464ae69366ea4fc27f5e42ce382ea9ec247b347ebeab2c3c817713
-  data.tar.gz: c175aad11e6c88bfbd10c551a3f1cd0381753b918bc901f9786676f03558dc6e75d369e25ebc3aad45ed780ecf4f78d2a3e3627aa519e0824b29e11ec248794f
+  metadata.gz: c73b5b28f9cb7ebcc7ba71e264029e725720cfa79593bcb891aeb5628ca3b50a26699043d38e79f1842a0336f1a66e881d636befa6f20d74e469131f86b1ac04
+  data.tar.gz: 2d086dee3c598f34bedc613fe1da601e7eff2afb6f05d9cd8944c9ffac21e7f16f5e4cea2a686ecdbf1f60c0c6d9f08e918b0f247ed4b23a54df1ec13a6b9f45

data/.rubocop.yml

@@ -1,63 +1,5 @@
 AllCops:
   Exclude:
-    - vendor/**
+    - vendor/**/*
 
-LineLength:
-  Enabled: false
-
-MethodLength:
-  Enabled: false
-
-ClassLength:
-  Enabled: false
-
-Documentation:
-  # don't require classes to be documented
-  Enabled: false
-
-CollectionMethods:
-  # don't prefer map to collect, recuce to inject
-  Enabled: false
-
-Encoding:
-  # no need to always specify encoding
-  Enabled: false
-
-Void:
-  # == operator used in void context in specs
-  Enabled: false
-
-SignalException:
-  # prefer raise to fail
-  EnforcedStyle: only_raise
-
-RaiseArgs:
-  # don't care for what kind of raise
-  Enabled: false
-
-PerlBackrefs:
-  # TODO: regular expression matching with $1, $2, etc.
-  Enabled: false
-
-BlockNesting:
-  # TODO: fix too much nesting
-  Max: 4
-
-Lambda:
-  # TODO: replace all lambda with -> or Proc
-  Enabled: false
-
-Blocks:
-  # allow multi-line blocks like expect { }
-  Enabled: false
-
-WordArray:
-  # %w vs. [ '', ... ]
-  Enabled: false
-
-CyclomaticComplexity:
-  Enabled: false
-
-FileName:
-  # allow grape-entity.rb for a require
-  Enabled: false
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,64 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2014-12-11 15:27:22 -0500 using RuboCop version 0.28.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 5
+Metrics/AbcSize:
+  Max: 53
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 301
+
+# Offense count: 4
+Metrics/CyclomaticComplexity:
+  Max: 17
+
+# Offense count: 175
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 147
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 34
+
+# Offense count: 4
+Metrics/PerceivedComplexity:
+  Max: 15
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Style/Blocks:
+  Enabled: false
+
+# Offense count: 30
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 2
+Style/EachWithObject:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: Exclude.
+Style/FileName:
+  Enabled: false
+
+# Offense count: 16
+Style/Lambda:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
+Style/Next:
+  Enabled: false
+
+# Offense count: 2
+Style/RegexpLiteral:
+  MaxSlashes: 0

data/.travis.yml

@@ -1,3 +1,5 @@
+sudo: false
+
 language: ruby
 
 cache: bundler
@@ -5,12 +7,11 @@ cache: bundler
 rvm:
   - ruby-head
   - 2.1.2
-  - 2.1.0
   - 2.0.0
   - 1.9.3
   - jruby-19mode
   - jruby-head
-  - rbx-2
+  - rbx-2.2.10
 
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.4.5 (2015-03-10)
+==================
+
+* [#109](https://github.com/intridea/grape-entity/pull/109): Added `unexpose` method - [@jonmchan](https://github.com/jonmchan).
+* [#98](https://github.com/intridea/grape-entity/pull/98): Added nested conditionals - [@zbelzer](https://github.com/zbelzer).
+* [#105](https://github.com/intridea/grape-entity/pull/105): Specify which attribute is missing in which Entity - [@jhollinger](https://github.com/jhollinger).
+* [#111](https://github.com/intridea/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/intridea/grape-entity/pull/110): Fix: safe exposure when using `Hash` models - [@croeck](https://github.com/croeck).
+* [#91](https://github.com/intridea/grape-entity/pull/91): Fix: OpenStruct serializing - [@etehtsea](https://github.com/etehtsea).
+
 0.4.4 (2014-08-17)
 ==================
 
@@ -7,7 +17,7 @@
 0.4.3 (2014-06-12)
 ==================
 
-* [#77](https://github.com/intridea/grape-entity/pull/77): Fix compatibility with Rspec 3 - [@justfalter](https://github.com/justfalter).
+* [#77](https://github.com/intridea/grape-entity/pull/77): Fix: compatibility with Rspec 3 - [@justfalter](https://github.com/justfalter).
 * [#76](https://github.com/intridea/grape-entity/pull/76): Improve performance of entity serialization - [@justfalter](https://github.com/justfalter)
 
 0.4.2 (2014-04-03)

data/Gemfile

@@ -11,12 +11,6 @@ group :development, :test do
   gem 'growl'
   gem 'json'
   gem 'rspec'
-  gem 'rack-test', "~> 0.6.2", :require => "rack/test"
-  gem 'rubocop', '0.21.0'
-end
-
-platforms :rbx do
-  gem 'rubysl', '~> 2.0'
-  gem 'parser', '~> 2.1'
-  gem 'racc', '~> 1.4'
+  gem 'rack-test', '~> 0.6.2', require: 'rack/test'
+  gem 'rubocop', '0.28.0'
 end

data/Guardfile

@@ -1,11 +1,11 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard 'rspec', :version => 2 do
+guard 'rspec', version: 2 do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^spec/support/shared_versioning_examples.rb$}) { |m| "spec/" }
-  watch('spec/spec_helper.rb')  { "spec/" }
+  watch(%r{^spec/support/shared_versioning_examples.rb$}) { |_m| 'spec/' }
+  watch('spec/spec_helper.rb')  { 'spec/' }
 end
 
 guard 'bundler' do

data/README.md

@@ -1,6 +1,9 @@
 # Grape::Entity
 
-[![Build Status](https://travis-ci.org/intridea/grape-entity.svg?branch=master)](https://travis-ci.org/intridea/grape-entity)
+[![Gem Version](http://img.shields.io/gem/v/grape-entity.svg)](http://badge.fury.io/rb/grape-entity)
+[![Build Status](http://img.shields.io/travis/intridea/grape-entity.svg)](https://travis-ci.org/intridea/grape-entity)
+[![Dependency Status](https://gemnasium.com/intridea/grape-entity.svg)](https://gemnasium.com/intridea/grape-entity)
+[![Code Climate](https://codeclimate.com/github/intridea/grape-entity.svg)](https://codeclimate.com/github/intridea/grape-entity)
 
 ## Introduction
 
@@ -66,7 +69,7 @@ expose :user_name, :ip
 The field lookup takes several steps
 
 * first try `entity-instance.exposure`
-* next try `object.exposure` 
+* next try `object.exposure`
 * next try `object.fetch(exposure)`
 * last raise an Exception
 
@@ -81,7 +84,7 @@ expose :replies, using: API::Status, as: :replies
 Presenter classes can also be specified in string format, which helps with circular dependencies.
 
 ```ruby
-expose :replies, using: `API::Status`, as: :replies
+expose :replies, using: "API::Status", as: :replies
 ```
 
 #### Conditional Exposure
@@ -117,6 +120,16 @@ expose :contact_info do
 end
 ```
 
+You can also conditionally expose attributes in nested exposures:
+```ruby
+expose :contact_info do
+  expose :phone
+  expose :address, using: API::Address
+  expose :email, if: lambda { |instance, options| options[:type] == :full }
+end
+```
+
+
 #### Collection Exposure
 
 Use `root(plural, singular = nil)` to expose an object or a collection of objects with a root key.
@@ -127,16 +140,16 @@ expose :id, :name, ...
 ```
 
 By default every object of a collection is wrapped into an instance of your `Entity` class.
-You can override this behavior and wrapp the hole collection into one instance of your `Entity`
+You can override this behavior and wrap the whole collection into one instance of your `Entity`
 class.
 
 As example:
 
 ```ruby
- 
+
  present_collection true, :collection_name  # `collection_name` is optional and defaults to `items`
  expose :collection_name, using: API:Items
- 
+
 
 ```
 
@@ -186,6 +199,31 @@ private
 end
 ```
 
+#### Unexpose
+
+To undefine an exposed field, use the ```.unexpose``` method. Useful for modifying inherited entities.
+
+```ruby
+class UserData < Grape::Entity
+  expose :name
+  expose :address1
+  expose :address2
+  expose :address_state
+  expose :address_city
+  expose :email
+  expose :phone
+end
+
+class MailingAddress < UserData
+  unexpose :email
+  unexpose :phone
+end
+```
+
+
+
+
+
 #### Aliases
 
 Expose under a different name with `:as`.
@@ -346,18 +384,13 @@ Also see [Grape Entity Matchers](https://github.com/agileanimal/grape-entity-mat
 
 ## Contributing
 
-1. Fork the project
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Write tests. Make changes. Run `rubocop`.
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create a new pull request
+See [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## License
 
-MIT License. See LICENSE for details.
+MIT License. See [LICENSE](LICENSE) for details.
 
 ## Copyright
 
-Copyright (c) 2010-2013 Michael Bleigh, Intridea, Inc., and contributors.
+Copyright (c) 2010-2014 Michael Bleigh, Intridea, Inc., and contributors.
 

data/RELEASING.md

@@ -31,7 +31,7 @@ Remove the line with "Your contribution here.", since there will be no more cont
 Commit your changes.
 
 ```
-git add README.md CHANGELOG.md lib/grape-entity/version.rb
+git add CHANGELOG.md lib/grape-entity/version.rb
 git commit -m "Preparing for release, 0.4.0."
 git push origin master
 ```
@@ -58,11 +58,13 @@ Next Release
 * Your contribution here.
 ```
 
+Increment the minor version, modify [lib/grape-entity/version.rb](lib/grape-entity/version.rb).
+
 Comit your changes.
 
 ```
-git add CHANGELOG.md README.md
-git commit -m "Preparing for next release."
+git add CHANGELOG.md lib/grape-entity/version.rb
+git commit -m "Preparing for next release, 0.4.1."
 git push origin master
 ```
 

data/Rakefile

@@ -17,6 +17,6 @@ end
 task :spec
 require 'rainbow/ext/string' unless String.respond_to?(:color)
 require 'rubocop/rake_task'
-Rubocop::RakeTask.new(:rubocop)
+RuboCop::RakeTask.new(:rubocop)
 
 task default: [:rubocop, :spec]

data/grape-entity.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ['Michael Bleigh']
   s.email       = ['michael@intridea.com']
   s.homepage    = 'https://github.com/intridea/grape-entity'
-  s.summary     = %q(A simple facade for managing the relationship between your model and API.)
-  s.description = %q(Extracted from Grape, A Ruby framework for rapid API development with great conventions.)
+  s.summary     = 'A simple facade for managing the relationship between your model and API.'
+  s.description = 'Extracted from Grape, A Ruby framework for rapid API development with great conventions.'
   s.license     = 'MIT'
 
   s.rubyforge_project = 'grape-entity'

data/lib/grape_entity/entity.rb

@@ -127,11 +127,11 @@ module Grape
       options = merge_options(args.last.is_a?(Hash) ? args.pop : {})
 
       if args.size > 1
-        raise ArgumentError, 'You may not use the :as option on multi-attribute exposures.' if options[:as]
-        raise ArgumentError, 'You may not use block-setting on multi-attribute exposures.' if block_given?
+        fail ArgumentError, 'You may not use the :as option on multi-attribute exposures.' if options[:as]
+        fail ArgumentError, 'You may not use block-setting on multi-attribute exposures.' if block_given?
       end
 
-      raise ArgumentError, 'You may not use block-setting when also using format_with' if block_given? && options[:format_with].respond_to?(:call)
+      fail ArgumentError, 'You may not use block-setting when also using format_with' if block_given? && options[:format_with].respond_to?(:call)
 
       options[:proc] = block if block_given? && block.parameters.any?
 
@@ -158,6 +158,10 @@ module Grape
       end
     end
 
+    def self.unexpose(attribute)
+      exposures.delete(attribute)
+    end
+
     # Set options that will be applied to any exposures declared inside the block.
     #
     # @example Multi-exposure if
@@ -270,7 +274,7 @@ module Grape
     #   end
     #
     def self.format_with(name, &block)
-      raise ArgumentError, 'You must pass a block for formatters' unless block_given?
+      fail ArgumentError, 'You must pass a block for formatters' unless block_given?
       formatters[name.to_sym] = block
     end
 
@@ -461,9 +465,9 @@ module Grape
           output[self.class.key_for(attribute)] =
             if partial_output.respond_to? :serializable_hash
               partial_output.serializable_hash(runtime_options)
-            elsif partial_output.kind_of?(Array) && !partial_output.map { |o| o.respond_to? :serializable_hash }.include?(false)
-              partial_output.map { |o| o.serializable_hash }
-            elsif partial_output.kind_of?(Hash)
+            elsif partial_output.is_a?(Array) && !partial_output.map { |o| o.respond_to? :serializable_hash }.include?(false)
+              partial_output.map(&:serializable_hash)
+            elsif partial_output.is_a?(Hash)
               partial_output.each do |key, value|
                 partial_output[key] = value.serializable_hash if value.respond_to? :serializable_hash
               end
@@ -535,10 +539,14 @@ module Grape
         end
 
       elsif nested_exposures.any?
-        Hash[nested_exposures.map do |nested_attribute, _|
-          [self.class.key_for(nested_attribute), value_for(nested_attribute, options)]
-        end]
+        nested_attributes =
+          nested_exposures.map do |nested_attribute, nested_exposure_options|
+            if conditions_met?(nested_exposure_options, options)
+              [self.class.key_for(nested_attribute), value_for(nested_attribute, options)]
+            end
+          end
 
+        Hash[nested_attributes.compact]
       else
         delegate_attribute(attribute)
       end
@@ -548,13 +556,17 @@ module Grape
       name = self.class.name_for(attribute)
       if respond_to?(name, true)
         send(name)
+      elsif object.is_a?(Hash)
+        object[name]
+      elsif object.respond_to?(name, true)
+        object.send(name)
+      elsif object.respond_to?(:fetch, true)
+        object.fetch(name)
       else
-        if object.respond_to?(name, true)
+        begin
           object.send(name)
-        elsif object.respond_to?(:fetch, true)
-          object.fetch(name)
-        else
-          raise ArgumentError
+        rescue NoMethodError
+          raise NoMethodError, "#{self.class.name} missing attribute `#{name}' on #{object}"
         end
       end
     end
@@ -562,9 +574,10 @@ module Grape
     def valid_exposure?(attribute, exposure_options)
       nested_exposures = self.class.nested_exposures_for(attribute)
       (nested_exposures.any? && nested_exposures.all? { |a, o| valid_exposure?(a, o) }) || \
-      exposure_options.key?(:proc) || \
-      !exposure_options[:safe] || \
-      object.respond_to?(self.class.name_for(attribute))
+        exposure_options.key?(:proc) || \
+        !exposure_options[:safe] || \
+        object.respond_to?(self.class.name_for(attribute)) || \
+        object.is_a?(Hash) && object.key?(self.class.name_for(attribute))
     end
 
     def conditions_met?(exposure_options, options)
@@ -638,7 +651,7 @@ module Grape
     # @param options [Hash] Exposure options.
     def self.valid_options(options)
       options.keys.each do |key|
-        raise ArgumentError, "#{key.inspect} is not a valid option." unless OPTIONS.include?(key)
+        fail ArgumentError, "#{key.inspect} is not a valid option." unless OPTIONS.include?(key)
       end
 
       options[:using] = options.delete(:with) if options.key?(:with)

data/lib/grape_entity/version.rb

@@ -1,3 +1,3 @@
 module GrapeEntity
-  VERSION = '0.4.4'
+  VERSION = '0.4.5'
 end

data/spec/grape_entity/entity_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
+require 'ostruct'
 
 describe Grape::Entity do
-
   let(:fresh_class) { Class.new(Grape::Entity) }
 
   context 'class methods' do
@@ -110,6 +110,15 @@ describe Grape::Entity do
             )
           end
 
+          it 'does not represent nested exposures whose conditions are not met' do
+            subject.expose :awesome do
+              subject.expose(:condition_met, if: lambda { |_, _| true }) { |_| 'value' }
+              subject.expose(:condition_not_met, if: lambda { |_, _| false }) { |_| 'value' }
+            end
+
+            expect(subject.represent({}).send(:value_for, :awesome)).to eq(condition_met: 'value')
+          end
+
           it 'does not represent attributes, declared inside nested exposure, outside of it' do
             subject.expose :awesome do
               subject.expose(:nested) { |_| 'value' }
@@ -269,6 +278,48 @@ describe Grape::Entity do
       end
     end
 
+    describe '.unexpose' do
+      it 'is able to remove exposed attributes' do
+        subject.expose :name, :email
+        subject.unexpose :email
+
+        expect(subject.exposures).to eq(name: {})
+      end
+
+      context 'inherited exposures' do
+        it 'when called from child class, only removes from the attribute from child' do
+          subject.expose :name, :email
+          child_class = Class.new(subject)
+          child_class.unexpose :email
+
+          expect(child_class.exposures).to eq(name: {})
+          expect(subject.exposures).to eq(name: {}, email: {})
+        end
+
+        # the following 2 behaviors are testing because it is not most intuitive and could be confusing
+        context 'when  called from the parent class' do
+          it 'remove from parent and all child classes that have not locked down their attributes with an .exposures call' do
+            subject.expose :name, :email
+            child_class = Class.new(subject)
+            subject.unexpose :email
+
+            expect(subject.exposures).to eq(name: {})
+            expect(child_class.exposures).to eq(name: {})
+          end
+
+          it 'remove from parent and do not remove from child classes that have locked down their attributes with an .exposures call' do
+            subject.expose :name, :email
+            child_class = Class.new(subject)
+            child_class.exposures
+            subject.unexpose :email
+
+            expect(subject.exposures).to eq(name: {})
+            expect(child_class.exposures).to eq(name: {}, email: {})
+          end
+        end
+      end
+    end
+
     describe '.with_options' do
       it 'raises an error for unknown options' do
         block = proc do
@@ -417,7 +468,7 @@ describe Grape::Entity do
         representation = subject.represent(4.times.map { Object.new })
         expect(representation).to be_kind_of Array
         expect(representation.size).to eq(4)
-        expect(representation.reject { |r| r.kind_of?(subject) }).to be_empty
+        expect(representation.reject { |r| r.is_a?(subject) }).to be_empty
       end
 
       it 'adds the collection: true option if called with a collection' do
@@ -442,6 +493,19 @@ describe Grape::Entity do
         representation = subject.represent({ awesome: true }, serializable: true)
         expect(representation).to eq(awesome: true)
       end
+
+      it 'returns a serialized hash of an OpenStruct' do
+        subject.expose(:awesome)
+        representation = subject.represent(OpenStruct.new, serializable: true)
+        expect(representation).to eq(awesome: nil)
+      end
+
+      it 'raises error if field not found' do
+        subject.expose(:awesome)
+        expect do
+          subject.represent(Object.new, serializable: true)
+        end.to raise_error(NoMethodError, /missing attribute `awesome'/)
+      end
     end
 
     describe '.present_collection' do
@@ -491,7 +555,7 @@ describe Grape::Entity do
             expect(representation).to have_key 'things'
             expect(representation['things']).to be_kind_of Array
             expect(representation['things'].size).to eq 4
-            expect(representation['things'].reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation['things'].reject { |r| r.is_a?(subject) }).to be_empty
           end
         end
 
@@ -500,7 +564,7 @@ describe Grape::Entity do
             representation = subject.represent(4.times.map { Object.new }, root: false)
             expect(representation).to be_kind_of Array
             expect(representation.size).to eq 4
-            expect(representation.reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation.reject { |r| r.is_a?(subject) }).to be_empty
           end
           it 'can use a different name' do
             representation = subject.represent(4.times.map { Object.new }, root: 'others')
@@ -508,7 +572,7 @@ describe Grape::Entity do
             expect(representation).to have_key 'others'
             expect(representation['others']).to be_kind_of Array
             expect(representation['others'].size).to eq 4
-            expect(representation['others'].reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation['others'].reject { |r| r.is_a?(subject) }).to be_empty
           end
         end
       end
@@ -532,7 +596,7 @@ describe Grape::Entity do
             representation = subject.represent(4.times.map { Object.new })
             expect(representation).to be_kind_of Array
             expect(representation.size).to eq 4
-            expect(representation.reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation.reject { |r| r.is_a?(subject) }).to be_empty
           end
         end
       end
@@ -555,7 +619,7 @@ describe Grape::Entity do
             expect(representation).to have_key('things')
             expect(representation['things']).to be_kind_of Array
             expect(representation['things'].size).to eq 4
-            expect(representation['things'].reject { |r| r.kind_of?(subject) }).to be_empty
+            expect(representation['things'].reject { |r| r.is_a?(subject) }).to be_empty
           end
         end
       end
@@ -574,25 +638,26 @@ describe Grape::Entity do
         expect(entity.options).to eq({})
       end
     end
-
   end
 
   context 'instance methods' do
-
     let(:model) { double(attributes) }
 
-    let(:attributes) {
+    let(:attributes) do
       {
         name: 'Bob Bobson',
         email: 'bob@example.com',
         birthday: Time.gm(2012, 2, 27),
         fantasies: ['Unicorns', 'Double Rainbows', 'Nessy'],
+        characteristics: [
+          { key: 'hair_color', value: 'brown' }
+        ],
         friends: [
-          double(name: 'Friend 1', email: 'friend1@example.com', fantasies: [], birthday: Time.gm(2012, 2, 27), friends: []),
-          double(name: 'Friend 2', email: 'friend2@example.com', fantasies: [], birthday: Time.gm(2012, 2, 27), friends: [])
+          double(name: 'Friend 1', email: 'friend1@example.com', characteristics: [], fantasies: [], birthday: Time.gm(2012, 2, 27), friends: []),
+          double(name: 'Friend 2', email: 'friend2@example.com', characteristics: [], fantasies: [], birthday: Time.gm(2012, 2, 27), friends: [])
         ]
       }
-    }
+    end
 
     subject { fresh_class.new(model) }
 
@@ -621,6 +686,13 @@ describe Grape::Entity do
           expect(res).to have_key :name
         end
 
+        it 'does expose attributes marked as safe if model is a hash object' do
+          fresh_class.expose :name, safe: true
+
+          res = fresh_class.new(name: 'myname').serializable_hash
+          expect(res).to have_key :name
+        end
+
         it "does not expose attributes that don't exist on the object, even with criteria" do
           fresh_class.expose :email
           fresh_class.expose :nonexistent_attribute, safe: true, if: lambda { false }
@@ -844,6 +916,25 @@ describe Grape::Entity do
           expect(rep.serializable_hash).to be_nil
         end
 
+        it 'passes through exposed entity with key and value attributes' do
+          module EntitySpec
+            class CharacteristicsEntity < Grape::Entity
+              root 'characteristics', 'characteristic'
+              expose :key, :value
+            end
+          end
+
+          fresh_class.class_eval do
+            expose :characteristics, using: EntitySpec::CharacteristicsEntity
+          end
+
+          rep = subject.send(:value_for, :characteristics)
+          expect(rep).to be_kind_of Array
+          expect(rep.reject { |r| r.is_a?(EntitySpec::CharacteristicsEntity) }).to be_empty
+          expect(rep.first.serializable_hash[:key]).to eq 'hair_color'
+          expect(rep.first.serializable_hash[:value]).to eq 'brown'
+        end
+
         it 'passes through custom options' do
           module EntitySpec
             class FriendEntity < Grape::Entity

data/spec/spec_helper.rb

@@ -9,6 +9,4 @@ Bundler.require :default, :test
 
 require 'pry'
 
-RSpec.configure do |config|
-  config.raise_errors_for_deprecations!
-end
+RSpec.configure(&:raise_errors_for_deprecations!)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-17 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,6 +119,7 @@ files:
 - .gitignore
 - .rspec
 - .rubocop.yml
+- .rubocop_todo.yml
 - .travis.yml
 - .yardopts
 - CHANGELOG.md
@@ -157,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: grape-entity
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple facade for managing the relationship between your model and API.