hash_dealer 1.4.7 → 1.4.8

data/VERSION

@@ -1 +1 @@
-1.4.7
+1.4.8

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hash_dealer"
-  s.version = "1.4.7"
+  s.version = "1.4.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2011-12-14"
+  s.date = "2012-06-05"
   s.description = "Like Factory Girl but for Hashes only"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [

data/lib/comparator.rb

@@ -2,11 +2,21 @@ require 'active_support/core_ext'
 
 class Comparator
   
+  def self.formatted_value(val)
+    if val.nil?
+      return "NilClass::nil"
+    elsif val == ""
+      return "''"
+    else
+      return val
+    end
+  end
+  
   def self.normalize_value(val)
     return val if val.is_a?(TimeDateMatcher)
     val = ActiveSupport::JSON.decode(val) if val.is_a?(String)
     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 = val.collect{|v| v.is_a?(Hash) || v.is_a?(Array) ? self.normalize_value(v) : v} if val.is_a?(Array)
     val
   end
   
@@ -14,14 +24,17 @@ class Comparator
     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]
+    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)]
   end
   
   def self.array_diff(obj1, obj2)
     {}.tap do |ret|
-      obj1.each_index do |k|
+      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]
-      end
+      end   
     end
   end
   
@@ -29,9 +42,9 @@ class Comparator
     obj1, obj2 = self.stringify_keys(obj1), self.stringify_keys(obj2)
     (obj1.keys + obj2.keys).uniq.inject({}) do |memo, key|
       if !obj1.keys.include?(key) 
-        memo[key] = ["KEY MISSING", obj2[key]]
+        memo[key] = ["KEY MISSING", formatted_value(obj2[key])]
       elsif !obj2.keys.include?(key) 
-        memo[key] = [obj1[key], "KEY MISSING"]
+        memo[key] = [formatted_value(obj1[key]), "KEY MISSING"]
       elsif obj1[key] != obj2[key]
         memo[key] = self.diff(obj1[key], obj2[key])
       end
@@ -47,4 +60,4 @@ class Comparator
       end
     end
   end
-end
+end

data/lib/core_extensions.rb

@@ -136,7 +136,12 @@ class Hash
       if opts[:only].include?(k.to_sym)
         ret[k] = v.matcher(opts[k.to_sym] || {})
       else
-        ret[k] = v
+        # Still try to pathify strings if this is an array or hash
+        if v.is_a?(Array) || v.is_a?(Hash)
+          ret[k] = v.pathify_strings
+        else
+          ret[k] = v
+        end
       end
     end
     ret

metadata

@@ -1,137 +1,134 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hash_dealer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.4.8
   prerelease: 
-  version: 1.4.7
 platform: ruby
-authors: 
+authors:
 - Dan Langevin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2152723880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152723880
+- !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2152723300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152723300
+- !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2152722740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152722740
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2152716020 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152716020
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2152715420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152715420
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2152714880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152714880
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2152714220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152714220
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2152713380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152713380
+- !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2152712340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2152712340
+- !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2152710780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id010
+  version_requirements: *2152710780
 description: Like Factory Girl but for Hashes only
 email: dan.langevin@lifebooker.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -153,34 +150,31 @@ files:
 - spec/lib/path_string_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/LifebookerInc/hash_dealer
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3422105148063784336
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 195646365187188942
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Hash Factory - like Factory Girl but for Hashes only
 test_files: []
-