hash_dealer 1.5.1 → 1.5.2

data/hash_dealer.gemspec

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

data/lib/comparator.rb

@@ -18,12 +18,18 @@ class Comparator
     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) || v.is_a?(Array) ? self.normalize_value(v) : v} if val.is_a?(Array)
+    
+    if val.is_a?(Array)
+      val = val.collect{|v| 
+        v.is_a?(Hash) || v.is_a?(Array) ? self.normalize_value(v) : v
+      }
+    end
+
     val
   end
   
   def self.diff(obj1, obj2)
-    return {} if obj1 == obj2
+    return {} if obj1.eql?(obj2)
     if obj1.is_a?(Array) && obj2.is_a?(Array)
       return self.array_diff(obj1, obj2) 
     elsif obj1.is_a?(Hash) && obj2.is_a?(Hash)
@@ -64,11 +70,18 @@ class Comparator
   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|
-      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
+    if hash_or_array.is_a?(Array)
+      return hash_or_array.collect{|v| 
+        v.is_a?(Hash) || v.is_a?(Array) ? self.stringify_keys(v) : v
+      }
+    end
+    
+    ret = hash_or_array.stringify_keys
+    ret.each_pair do |k,v|
+      if v.is_a?(Hash) || v.is_a?(Array)
+        ret[k] = self.stringify_keys(v)
       end
     end
+    ret
   end
 end

data/lib/hash.rb

@@ -1,15 +1,32 @@
 class HashDealer
   class Hash < ::Hash
 
+    attr_accessor :optional_attributes
+
     def initialize(optional_attributes = [])
       @optional_attributes = optional_attributes
     end
 
     def eql?(other)
-      self_for_comparison = self.remove_optional_keys(self)
-      other_for_comparison = self.remove_optional_keys(other)
+      self_copy, other_copy = self.get_copies_for_comparison(other)
+      self_copy.eql?(other_copy)
+    end
+
+    def matcher(opts = {})
+      ret = super
+      ret.optional_attributes = self.optional_attributes
+      ret
+    end
 
-      self_for_comparison.eql?(other_for_comparison)
+    def ==(other)
+      self_copy, other_copy = self.get_copies_for_comparison(other)
+      self_copy == other_copy
+    end
+
+    def stringify_keys
+      ret = super
+      ret.optional_attributes = self.optional_attributes.collect(&:to_s)
+      ret
     end
 
     def to_hash
@@ -22,6 +39,10 @@ class HashDealer
 
     protected
 
+    def get_copies_for_comparison(other)
+      [self.remove_optional_keys(self), self.remove_optional_keys(other)]
+    end
+
     def remove_optional_keys(hash)
       hash = hash.clone.to_hash
       @optional_attributes.each do |optional_attribute|

data/lib/matcher.rb

@@ -15,7 +15,6 @@ def print_diff(diff, depth = 1)
 end
 
 RSpec::Matchers.define(:match_response) do |actual|
-  
   actual = Comparator.normalize_value(actual)
   
   match do |expected|

data/spec/lib/comparator_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Comparator do
+
+  context ".diff" do
+
+    it "should respect optional arguments when doing a diff on matchers" do
+
+      HashDealer.define(:comparator_with_options) do
+        required_val("val")
+        optional_val("opt", optional: true)
+      end
+
+      matcher = HashDealer.roll(:comparator_with_options).matcher
+
+      Comparator.diff(matcher, {:required_val => "x", :optional_val => "y"}).should eql({})
+
+      Comparator.diff(matcher, {:required_val => "x"}).should eql({})
+      Comparator.diff(matcher, {:optional_val => "x"}).should_not eql({})
+
+
+    end
+
+  end
+
+end

data/spec/lib/matcher_spec.rb

@@ -29,6 +29,28 @@ describe "match_response Matcher" do
     {:a => "a"}.matcher.should match_response({"a" => "abcde"})
     {:a => {:b => "c"}}.should match_response({"a" => {"b" => "c"}})
   end
+
+  it "should handle optional parameters" do
+
+    HashDealer.define(:matcher_optional_values) do
+      required_val("123")
+      optional_val("456", optional: true)
+    end
+    hash_dealer = HashDealer.roll(:matcher_optional_values)
+    
+
+    {"required_val" => "123"}.should match_response(
+      hash_dealer
+    )
+
+    {"required_val" => "123", "optional_val" => "456"}.should match_response(
+      hash_dealer
+    )
+    {"optional_val" => "456"}.should_not match_response(
+      hash_dealer
+    )
+
+  end
   
   context ".diff" do
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hash_dealer
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -232,6 +232,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - Guardfile
+- hash_dealer-1.5.2.gem
 - hash_dealer.gemspec
 - lib/comparator.rb
 - lib/core_extensions.rb
@@ -244,6 +245,7 @@ files:
 - pkg/hash_dealer-1.4.10.gem
 - Rakefile
 - README.rdoc
+- spec/lib/comparator_spec.rb
 - spec/lib/hash_dealer_spec.rb
 - spec/lib/matcher_spec.rb
 - spec/lib/path_string_spec.rb