hash_dealer 1.3.6 → 1.4.0

data/Gemfile

@@ -4,6 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem "activesupport", :require => "active_support"
+gem "i18n"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/VERSION

@@ -1 +1 @@
-1.3.6
+1.4.0

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hash_dealer"
-  s.version = "1.3.6"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2011-09-15"
+  s.date = "2011-10-05"
   s.description = "Like Factory Girl but for Hashes only"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "hash_dealer.gemspec",
+    "lib/comparator.rb",
     "lib/core_extensions.rb",
     "lib/hash_dealer.rb",
     "lib/matcher.rb",
@@ -47,6 +48,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
@@ -56,6 +58,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 0"])
@@ -66,6 +69,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 0"])

data/lib/comparator.rb

@@ -0,0 +1,56 @@
+require 'active_support/core_ext'
+
+class Comparator
+  
+  def self.normalize_value(val)
+    return val if val.is_a?(TimeDateMatcher)
+    val = ActiveSupport::JSON.decode(val) if val.is_a?(String)
+    val = val.stringify_keys if val.is_a?(Hash)
+    val = val.collect{|v| v.is_a?(Hash) || n.is_a?(Array) ? self.normalize_value(v) : v} if val.is_a?(Array)
+    val
+  end
+  
+  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)
+    return [obj1, obj2]
+  end
+  
+  def self.array_diff(obj1, obj2)
+    {}.tap do |ret|
+      obj1.each_index do |k|
+        ret[k] = self.diff(obj1[k], obj2[k]) unless obj1[k] == obj2[k]
+      end
+    end
+  end
+  
+  def self.hash_diff(obj1, obj2)
+    obj1, obj2 = self.stringify_keys(obj1), self.stringify_keys(obj2)
+    (obj1.keys + obj2.keys).uniq.inject({}) do |memo, key|
+      unless obj1[key] == obj2[key]
+        if obj1[key].kind_of?(Hash) && obj2[key].kind_of?(Hash)
+          memo[key] = self.diff(obj1[key],obj2[key])
+        elsif obj1[key].kind_of?(Array) && obj2[key].kind_of?(Array)
+          memo[key] = [].tap do |arr|
+            obj1[key].each_index do |i|
+              arr << self.diff(obj1[key][i], obj2[key][i])
+            end
+          end
+        else
+          memo[key] = self.diff(obj1[key], obj2[key]) 
+        end
+      end
+      memo
+    end
+  end
+  
+  def self.stringify_keys(hash)
+    {}.tap do |ret|
+      hash.keys.each do |k|
+        ret[k.to_s] = hash[k].is_a?(Hash) ? self.stringify_keys(hash[k]) : hash[k]
+      end
+    end
+  end
+    
+end

data/lib/core_extensions.rb

@@ -61,8 +61,18 @@ end
 class String
   def matcher(opts = {})
     # if we have a leading : or a /:xyz - a matcher is already defined
-    self =~ /(^:|\/:)/ ? self : ":#{self}"
+    self =~ /(^:|\/:)/ ? PathString.new(self) : PathString.new(":#{self}")
   end
+  define_method "==_with_path_string" do |other|
+    if other.is_a?(PathString)
+      return true if self.is_a?(PathString)
+      return other == self 
+    end
+    return self.send("==_without_path_string", other)
+  end
+  alias_method "==_without_path_string", :==
+  alias_method :==, "==_with_path_string"
+  alias_method :eql?, :==
 end
 
 class Hash

data/lib/hash_dealer.rb

@@ -2,6 +2,7 @@ require File.expand_path('../path_string', __FILE__)
 require File.expand_path('../variable_array', __FILE__)
 require File.expand_path('../core_extensions', __FILE__)
 require File.expand_path('../matcher', __FILE__)
+require File.expand_path('../comparator', __FILE__)
 
 class HashDealer
   

data/lib/matcher.rb

@@ -4,43 +4,40 @@ require 'pp'
 
 RSpec::Matchers.define(:match_response) do |actual|
   
+  actual = Comparator.normalize_value(actual)
+  
   match do |expected|
-    PathString.as_sorted_json(actual) == PathString.as_sorted_json(expected)
+    expected = Comparator.normalize_value(expected)
+    Comparator.diff(actual, expected) == {}
   end
   
   failure_message_for_should do |container|
-    "expected #{PathString.as_sorted_json(actual).pretty_inspect}\n to equal\n #{PathString.as_sorted_json(container).pretty_inspect} \n\n Diff: \n #{PathString.diff(container, actual)}"
+    Comparator.diff(actual, expected).pretty_inspect
   end
   
   failure_message_for_should_not do |container|
-    "expected #{PathString.as_sorted_json(actual).pretty_inspect}\n not to equal\n #{PathString.as_sorted_json(container).pretty_inspect} \n\n Diff: \n #{PathString.diff(container, actual)}"
+    Comparator.diff(actual, expected).pretty_inspect
   end
 end
 
 # alias as match_json
 RSpec::Matchers.define(:match_list) do |actual|
   
-  def normalize(val)
-    val = JSON.parse(val) if val.is_a?(String)
-    # if it's an array, we want just the first value   
-    if val.is_a?(Array)
-      # we append :matcher to account for variable length arrays - that causes a problem
-      # when the array is at the root and we are looking for the first element
-      val = val.first == ":matcher" ? val[1] : val.first 
-    end
-    val
-  end
+  actual = Comparator.normalize_value(actual)
   
   match do |expected|
-    PathString.as_sorted_json(normalize(actual)) == PathString.as_sorted_json(normalize(expected))
+    expected = Comparator.normalize_value(expected)
+    expected = expected.first if expected.is_a?(Array)
+    actual = actual.first if actual.is_a?(Array)
+    Comparator.diff(actual, expected) == {}
   end
     
   failure_message_for_should do |container|
-    "expected #{PathString.as_sorted_json(normalize(actual))}\n to equal\n #{PathString.as_sorted_json(normalize(container))} \n\n Diff: \n #{PathString.diff(container, actual)}"
+    Comparator.diff(actual, expected).pretty_inspect
   end
   
   failure_message_for_should_not do |container|
-    "expected #{PathString.as_sorted_json(normalize(actual))}\n not to equal\n #{PathString.as_sorted_json(normalize(container))} \n\n Diff: \n #{PathString.diff(container, actual)}"
+    Comparator.diff(actual, expected).pretty_inspect
   end
   
 end

data/spec/lib/hash_dealer_spec.rb

@@ -121,7 +121,7 @@ describe HashDealer do
         updated_at(Time.now)
       end
       
-      JSON.unparse({:created_at => Time.now, :updated_at => Time.now, :id => 1}).should match_response(HashDealer.roll(:var).matcher)
+      ActiveSupport::JSON.encode({:created_at => Time.now, :updated_at => Time.now, :id => 1}).should match_response(HashDealer.roll(:var).matcher)
       
     end
     

data/spec/lib/matcher_spec.rb

@@ -4,19 +4,20 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe "match_response Matcher" do
 
   it "should match hashes" do
-    {:a => "b"}.should match_response({"a" => ":test"})
+    {:a => "b"}.should match_response({"a" => "test"}.matcher)
   end
   
   it "should match paths within hashes" do
-    {:a => {:b => "/test/test"}}.should match_response({"a" =>{"b" => "/:a/:b"}})
+    String.new({"a" =>{"b" => "/:a/:b"}}.matcher["a"]["b"]).should eql "/:a/:b"
+    {:a => {:b => "/test/test"}}.should match_response({"a" =>{"b" => "/:a/:b"}}.matcher)
   end
   
   it "should match the first element in a list" do
-    {"a" => ":b"}.should match_list([{"a" => "test"}, {"a" => "test2"}])
+    [{"a" => "test"}, {"a" => "test2"}].should match_list({"a" => "b"}.matcher)
   end
   
   it "should account for the first :matcher param when it's at the root" do
-    JSON.unparse([{"a" => "b"}, {"a" => "c"}]).should match_list({"a" => ":b"})
+    JSON.unparse([{"a" => "b"}, {"a" => "c"}]).should match_list({"a" => "b"}.matcher)
   end
   
   it "should match using wildcards for variable length arrays" do
@@ -29,4 +30,18 @@ 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" => [nil, "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
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors: 
 - Dan Langevin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-15 00:00:00 Z
+date: 2011-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -24,18 +24,18 @@ dependencies:
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: i18n
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: "0"
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  name: bundler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,7 +46,7 @@ dependencies:
   prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: jeweler
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,7 +57,7 @@ dependencies:
   prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: rspec
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -68,8 +68,19 @@ dependencies:
   prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
+  name: rcov
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -77,10 +88,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: ruby-debug19
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -88,10 +99,10 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,7 +110,7 @@ dependencies:
         version: "0"
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *id009
 description: Like Factory Girl but for Hashes only
 email: dan.langevin@lifebooker.com
 executables: []
@@ -119,6 +130,7 @@ files:
 - Rakefile
 - VERSION
 - hash_dealer.gemspec
+- lib/comparator.rb
 - lib/core_extensions.rb
 - lib/hash_dealer.rb
 - lib/matcher.rb
@@ -141,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -498563270830469616
+      hash: -3208818064426284269
       segments: 
       - 0
       version: "0"