hash_dealer 1.4.2 → 1.4.3

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/hash_dealer.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "hash_dealer"
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]

data/lib/comparator.rb

@@ -5,7 +5,7 @@ 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 = self.stringify_keys(val) 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
@@ -31,12 +31,6 @@ class Comparator
       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
@@ -45,12 +39,12 @@ class Comparator
     end
   end
   
-  def self.stringify_keys(hash)
+  def self.stringify_keys(hash_or_array)
+    return hash_or_array.collect{|v| v.is_a?(Hash) || v.is_a?(Array) ? self.stringify_keys(v) : v} if hash_or_array.is_a?(Array)
     {}.tap do |ret|
-      hash.keys.each do |k|
-        ret[k.to_s] = hash[k].is_a?(Hash) ? self.stringify_keys(hash[k]) : hash[k]
+      hash_or_array.each_pair.each do |k, v|
+        ret[k.to_s] = v.is_a?(Hash) || v.is_a?(Array) ? self.stringify_keys(v) : v
       end
     end
   end
-    
 end

data/lib/hash_dealer.rb

@@ -1,3 +1,5 @@
+require 'colorize'
+
 require File.expand_path('../path_string', __FILE__)
 require File.expand_path('../variable_array', __FILE__)
 require File.expand_path('../core_extensions', __FILE__)

data/lib/matcher.rb

@@ -8,7 +8,7 @@ def print_diff(diff, depth = 1)
   if diff.is_a?(Hash)
     diff.each_pair do |k, v|
       puts "\n"
-      puts (("\t" * depth) + k).red
+      puts (("\t" * depth) + k.to_s).red
       print_diff(v, depth + 1)
     end
   end

data/lib/variable_array.rb

@@ -2,10 +2,17 @@ class VariableArray < Array
   def ==(other)
     if other.is_a?(Array)
       comp = self[1..(self.length - 1)]
-      return true if comp.first == other.first
+      return comp.first == other.first
     else
       super
     end
   end
+  def collect(&block)
+    self.class.new.tap do |ret|
+      self.each_with_index do |el, i|
+        ret[i] = block.call(el)
+      end
+    end
+  end
   alias_method :eql?, :==
 end

data/spec/lib/matcher_spec.rb

@@ -44,4 +44,8 @@ describe "match_response Matcher" do
     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"
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: hash_dealer
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors: 
 - Dan Langevin
@@ -153,7 +153,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1097571649744545585
+      hash: -2331371851273189618
       segments: 
       - 0
       version: "0"