contrast 0.1.4 → 0.2.0

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 gem 'rake'
 gem 'subtle'
+gem 'awesome_print'
 
 group :development do
   gem 'mocha'

data/contrast.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Contrast::VERSION
 
   gem.add_runtime_dependency 'subtle'
+  gem.add_runtime_dependency 'awesome_print'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'rake'
 end

data/lib/contrast/detective.rb

@@ -1,15 +1,23 @@
+require 'subtle'
 module Contrast
+
   class Detective
     def initialize(*args)
       @fields = args
     end
 
     def examine(a, b)
-      @fields.select do |field| 
+      keys = @fields.select do |field| 
         first = get_the_value(a, field)
         second = get_the_value(b, field)
         the_values_the_do_not_match(first, second)
       end
+      result = {}
+      keys.each do |key|
+        result[key] = {:actual_value => get_the_value(a, key),
+                       :expected_value => get_the_value(b, key)}
+      end
+      result
     end
 
     private

data/lib/contrast/matching_exception.rb

@@ -1,5 +1,10 @@
+require 'awesome_print'
 module Contrast
   class MatchingException < StandardError  
     attr_accessor :results
+    def to_s
+      return 'The results did not match, but I cannot tell you why.' if results.nil? || results.empty?
+      return self.results.ai
+    end
   end
 end

data/lib/contrast/version.rb

@@ -1,3 +1,3 @@
 module Contrast
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/spec/contrast/detective_spec.rb

@@ -32,7 +32,15 @@ describe Contrast::Detective do
       end
 
       it "should return the field" do
-        @result[0].must_equal :name
+        @result.keys[0].must_equal :name
+      end
+
+      it "should return the actual value" do
+        @result[:name][:actual_value].must_equal 'apple'
+      end
+
+      it "should return the expected value" do
+        @result[:name][:expected_value].must_equal 'orange'
       end
     end
   end
@@ -71,7 +79,7 @@ describe Contrast::Detective do
       end
 
       it "should return the field" do
-        @result[0].must_equal :first_name
+        @result.keys[0].must_equal :first_name
       end
     end
 
@@ -91,7 +99,7 @@ describe Contrast::Detective do
       end
 
       it "should return the field" do
-        @result[0].must_equal :last_name
+        @result.keys[0].must_equal :last_name
       end
     end
 
@@ -111,8 +119,8 @@ describe Contrast::Detective do
       end
 
       it "should return the fields" do
-        @result[0].must_equal :first_name
-        @result[1].must_equal :last_name
+        @result.keys[0].must_equal :first_name
+        @result.keys[1].must_equal :last_name
       end
     end
 

data/spec/contrast/matching_exception_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Contrast::MatchingException do
+  describe "#to_s" do
+    it 'no results: The results did not match, but I cannot tell you why.' do
+      [nil, []]. each do |value|
+        error = Contrast::MatchingException.new
+        error.results = value
+        get_message_for(error).must_equal 'The results did not match, but I cannot tell you why.'
+      end
+    end
+
+    it "results: Run them through awesome print" do
+      error = Contrast::MatchingException.new
+      error.results = {:result => nil}
+      error.results.expects(:ai).returns('expected results')
+      get_message_for(error).must_equal 'expected results'
+    end
+  end
+
+  def get_message_for(error)
+    begin
+      raise error
+    rescue Exception => e
+      return e.message
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
-require 'mocha'
-require 'minitest/spec'
-require 'minitest/autorun'
 require './lib/contrast.rb'
 require 'subtle'
+require 'minitest/spec'
+require 'minitest/autorun'
+require 'mocha'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrast
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: subtle
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  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: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +96,7 @@ files:
 - lib/contrast/version.rb
 - lib/contrast_with.rb
 - spec/contrast/detective_spec.rb
+- spec/contrast/matching_exception_spec.rb
 - spec/contrast_with_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -108,5 +125,6 @@ specification_version: 3
 summary: Contrast two objects by a defined set of values
 test_files:
 - spec/contrast/detective_spec.rb
+- spec/contrast/matching_exception_spec.rb
 - spec/contrast_with_spec.rb
 - spec/spec_helper.rb