mongoid-minitest 0.1.2 → 0.1.3.pre

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.1.3 - September 8, 2012
+
++ Bump mongoid version to 3.0.5 - *Francesco Rodriguez*.
++ Bump minitest version to 3.4.0 - *Francesco Rodriguez*.
++ Added on option for validation matchers.
+  Pull Request [#14](https://github.com/frodsan/mongoid-minitest/pull/14) - *Godfrey Chan*.
+
 ## 0.1.2 - August 13, 2012
 
 + Allow passing in a Regex to the validate_format_of matcher.

data/README.md

@@ -10,7 +10,7 @@ This gem supports:
 
 * Ruby 1.9.3
 * Mongoid ~>3.0.4
-* MiniTest ~>3.3.0
+* MiniTest ~>3.4.0
 
 If you're using Mongoid 2.4.x, you should use [0.0.3.1 version](https://github.com/frodsan/mongoid-minitest/tree/274976e8814cc9bfb3f1c83eba1bed21fa3cf26b).
 
@@ -181,8 +181,9 @@ To run unit tests, run `bundle exec rake`.
 
 ## Maintainers
 
-* Francesco Rodriguez (<https://github.com/frodsan/>).
-* Sascha Wessel (<https://github.com/gr4y>).
+* Francesco Rodriguez (https://github.com/frodsan/).
+* Sascha Wessel (https://github.com/gr4y).
+* Godfrey Chan (https://github.com/chancancode).
 
 ## License
 

data/lib/matchers/validations/validations.rb

@@ -12,6 +12,11 @@ module Mongoid
           self
         end
 
+        def on(*contexts)
+          @expected_on = clean_contexts(contexts)
+          self
+        end
+
         def matches?(subject)
           @klass     = class_of(subject)
           @validator = detect_validator
@@ -19,6 +24,7 @@ module Mongoid
 
           check_validator
           check_message if @expected_message
+          check_on if @expected_on
 
           @result
         end
@@ -34,18 +40,24 @@ module Mongoid
         def description
           desc = "validate #{@type.inspect} of #{@field.inspect}"
           desc << " with message: #{@expected_message.inspect}" if @expected_message
+          desc << " on #{@expected_on.empty? ? 'all actions' : to_sentence(@expected_on)}" if @expected_on
 
           desc
         end
 
         private
 
+        # Make sure contexts is always an array + normalize AR 2.x and AR 3.x differences
+        def clean_contexts(contexts)
+          [contexts].flatten.reject{|ctx| ctx == :save}.compact
+        end
+
         def check_validator
           if @validator
-            @negative_message = "#{@type.inspect} validator on #{@field.inspect}"
-            @positive_message = "#{@type.inspect} validator on #{@field.inspect}"
+            @negative_message = "#{@type.inspect} validator for #{@field.inspect}"
+            @positive_message = "#{@type.inspect} validator for #{@field.inspect}"
           else
-            @negative_message = "no #{@type.inspect} validator on #{@field.inspect}"
+            @negative_message = "no #{@type.inspect} validator for #{@field.inspect}"
             @result = false
           end
         end
@@ -60,6 +72,16 @@ module Mongoid
           end
         end
 
+        def check_on
+          on = clean_contexts(@validator.options[:on])
+          if on.sort == @expected_on.sort
+            @positive_message << " on #{on.empty? ? 'all actions' : to_sentence(on)}"
+          else
+            @negative_message << " on #{on.empty? ? 'all actions' : to_sentence(on)}"
+            @result = false
+          end
+        end
+
         def detect_validator
           @klass.validators_on(@field).detect { |v| v.kind.to_s == @type }
         end

data/lib/mongoid-minitest/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module MiniTest
-    VERSION = '0.1.2'
+    VERSION = '0.1.3.pre'
   end
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-minitest
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.3.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Francesco Rodriguez
 - Sascha Wessel
+- Godfrey Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-13 00:00:00.000000000 Z
+date: 2012-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -19,7 +20,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +28,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: minitest-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +52,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,7 +60,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.4
+        version: 3.0.5
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,9 +121,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23