dynport_tools 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/dynport_tools.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dynport_tools}
-  s.version = "0.2.5"
+  s.version = "0.2.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tobias Schwab"]

data/lib/dynport_tools/differ.rb

@@ -1,6 +1,6 @@
 module DynportTools
   class Differ
-    attr_accessor :diff_all, :use_return
+    attr_accessor :diff_all, :use_return, :symbolize_keys
   
   
     def initialize(options = {})
@@ -45,7 +45,13 @@ module DynportTools
   
     def diff_hash_values(a, b, keys)
       ret = keys.uniq.inject({}) do |hash, key|
-        if diff = diff(a[key], b[key])
+        value_a = a[key]
+        value_b = b[key]
+        if symbolize_keys
+          value_a ||= a[key.is_a?(Symbol) ? key.to_s : key.to_sym]
+          value_b ||= b[key.is_a?(Symbol) ? key.to_s : key.to_sym]
+        end
+        if diff = diff(value_a, value_b)
           hash[key] = diff
         end
         hash

data/lib/dynport_tools/have_attributes.rb

@@ -9,8 +9,13 @@ module DynportTools::HaveAttributesMatcher
     end
 
     def matches?(target)
-      @target = target
-      if diff = differ.diff(@expected, target)
+      @target = if target.respond_to?(:attributes)
+        differ.symbolize_keys = true
+        target.attributes
+      else
+        target
+      end
+      if diff = differ.diff(@expected, @target)
         @error = differ.diff_to_message_lines(diff).join("\n")
         false
       else

data/spec/dynport_tools/differ_spec.rb

@@ -21,6 +21,16 @@ describe DynportTools::Differ do
       differ.diff(hash, hash).should be_nil
     end
     
+    it "returns true when symbolize_keys is set to true and comparing hashes with symbols and strings" do
+      differ.symbolize_keys = true
+      differ.diff({ :a => 1 }, { "a" => 1 }).should be_nil
+    end
+    
+    it "returns false when symbolize_keys is set to false and comparing hashes with symbols and strings" do
+      differ.symbolize_keys = nil
+      differ.diff({ :a => 1 }, { "a" => 1 }).should_not be_nil
+    end
+    
     it "returns the diff when there is one" do
       a = { :a => 1, :b => 2 }
       b = { :a => 1, :b => 3 }

data/spec/dynport_tools/have_attributes_spec.rb

@@ -49,4 +49,18 @@ describe "DynportTools::HaveAttributesMatcher" do
     matcher = DynportTools::HaveAttributesMatcher::HaveAttributes.new(:a => 1, :b => 2)
     matcher.matches?(:a => 1).should be_false
   end
+  
+  it "returns true when comparing ActiveRecord like objects with hashes" do
+    attributes = { "title" => "Some Title" }
+    ar = double("ar", :attributes => attributes)
+    matcher = DynportTools::HaveAttributesMatcher::HaveAttributes.new(:title => "Some Title")
+    matcher.matches?(ar).should be_true
+  end
+  
+  it "returns false when comparing ActiveRecord like objects with hashes but not equal" do
+    attributes = { "title" => "Some Title" }
+    ar = double("ar", :attributes => attributes)
+    matcher = DynportTools::HaveAttributesMatcher::HaveAttributes.new(:title => "Some Other Title")
+    matcher.matches?(ar).should be_false
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dynport_tools
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - Tobias Schwab