diff_matcher 2.5.0 → 2.6.0

data/.travis.yml

@@ -5,8 +5,17 @@ rvm:
   - 1.9.2
   - 1.9.3
   - rbx
-#  - rbx-19mode
+  - rbx-19mode
+  - rbx-2
   - jruby
   - ree
-#  - ruby-head
   - 2.0.0
+  - 2.1.1
+  - ruby-head
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: rbx
+    - rvm: rbx-19mode
+    - rvm: rbx-2

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+### v2.6.0
+
+* Add rspec custom matcher `be_matching` for RSpec v3.x
+
 ### v2.5.0
 
 * Add rspec custom matcher `be_matching`

data/README.md

@@ -355,42 +355,11 @@ do pattern matching and also looks like a good alternative to diff_matcher, it h
 
 Use with rspec
 ---
-To use with rspec, create a custom matcher. The following example matcher works with rspec-1.2.4 and up.
+To use with rspec, require it in `spec_helper.rb`
 
 ``` ruby
-require 'diff_matcher'
-
-# 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
+require 'diff_matcher/rspec'   # for RSpec version < 3.0
+require 'diff_matcher/rspec_3' # for RSpec version >= 3.x
 ```
 
 And use it with:

data/lib/diff_matcher/rspec_3.rb

@@ -0,0 +1,3 @@
+require 'rspec/core'
+require 'diff_matcher'
+require 'diff_matcher/rspec_3/matchers/diff_matcher'

data/lib/diff_matcher/rspec_3/matchers/diff_matcher.rb

@@ -0,0 +1,31 @@
+# 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 do |actual|
+    "diff is:\n" + @difference.to_s
+  end
+
+  failure_message_when_negated do |actual|
+    "diff is:\n" + @difference.to_s
+  end
+
+  description do
+    "match via DiffMatcher #{expected}" + (@options.blank? ? '' : " with options: #{@options}")
+  end
+end

data/lib/diff_matcher/version.rb

@@ -1,3 +1,3 @@
 module DiffMatcher
-  VERSION = "2.5.0"
+  VERSION = "2.6.0"
 end

metadata

@@ -1,19 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: diff_matcher
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.6.0
+  prerelease: 
 platform: ruby
 authors:
 - locochris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies: []
-description: |
-  DiffMatcher matches input data (eg. from a JSON API) against values,
+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@locomote.com.au
 executables: []
 extensions: []
@@ -35,6 +39,8 @@ files:
 - lib/diff_matcher/escape_to_html.rb
 - lib/diff_matcher/rspec.rb
 - lib/diff_matcher/rspec/matchers/diff_matcher.rb
+- lib/diff_matcher/rspec_3.rb
+- lib/diff_matcher/rspec_3/matchers/diff_matcher.rb
 - lib/diff_matcher/version.rb
 - spec/diff_matcher/difference_spec.rb
 - spec/diff_matcher/rspec/matchers/diff_matcher_spec.rb
@@ -43,26 +49,33 @@ homepage: http://github.com/diff-matcher/diff_matcher
 licenses:
 - BSD
 - 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'
+      segments:
+      - 0
+      hash: -213964590511459667
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -213964590511459667
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Generates a diff by matching against user-defined matchers written in ruby.
 test_files:
 - spec/diff_matcher/difference_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2868c9df6fcb0629a3b11aa0ff612fec55d83c7e
-  data.tar.gz: db68ce3ce7834da9517bea0b7987537f3cbb3e85
-SHA512:
-  metadata.gz: 57f3e4075c94f1ebf5f4ce3862df3c7ee6e32a39ee27eba9f37f65cd6d377686dfda4bcd8a62ae2a0379ad9780c11555dabc43e0e9faa03ea4aa190779c67c3f
-  data.tar.gz: 0f5752354f037eed868ccf50fab9c0e84c6593cb710effa098555c73aadc89327bd110cd30d5c2e64360dcf3a42020ab0ab985ae7633306f08a845e6ae30cc00