hash_dealer 1.3.4 → 1.3.5

data/VERSION

@@ -1 +1 @@
-1.3.4
+1.3.5

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hash_dealer}
-  s.version = "1.3.4"
+  s.version = "1.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = %q{2011-09-08}
+  s.date = %q{2011-09-13}
   s.description = %q{Like Factory Girl but for Hashes only}
   s.email = %q{dan.langevin@lifebooker.com}
   s.extra_rdoc_files = [

data/lib/matcher.rb

@@ -9,11 +9,11 @@ RSpec::Matchers.define(:match_response) do |actual|
   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}"
+    "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)}"
   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}"
+    "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)}"
   end
 end
 
@@ -36,11 +36,11 @@ RSpec::Matchers.define(:match_list) do |actual|
   end
     
   failure_message_for_should do |container|
-    "expected #{PathString.as_sorted_json(normalize(actual))}\n to equal\n #{PathString.as_sorted_json(normalize(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)}"
   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))}"
+    "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)}"
   end
   
 end

data/lib/path_string.rb

@@ -61,16 +61,49 @@ class PathString < String
     return params
   end
   
+  def self.diff(a,b)
+    a, b = self.as_sorted_json(a), self.as_sorted_json(b)
+    diff = []
+    a.each_index do |i|
+      unless a[i] == b[i]
+        diff << {:expected => a[i], :got => b[i]}
+      end
+    end
+    diff
+  end
+  
+  
   private
   
   def self.stringify_keys(hash)
-    new_hash = {}
+    new_hash = hash.class.new
     hash.each_pair do |k,v|
-      new_hash[k.to_s] = v.is_a?(Hash) ? self.stringify_keys(v) : v
+      new_hash[k.to_s] = case v
+        when Hash
+          self.stringify_keys(v)
+        when Array
+          self.stringify_array_keys(v)
+        else
+         v 
+      end
     end
     new_hash
   end
   
+  # 
+  def self.stringify_array_keys(array)
+    array.collect{|v|
+      case v
+        when Hash
+          self.stringify_keys(v)
+        when Array
+          self.stringify_array_keys(v)
+        else
+          v
+      end
+    }
+  end
+  
   def self.get_zipped_array(known_path, entered_path)
     # make these strings
     known_path, entered_path = known_path.to_s, entered_path.to_s

data/spec/lib/matcher_spec.rb

@@ -1,3 +1,4 @@
+require 'json'
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "match_response Matcher" do
@@ -23,4 +24,9 @@ describe "match_response Matcher" do
     {"a" => [{"a" => "b"}]}.matcher.should match_response({"a" => [{"a" => "c"},{"a" => "x"},{"a" => "y"}]})
   end
   
+  it "should stringify keys so it matches symbols to strings" do
+    {:a => "a"}.matcher.should match_response({"a" => "abcde"})
+    {:a => {:b => "c"}}.should match_response({"a" => {"b" => "c"}})
+  end
+  
 end

data/spec/lib/path_string_spec.rb

@@ -36,4 +36,5 @@ describe PathString do
   it "should match wildcard paths" do
     PathString.paths_match?("/a/1/test/2", "/a/:1/test/:2").should be_true
   end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors: 
 - Dan Langevin
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 Z
+date: 2011-09-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -141,7 +141,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 284898895399616564
+      hash: 882149138124409394
       segments: 
       - 0
       version: "0"