don't expose a block generated attribute if criteria is not met

Author: Lester Celestial

lib/grape/entity.rb

@@ -259,7 +259,7 @@ def serializable_hash(runtime_options = {})
       return nil if object.nil?
       opts = options.merge(runtime_options || {})
       exposures.inject({}) do |output, (attribute, exposure_options)|
-        if exposure_options.has_key?(:proc) || object.respond_to?(attribute) && conditions_met?(exposure_options, opts)
+        if (exposure_options.has_key?(:proc) || object.respond_to?(attribute)) && conditions_met?(exposure_options, opts)
           partial_output = value_for(attribute, opts)
           output[key_for(attribute)] =
             if partial_output.respond_to? :serializable_hash

spec/grape/entity_spec.rb

@@ -253,8 +253,6 @@
 
     describe '#serializable_hash' do
 
-
-
       it 'should not throw an exception if a nil options object is passed' do
         expect{ fresh_class.new(model).serializable_hash(nil) }.not_to raise_error
       end
@@ -296,6 +294,14 @@
         res = fresh_class.new(model).serializable_hash
         res.should have_key :non_existant_attribute
       end
+
+      it "should not expose attributes that are generated by a block but have not passed criteria" do
+        fresh_class.expose :non_existant_attribute, :proc => lambda {|model, options|
+          "I exist, but it is not yet my time to shine"
+        }, :if => lambda { |model, options| false }
+        res = fresh_class.new(model).serializable_hash
+        res.should_not have_key :non_existant_attribute
+      end
 
       context "#serializable_hash" do