validation_matcher 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 993f336a5005de6e9ca46cfe4fa412be17b1f673
-  data.tar.gz: 9011fb9a06126bfed6a1e9c09a32ebc7814bd0e4
+  metadata.gz: 16e7a986b13eb0f10dea0235be0abcaf46b97519
+  data.tar.gz: f97b1d7823440f7190b64933975039199d98b42c
 SHA512:
-  metadata.gz: 890d820ace0823435ef1a3b58ec4247505e656a4aca686a96a8276d165f4c613b2a413680a8bd47ac91263ce8932c8a7042a68845b4f37eb757676c620db106b
-  data.tar.gz: fea9adc9fdcd165a433a2622cd4d6c186c2bbfa69aa4218963c5aff7b4bb4ac5154c56595f1f238d8449832e922f11fad92a54544a2548e78c0531d96a5764c8
+  metadata.gz: 2f304d374fbac5c2fe71d24720f151d9c3422aa7ef34918381db4aea93aa62954fd173669db069f983e70915f328cd13a3ac2433e337a9b4878478a21d112926
+  data.tar.gz: ea3d90d4556bbb05ae2e4005bd5dc412a515dbd0df4f585ea257632135672e0a3961b2f59db041904e221683e0ee6788e9ac57cf27b243b9533a335a0a07a88b

data/lib/validation_matcher/version.rb

@@ -1,3 +1,3 @@
 module ValidationMatcher
-  VERSION = '3.0.1'
+  VERSION = '3.1.0'
 end

data/lib/validation_matcher.rb

@@ -1,62 +1,29 @@
 require 'validation_matcher/version'
-require 'validation_matcher/hash_diff'
 require 'rspec/expectations'
 
 module ValidationMatcher
 
-  using HashDiff
+  RSpec::Matchers.define :validate do |*expected|
+    attr_reader :expected_attribute, :expected_options, :expected_validator
 
-  RSpec::Matchers.define :validate do |kind|
-
-    chain(:of)   { |field| @field            = field }
+    chain(:of)   { |field| @expected_attribute = field }
     chain(:with) { |hash|  @expected_options = hash }
 
-    description do
-      msg  = "validate the #{ kind } of #{ @field.inspect }"
-      msg << " with options: #{ @expected_options.inspect }" if @expected_options
-      @expected_options = nil # for some reason this appears to be cached between runs?
-      msg
-    end
-
-    failure_message do
-      "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_with }"
-    end
-
-    def expected_options
-      @expected_options || {}
-    end
-
-    def validator
-      @validator ||= actual.class.validators_on(@field).detect { |v| expected == v.kind }
-    end
-
-    def validator_options
-      @validator_options ||= validator.options rescue {}
-    end
-
-    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_with them, if there's a diff_with, there is a problem
+    match do |actual|
+      @expected_options ||= {}
+      @expected_validator = expected.first
 
-      return true if expected_options.present? ^ validator_options.present?
-      return true if validator_options.diff_with(expected_options).present?
-      false
+      validator?
     end
 
-    def diff_with
-      return '' unless diff_with?
-      str  = "\n expected options: #{ expected_options.inspect }"
-      str << "\n actual options: #{ validator_options.inspect }"
-      str
+    def attribute_validators
+      expected_attribute ? actual.class.validators_on(expected_attribute) : []
     end
 
-    match do |actual|
-      validator.present? and not diff_with?
+    def validator?
+      attribute_validators.any? do |validator|
+        validator.kind == expected_validator && validator.options == expected_options
+      end
     end
 
   end

data/spec/spec_helper.rb

@@ -8,6 +8,24 @@ libs = %w[
 
 libs.each { |lib| require lib }
 
+RSpec.configure do |config|
+  Kernel.srand config.seed
+
+  config.filter_run :focus
+  config.order = :random
+  config.run_all_when_everything_filtered = true
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+    expectations.syntax = :should
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+    mocks.syntax = :should
+  end
+end
+
 class Thing
 
   extend  ActiveModel::Naming

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validation_matcher
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.1.0
 platform: ruby
 authors:
 - BM5k
@@ -109,7 +109,6 @@ 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
@@ -134,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: validation_matcher
-rubygems_version: 2.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: RSpec matcher for ActiveModel validations

data/lib/validation_matcher/hash_diff.rb

@@ -1,17 +0,0 @@
-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