Merge pull request ruby-grape#249 from petergoldstein/feature/add_options_for_child_representations

Pass options when using child representations in Grape::Entity

Author: mbleigh

lib/grape/entity.rb

@@ -342,7 +342,10 @@ def value_for(attribute, options = {})
       if exposure_options[:proc]
         exposure_options[:proc].call(object, options)
       elsif exposure_options[:using]
-        exposure_options[:using].represent(object.send(attribute), :root => nil)
+        using_options = options.dup
+        using_options.delete(:collection)
+        using_options[:root] = nil
+        exposure_options[:using].represent(object.send(attribute), using_options)
       elsif exposure_options[:format_with]
         format_with = exposure_options[:format_with]
 

spec/grape/entity_spec.rb

@@ -375,24 +375,73 @@ def timestamp(date)
         rep.last.serializable_hash[:name].should == 'Friend 2'
       end
 
-      it 'should disable root key name for child representations' do
-      
-        module EntitySpec
-          class FriendEntity < Grape::Entity
-            root 'friends', 'friend'
-            expose :name, :email
-          end
-        end
+      context 'child representations' do
+        it 'should disable root key name for child representations' do
 
-        fresh_class.class_eval do
-          expose :friends, :using => EntitySpec::FriendEntity
+          module EntitySpec
+            class FriendEntity < Grape::Entity
+              root 'friends', 'friend'
+              expose :name, :email
+            end
+          end
+          
+          fresh_class.class_eval do
+            expose :friends, :using => EntitySpec::FriendEntity
+          end
+          
+          rep = subject.send(:value_for, :friends)
+          rep.should be_kind_of(Array)
+          rep.reject{|r| r.is_a?(EntitySpec::FriendEntity)}.should be_empty
+          rep.first.serializable_hash[:name].should == 'Friend 1'
+          rep.last.serializable_hash[:name].should == 'Friend 2'
+        end
+
+        it 'should pass through custom options' do
+          module EntitySpec
+            class FriendEntity < Grape::Entity
+              root 'friends', 'friend'
+              expose :name
+              expose :email, :if => { :user_type => :admin }
+            end
+          end
+          
+          fresh_class.class_eval do
+            expose :friends, :using => EntitySpec::FriendEntity
+          end
+          
+          rep = subject.send(:value_for, :friends)
+          rep.should be_kind_of(Array)
+          rep.reject{|r| r.is_a?(EntitySpec::FriendEntity)}.should be_empty
+          rep.first.serializable_hash[:email].should be_nil
+          rep.last.serializable_hash[:email].should be_nil
+
+          rep = subject.send(:value_for, :friends, { :user_type => :admin })
+          rep.should be_kind_of(Array)
+          rep.reject{|r| r.is_a?(EntitySpec::FriendEntity)}.should be_empty
+          rep.first.serializable_hash[:email].should == '[email protected]'
+          rep.last.serializable_hash[:email].should == '[email protected]'
+        end
+
+        it 'should ignore the :collection parameter in the source options' do
+          module EntitySpec
+            class FriendEntity < Grape::Entity
+              root 'friends', 'friend'
+              expose :name
+              expose :email, :if => { :collection => true }
+            end
+          end
+          
+          fresh_class.class_eval do
+            expose :friends, :using => EntitySpec::FriendEntity
+          end
+          
+          rep = subject.send(:value_for, :friends, { :collection => false })
+          rep.should be_kind_of(Array)
+          rep.reject{|r| r.is_a?(EntitySpec::FriendEntity)}.should be_empty
+          rep.first.serializable_hash[:email].should == '[email protected]'
+          rep.last.serializable_hash[:email].should == '[email protected]'
         end
-        
-        rep = subject.send(:value_for, :friends)
-        rep.should be_kind_of(Array)
-        rep.reject{|r| r.is_a?(EntitySpec::FriendEntity)}.should be_empty
-        rep.first.serializable_hash[:name].should == 'Friend 1'
-        rep.last.serializable_hash[:name].should == 'Friend 2'
+
       end
 
       it 'should call through to the proc if there is one' do