Merge pull request #27 from clintonb/serialize-hashes

Properly serializing hashes

Author: dblock

CHANGELOG.md

@@ -5,6 +5,7 @@ Next Release
 * [#18](https://github.com/intridea/grape-entity/pull/18): Add `safe` option to `expose`, will not raise error for a missing attribute - [@fixme](https://github.com/fixme).
 * [#16](https://github.com/intridea/grape-entity/pull/16): Add `using` option to `expose SYMBOL BLOCK` - [@fahchen](https://github.com/fahchen).
 * [#24](https://github.com/intridea/grape-entity/pull/24): Return documentation with `as` param considered - [@drakula2k](https://github.com/drakula2k).
+* [#27](https://github.com/intridea/grape-entity/pull/27): Properly serializing hashes - [@clintonb](https://github.com/clintonb).
 * Your contribution here.
 
 0.3.0 (2013-03-29)

lib/grape_entity/entity.rb

@@ -344,6 +344,10 @@ def serializable_hash(runtime_options = {})
  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)
+ partial_output.each do |key, value|
+ partial_output[key] = value.serializable_hash if value.respond_to? :serializable_hash
+ end
  else
  partial_output
  end

spec/grape_entity/entity_spec.rb

@@ -387,6 +387,14 @@ def serializable_hash(opts = {})
  { :abc => 'def' }
  end
  end
+ class EmbeddedExampleWithHash
+ def name
+ "abc"
+ end
+ def embedded
+ { :a => nil, :b => EmbeddedExample.new }
+ end
+ end
  class EmbeddedExampleWithMany
  def name
  "abc"
@@ -417,6 +425,12 @@ def embedded
  presenter.serializable_hash.should == {:name => "abc", :embedded => [{:abc => "def"}, {:abc => "def"}]}
  end
 
+ it 'serializes embedded hashes of objects which respond to #serializable_hash' do
+ fresh_class.expose :name, :embedded
+ presenter = fresh_class.new(EntitySpec::EmbeddedExampleWithHash.new)
+ presenter.serializable_hash.should == {:name => "abc", :embedded => {:a => nil, :b => {:abc => "def"}}}
+ end
+
  end
 
  end