hash_dealer 1.4.9 → 1.4.10

data/VERSION

@@ -1 +1 @@
-1.4.9
+1.4.10

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hash_dealer"
-  s.version = "1.4.9"
+  s.version = "1.4.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2012-08-02"
+  s.date = "2012-12-03"
   s.description = "Like Factory Girl but for Hashes only"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [
@@ -41,7 +41,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/LifebookerInc/hash_dealer"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.24"
   s.summary = "Hash Factory - like Factory Girl but for Hashes only"
 
   if s.respond_to? :specification_version then

data/lib/comparator.rb

@@ -5,6 +5,8 @@ class Comparator
   def self.formatted_value(val)
     if val.nil?
       return "NilClass::nil"
+    elsif val.is_a?(PathString)
+      return val.gsub(":","")
     elsif val == ""
       return "''"
     else
@@ -22,8 +24,11 @@ class Comparator
   
   def self.diff(obj1, obj2)
     return {} if obj1 == obj2
-    return self.array_diff(obj1, obj2) if obj1.is_a?(Array) && obj2.is_a?(Array)
-    return self.hash_diff(obj1, obj2) if obj1.is_a?(Hash) && obj2.is_a?(Hash)
+    if obj1.is_a?(Array) && obj2.is_a?(Array)
+      return self.array_diff(obj1, obj2) 
+    elsif obj1.is_a?(Hash) && obj2.is_a?(Hash)
+      return self.hash_diff(obj1, obj2) 
+    end
     return [formatted_value(obj1), "KEY MISSING"] if obj2.nil?
     return ["KEY MISSING", formatted_value(obj2)] if obj1.nil?
     return [formatted_value(obj1), formatted_value(obj2)]
@@ -31,6 +36,12 @@ class Comparator
   
   def self.array_diff(obj1, obj2)
     {}.tap do |ret|
+      # handle VariableArray by extracting the first element
+      # of non-VariableArrays and the 2nd element of VariableArrays
+      if obj1.is_a?(VariableArray) || obj2.is_a?(VariableArray)
+        obj1 = obj1.is_a?(VariableArray) ? [obj1[1]] : [obj1[0]]
+        obj2 = obj2.is_a?(VariableArray) ? [obj2[1]] : [obj2[0]]
+      end
       bigger_arr = obj1.size >= obj2.size ? obj1 : obj2
       bigger_arr.each_index do |k|
         ret[k] = self.diff(obj1[k], obj2[k]) unless obj1[k] == obj2[k]

data/spec/lib/matcher_spec.rb

@@ -30,19 +30,50 @@ describe "match_response Matcher" do
     {:a => {:b => "c"}}.should match_response({"a" => {"b" => "c"}})
   end
   
-  it "should provide meaningful diffs" do
-    diff = Comparator.diff({:a => {:b => "c", :d => "e"}}, {:a => {:b => "d", :d => "e"}, :b => "test"})
-    diff.should eql({"a" => {"b" => ["c", "d"]}, "b" => ["KEY MISSING", "test"]})
+  context ".diff" do
+
+    it "should provide meaningful diffs" do
+      h1 = {:a => {:b => "c", :d => "e"}}
+      h2 = {:a => {:b => "d", :d => "e"}, :b => "test"}
+      diff = Comparator.diff(h1, h2)
+      diff.should eql({
+        "a" => {"b" => ["c", "d"]}, 
+        "b" => ["KEY MISSING", "test"]
+      })
+    end
+
+    it "should match hashes regardless of the order of the keys" do
+      Comparator.diff({"a" => {"b" => "c", "d" => "e"}, "b" => "c"}, {:b => "c", :a => {"d" => "e", :b => "c"}}).should eql({})
+    end
+    
+    it "should use the matcher comparison inside of Comparator" do
+      Comparator.diff({"a" => "dkddk"}.matcher, {"a" => "test"}).should eql({})
+      Comparator.diff({"a" => "dkddk"}, {"a" => "test"}.matcher).should eql({})
+    end
+
+    it "should provide meaningful diffs for arrays" do
+      h1 = {
+        :a => [{"1" => "3"}]
+      }
+      h2 = {
+        :a => [{"2" => "4"}]
+      }
+      diff = Comparator.diff(h1.matcher, h2)
+      diff.should eql({
+        "a" => {
+          0 => {
+            "1" => ["3", "KEY MISSING"], 
+            "2" => ["KEY MISSING", "4"]
+          }
+        }
+      })
+      true
+    end
+
+
   end
   
-  it "should match hashes regardless of the order of the keys" do
-    Comparator.diff({"a" => {"b" => "c", "d" => "e"}, "b" => "c"}, {:b => "c", :a => {"d" => "e", :b => "c"}}).should eql({})
-  end
   
-  it "should use the matcher comparison inside of Comparator" do
-    Comparator.diff({"a" => "dkddk"}.matcher, {"a" => "test"}).should eql({})
-    Comparator.diff({"a" => "dkddk"}, {"a" => "test"}.matcher).should eql({})
-  end
   
   it "should recursively set hash keys to strings" do
     Comparator.normalize_value({:x => [[{:y => "z"}]]})["x"].first.first["y"].should eql "z"

data/spec/spec_helper.rb

@@ -20,3 +20,8 @@ Debugger.start
 
 Dir[File.join(File.dirname(__FILE__), '..', 'spec/support/**/*.rb')].each {|f| require f}
 
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_dealer
 version: !ruby/object:Gem::Version
-  version: 1.4.9
+  version: 1.4.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-02 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2156289180 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156289180
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2156288400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156288400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2156287840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156287840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156287160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156287160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156286200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156286200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156285720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156285720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156285080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,21 +117,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156285080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2156284420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2156284420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &2156283700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156283700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2156282880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +165,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156282880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Like Factory Girl but for Hashes only
 email: dan.langevin@lifebooker.com
 executables: []
@@ -164,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2453696594862586054
+      hash: 4440880840768368962
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Hash Factory - like Factory Girl but for Hashes only