validation_matcher 0.1.7 → 0.1.8

data/lib/validation_matcher.rb

@@ -6,27 +6,25 @@ module ValidationMatcher
   RSpec::Matchers.define :validate do |kind|
 
     chain(:of)   { |field| @field            = field }
-    chain(:with) { |hash|  @expected_options = hash  }
-
-    def options_message
-      return '' unless diff.present?
-      str  = "\n expected options: " + @expected_options.inspect
-      str << "\n actual options: "   + validator_options.inspect
-      str
-    end
+    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_for_should do
-      "Expected #{ described_class } to validate the #{ kind } of #{ @field.inspect } #{ options_message }"
+      "Expected #{ described_class } to validate the #{ kind } of #{ @field.inspect } #{ diff }"
     end
 
     failure_message_for_should_not do
-      "Expected #{ described_class } not to validate the #{ kind } of #{ @field.inspect } #{ options_message }"
+      "Expected #{ described_class } not to validate the #{ kind } of #{ @field.inspect } #{ diff }"
+    end
+
+    def expected_options
+      @expected_options || {}
     end
 
     def validator
@@ -37,14 +35,25 @@ module ValidationMatcher
       @validator_options ||= validator.options rescue {}
     end
 
+    def diff?
+      # 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
+
+      return true if expected_options.present? ^ validator_options.present?
+      return true if validator_options.diff(expected_options).present?
+      false
+    end
+
     def diff
-      @diff ||= @expected_options ? validator_options.diff(@expected_options) : {}
+      return '' unless diff?
+      str  = "\n expected options: #{ expected_options.inspect }"
+      str << "\n actual options: #{ validator_options.inspect }"
+      str
     end
 
     match do |actual|
-      result = validator.present? and diff.blank?
-      @expected_options = nil # for some reason this appears to be cached between runs?
-      result
+      validator.present? and not diff?
     end
 
   end

data/lib/validation_matcher/version.rb

@@ -1,3 +1,3 @@
 module ValidationMatcher
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 libs = %w[
   active_model
   active_support/core_ext
+  pry
   rspec
   validation_matcher
 ]

data/spec/thing_spec.rb

@@ -2,8 +2,11 @@ require 'spec_helper'
 
 describe Thing do
 
-  it { should_not validate(:presence).of(:field_a) }
-  it { should     validate(:presence).of(:field_b) }
-  it { should     validate(:numericality).of(:field_c).with(only_integer: true, allow_nil: false) }
+  it { should_not validate(:presence).of :field_a }
+  it { should     validate(:presence).of :field_b }
+
+  it { should_not validate(:numericality).of :field_c }
+  it { should_not validate(:numericality).of(:field_c).with only_integer: true }
+  it { should     validate(:numericality).of(:field_c).with only_integer: true, allow_nil: false }
 
 end

data/validation_matcher.gemspec

@@ -23,4 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activesupport', '~> 3'
 
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'pry'
+  s.add_development_dependency 'pry-doc'
+  s.add_development_dependency 'pry-debugger'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validation_matcher
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -75,6 +75,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-debugger
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Use reflection to spec ActiveModel validations
 email:
 - me@bm5k.com
@@ -105,15 +153,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1150667163459900178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1150667163459900178
 requirements: []
 rubyforge_project: validation_matcher
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: RSpec matcher for ActiveModel validations