Merge pull request ruby-grape#164 from marshall-lee/fix_entity_privat…

…e_methods_regression

Fix: entity instance methods exposure (0.4)

CHANGELOG.md

@@ -1,3 +1,7 @@
+0.4.7 (2015-08-03)
+==================
+* [#164](https://github.com/intridea/grape-entity/pull/164): Regression: entity instance methods were exposed with `NoMethodError`: [#163](https://github.com/intridea/grape-entity/issues/163) - [@marshall-lee](http://github.com/marshall-lee).
+
 0.4.6 (2015-07-27)
 ==================
 

lib/grape_entity/entity.rb

@@ -589,10 +589,11 @@ def valid_exposure?(attribute, exposure_options)
         true
       else
         name = self.class.name_for(attribute)
+        is_delegatable = delegator.delegatable?(name) || respond_to?(name, true)
         if exposure_options[:safe]
-          delegator.delegatable?(name)
+          is_delegatable
         else
-          delegator.delegatable?(name) || fail(NoMethodError, "#{self.class.name} missing attribute `#{name}' on #{object}")
+          is_delegatable || fail(NoMethodError, "#{self.class.name} missing attribute `#{name}' on #{object}")
         end
       end
     end

lib/grape_entity/version.rb

@@ -1,3 +1,3 @@
 module GrapeEntity
-  VERSION = '0.4.6'
+  VERSION = '0.4.7'
 end

spec/grape_entity/entity_spec.rb

@@ -1198,6 +1198,10 @@ def name
         rep = EntitySpec::DelegatingEntity.new(friend)
         expect(rep.send(:value_for, :name)).to eq 'cooler name'
         expect(rep.send(:value_for, :email)).to eq 'joe@example.com'
+
+        another_friend = double('Friend', email: 'joe@example.com')
+        rep = EntitySpec::DelegatingEntity.new(another_friend)
+        expect(rep.send(:value_for, :name)).to eq 'cooler name'
       end
 
       context 'using' do