diff options
author | Spencer Rogers <spencer1248@gmail.com> | 2013-11-30 12:02:59 -0700 |
---|---|---|
committer | Spencer Rogers <spencer1248@gmail.com> | 2013-11-30 12:02:59 -0700 |
commit | 05e3cba9241dc82df0c22f1cd508790c2500125c (patch) | |
tree | 788eefe813386b7d4e882bbec07643b91fb45bbb | |
parent | 3321005d0bd77e0811a2cea6dbbd302d8e86851f (diff) | |
download | hashie-05e3cba9241dc82df0c22f1cd508790c2500125c.tar.gz |
Fix Dash#merge
-rw-r--r-- | lib/hashie/dash.rb | 8 | ||||
-rw-r--r-- | spec/hashie/dash_spec.rb | 29 |
2 files changed, 37 insertions, 0 deletions
diff --git a/lib/hashie/dash.rb b/lib/hashie/dash.rb index a1669a5..42056e7 100644 --- a/lib/hashie/dash.rb +++ b/lib/hashie/dash.rb @@ -127,6 +127,14 @@ module Hashie super(property.to_s, value) end + def merge(other_hash) + new_dash = self.dup + other_hash.each do |k,v| + new_dash[k] = block_given? ? yield(k, self[k], v) : v + end + new_dash + end + def replace(other_hash) other_hash = self.class.defaults.merge(other_hash) (keys - other_hash.keys).each { |key| delete(key) } diff --git a/spec/hashie/dash_spec.rb b/spec/hashie/dash_spec.rb index 3df672a..b6467c3 100644 --- a/spec/hashie/dash_spec.rb +++ b/spec/hashie/dash_spec.rb @@ -147,6 +147,35 @@ describe DashTest do end end + describe '#merge' do + it 'creates a new instance of the Dash' do + new_dash = subject.merge(:first_name => 'Robert') + subject.object_id.should_not == new_dash.object_id + end + + it 'merges the given hash' do + new_dash = subject.merge(:first_name => 'Robert', :email => 'robert@example.com') + new_dash.first_name.should == 'Robert' + new_dash.email.should == 'robert@example.com' + end + + it 'fails with non-existent properties' do + expect { subject.merge(:middle_name => 'James') }.to raise_error(NoMethodError) + end + + it 'errors out when attempting to set a required property to nil' do + expect { subject.merge(:first_name => nil) }.to raise_error(ArgumentError) + end + + context "given a block" do + it "sets merged key's values to the block's return value" do + subject.merge(:first_name => 'Jim') do |key, oldval, newval| + "#{key}: #{newval} #{oldval}" + end.first_name.should == 'first_name: Jim Bob' + end + end + end + describe 'properties' do it 'lists defined properties' do described_class.properties.should == Set.new([:first_name, :email, :count]) |