validation_matcher 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98b84120db3a3b9161ee52fa111c725e40c5619a
-  data.tar.gz: a9fdc92cf3a81969d17940c41ea9e288e23f3d30
+  metadata.gz: b16465f924eb98a7218d2f6cc181c61bcb420a72
+  data.tar.gz: 50aae6f4842ebe52344b916ef1200d159b07509f
 SHA512:
-  metadata.gz: fe8ff27fb896a5bdaee9303e9ffcf66448664ce0ce774b633967efe0ea6fec1ed117b9c715e64dd658c63946bdfa8dc902dc54683649e1ace9657d036406cf74
-  data.tar.gz: 83de8591e14d9d54567dd23388aff4a8b656fa7bd5c206af8236bd723ddc320340c410053c028c18bd023a0d7a5d7c8c21be8ea13edd329e8ee59a741a470ecb
+  metadata.gz: 4f4f0af1a4e941053b8698abdddc5e756d5d070af667ef23cb8ea752d912e2751ceead3c15d7a2ec5f4689935d5a22f71871d09c7b69dc8d1f1b4d6efea89c96
+  data.tar.gz: 9b22e0532ac4bd4dce5bd5ba10f496a94733eb3fc712aa92e236a535dc22e3ffd666cc9c20b5728c3ae2d855e463401ad90e81a3cca015e221cd3a70273dfec5

data/lib/validation_matcher/hash_diff.rb

@@ -0,0 +1,17 @@
+module HashDiff
+
+  refine Hash do
+    # Stolen from Rails 4.0.5 since this has been removed!
+    #
+    # Returns a hash that represents the diff_witherence between two hashes.
+    #
+    #   {1 => 2}.diff_with(1 => 2)         # => {}
+    #   {1 => 2}.diff_with(1 => 3)         # => {1 => 2}
+    #   {}.diff_with(1 => 2)               # => {1 => 2}
+    #   {1 => 2, 3 => 4}.diff_with(1 => 2) # => {3 => 4}
+    def diff_with other
+      dup.delete_if { |k, v| other[k] == v }.merge!(other.dup.delete_if { |k, v| has_key?(k) })
+    end
+  end
+
+end

data/lib/validation_matcher/version.rb

@@ -1,3 +1,3 @@
 module ValidationMatcher
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

data/lib/validation_matcher.rb

@@ -1,26 +1,11 @@
 require 'validation_matcher/version'
+require 'validation_matcher/hash_diff'
 require 'rspec/expectations'
 
-unless Hash.instance_methods.include?(:diff)
-  class Hash
-
-    # Stolen from Rails 4.0.5 since this has been removed!
-    #
-    # Returns a hash that represents the difference between two hashes.
-    #
-    #   {1 => 2}.diff(1 => 2)         # => {}
-    #   {1 => 2}.diff(1 => 3)         # => {1 => 2}
-    #   {}.diff(1 => 2)               # => {1 => 2}
-    #   {1 => 2, 3 => 4}.diff(1 => 2) # => {3 => 4}
-    def diff other
-      dup.delete_if { |k, v| other[k] == v }.merge!(other.dup.delete_if { |k, v| has_key?(k) })
-    end
-
-  end
-end
-
 module ValidationMatcher
 
+  using HashDiff
+
   RSpec::Matchers.define :validate do |kind|
 
     chain(:of)   { |field| @field            = field }
@@ -34,11 +19,11 @@ module ValidationMatcher
     end
 
     failure_message do
-      "Expected #{ described_class } to validate the #{ kind } of #{ @field.inspect } #{ diff }"
+      "Expected #{ described_class } to validate the #{ kind } of #{ @field.inspect } #{ diff_with }"
     end
 
     failure_message_when_negated do
-      "Expected #{ described_class } not to validate the #{ kind } of #{ @field.inspect } #{ diff }"
+      "Expected #{ described_class } not to validate the #{ kind } of #{ @field.inspect } #{ diff_with }"
     end
 
     def expected_options
@@ -53,25 +38,25 @@ module ValidationMatcher
       @validator_options ||= validator.options rescue {}
     end
 
-    def diff?
+    def diff_with?
       # if validator_options is empty and @expected_options is not, there is a problem
       # if @expected_options is empty and validator_options is not, there is a problem
-      # if neither is empty diff them, if there's a diff, there is a problem
+      # if neither is empty diff_with them, if there's a diff_with, there is a problem
 
       return true if expected_options.present? ^ validator_options.present?
-      return true if validator_options.diff(expected_options).present?
+      return true if validator_options.diff_with(expected_options).present?
       false
     end
 
-    def diff
-      return '' unless diff?
+    def diff_with
+      return '' unless diff_with?
       str  = "\n expected options: #{ expected_options.inspect }"
       str << "\n actual options: #{ validator_options.inspect }"
       str
     end
 
     match do |actual|
-      validator.present? and not diff?
+      validator.present? and not diff_with?
     end
 
   end

data/validation_matcher.gemspec

@@ -19,6 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
+  s.required_ruby_version = '>= 2.0'
+
   s.add_dependency 'rspec-expectations', '~> 3.1'
 
   s.add_development_dependency 'activemodel', '>= 3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validation_matcher
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 3.0.0
 platform: ruby
 authors:
 - BM5k
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
@@ -109,6 +109,7 @@ files:
 - README.md
 - Rakefile
 - lib/validation_matcher.rb
+- lib/validation_matcher/hash_diff.rb
 - lib/validation_matcher/version.rb
 - spec/spec_helper.rb
 - spec/thing_spec.rb
@@ -125,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: validation_matcher
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RSpec matcher for ActiveModel validations