validation_matcher 0.0.1 → 0.1.0

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.9.2
+  - 1.9.3
+
+script: bundle exec rspec spec

data/README.md

@@ -1,8 +1,17 @@
-Validation Matcher
-==================
+Validation Matcher [![build status][status-image]][ci]
+======================================================
+
+About
+-----
 
 Use Rails 3 validation reflection to test validations.
 
+URLs:
+
+- Github:             https://github.com/bm5k/validation_matcher/
+- Documentation:      http://rubydoc.info/github/BM5k/validation_matcher/master/frames
+- RubyGems:           https://rubygems.org/gems/validation_matcher
+
 Installation
 ------------
 
@@ -26,12 +35,16 @@ Usage
 
   require 'spec_helper'
 
-  describe Subscription do
-
-    its(:field_a) { should validate :presence }
-    its(:field_b) { should validate :uniqueness }
-    its(:field_c) { should validate :presence }
-    its(:field_c) { should validate :uniqueness, { case_insensitive: false }}
-
+  describe Foo do
+    it { should validate(:presence).of(:field_a) }
+    it { should validate(:presence).of(:field_b) }
+    it { should validate(:presence).of(:field_c).with(case_insensitive: false) }
+    it { should validate(:uniqueness).of(:field_b).with(options) }
   end
   ```
+
+<!-- links -->
+[ci]: http://travis-ci.org/BM5k/validation_matcher "build status"
+
+<!-- images -->
+[status-image]: https://secure.travis-ci.org/BM5k/validation_matcher.png?branch=master

data/lib/validation_matcher/version.rb

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

data/lib/validation_matcher.rb

@@ -2,35 +2,49 @@ require 'validation_matcher/version'
 
 module ValidationMatcher
 
-  RSpec::Matchers.define :validate do |kind, expected_options|
+  RSpec::Matchers.define :validate do |kind|
 
-    field     = example.metadata[:example_group][:description_args].first
-    validator = described_class.validators_on(field).detect { |v| v.kind == kind }
-    options   = validator.options rescue {}
+    chain(:of)   { |field| @field   = field }
+    chain(:with) { |hash|  @options = hash  }
 
-    diff      = expected_options.present? ? options.diff(expected_options) : nil
+    # 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 }
+    end
 
     description do
-      msg  = "validate the #{ kind } of #{ field.inspect }"
-      msg += " with options: #{ expected_options.inspect }" unless expected_options.blank?
+      msg  = "validate the #{ kind } of #{ @field.inspect }"
+      msg << " with options: #{ @options.inspect }" if @options
       msg
     end
 
     failure_message_for_should do
-      msg  = "Expected #{ described_class } to validate the #{ kind } of #{ field.inspect }"
-      if expected_options.present? and diff.present?
-        msg += "\n with options: #{ expected_options.inspect }"
-        msg += "\n actual options: #{ options.inspect }"
-      end
+      msg  = "Expected #{ described_class } to validate the #{ kind } of #{ @field.inspect }"
+      msg << "\n with options: #{ @options.inspect }" if @options.present?
       msg
     end
 
     failure_message_for_should_not do
-      "Did not expect #{ described_class } to validate the #{ kind } of #{ field.inspect }"
+      msg  = "Expected #{ described_class } not to validate the #{ kind } of #{ @field.inspect }"
+      msg << "\n with options: #{ @options.inspect }" if @options.present?
+      msg
     end
 
-    match_for_should     { validator.present? and diff.blank? }
-    match_for_should_not { validator.blank? }
+    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?
+
+      validator.present? and diff.blank?
+    end
 
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,14 @@
-%w[ validation_matcher supermodel pry pry-nav ].each { |lib| require lib }
+%w[ validation_matcher active_support/core_ext active_model pry pry-nav ].each { |lib| require lib }
+
+class Thing
+
+  extend  ActiveModel::Naming
+  include ActiveModel::Conversion
+  include ActiveModel::Validations
+
+  attr_accessor :field_a, :field_b, :field_c
 
-class Thing < SuperModel::Base
-  attr_accessor :field_a, :field_b
   validates :field_b, presence: true
+  validates :field_c, numericality: { allow_nil: false, only_integer: true }
+
 end

data/spec/thing_spec.rb

@@ -2,7 +2,8 @@ require 'spec_helper'
 
 describe Thing do
 
-  its(:field_a) { should_not validate :presence }
-  its(:field_b) { should     validate :presence }
+  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) }
 
 end

data/validation_matcher.gemspec

@@ -18,9 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'rspec', '~> 2.8.0'
+  s.add_dependency 'rspec', '~> 2'
+
+  s.add_dependency 'activemodel',   '~> 3'
+  s.add_dependency 'activesupport', '~> 3'
 
-  s.add_development_dependency 'supermodel'
   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.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,33 +9,59 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-16 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70184564228100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2'
   type: :runtime
   prerelease: false
-  version_requirements: *70184564228100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: supermodel
-  requirement: &70184564225040 !ruby/object:Gem::Requirement
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
   prerelease: false
-  version_requirements: *70184564225040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70184564222540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184564222540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
-  requirement: &70184564237080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70184564237080
+  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
@@ -64,6 +100,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - README.md
 - Rakefile
@@ -93,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: validation_matcher
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RSpec matcher for ActiveModel validations
@@ -101,4 +138,3 @@ test_files:
 - spec/matchers_spec.rb
 - spec/spec_helper.rb
 - spec/thing_spec.rb
-has_rdoc: