symbolmatrix 1.0.0 → 1.1.0

data/.travis.yml

@@ -1,10 +1,10 @@
 language: ruby
 rvm:
-  - 1.8.7
-  - 1.9.2
+#  - 1.8.7
+#  - 1.9.2
   - 1.9.3
-  - jruby-18mode
+#  - jruby-18mode
   - jruby-19mode
-  - rbx-18mode
+#  - rbx-18mode
   - rbx-19mode
-  - ree
+#  - ree

data/features/stepdefs/parse_serialization.rb

@@ -7,5 +7,5 @@ When /^I parse it$/ do
 end
 
 Then /^I should see \(serialized in yaml\)$/ do |data|
-  @parsed.to_hash.should include SymbolMatrix.new(data).to_hash
+  @parsed.to.hash.should include SymbolMatrix.new(data).to.hash
 end

data/features/stepdefs/serialize.rb

@@ -3,7 +3,7 @@ Given /^the SymbolMatrix:$/ do |yaml|
 end
 
 When /^I serialize it$/ do 
-  @serialization = @symbolmatrix.to.serialization
+  @serialization = @symbolmatrix.to.smas
 end
 
 Then /^I should get "(.+?)"$/ do |serialization|

data/lib/symbolmatrix/symbolmatrix.rb

@@ -85,6 +85,17 @@ class SymbolMatrix < Hash
     return result
   end
 
+  # Merges recursively the passed SymbolMatrix into self
+  def recursive_merge! symbolmatrix
+    symbolmatrix.each do |key, value|
+      if self.has_key? key
+        self[key].recursive_merge! value
+      else 
+        self[key] = value
+      end
+    end
+  end
+
   class KeyNotDefinedException < RuntimeError; end
   class InvalidKeyException < RuntimeError; end 
 end

data/lib/symbolmatrix/version.rb

@@ -1,3 +1,3 @@
 module Symbolmatrix
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/symbolmatrix/symbolmatrix_spec.rb

@@ -170,6 +170,57 @@ describe SymbolMatrix do
     end
   end
 
+  describe '#recursive_merge!' do 
+    it 'should merge a symbolmatrix into this' do 
+      sm = SymbolMatrix.new a: "hola"
+      sm.recursive_merge! SymbolMatrix.new b: "chau"
+      sm.a.should == "hola"
+      sm.b.should == "chau"
+    end
+
+    it 'should merge two symbolmatrices (new values)' do 
+      sm = SymbolMatrix.new a: "hey"
+      sm.recursive_merge! SymbolMatrix.new b: "bye"
+      sm.a.should == "hey"
+      sm.b.should == "bye"
+    end
+
+    it 'should merge two symbolmatrices (new keys)' do 
+      sm = SymbolMatrix.new y: "allo"
+      sm.recursive_merge! SymbolMatrix.new z: "ciao"
+      sm.y.should == "allo"
+      sm.z.should == "ciao"
+    end
+
+    it 'should recursively merge this with that (simple)' do 
+      sm = SymbolMatrix.new another: { b: "aa" }
+      sm.recursive_merge! SymbolMatrix.new another: { c: "ee" }
+      sm.another.b.should == "aa"
+      sm.another.c.should == "ee"
+    end
+
+    it 'should recursively merge this with that (simple)' do 
+      sm = SymbolMatrix.new distinct: { b: "rr" }
+      sm.recursive_merge! SymbolMatrix.new distinct: { c: "gg" }
+      sm.distinct.b.should == "rr"
+      sm.distinct.c.should == "gg"
+    end
+
+    it 'should recursively merge this with that v2 (simple)' do
+      sm = SymbolMatrix.new a: { z: "ee" }
+      sm.recursive_merge! SymbolMatrix.new a: { g: "oo" }
+      sm.a.z.should == "ee"
+      sm.a.g.should == "oo"
+    end
+
+    it 'should recursively merge this with the argument hash' do 
+      sm = SymbolMatrix.new a: { b: { c: "hola" } }
+      sm.recursive_merge! a: { b: { d: "aaa" } }
+      sm.a.b.c.should == "hola"
+      sm.a.b.d.should == "aaa"
+    end
+  end
+
   it 'should be a method that calls SymbolMatrix.new with its arguments' do 
     argument = stub 'argument'
     SymbolMatrix.should_receive(:new).with argument

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symbolmatrix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-16 00:00:00.000000000 Z
+date: 2012-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: discoverer