diff_matcher 2.6.0 → 2.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 85c693faa10896940ac3eebf11393668fd78b0e1
+  data.tar.gz: 38be21bd9cd7d420fc53d2a1378156eefcb7c841
+SHA512:
+  metadata.gz: 37da42959f13bd42a3c736b959c8f9685bfc0f44f3a14ae330a3586658f71cceefcad2e5ff223bcfd6d1958b0b25b39f6d1efbe631f852dd0e28a1af0abd2ff6
+  data.tar.gz: f2ac31ed19ecdc51f28a0a5ca93a81a4a7d4292a717a770556adc60c43512d763ea00f2c23460216cad04296cb5980f4805958f9459bc956eefe60e970335df3

data/CHANGELOG.md

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

data/lib/diff_matcher/rspec.rb

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

data/lib/diff_matcher/rspec/matchers.rb

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

data/lib/diff_matcher/rspec/matchers/diff_json_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 JSON.parse(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_json_matching do |expected|
+  match do |actual|
+    options = { :color_enabled => RSpec::configuration.color_enabled?, :quiet => true }.merge(@options || {})
+    @difference = DiffMatcher::Difference.new(expected, JSON.parse(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

data/lib/diff_matcher/rspec/matchers/diff_matcher.rb

@@ -1,15 +1,15 @@
 # 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.
+# diff between JSON.parse(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|
+RSpec::Matchers.define :be_json_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 = DiffMatcher::Difference.new(expected, JSON.parse(actual), options)
     @difference.matching?
   end
 

data/lib/diff_matcher/rspec_3.rb

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

data/lib/diff_matcher/rspec_3/matchers.rb

@@ -0,0 +1,2 @@
+require 'diff_matcher/rspec_3/matchers/diff_matcher'
+require 'diff_matcher/rspec_3/matchers/diff_json_matcher'

data/lib/diff_matcher/rspec_3/matchers/diff_json_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 JSON.parse(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_json_matching do |expected|
+  match do |actual|
+    options = { :color_enabled => RSpec::configuration.color_enabled?, :quiet => true }.merge(@options || {})
+    @difference = DiffMatcher::Difference.new(expected, JSON.parse(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.6.0"
+  VERSION = "2.7.0"
 end

data/spec/diff_matcher/rspec/matchers/diff_matcher_spec.rb

@@ -3,6 +3,7 @@ require 'diff_matcher/rspec'
 
 describe :be_matching do
   it "should call DiffMatcher::Difference" do
+    pending 'how are custom matchers tested now?'
     DiffMatcher::Difference.should_receive(:new).with(
       :expected, :actual, { :color_enabled => RSpec::configuration.color_enabled?, :quiet => true }.merge({ :foo => 'bar' })
     ).and_return(double(:matching? => true))

metadata

@@ -1,31 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: diff_matcher
 version: !ruby/object:Gem::Version
-  version: 2.6.0
-  prerelease: 
+  version: 2.7.0
 platform: ruby
 authors:
 - locochris
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-10-30 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: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -38,8 +34,12 @@ files:
 - lib/diff_matcher/difference.rb
 - lib/diff_matcher/escape_to_html.rb
 - lib/diff_matcher/rspec.rb
+- lib/diff_matcher/rspec/matchers.rb
+- lib/diff_matcher/rspec/matchers/diff_json_matcher.rb
 - lib/diff_matcher/rspec/matchers/diff_matcher.rb
 - lib/diff_matcher/rspec_3.rb
+- lib/diff_matcher/rspec_3/matchers.rb
+- lib/diff_matcher/rspec_3/matchers/diff_json_matcher.rb
 - lib/diff_matcher/rspec_3/matchers/diff_matcher.rb
 - lib/diff_matcher/version.rb
 - spec/diff_matcher/difference_spec.rb
@@ -49,33 +49,26 @@ 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: 1.8.24
+rubygems_version: 2.4.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generates a diff by matching against user-defined matchers written in ruby.
 test_files:
 - spec/diff_matcher/difference_spec.rb