hash_dealer 1.6.1 → 1.6.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a3739d118f18cc4dba12e6bb91a424cc8cf48f62
+  data.tar.gz: db91fef82793b6262e7ec75b7796c16e6b2586ac
+SHA512:
+  metadata.gz: c59ace8933daae838a47a6874f93152fad1adbed38dfbc15232cc6e81710902e013df42622fe59d6254bd96704a740cffc92df4d89a8a4b4f2d9e66b0d3fc3c0
+  data.tar.gz: 3d9809e24497cbb527632cf2cfe4c2b18ffaa16f99e3b486d0ab7dc5abd9054f14c976ccb475d0b1b6f5d0a363b181161482ca6bffcf0f50095bb4e4c060c6ec

data/VERSION

@@ -1 +1 @@
-1.6.1
+1.6.2

data/hash_dealer.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "hash_dealer"
-  s.version = "1.6.1"
+  s.version = "1.6.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Langevin"]
-  s.date = "2013-08-12"
+  s.date = "2013-10-15"
   s.description = "Like Factory Girl but for Hashes only"
   s.email = "dan.langevin@lifebooker.com"
   s.extra_rdoc_files = [
@@ -43,11 +43,11 @@ 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.23"
+  s.rubygems_version = "2.0.3"
   s.summary = "Hash Factory - like Factory Girl but for Hashes only"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])

data/lib/comparator.rb

@@ -1,7 +1,7 @@
 require 'active_support/core_ext'
 
 class Comparator
-  
+
   def self.formatted_value(val)
     if val.nil?
       return "NilClass::nil"
@@ -13,7 +13,7 @@ class Comparator
       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)
@@ -21,19 +21,19 @@ class Comparator
     val = val.collect{|v| v.is_a?(Hash) || v.is_a?(Array) ? self.normalize_value(v) : v} if val.is_a?(Array)
     val
   end
-  
+
   def self.diff(obj1, obj2)
     return {} if obj1 == obj2
     if obj1.is_a?(Array) && obj2.is_a?(Array)
-      return self.array_diff(obj1, obj2) 
+      return self.array_diff(obj1, obj2)
     elsif obj1.is_a?(Hash) && obj2.is_a?(Hash)
-      return self.hash_diff(obj1, obj2) 
+      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)]
   end
-  
+
   def self.array_diff(obj1, obj2)
     {}.tap do |ret|
       # handle VariableArray by extracting the first element
@@ -45,16 +45,17 @@ class Comparator
       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
-  
+
   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|
-      if !obj1.keys.include?(key) 
+      if !obj1.keys.include?(key)
         memo[key] = ["KEY MISSING", formatted_value(obj2[key])]
-      elsif !obj2.keys.include?(key) 
+      elsif !obj2.keys.include?(key)
         memo[key] = [formatted_value(obj1[key]), "KEY MISSING"]
       elsif obj1[key] != obj2[key]
         memo[key] = self.diff(obj1[key], obj2[key])
@@ -62,10 +63,12 @@ class Comparator
       memo
     end
   end
-  
+
   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|
+    new_obj = hash_or_array.clone
+    new_obj.clear
+    new_obj.tap do |ret|
       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

data/lib/hash.rb

@@ -27,9 +27,9 @@ class HashDealer
     protected
 
     def remove_optional_keys(hash)
-      hash = hash.clone.to_hash
+      hash = hash.clone.to_hash.stringify_keys
       @optional_attributes.each do |optional_attribute|
-        hash.delete(optional_attribute)
+        hash.delete(optional_attribute.to_s)
       end
       hash
     end

metadata

@@ -1,148 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: hash_dealer
 version: !ruby/object:Gem::Version
-  version: 1.6.1
-  prerelease: 
+  version: 1.6.2
 platform: ruby
 authors:
 - Dan Langevin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-12 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -158,17 +139,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Like Factory Girl but for Hashes only
@@ -204,27 +183,25 @@ files:
 homepage: http://github.com/LifebookerInc/hash_dealer
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Hash Factory - like Factory Girl but for Hashes only
 test_files: []
-has_rdoc: