shoulda-matchers 2.0.0 → 2.1.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWMwNTNlMjgwZTMwZGU1ZDFmMjdhYTY3MjU2NDNiMGNhNjQwNjZhMw==
+    YzVkMDJkYmRiNjE2ODM0MDMzMzQxODQwZTBjMWEzM2RmYTMyZTIzYQ==
   data.tar.gz: !binary |-
-    YjM1NmVhYTc5YzYwY2NhNzFmZmM0Yjk0YjM0ODRhZDJkZTQyMThiNw==
+    NTExOTlmMTUyOGU1NjVlZjM0YzVhN2FiNDVjYTE3NmI0ZDU0ZjNiMQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTUyNjY4M2RjMjM1NTQ0ZWU5M2RiNDUwYTZhOTUzNGEyYzIyNzAyNDY4MWQ1
-    ZTFjMGJlMzgxY2NhY2U0OTgwMTI2MjlhYTY3MTU0ZjlhMzk0ZDIzYmVhMjdj
-    NDkzOTU5ZjI2NWQxZTZmNzVlZWVmMTYxZTNjNzAzZjkzMzc4MTU=
+    NWI5ZTA2ZGJjMTJmNjgxYjI0Mjk1NGZhYjZkYzUyMmIwNjJjZmJhYjRjZGRh
+    NTA2MjIwZDMzZjQ3YmIxMTNjNGUwMjEzYzg1ZjkzZDA2ZThlY2UyZWY5OGNm
+    OTY0ZTg4ZjM2ODQxZTU0OTg4MDhmMTA0ZDU3YjEyNTcxZmVlNDQ=
   data.tar.gz: !binary |-
-    ODNhMDRhMjBkYWE5OTkzNzUwNTkzYmE0MmE2OWM5MzgwODBkOTIwZGQ4ZTAz
-    OWJhNDA2MzI3MmE4NmYzNzFmYjAxNjhlYzFhMjAxOWI5Y2E1ZDQxMDE4MTI2
-    NDRlNmI0ZmI0ODM5NzA3MzJkZDVmMzJlNzQ1YzljNWNhMWZhOTg=
+    N2FkMWNjZTgzOTgwZjcwOWE2YjE2NzU1ZDNmMDQwZDEzNjQzMjVhMTAxYjQy
+    NjJjYmI0NmFlN2E3OTZkOGU0ODIzNDllMDgwZjlhNjRmNTRmMWQ3YWU5ZGNk
+    NzA0NmE5MzVkM2JhODAzNjMyNDU3NzBlYzIyZWUwYmRiNzEwMjI=

data/.travis.yml

@@ -1,11 +1,8 @@
 script: "bundle exec rake spec cucumber"
 
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-18mode
-  - jruby
 
 gemfile:
   - gemfiles/3.0.gemfile
@@ -14,15 +11,12 @@ gemfile:
 
 matrix:
   allow_failures:
-    - rvm: 1.8.7
-    - rvm: rbx-18mode
-    - rvm: jruby
-  exclude:
-    - rvm: rbx-18mode
-      gemfile: gemfiles/3.0.gemfile
-    - rvm: rbx-18mode
-      gemfile: gemfiles/3.1.gemfile
-    - rvm: jruby
-      gemfile: gemfiles/3.0.gemfile
-    - rvm: jruby
-      gemfile: gemfiles/3.1.gemfile
+    - rvm: rbx-19mode
+    - rvm: jruby-19mode
+  include:
+    - rvm: 2.0.0
+      gemfile: gemfiles/3.2.gemfile
+    - rvm: rbx-19mode
+      gemfile: gemfiles/3.2.gemfile
+    - rvm: jruby-19mode
+      gemfile: gemfiles/3.2.gemfile

data/Appraisals

@@ -1,15 +1,17 @@
-appraise '3.0' do
-  gem 'rails', '~> 3.0.17'
-end
+if RUBY_VERSION < '2.0'
+  appraise '3.0' do
+    gem 'rails', '~> 3.0.17'
+  end
 
-appraise '3.1' do
-  gem 'rails', '~> 3.1.8'
-  gem 'jquery-rails'
-  gem 'sass-rails'
+  appraise '3.1' do
+    gem 'rails', '~> 3.1.8'
+    gem 'jquery-rails'
+    gem 'sass-rails'
+  end
 end
 
 appraise '3.2' do
-  gem 'rails', '~> 3.2.8'
+  gem 'rails', '~> 3.2.13'
   gem 'jquery-rails'
   gem 'sass-rails'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shoulda-matchers (2.0.0)
+    shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/NEWS.md

@@ -1,5 +1,30 @@
 # HEAD
 
+# v 2.1.0
+
+* Add missing `failure_message_for_should_not` implementations to
+`validate_numericality_of` and its submatchers
+
+* Support validation contexts for testing validations `on: :create` and when using custom contexts like `model.valid?(:my_context)`.
+
+* Fix a bug in validations with autosaved models.
+
+* Fix maximum value detection for the `ensure_inclusion_of` and
+`ensure_exclusion_of` matchers.
+
+* Add `:odd` and `:even` options to the `validate_numericality_of` matcher.
+
+* Add `:touch` option to AssociationMatcher.
+
+* Ruby 2.0.0 is now officially supported.
+
+* Fix the issue where using `%{attribute}` or `%{model}` in I18n translations
+raised exceptions.
+
+* Support datetime columns in `validate_uniqueness_of.scoped_to`.
+
+* Add `allow_nil` option to the `validate_uniqueness_of` matcher.
+
 # v 2.0.0
 * Remove the following matchers:
   * `assign_to`
@@ -9,60 +34,65 @@
   * `have_sent_email`
   * `permit` (strong parameters matcher)
   * `delegate_method`
+
 * For more information about 2.0 changes, see:
-http://robots.thoughtbot.com/post/47031676783/shoulda-matchers-2-0
+http://robots.thoughtbot.com/post/47031676783/shoulda-matchers-2-0.
 
 # v 1.5.6
-* Revert previous change in `AllowValueMatcher` that added a check for a
+* Revert previous change in AllowValueMatcher that added a check for a
 properly-set attribute.
 
 # v 1.5.5
-* `AllowValueMatcher` checks that the right value is used for attempts at
-setting the attribute with it
+* AllowValueMatcher checks that the right value is used for attempts at
+setting the attribute with it.
   * Please note that previously-passing tests might now fail. It is likely that
   it's not a bug, but please make sure that the code you're testing is written
   properly before submitting an issue.
-* Use DisallowValueMatcher for `disallows_value_of` method
-* Assert `class_name` value on real class name for `AssociationMatcher`
-* Correct the variable used for `validate_confirmation_of` matcher description
+
+* Use DisallowValueMatcher for `disallows_value_of` method.
+
+* Assert `class_name` value on real class name for AssociationMatcher.
+
+* Correct the variable used for `validate_confirmation_of` matcher description.
 
 # v 1.5.4
-* Properly-released version of 1.5.3
+* Properly-released version of 1.5.3.
 
 # v 1.5.3 - yanked due to mis-release
-* Alleviate the need to add `rspec` gem to your app
+* Alleviate the need to add `rspec` gem to your app.
 
 # v 1.5.1
-* Bump version depedency of Bourne to allow for Mocha upgrade.
-* Should fix incompatiblity with MiniTest.
+* Bump version dependency of Bourne to allow for Mocha upgrade.
+
+* Should fix incompatibility with MiniTest.
 
 # v 1.5.0
 * Deprecate the following matchers:
-  * assign_to
-  * respond_with_content_type
-  * query_the_database
-  * validate_format_of
-  * have_sent_email
-  * strong_parameters_matcher
-  * delegate_method
+  * `assign_to`
+  * `respond_with_content_type`
+  * `query_the_database`
+  * `validate_format_of`
+  * `have_sent_email`
+  * `permit` (strong parameters matcher)
+  * `delegate_method`
 
 * Use RSpec's native `configure.include` syntax for including matchers into
-  RSpec (#204)
+  RSpec (#204).
 
-* Do not force minitest loading when test-unit is available (this was fixed
-  before 1.3.0 then reverted in 1.3.0) (#181)
+* Do not force MiniTest loading when test-unit is available (this was fixed
+  before 1.3.0 then reverted in 1.3.0).
 
 # v1.4.2
-* Added a new `delegate_method` matcher.
+* Add a new `delegate_method` matcher.
 
 # v1.4.1
-* Fixes an issue when used with Test::Unit on the allow value matcher.
+* Fix an issue when used with Test::Unit on the allow value matcher.
 
-* Fixes an issue with using `ensure_inclusion_of(:attr)` given an array of true or false values.
+* Fix an issue with using `ensure_inclusion_of(:attr)` given an array of true or false values.
 
 # v1.4.0
 
-* Added `strict` option to validation matchers.
+* Add `strict` option to validation matchers.
 
 * Verify that arguments to `set_the_flash` matcher are valid.
 
@@ -78,13 +108,13 @@ setting the attribute with it
 
 * Test outside values for `ensure_inclusion_of` when given an array.
 
-* Fixed the output of the `set_the_flash` matcher.
+* Fix the output of the `set_the_flash` matcher.
 
 # v1.3.0
 
-* `validate_format_of` will accept `allow_blank(bool)` and `allow_nil(bool)`
+* `validate_format_of` will accept `allow_blank(bool)` and `allow_nil(bool)`.
 
-* Prefer Test::Unit to Minitest when loading integrations so that RubyMine is
+* Prefer Test::Unit to MiniTest when loading integrations so that RubyMine is
   happy (#88).
 
 * `validates_uniqueness_of` will now create a record if one does not exist.
@@ -119,10 +149,10 @@ setting the attribute with it
 
 # v1.1.0
 
-* Added `only_integer` option to `validate_numericality_of`:
+* Add `only_integer` option to `validate_numericality_of`:
   `should validate_numericality_of(:attribute).only_integer`
 
-* Added a `query_the_database` matcher:
+* Add a `query_the_database` matcher:
 
     `it { should query_the_database(4.times).when_calling(:complicated_method) }`
     `it { should query_the_database(4.times).or_less.when_calling(:complicated_method) }`
@@ -137,10 +167,10 @@ setting the attribute with it
 * The `have_sent_email` matcher can check `reply_to`:
   ` it { should have_sent_email.reply_to([user, other]) }`
 
-* Added `validates_confirmation_of` matcher:
+* Add `validates_confirmation_of` matcher:
   `it { should validate_confirmation_of(:password) }`
 
-* Added `serialize` matcher:
+* Add `serialize` matcher:
   `it { should serialize(:details).as(Hash).as_instance_of(Hash) }`
 
 * shoulda-matchers checks for all possible I18n keys, instead of just

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/melissaxie/thoughtbot/shoulda-matchers
+  remote: ../
   specs:
-    shoulda-matchers (2.0.0)
+    shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/melissaxie/thoughtbot/shoulda-matchers
+  remote: ../
   specs:
-    shoulda-matchers (2.0.0)
+    shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.2.gemfile

@@ -9,7 +9,7 @@ gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
-gem "rails", "~> 3.2.8"
+gem "rails", "~> 3.2.13"
 gem "jquery-rails"
 gem "sass-rails"
 

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/melissaxie/thoughtbot/shoulda-matchers
+  remote: ../
   specs:
-    shoulda-matchers (2.0.0)
+    shoulda-matchers (2.1.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -147,7 +147,7 @@ DEPENDENCIES
   jdbc-sqlite3
   jquery-rails
   jruby-openssl
-  rails (~> 3.2.8)
+  rails (~> 3.2.13)
   rake (>= 0.9.2)
   rspec-rails (~> 2.13)
   sass-rails

data/lib/shoulda/matchers/active_model.rb

@@ -5,6 +5,7 @@ require 'shoulda/matchers/active_model/exception_message_finder'
 require 'shoulda/matchers/active_model/allow_value_matcher'
 require 'shoulda/matchers/active_model/disallow_value_matcher'
 require 'shoulda/matchers/active_model/only_integer_matcher'
+require 'shoulda/matchers/active_model/odd_even_number_matcher'
 require 'shoulda/matchers/active_model/ensure_length_of_matcher'
 require 'shoulda/matchers/active_model/ensure_inclusion_of_matcher'
 require 'shoulda/matchers/active_model/ensure_exclusion_of_matcher'

data/lib/shoulda/matchers/active_model/allow_value_matcher.rb

@@ -43,6 +43,11 @@ module Shoulda # :nodoc:
           self
         end
 
+        def on(context)
+          @context = context
+          self
+        end
+
         def with_message(message)
           self.options[:expected_message] = message
           self
@@ -78,7 +83,7 @@ module Shoulda # :nodoc:
         private
 
         attr_accessor :values_to_match, :message_finder_factory,
-          :instance, :attribute, :value, :matched_error
+          :instance, :attribute, :context, :value, :matched_error
 
         def errors_match?
           has_messages? && errors_for_attribute_match?
@@ -161,7 +166,7 @@ module Shoulda # :nodoc:
         end
 
         def message_finder
-          message_finder_factory.new(instance, attribute)
+          message_finder_factory.new(instance, attribute, context)
         end
       end
     end

data/lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb

@@ -27,7 +27,7 @@ module Shoulda # :nodoc:
         def in_range(range)
           @range = range
           @minimum = range.first
-          @maximum = range.last
+          @maximum = range.max
           self
         end
 

data/lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb

@@ -37,7 +37,7 @@ module Shoulda # :nodoc:
         def in_range(range)
           @range = range
           @minimum = range.first
-          @maximum = range.last
+          @maximum = range.max
           self
         end
 

data/lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb

@@ -104,6 +104,7 @@ module Shoulda # :nodoc:
           if Symbol === @short_message
             @short_message = default_error_message(@short_message,
                                                    :model_name => @subject.class.to_s.underscore,
+                                                   :instance => @subject,
                                                    :attribute => @attribute,
                                                    :count => @options[:minimum])
           end
@@ -111,6 +112,7 @@ module Shoulda # :nodoc:
           if Symbol === @long_message
             @long_message = default_error_message(@long_message,
                                                   :model_name => @subject.class.to_s.underscore,
+                                                  :instance => @subject,
                                                   :attribute => @attribute,
                                                   :count => @options[:maximum])
           end

data/lib/shoulda/matchers/active_model/exception_message_finder.rb

@@ -3,9 +3,10 @@ module Shoulda
     module ActiveModel
       # Finds message information from exceptions thrown by #valid?
       class ExceptionMessageFinder
-        def initialize(instance, attribute)
+        def initialize(instance, attribute, context=nil)
           @instance = instance
           @attribute = attribute
+          @context = context
         end
 
         def allow_description(allowed_values)
@@ -39,7 +40,7 @@ module Shoulda
         private
 
         def validate_and_rescue
-          @instance.valid?
+          @instance.valid?(@context)
           []
         rescue ::ActiveModel::StrictValidationFailed => exception
           [exception.message]

data/lib/shoulda/matchers/active_model/helpers.rb

@@ -5,7 +5,10 @@ module Shoulda # :nodoc:
         def pretty_error_messages(obj) # :nodoc:
           obj.errors.map do |attribute, model|
             msg = "#{attribute} #{model}"
-            msg << " (#{obj.send(attribute).inspect})" unless attribute.to_sym == :base
+            if attribute.to_sym != :base && obj.respond_to?(attribute)
+              msg << " (#{obj.send(attribute).inspect})"
+            end
+            msg
           end
         end
 
@@ -26,7 +29,7 @@ module Shoulda # :nodoc:
           instance = options.delete(:instance)
 
           if instance && instance.errors.respond_to?(:generate_message)
-            instance.errors.generate_message(attribute.to_sym, key, {})
+            instance.errors.generate_message(attribute.to_sym, key, options)
           else
             default_translation = [ :"activerecord.errors.models.#{model_name}.#{key}",
                                     :"activerecord.errors.messages.#{key}",

data/lib/shoulda/matchers/active_model/odd_even_number_matcher.rb

@@ -0,0 +1,47 @@
+module Shoulda # :nodoc:
+  module Matchers
+    module ActiveModel # :nodoc:
+      class OddEvenNumberMatcher # :nodoc:
+        NON_EVEN_NUMBER_VALUE = 1
+        NON_ODD_NUMBER_VALUE  = 2
+
+        def initialize(attribute, options = {})
+          @attribute = attribute
+          options[:odd]   ||= true
+          options[:even]  ||= false
+
+          if options[:odd] && !options[:even]
+            @disallow_value_matcher = DisallowValueMatcher.new(NON_ODD_NUMBER_VALUE).
+              for(@attribute).
+              with_message(:odd)
+          else
+            @disallow_value_matcher = DisallowValueMatcher.new(NON_EVEN_NUMBER_VALUE).
+              for(@attribute).
+              with_message(:even)
+          end
+        end
+
+        def matches?(subject)
+          @disallow_value_matcher.matches?(subject)
+        end
+
+        def with_message(message)
+          @disallow_value_matcher.with_message(message)
+          self
+        end
+
+        def allowed_types
+          'integer'
+        end
+
+        def failure_message_for_should
+          @disallow_value_matcher.failure_message_for_should
+        end
+
+        def failure_message_for_should_not
+          @disallow_value_matcher.failure_message_for_should_not
+        end
+      end
+    end
+  end
+end