rego-ruby-ext 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/hash.rb

@@ -0,0 +1,39 @@
+class Hash
+
+  # Merges self with another hash, recursively.
+  #
+  # This code was lovingly stolen from some random gem:
+  # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
+  #
+  # Thanks to whoever made it.
+
+  def deep_merge(hash)
+    target = dup
+
+    hash.keys.each do |key|
+      if hash[key].is_a? Hash and self[key].is_a? Hash
+        target[key] = target[key].deep_merge(hash[key])
+        next
+      end
+
+      target[key] = hash[key]
+    end
+
+    target
+  end
+
+
+  # From: http://www.gemtacular.com/gemdocs/cerberus-0.2.2/doc/classes/Hash.html
+  # File lib/cerberus/utils.rb, line 42
+
+  def deep_merge!(second)
+    second.each_pair do |k,v|
+      if self[k].is_a?(Hash) and second[k].is_a?(Hash)
+        self[k].deep_merge!(second[k])
+      else
+        self[k] = second[k]
+      end
+    end
+  end
+
+end

data/lib/rego-ruby-ext.rb

@@ -1,4 +1,4 @@
-['nil', 'date', 'time', 'enumerable', 'numeric', 'symbol', 'string-interpolation', 'string'].each do |file_name|
+['nil', 'date', 'time', 'enumerable', 'hash', 'numeric', 'symbol', 'string-interpolation', 'string'].each do |file_name|
   require File.join(File.dirname(__FILE__), file_name)
 end
 

data/rego-ruby-ext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rego-ruby-ext}
-  s.version = "0.0.1"
+  s.version = "0.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Alex Tkachev"]
-  s.date = %q{2011-08-21}
+  s.date = %q{2011-09-14}
   s.description = %q{Ruby core extensions that are common for all ReGO projects}
   s.email = %q{tkachev.alex@gmail.com}
   s.extra_rdoc_files = [
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
     "init.rb",
     "lib/date.rb",
     "lib/enumerable.rb",
+    "lib/hash.rb",
     "lib/nil.rb",
     "lib/numeric.rb",
     "lib/rego-ruby-ext.rb",
@@ -37,6 +38,7 @@ Gem::Specification.new do |s|
     "rego-ruby-ext.gemspec",
     "spec/date_spec.rb",
     "spec/enumerable_spec.rb",
+    "spec/hash_spec.rb",
     "spec/nil_spec.rb",
     "spec/numeric_spec.rb",
     "spec/rego-ruby-ext_spec.rb",

data/spec/hash_spec.rb

@@ -0,0 +1,30 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Hash do
+  describe '#deep_merge' do
+    it 'should not modify original hash' do
+      h1 = {:a => 1, :b => 2}
+      h2 = h1.deep_merge(:c => 3)
+      h2.should_not == h1
+      h2.should include(:c)
+      h1.should_not include(:c)
+    end
+
+    it 'should merge non deep hash regularly' do
+      h = {:a => 1, :b => 2}.deep_merge({:a => 3, :c => 4})
+      h.should include(:a)
+      h.should include(:c)
+      h[:c].should == 4
+      h[:a].should == 3
+    end
+
+    it 'should merge recursively' do
+      h = {:a => 1, :b =>2, :c => {:c1 => 1, :c2 => 2}, :d => 4}.deep_merge(:b => 'bb', :c => {:c2 => 'cc'})
+      h[:a].should == 1
+      h[:b].should == 'bb'
+      h[:c][:c1].should == 1
+      h[:c][:c2].should == 'cc'
+      h[:d].should == 4
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rego-ruby-ext
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Alex Tkachev
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-21 00:00:00 +03:00
+date: 2011-09-14 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -114,6 +114,7 @@ files:
 - init.rb
 - lib/date.rb
 - lib/enumerable.rb
+- lib/hash.rb
 - lib/nil.rb
 - lib/numeric.rb
 - lib/rego-ruby-ext.rb
@@ -124,6 +125,7 @@ files:
 - rego-ruby-ext.gemspec
 - spec/date_spec.rb
 - spec/enumerable_spec.rb
+- spec/hash_spec.rb
 - spec/nil_spec.rb
 - spec/numeric_spec.rb
 - spec/rego-ruby-ext_spec.rb