dynport_tools 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/dynport_tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]
-  s.date = %q{2011-08-17}
+  s.date = %q{2011-08-21}
   s.description = %q{Collection of various tools}
   s.email = %q{tobias.schwab@dynport.de}
   s.executables = ["xmldiff", "redis_dumper"]

data/lib/dynport_tools/deep_merger.rb

@@ -1,14 +1,13 @@
 class DynportTools::DeepMerger
   class << self
     def merge(a, b)
-      if a.class == b.class
-        if a.is_a?(Hash)
-          return merge_hashes(a, b)
-        elsif a.is_a?(Array)
-          return merge_arrays(a, b)
-        end
+      if a.is_a?(Hash) && b.is_a?(Hash)
+        merge_hashes(a, b)
+      elsif a.is_a?(Array) && b.is_a?(Array)
+        merge_arrays(a, b)
+      else
+        b
       end
-      b
     end
     
     def merge_arrays(a, b)

data/spec/dynport_tools/deep_merger_spec.rb

@@ -1,10 +1,30 @@
 require 'spec_helper'
 
 describe DynportTools::DeepMerger do
+  class SubHash < Hash
+  end
+  
+  class SubArray < Array
+  end
+  
   it "merges two hashes" do
     DynportTools::DeepMerger.merge({ :a => 1 }, { :b => 2 }).should == { :a => 1, :b => 2 }
   end
   
+  it "calls merge_hashes even if one is a subclass of hash" do
+    sh = SubHash.new
+    hash = { :a => 1 }
+    DynportTools::DeepMerger.should_receive(:merge_hashes).with(hash, sh).and_return "hash"
+    DynportTools::DeepMerger.merge(hash, sh).should == "hash"
+  end
+  
+  it "calls merge_arrays even if one is a subclass of array" do
+    sa = SubArray.new
+    array = [1]
+    DynportTools::DeepMerger.should_receive(:merge_arrays).with(sa, array).and_return "array"
+    DynportTools::DeepMerger.merge(sa, array).should == "array"
+  end
+  
   it "merges two arrays with same number of attributes" do
     DynportTools::DeepMerger.merge([{ :a => 1, :b => 1 }], [{ :a => 2, :c => 3 }]).should == [{ :a => 2, :b => 1, :c => 3 }]
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - Tobias Schwab
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-17 00:00:00 +02:00
+date: 2011-08-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: nokogiri
-  prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +29,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  name: redis
+  name: nokogiri
+  version_requirements: *id001
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +43,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  name: typhoeus
+  name: redis
+  version_requirements: *id002
   prerelease: false
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +57,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
+  name: typhoeus
+  version_requirements: *id003
   prerelease: false
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -74,12 +73,12 @@ dependencies:
         - 3
         - 0
         version: 2.3.0
-  type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  name: bundler
+  name: rspec
+  version_requirements: *id004
   prerelease: false
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -90,12 +89,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
+  version_requirements: *id005
   prerelease: false
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -106,12 +105,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
+  name: jeweler
+  version_requirements: *id006
   prerelease: false
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,12 +119,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
-  name: ZenTest
+  name: rcov
+  version_requirements: *id007
   prerelease: false
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -136,12 +135,12 @@ dependencies:
         - 5
         - 0
         version: 4.5.0
-  type: :development
-  requirement: *id008
-- !ruby/object:Gem::Dependency 
-  name: autotest
+  name: ZenTest
+  version_requirements: *id008
   prerelease: false
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -150,12 +149,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
-  name: autotest-growl
+  name: autotest
+  version_requirements: *id009
   prerelease: false
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -164,12 +163,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
+  name: autotest-growl
+  version_requirements: *id010
   prerelease: false
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -178,8 +177,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  requirement: *id011
+  name: ruby-debug
+  version_requirements: *id011
+  prerelease: false
 description: Collection of various tools
 email: tobias.schwab@dynport.de
 executables: