diff_matcher 2.4.0 → 2.4.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 263716b9ab7bbdc763e3ee639f6a8ecdcca95661
+  data.tar.gz: 193438c3843d95b7dd6d1d311ea7f5da4c98d6e2
+SHA512:
+  metadata.gz: abbfb0e8738b88efc5a8d5546cb02e7ffc845c76255d7cf1542391c8140abdec7b21d072cb9a913d7d75f876b47a21f7e6b2a71e80c99e0f9490ada00f922571
+  data.tar.gz: f1d2222a64acc05739651604c378a4a9f33998d91af454f3d0c3805fa02bc0b1d7ec81032ec284da8c0c7afef5d845e46eeac81ad40eb60a30a22a842c3a1192

data/.gitignore

@@ -1,4 +1,6 @@
 coverage
 pkg
 Gemfile.lock
-.rvmrc
+.ruby_version
+gems
+bin

data/.travis.yml

@@ -8,4 +8,5 @@ rvm:
 #  - rbx-19mode
   - jruby
   - ree
-  - ruby-head
+#  - ruby-head
+  - 2.0.0

data/CHANGELOG.md

@@ -1,12 +1,16 @@
 # Changelog
 
+### v2.4.1
+
+* BUGFIX match values where their classes are different but one is a subclass of the other
+
 ### v2.4.0
 
-  Add class configuration of Difference from a block
+* Add class configuration of Difference from a block
 
 ### v2.3.3
 
-  Allow HTML output using `:html_output=>true` option
+* Allow HTML output using `:html_output=>true` option
 
 ### v2.3.2
 
@@ -19,13 +23,13 @@
 ### v2.2.3
 
 * set color_enabled/color_scheme on the class
-  
+
   (ie. so it can be used by default)
 
 ### v2.2.2
 
 * BUGFIX for `AllMatcher`
-  
+
   - return a diff instead of raising an exception
   - (raising an exception was a bad idea as it blew up the entire match
      when used in conjuction with an or-matcher, or embedded into other
@@ -45,7 +49,7 @@
 ### v2.0.0
 
 * Remove `:verbose` option
-  
+
   More often than not users want this as the default.
 
 ### v1.0.1

data/Gemfile

@@ -1,10 +1,10 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-#gemspec
+gemspec
 
 group :development do
-  gem "rake" , "~> 0.9"
-  gem "rspec", "~> 2.6.0"
+  gem "rake" , "~> 10.1"
+  gem "rspec", "~> 2.14"
 
   platforms :mri_19 do
     gem "simplecov"

data/README.md

@@ -1,8 +1,10 @@
 DiffMatcher
 ===
 
-[![build status](http://travis-ci.org/playup/diff_matcher.png)](http://travis-ci.org/playup/diff_matcher)
-[![still maintained](http://stillmaintained.com/playupchris/diff_matcher.png)](http://stillmaintained.com/playupchris/diff_matcher)
+[![Build Status](https://secure.travis-ci.org/diff-matcher/diff_matcher.png)](https://travis-ci.org/diff-matcher/diff_matcher)
+[![Gem Version](https://badge.fury.io/rb/diff_matcher.png)](http://badge.fury.io/rb/diff_matcher)
+[![Dependency Status](https://gemnasium.com/diff-matcher/diff_matcher.png)](https://gemnasium.com/diff-matcher/diff_matcher)
+[![still maintained](http://stillmaintained.com/diff-matcher/diff_matcher.png)](http://stillmaintained.com/diff-matcher/diff_matcher)
 
 Generates a diff by matching against user-defined matchers written in ruby.
 
@@ -301,7 +303,7 @@ Using the `:default` colour scheme items shown in a difference are coloured as f
 
 Other colour schemes, eg. `:color_scheme=>:white_background` will use different colour mappings.
 
-  
+
 
 Similar gems
 ---
@@ -353,34 +355,40 @@ do pattern matching and also looks like a good alternative to diff_matcher, it h
 
 Use with rspec
 ---
-To use with rspec create the following custom matcher:
+To use with rspec, create a custom matcher. The following example matcher works with rspec-1.2.4 and up.
 
 ``` ruby
 require 'diff_matcher'
 
-module RSpec
-  module Matchers
-    class BeMatching
-      include BaseMatcher
-
-      def initialize(expected, opts)
-        @expected = expected
-        @opts = opts.update(:color_enabled=>RSpec::configuration.color_enabled?)
-      end
-
-      def matches?(actual)
-        @difference = DiffMatcher::Difference.new(expected, actual, @opts)
-        @difference.matching?
-      end
-
-      def failure_message_for_should
-        @difference.to_s
-      end
-    end
-
-    def be_matching(expected, opts={})
-      Matchers::BeMatching.new(expected, opts)
-    end
+# Uses the diff_matcher gem to provide advanced matching abilities, along with nice visual representation of the
+# diff between actual and expected. The functionality set is very helpful for comparing hashes.
+#
+# Usage examples:
+#  it { should be_matching(my_var) }
+#  it { should be_matching(my_var).with_options(ignore_additional: true) }
+#
+# Options: by default, color_enabled is controlled by Rspec, and quiet is set to true.
+RSpec::Matchers.define :be_matching do |expected|
+  match do |actual|
+    options = { :color_enabled => RSpec::configuration.color_enabled?, :quiet => true }.merge(@options || {})
+    @difference = DiffMatcher::Difference.new(expected, actual, options)
+    @difference.matching?
+  end
+
+  chain :with_options do |options|
+    @options = options
+  end
+
+  failure_message_for_should do |actual|
+    "diff is:\n" + @difference.to_s
+  end
+
+  failure_message_for_should_not do |actual|
+    "diff is:\n" + @difference.to_s
+  end
+
+  description do
+    "match via DiffMatcher #{expected}" + (@options.blank? ? '' : " with options: #{@options}")
   end
 end
 ```
@@ -392,7 +400,7 @@ describe "hash matcher" do
   subject { { :a=>1, :b=>2, :c=>'3', :d=>4, :e=>"additional stuff" } }
   let(:expected) { { :a=>1, :b=>Fixnum, :c=>/[0-9]/, :d=>lambda { |x| (3..5).include?(x) } } }
 
-  it { should be_matching(expected, :ignore_additional=>true) }
+  it { should be_matching(expected).with_options(:ignore_additional=>true) }
   it { should be_matching(expected) }
 end
 ```
@@ -431,5 +439,5 @@ Status
 
 Our company is using this gem to test our JSON API which has got above and beyond a stable v1.0.0 release.
 
-There's a [pull request](http://github.com/rspec/rspec-expectations/pull/79) to use this gem in a `be_hash_matching` 
+There's a [pull request](http://github.com/rspec/rspec-expectations/pull/79) to use this gem in a `be_hash_matching`
 [rspec matcher](https://www.relishapp.com/rspec/rspec-expectations).

data/diff_matcher.gemspec

@@ -7,9 +7,9 @@ Gem::Specification.new do |s|
   s.name          = "diff_matcher"
   s.version       = DiffMatcher::VERSION.dup
   s.platform      = Gem::Platform::RUBY
-  s.authors       = ["Playup"]
-  s.email         = "chris@playup.com"
-  s.homepage      = "http://github.com/playup/diff_matcher"
+  s.authors       = ["locochris"]
+  s.email         = "chris@locomote.com.au"
+  s.homepage      = "http://github.com/diff-matcher/diff_matcher"
 
   s.summary       = %q{Generates a diff by matching against user-defined matchers written in ruby.}
   s.description   = <<EOF

data/lib/diff_matcher/difference.rb

@@ -234,7 +234,7 @@ module DiffMatcher
         diff(expected, actual)
       else
         actual
-      end if expected.is_a? actual.class
+      end if expected.is_a?(actual.class) || actual.is_a?(expected.class)
     end
 
     def compare(right, expected, default=nil)

data/lib/diff_matcher/version.rb

@@ -1,3 +1,3 @@
 module DiffMatcher
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/spec/diff_matcher/difference_spec.rb

@@ -133,7 +133,7 @@ describe "DiffMatcher::Matcher[expected].diff(actual, opts)" do
         2
 
       it_behaves_like "a diff matcher", expected, same, different,
-        "\e[31m- \e[1m1\e[0m\e[33m+ \e[1m2\e[0m", {}
+        "\e[31m- \e[1m1\e[0m\e[33m+ \e[1m2\e[0m"
     end
   end
 
@@ -163,7 +163,7 @@ describe "DiffMatcher::difference(expected, actual, opts)" do
         2
 
       it_behaves_like "a diff matcher", expected, same, different,
-        <<-EOF, {}
+        <<-EOF
         - 1+ 2
         Where, - 1 missing, + 1 additional
         EOF
@@ -176,7 +176,7 @@ describe "DiffMatcher::difference(expected, actual, opts)" do
         "b"
 
       it_behaves_like "a diff matcher", expected, same, different,
-        <<-EOF, {}
+        <<-EOF
         - "a"+ "b"
         Where, - 1 missing, + 1 additional
         EOF
@@ -185,17 +185,29 @@ describe "DiffMatcher::difference(expected, actual, opts)" do
         different = 0
 
         it_behaves_like "a diff matcher", expected, same, different,
-          <<-EOF, {}
+          <<-EOF
           - "a"+ 0
           Where, - 1 missing, + 1 additional
           EOF
+
+        context "expected class is a subclass of actual class" do
+          class SubString < String; end
+          same = SubString.new("a")
+          different = SubString.new("b")
+
+          it_behaves_like "a diff matcher", expected, same, different,
+            <<-EOF
+            - "a"+ "b"
+            Where, - 1 missing, + 1 additional
+            EOF
+        end
       end
 
       context "when actual is nil" do
         different = nil
 
         it_behaves_like "a diff matcher", expected, same, different,
-          <<-EOF, {}
+          <<-EOF
           - "a"+ nil
           Where, - 1 missing, + 1 additional
           EOF
@@ -209,7 +221,7 @@ describe "DiffMatcher::difference(expected, actual, opts)" do
         false
 
       it_behaves_like "a diff matcher", expected, same, different,
-        <<-EOF, {}
+        <<-EOF
         - nil+ false
         Where, - 1 missing, + 1 additional
         EOF
@@ -222,7 +234,7 @@ describe "DiffMatcher::difference(expected, actual, opts)" do
         [ 2 ]
 
       it_behaves_like "a diff matcher", expected, same, different,
-        <<-EOF, {}
+        <<-EOF
         [
           - 1+ 2
         ]
@@ -335,7 +347,7 @@ describe "DiffMatcher::difference(expected, actual, opts)" do
         ArrayChild[ 2 ]
 
       it_behaves_like "a diff matcher", expected, same, different,
-        <<-EOF, {}
+        <<-EOF
         [
           - 1+ 2
         ]

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 RUBY_1_9 = (RUBY_VERSION =~ /^1\.9/)
-if RUBY_1_9
+if RUBY_1_9 && !ENV['CI']
   require 'simplecov'
+  SimpleCov.add_filter 'gems'
   SimpleCov.start
 end
 require "diff_matcher"

metadata

@@ -1,31 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: diff_matcher
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.4.0
+version: !ruby/object:Gem::Version
+  version: 2.4.1
 platform: ruby
-authors: 
-- Playup
+authors:
+- locochris
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-05 00:00:00 Z
+date: 2013-07-28 00:00:00.000000000 Z
 dependencies: []
-
 description: |
   DiffMatcher matches input data (eg. from a JSON API) against values,
   ranges, classes, regexes, procs, custom matchers and/or easily composed,
   nested combinations thereof to produce an easy to read diff string.
-
-email: chris@playup.com
+email: chris@locomote.com.au
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -44,35 +37,29 @@ files:
 - lib/diff_matcher/version.rb
 - spec/diff_matcher/difference_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/playup/diff_matcher
+homepage: http://github.com/diff-matcher/diff_matcher
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -1395308355013142327
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generates a diff by matching against user-defined matchers written in ruby.
-test_files: []
-
+test_files:
+- spec/diff_matcher/difference_spec.rb
+- spec/spec_helper.rb