validation_matcher 0.1.0 → 0.1.1

data/lib/validation_matcher/version.rb

@@ -1,3 +1,3 @@
 module ValidationMatcher
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/validation_matcher.rb

@@ -4,45 +4,43 @@ module ValidationMatcher
 
   RSpec::Matchers.define :validate do |kind|
 
-    chain(:of)   { |field| @field   = field }
-    chain(:with) { |hash|  @options = hash  }
-
-    # simplify access to the described_class
-    def described_class
-      @described_class ||= actual.class
-    end
-
-    # Attempts to find the selected validator
-    #
-    # @param [Symbol] kind the type of validator we're looking for
-    def find_validator kind
-      described_class.validators_on(@field).detect { |v| v.kind == 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
 
     description do
       msg  = "validate the #{ kind } of #{ @field.inspect }"
-      msg << " with options: #{ @options.inspect }" if @options
+      msg << " with options: #{ @expected_options.inspect }" if @expected_options
       msg
     end
 
     failure_message_for_should do
-      msg  = "Expected #{ described_class } to validate the #{ kind } of #{ @field.inspect }"
-      msg << "\n with options: #{ @options.inspect }" if @options.present?
-      msg
+      "Expected #{ described_class } to validate the #{ kind } of #{ @field.inspect } #{ options_message }"
     end
 
     failure_message_for_should_not do
-      msg  = "Expected #{ described_class } not to validate the #{ kind } of #{ @field.inspect }"
-      msg << "\n with options: #{ @options.inspect }" if @options.present?
-      msg
+      "Expected #{ described_class } not to validate the #{ kind } of #{ @field.inspect } #{ options_message }"
     end
 
-    match do |actual|
-      validator = find_validator kind
-      options   = validator.options rescue {}
-      diff      = @options ? options.diff(@options) : nil
-      @options = nil # for some reason this appears to be cached between runs?
+    def validator
+      @validator ||= actual.class.validators_on(@field).detect { |v| @expected.include? v.kind }
+    end
+
+    def validator_options
+      @validator_options ||= validator.options rescue {}
+    end
 
+    def diff
+      @diff ||= @expected_options ? validator_options.diff(@expected_options) : {}
+    end
+
+    match do |actual|
       validator.present? and diff.blank?
     end
 

data/validation_matcher.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validation_matcher
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-30 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +122,6 @@ files:
 - Rakefile
 - lib/validation_matcher.rb
 - lib/validation_matcher/version.rb
-- spec/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/thing_spec.rb
 - validation_matcher.gemspec
@@ -135,6 +150,5 @@ signing_key:
 specification_version: 3
 summary: RSpec matcher for ActiveModel validations
 test_files:
-- spec/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/thing_spec.rb

data/spec/matchers_spec.rb

@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe ValidationMatcher do
-
-  it 'something' do
-    # binding.pry
-  end
-
-end