symbolmatrix 1.1.1 → 1.1.2

data/lib/symbolmatrix/symbolmatrix.rb

@@ -69,7 +69,7 @@ class SymbolMatrix < Hash
   end
   
   # Merges this SymbolMatrix with another SymbolMatrix recursively
-  def recursive_merge hash
+  def recursive_merge hash, override = false
     result = SymbolMatrix.new
     self.keys.each do |key|
       result[key] = self[key]
@@ -77,7 +77,15 @@ class SymbolMatrix < Hash
 
     hash.keys.each do |key|
       if result.has_key? key
-        result[key] = result[key].recursive_merge hash[key]
+        if result[key].respond_to? :recursive_merge
+          result[key] = result[key].recursive_merge hash[key], override
+        else
+          if override
+            result[key] = hash[key]
+          else
+            raise MergeError, "The value of the :#{key} key is already defined. Run recursive merge with flag true if you want it to override"
+          end
+        end
       else
         result[key] = hash[key]
       end
@@ -86,10 +94,18 @@ class SymbolMatrix < Hash
   end
 
   # Merges recursively the passed SymbolMatrix into self
-  def recursive_merge! symbolmatrix
+  def recursive_merge! symbolmatrix, override = false
     symbolmatrix.each do |key, value|
       if self.has_key? key
-        self[key].recursive_merge! value
+        if self[key].respond_to? :recursive_merge!
+          self[key].recursive_merge! value, override
+        else
+          if override
+            self[key] = value
+          else
+            raise MergeError, "The value of the :#{key} key is already defined. Run recursive merge with flag true if you want it to override"
+          end
+        end
       else 
         self[key] = value
       end
@@ -98,6 +114,7 @@ class SymbolMatrix < Hash
 
   class KeyNotDefinedException < RuntimeError; end
   class InvalidKeyException < RuntimeError; end 
+  class MergeError < RuntimeError; end 
 end
 
 def SymbolMatrix *args

data/lib/symbolmatrix/version.rb

@@ -1,3 +1,3 @@
 module Symbolmatrix
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/symbolmatrix/symbolmatrix_spec.rb

@@ -120,6 +120,25 @@ describe SymbolMatrix do
   end
 
   describe "#recursive_merge" do 
+    it 'should raise a relevant error when the two matrices collide' do 
+      sm = SymbolMatrix a: "hola"
+      expect { sm.recursive_merge SymbolMatrix a: "hey"
+      }.to raise_error SymbolMatrix::MergeError,
+        "The value of the :a key is already defined. Run recursive merge with flag true if you want it to override"
+    end
+
+    it 'should override on collide if the override flag is on' do 
+      sm = SymbolMatrix a: "hola"
+      result = sm.recursive_merge SymbolMatrix(a: "hey"), true
+      result.a.should == "hey"
+    end
+
+    it 'should send the override directive into the recursion' do 
+      sm = SymbolMatrix a: { b: "hola" }
+      result = sm.recursive_merge SymbolMatrix( a: { b: "hey" } ), true
+      result.a.b.should == "hey"
+    end
+
     it 'should merge two symbolmatrices' do 
       sm = SymbolMatrix.new a: "hola"
       result = sm.recursive_merge SymbolMatrix.new b: "chau"
@@ -171,6 +190,25 @@ describe SymbolMatrix do
   end
 
   describe '#recursive_merge!' do 
+    it 'should raise a relevant error when the two matrices collide' do 
+      sm = SymbolMatrix a: "hola"
+      expect { sm.recursive_merge! SymbolMatrix a: "hey"
+      }.to raise_error SymbolMatrix::MergeError,
+        "The value of the :a key is already defined. Run recursive merge with flag true if you want it to override"
+    end
+
+    it 'should override on collide if the override flag is on' do 
+      sm = SymbolMatrix a: "hola"
+      sm.recursive_merge! SymbolMatrix(a: "hey"), true
+      sm.a.should == "hey"
+    end
+
+    it 'should send the override directive into the recursion' do 
+      sm = SymbolMatrix a: { b: "hola" }
+      sm.recursive_merge! SymbolMatrix( a: { b: "hey" } ), true
+      sm.a.b.should == "hey"
+    end
+
     it 'should merge a symbolmatrix into this' do 
       sm = SymbolMatrix.new a: "hola"
       sm.recursive_merge! SymbolMatrix.new b: "chau"

metadata

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