shoulda-matchers 2.4.0.rc1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d6dec5056a7af853da41e6e4ae08288de002a7
-  data.tar.gz: ea8954413360434e6ab48488e52f5783398a6e06
+  metadata.gz: 1d6e59e41d93f44812d45789d56c5b7dfee4b7fd
+  data.tar.gz: a5d9a41130c16ac1f68735ccdf8070f0de86432a
 SHA512:
-  metadata.gz: fc71bcd764ed3b1810bcdd5356bda25df166d18ad2d2d2189a6a8d4f7a2795918f477ac6f59bb7ff01fcbc36091bd34c786612247d77bda0475c4f6c6b056a21
-  data.tar.gz: d76951b81ac17fd5449f1b0e15129805811c581ece8b0ec46a9bdc691dd07a51351f965a9c8cfbb9d71a9691c86fc3ff2977441edb13e027c2cac0ddbc4c8c99
+  metadata.gz: d776d5f7772c8330f3f4b3164b7e6131841e437dbe938cb453cc38a7cf63196cb92689d567bc5a51ef17f2f0a675e3b55941c851c1d2489f33ab1af8baa95387
+  data.tar.gz: 4eccb03b31c410dc981f85e3af53743a186844d381c0d7408f50c7526d9715398733acd9062476c98a362f81146c27dd7a182d0afc4bf6e15e0bc4eebc9d2179

data/.travis.yml

@@ -17,8 +17,12 @@ matrix:
     - rvm: rbx-19mode
     - rvm: jruby-19mode
   include:
+    - rvm: 1.9.3
+      gemfile: gemfiles/4.0.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/3.2.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/4.0.gemfile
     - rvm: rbx-19mode
       gemfile: gemfiles/3.2.gemfile
     - rvm: jruby-19mode

data/Appraisals

@@ -6,6 +6,7 @@ if RUBY_VERSION < '2.0'
 
   appraise '3.1' do
     gem 'rails', '~> 3.1.8'
+    gem 'bcrypt-ruby', '~> 3.0.0'
     gem 'jquery-rails'
     gem 'sass-rails'
     gem 'strong_parameters'
@@ -14,6 +15,7 @@ end
 
 appraise '3.2' do
   gem 'rails', '~> 3.2.13'
+  gem 'bcrypt-ruby', '~> 3.0.0'
   gem 'jquery-rails'
   gem 'sass-rails'
   gem 'strong_parameters'
@@ -21,8 +23,10 @@ end
 
 appraise '4.0' do
   gem 'rails', '4.0.0'
+  gem 'bcrypt-ruby', '~> 3.0.0' #FIXME: This should be ~> 3.1.0 for Rails 4.0
   gem 'jquery-rails'
   gem 'sass-rails', '~> 4.0.0'
+  gem 'activeresource', require: 'active_resource'
 
   # Test suite makes heavy use of attr_accessible
   gem 'protected_attributes'

data/Gemfile.lock

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

data/NEWS.md

@@ -1,5 +1,11 @@
 # HEAD
 
+# v 2.4.0
+* Fix a bug with the `validate_numericality_of` matcher that would not allow the
+  `with_message` option on certain submatchers.
+
+* Fix a regression with context-dependent validations in ActiveResource
+
 * shoulda-matchers is now fully compatible with Rails 4.
 
 * When not using RSpec, shoulda-matchers is now auto-included into

data/README.md

@@ -42,6 +42,7 @@ describe User do
   it { should allow_value("a@b.com").for(:email) }
   it { should ensure_inclusion_of(:age).in_range(1..100) }
   it { should_not allow_mass_assignment_of(:password) }
+  it { should have_secure_password }
 end
 ```
 

data/gemfiles/3.1.gemfile

@@ -10,6 +10,7 @@ gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
 gem "rails", "~> 3.1.8"
+gem "bcrypt-ruby", "~> 3.0.0"
 gem "jquery-rails"
 gem "sass-rails"
 gem "strong_parameters"

data/gemfiles/3.1.gemfile.lock

@@ -43,6 +43,7 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
+    bcrypt-ruby (3.0.1)
     bourne (1.4.0)
       mocha (~> 0.13.2)
     builder (3.0.4)
@@ -143,6 +144,7 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   appraisal (~> 0.4)
   aruba
+  bcrypt-ruby (~> 3.0.0)
   bourne (~> 1.3)
   bundler (~> 1.1)
   cucumber (~> 1.1)

data/gemfiles/3.2.gemfile

@@ -10,6 +10,7 @@ gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
 gem "rails", "~> 3.2.13"
+gem "bcrypt-ruby", "~> 3.0.0"
 gem "jquery-rails"
 gem "sass-rails"
 gem "strong_parameters"

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.4.0.rc1)
+    shoulda-matchers (2.4.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -42,6 +42,7 @@ GEM
       childprocess (~> 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
+    bcrypt-ruby (3.0.1)
     bourne (1.4.0)
       mocha (~> 0.13.2)
     builder (3.0.4)
@@ -141,6 +142,7 @@ DEPENDENCIES
   activerecord-jdbcsqlite3-adapter
   appraisal (~> 0.4)
   aruba
+  bcrypt-ruby (~> 3.0.0)
   bourne (~> 1.3)
   bundler (~> 1.1)
   cucumber (~> 1.1)

data/gemfiles/4.0.gemfile

@@ -10,8 +10,10 @@ gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
 gem "rails", "4.0.0"
+gem "bcrypt-ruby", "~> 3.0.0"
 gem "jquery-rails"
 gem "sass-rails", "~> 4.0.0"
+gem "activeresource", :require=>"active_resource"
 gem "protected_attributes"
 
 gemspec :path=>"../"

data/gemfiles/4.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.4.0.rc1)
+    shoulda-matchers (2.4.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -25,6 +25,10 @@ GEM
       activesupport (= 4.0.0)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
+    activeresource (4.0.0)
+      activemodel (~> 4.0)
+      activesupport (~> 4.0)
+      rails-observers (~> 0.1.1)
     activesupport (4.0.0)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
@@ -40,6 +44,7 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     atomic (1.1.13)
+    bcrypt-ruby (3.0.1)
     bourne (1.5.0)
       mocha (>= 0.13.2, < 0.15)
     builder (3.1.4)
@@ -85,6 +90,8 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.0.0)
       sprockets-rails (~> 2.0.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
     railties (4.0.0)
       actionpack (= 4.0.0)
       activesupport (= 4.0.0)
@@ -133,8 +140,10 @@ PLATFORMS
 DEPENDENCIES
   activerecord-jdbc-adapter
   activerecord-jdbcsqlite3-adapter
+  activeresource
   appraisal (~> 0.4)
   aruba
+  bcrypt-ruby (~> 3.0.0)
   bourne (~> 1.3)
   bundler (~> 1.1)
   cucumber (~> 1.1)

data/lib/shoulda/matchers/active_model.rb

@@ -17,6 +17,7 @@ require 'shoulda/matchers/active_model/validate_confirmation_of_matcher'
 require 'shoulda/matchers/active_model/validate_numericality_of_matcher'
 require 'shoulda/matchers/active_model/allow_mass_assignment_of_matcher'
 require 'shoulda/matchers/active_model/errors'
+require 'shoulda/matchers/active_model/have_secure_password_matcher'
 
 
 module Shoulda

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

@@ -9,6 +9,7 @@ module Shoulda # :nodoc:
         def initialize(value, operator)
           @value = value
           @operator = operator
+          @message = nil
         end
 
         def for(attribute)
@@ -18,13 +19,17 @@ module Shoulda # :nodoc:
 
         def matches?(subject)
           @subject = subject
-          disallows_value_of(value_to_compare)
+          disallows_value_of(value_to_compare, @message)
         end
 
         def allowed_types
           'integer'
         end
 
+        def with_message(message)
+          @message = message
+        end
+
         private
 
         def value_to_compare

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

@@ -0,0 +1,71 @@
+module Shoulda # :nodoc:
+  module Matchers
+    module ActiveModel # :nodoc:
+
+      # Ensures that the model exhibits behavior added by has_secure_password.
+      #
+      # Example:
+      #   it { should have_secure_password }
+      def have_secure_password
+        HaveSecurePasswordMatcher.new
+      end
+
+      class HaveSecurePasswordMatcher # :nodoc:
+        attr_reader :failure_message_for_should
+
+        CORRECT_PASSWORD = "aBcDe12345"
+        INCORRECT_PASSWORD = "password"
+
+        EXPECTED_METHODS = [
+          :authenticate,
+          :password=,
+          :password_confirmation=,
+          :password_digest,
+          :password_digest=,
+        ]
+
+        MESSAGES = {
+          authenticated_incorrect_password: "expected %{subject} to not authenticate an incorrect password",
+          did_not_authenticate_correct_password: "expected %{subject} to authenticate the correct password",
+          method_not_found: "expected %{subject} to respond to %{methods}"
+        }
+
+        def description
+          "have a secure password"
+        end
+
+        def matches?(subject)
+          @subject = subject
+
+          if failure = validate
+            key, params = failure
+            @failure_message_for_should = MESSAGES[key] % { subject: subject.class }.merge(params)
+          end
+
+          failure.nil?
+        end
+
+        private
+
+        attr_reader :subject
+
+        def validate
+          missing_methods = EXPECTED_METHODS.select {|m| !subject.respond_to?(m) }
+
+          if missing_methods.present?
+            [:method_not_found, { methods: missing_methods.to_sentence }]
+          else
+            subject.password = CORRECT_PASSWORD
+            subject.password_confirmation = CORRECT_PASSWORD
+
+            if not subject.authenticate(CORRECT_PASSWORD)
+              [:did_not_authenticate_correct_password, {}]
+            elsif subject.authenticate(INCORRECT_PASSWORD)
+              [:authenticated_incorrect_password, {}]
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -37,7 +37,7 @@ module Shoulda
         end
 
         def messages
-          Array.wrap(messages_for_attribute)
+          Array(messages_for_attribute)
         end
 
         private
@@ -59,7 +59,7 @@ module Shoulda
         end
 
         def validate_instance
-          @instance.valid?(@context)
+          @instance.valid?(*@context)
           @instance
         end
       end

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = '2.4.0.rc1'.freeze
+    VERSION = '2.4.0'.freeze
   end
 end

data/spec/shoulda/matchers/action_controller/redirect_to_matcher_spec.rb

@@ -37,6 +37,6 @@ describe Shoulda::Matchers::ActionController::RedirectToMatcher do
   it 'provides the correct description when provided a block' do
     matcher = redirect_to('somewhere else') { '/some/other/url' }
 
-    matcher.description.should == 'redirect to somewhere else'
+    matcher.description.should eq 'redirect to somewhere else'
   end
 end

data/spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb

@@ -4,16 +4,16 @@ describe Shoulda::Matchers::ActiveModel::AllowMassAssignmentOfMatcher do
   context '#description' do
     context 'without a role' do
       it 'includes the attribute name' do
-        described_class.new(:attr).description.should ==
-          'allow mass assignment of attr'
+        described_class.new(:attr).description.
+          should eq 'allow mass assignment of attr'
       end
     end
 
     if active_model_3_1?
       context 'with a role' do
         it 'includes the attribute name and the role' do
-          described_class.new(:attr).as(:admin).description.should ==
-            'allow mass assignment of attr as admin'
+          described_class.new(:attr).as(:admin).description.
+            should eq 'allow mass assignment of attr as admin'
         end
       end
     end

data/spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb

@@ -5,21 +5,21 @@ describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
     it 'describes itself with multiple values' do
       matcher = allow_value('foo', 'bar').for(:baz)
 
-      matcher.description.should == 'allow baz to be set to any of ["foo", "bar"]'
+      matcher.description.should eq 'allow baz to be set to any of ["foo", "bar"]'
     end
 
     it 'describes itself with a single value' do
       matcher = allow_value('foo').for(:baz)
 
-      matcher.description.should == 'allow baz to be set to "foo"'
+      matcher.description.should eq 'allow baz to be set to "foo"'
     end
 
     if active_model_3_2?
       it 'describes itself with a strict validation' do
         strict_matcher = allow_value('xyz').for(:attr).strict
 
-        strict_matcher.description.should ==
-          %q(doesn't raise when attr is set to "xyz")
+        strict_matcher.description.
+          should eq %q(doesn't raise when attr is set to "xyz")
       end
     end
   end
@@ -162,7 +162,7 @@ describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
 
         matcher.matches?(validating_format(:with => /abc/, :strict => true))
 
-        matcher.failure_message_for_should_not.should == 'Expected exception to include /abc/ ' +
+        matcher.failure_message_for_should_not.should eq 'Expected exception to include /abc/ ' +
           'when attr is set to "xyz", got Attr is invalid'
       end
     end

data/spec/shoulda/matchers/active_model/comparison_matcher_spec.rb

@@ -1,40 +1,51 @@
 require 'spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::ComparisonMatcher do
+  it_behaves_like 'a numerical submatcher' do
+    subject {  Shoulda::Matchers::ActiveModel::ComparisonMatcher.new(0, :>) }
+  end
+
   context 'is_greater_than' do
-    it { instance_with_validations(:greater_than => 2).should matcher.is_greater_than(2) }
+    it { instance_with_validations(greater_than: 2).should matcher.is_greater_than(2) }
     it { instance_without_validations.should_not matcher.is_greater_than(2) }
   end
 
   context 'greater_than_or_equal_to' do
-    it { instance_with_validations(:greater_than_or_equal_to => 2).should matcher.is_greater_than_or_equal_to(2) }
+    it { instance_with_validations(greater_than_or_equal_to: 2).should matcher.is_greater_than_or_equal_to(2) }
     it { instance_without_validations.should_not matcher.is_greater_than_or_equal_to(2) }
   end
 
   context 'less_than' do
-    it { instance_with_validations(:less_than => 2).should matcher.is_less_than(2) }
+    it { instance_with_validations(less_than: 2).should matcher.is_less_than(2) }
     it { instance_without_validations.should_not matcher.is_less_than(2) }
   end
 
   context 'less_than_or_equal_to' do
-    it { instance_with_validations(:less_than_or_equal_to => 2).should matcher.is_less_than_or_equal_to(2) }
+    it { instance_with_validations(less_than_or_equal_to: 2).should matcher.is_less_than_or_equal_to(2) }
     it { instance_without_validations.should_not matcher.is_less_than_or_equal_to(2) }
   end
 
   context 'is_equal_to' do
-    it { instance_with_validations(:equal_to => 0).should matcher.is_equal_to(0) }
+    it { instance_with_validations(equal_to: 0).should matcher.is_equal_to(0) }
     it { instance_without_validations.should_not matcher.is_equal_to(0) }
   end
 
+  context 'with_message' do
+    it 'verifies the message for the validation' do
+      instance = instance_with_validations(equal_to: 0, message: 'Must be zero')
+      instance.should matcher.is_equal_to(0).with_message('Must be zero')
+    end
+  end
+
   def instance_with_validations(options = {})
-    define_model :example, :attr => :string do
+    define_model :example, attr: :string do
       validates_numericality_of :attr, options
       attr_accessible :attr
     end.new
   end
 
   def instance_without_validations
-    define_model :example, :attr => :string do
+    define_model :example, attr: :string do
       attr_accessible :attr
     end.new
   end

data/spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::DisallowValueMatcher do
   it 'does not allow any types' do
-    matcher('abcde').allowed_types.should == ''
+    matcher('abcde').allowed_types.should eq ''
   end
 
   context 'an attribute with a format validation' do
@@ -46,7 +46,7 @@ describe Shoulda::Matchers::ActiveModel::DisallowValueMatcher do
       matcher = matcher('abcde').for(:attr).with_message('good message')
       matcher.matches?(validating_format(:with => /abc/, :message => 'good message'))
 
-      matcher.failure_message_for_should.should == 'allow matcher failure'
+      matcher.failure_message_for_should.should eq 'allow matcher failure'
     end
 
     it 'matches if the message is correct but the value is not' do

data/spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb

@@ -77,7 +77,7 @@ describe Shoulda::Matchers::ActiveModel::EnsureExclusionOfMatcher do
 
     it 'has correct description' do
       ensure_exclusion_of(:attr).in_array([true, 'dog']).description.
-        should == 'ensure exclusion of attr in [true, "dog"]'
+        should eq 'ensure exclusion of attr in [true, "dog"]'
     end
 
     def validating_exclusion(options)

data/spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb

@@ -129,7 +129,7 @@ describe Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher do
 
     it 'has correct description' do
       ensure_inclusion_of(:attr).in_array([true, "dog"]).description.
-        should == 'ensure inclusion of attr in [true, "dog"]'
+        should eq 'ensure inclusion of attr in [true, "dog"]'
     end
 
     it 'rejects allow_blank' do

data/spec/shoulda/matchers/active_model/exception_message_finder_spec.rb

@@ -8,7 +8,7 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
 
         description = finder.allow_description('allowed values')
 
-        description.should == %q(doesn't raise when attr is set to allowed values)
+        description.should eq %q(doesn't raise when attr is set to allowed values)
       end
     end
 
@@ -18,7 +18,7 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
 
         message = finder.expected_message_from('some message')
 
-        message.should == 'Attr some message'
+        message.should eq 'Attr some message'
       end
     end
 
@@ -50,7 +50,7 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
 
         messages = finder.messages
 
-        messages.should == ['Attr is invalid']
+        messages.should eq ['Attr is invalid']
       end
     end
 
@@ -64,7 +64,7 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
 
         description = finder.messages_description
 
-        description.should == 'Attr is invalid'
+        description.should eq 'Attr is invalid'
       end
 
       it 'describes errors when there are none' do
@@ -72,7 +72,7 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
 
         description = finder.messages_description
 
-        description.should == 'no exception'
+        description.should eq 'no exception'
       end
     end
 
@@ -82,7 +82,7 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
 
         description = finder.source_description
 
-        description.should == 'exception'
+        description.should eq 'exception'
       end
     end
   end
@@ -109,4 +109,3 @@ describe Shoulda::Matchers::ActiveModel::ExceptionMessageFinder do
     model_class.new(attribute => value)
   end
 end
-

data/spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActiveModel::HaveSecurePasswordMatcher do
+  if active_model_3_1?
+    it 'matches when the subject configures has_secure_password with default options' do
+      working_model = define_model(:example, password_digest: :string) { has_secure_password }
+      expect(working_model.new).to have_secure_password
+    end
+
+    it 'does not match when the subject does not authenticate a password' do
+      no_secure_password = define_model(:example)
+      expect(no_secure_password.new).not_to have_secure_password
+    end
+
+    it 'does not match when the subject is missing the password_digest attribute' do
+      no_digest_column = define_model(:example) { has_secure_password }
+      expect(no_digest_column.new).not_to have_secure_password
+    end
+  end
+end

data/spec/shoulda/matchers/active_model/odd_even_number_matcher_spec.rb

@@ -1,6 +1,10 @@
 require 'spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::OddEvenNumberMatcher do
+  it_behaves_like 'a numerical submatcher' do
+    subject {  Shoulda::Matchers::ActiveModel::OddEvenNumberMatcher.new(:attr) }
+  end
+
   context 'given an attribute that only allows odd number values' do
     it 'matches' do
       validating_odd_number.should new_odd_matcher
@@ -8,7 +12,7 @@ describe Shoulda::Matchers::ActiveModel::OddEvenNumberMatcher do
 
     it 'returns itself when given a message' do
       matcher = new_odd_matcher
-      matcher.with_message('some message').should == matcher
+      matcher.with_message('some message').should eq matcher
     end
   end
 
@@ -19,7 +23,7 @@ describe Shoulda::Matchers::ActiveModel::OddEvenNumberMatcher do
 
     it 'returns itself when given a message' do
       matcher = new_even_matcher
-      matcher.with_message('some message').should == matcher
+      matcher.with_message('some message').should eq matcher
     end
   end
 
@@ -85,7 +89,7 @@ describe Shoulda::Matchers::ActiveModel::OddEvenNumberMatcher do
     end.new
   end
 
-   def validating_even_number(options = {})
+  def validating_even_number(options = {})
     define_model :example, :attr => :string do
       validates_numericality_of :attr, { :even => true }.merge(options)
     end.new

data/spec/shoulda/matchers/active_model/only_integer_matcher_spec.rb

@@ -1,18 +1,22 @@
 require 'spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::OnlyIntegerMatcher do
+  it_behaves_like 'a numerical submatcher' do
+    subject { Shoulda::Matchers::ActiveModel::OnlyIntegerMatcher.new(:attr) }
+  end
+
   context 'given an attribute that only allows integer values' do
     it 'matches' do
       validating_only_integer.should new_matcher
     end
 
     it 'allows integer types' do
-      new_matcher.allowed_types.should == 'integer'
+      new_matcher.allowed_types.should eq 'integer'
     end
 
     it 'returns itself when given a message' do
       matcher = new_matcher
-      matcher.with_message('some message').should == matcher
+      matcher.with_message('some message').should eq matcher
     end
   end
 

data/spec/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Shoulda::Matchers::ActiveModel::ValidateConfirmationOfMatcher do
   context '#description' do
     it 'states that the confirmation must match its base attribute' do
-      matcher.description.should == 'require attr_confirmation to match attr'
+      matcher.description.should eq 'require attr_confirmation to match attr'
     end
   end
 

data/spec/shoulda/matchers/active_model/validate_numericality_of_matcher_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Shoulda::Matchers::ActiveModel::ValidateNumericalityOfMatcher do
   context '#description' do
     it 'states that it allows only numeric values' do
-      matcher.description.should == 'only allow numeric values for attr'
+      matcher.description.should eq 'only allow numeric values for attr'
     end
   end
 

data/spec/shoulda/matchers/active_model/validate_presence_of_matcher_spec.rb

@@ -134,6 +134,16 @@ describe Shoulda::Matchers::ActiveModel::ValidatePresenceOfMatcher do
     end
   end
 
+  context 'an active_resource model' do
+    context 'with the validation context' do
+      it 'does not raise an exception' do
+        expect {
+          active_resource_model.should validate_presence_of(:attr)
+        }.to_not raise_exception
+      end
+    end
+  end
+
   def matcher
     validate_presence_of(:attr)
   end
@@ -161,4 +171,10 @@ describe Shoulda::Matchers::ActiveModel::ValidatePresenceOfMatcher do
       end
     end.new
   end
+
+  def active_resource_model
+    define_active_resource_class :foo, :attr => :string do
+      validates_presence_of :attr
+    end.new
+  end
 end

data/spec/shoulda/matchers/active_model/validate_uniqueness_of_matcher_spec.rb

@@ -34,7 +34,7 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
     context 'without an existing record' do
       it 'does not require a created instance' do
         define_model_with_other
-        Example.count.should == 0
+        Example.count.should eq 0
         validating_uniqueness_with_other.should matcher
       end
     end
@@ -274,6 +274,51 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
     end
   end
 
+  context "when the validation allows nil" do
+    context "when there is an existing entry with a nil" do
+      it "should allow_nil" do
+        model = define_model_with_allow_nil
+        Example.create!(:attr => nil)
+        model.should matcher.allow_nil
+      end
+    end
+
+    it "should create a nil and verify that it is allowed" do
+      model = define_model_with_allow_nil
+      model.should matcher.allow_nil
+      Example.all.any?{ |instance| instance.attr.nil? }
+    end
+
+    def define_model_with_allow_nil
+      define_model(:example, :attr  => :integer) do
+        attr_accessible :attr
+        validates_uniqueness_of :attr, :allow_nil => true
+      end.new
+    end
+  end
+
+  context "when the validation does not allow a nil" do
+    context "when there is an existing entry with a nil" do
+      it "should not allow_nil" do
+        model = define_model_without_allow_nil
+        Example.create!(:attr => nil)
+        model.should_not matcher.allow_nil
+      end
+    end
+
+    it "should not allow_nil" do
+      model = define_model_without_allow_nil
+      model.should_not matcher.allow_nil
+    end
+
+    def define_model_without_allow_nil
+      define_model(:example, :attr  => :integer) do
+        attr_accessible :attr
+        validates_uniqueness_of :attr
+      end.new
+    end
+  end
+
   def case_sensitive_validation_with_existing_value(attr_type)
     model = define_model(:example, :attr => attr_type) do
       attr_accessible :attr

data/spec/shoulda/matchers/active_model/validation_message_finder_spec.rb

@@ -7,7 +7,7 @@ describe Shoulda::Matchers::ActiveModel::ValidationMessageFinder do
 
       description = finder.allow_description('allowed values')
 
-      description.should == 'allow attr to be set to allowed values'
+      description.should eq 'allow attr to be set to allowed values'
     end
   end
 
@@ -17,7 +17,7 @@ describe Shoulda::Matchers::ActiveModel::ValidationMessageFinder do
 
       message = finder.expected_message_from('some message')
 
-      message.should == 'some message'
+      message.should eq 'some message'
     end
   end
 
@@ -45,7 +45,15 @@ describe Shoulda::Matchers::ActiveModel::ValidationMessageFinder do
 
       messages = finder.messages
 
-      messages.should == ['is invalid']
+      messages.should eq ['is invalid']
+    end
+
+    it 'returns an empty array if there are no errors for the given attribute' do
+      finder = build_finder
+
+      messages = finder.messages
+
+      messages.should == []
     end
   end
 
@@ -60,7 +68,7 @@ describe Shoulda::Matchers::ActiveModel::ValidationMessageFinder do
       description = finder.messages_description
 
       expected_messages = ['attr is invalid ("xyz")']
-      description.should == "errors: #{expected_messages}"
+      description.should eq "errors: #{expected_messages}"
     end
 
     it 'describes errors when there are none' do
@@ -68,7 +76,7 @@ describe Shoulda::Matchers::ActiveModel::ValidationMessageFinder do
 
       description = finder.messages_description
 
-      description.should == 'no errors'
+      description.should eq 'no errors'
     end
 
     it 'should not fetch attribute values for errors that were copied from an autosaved belongs_to association' do
@@ -80,7 +88,7 @@ describe Shoulda::Matchers::ActiveModel::ValidationMessageFinder do
       finder = Shoulda::Matchers::ActiveModel::ValidationMessageFinder.new(instance, :attribute)
 
       expected_messages = ['association.association_attribute is invalid']
-      finder.messages_description.should == "errors: #{expected_messages}"
+      finder.messages_description.should eq "errors: #{expected_messages}"
     end
 
   end
@@ -91,7 +99,7 @@ describe Shoulda::Matchers::ActiveModel::ValidationMessageFinder do
 
       description = finder.source_description
 
-      description.should == 'errors'
+      description.should eq 'errors'
     end
   end
 

data/spec/shoulda/matchers/active_record/accept_nested_attributes_for_matcher_spec.rb

@@ -10,7 +10,8 @@ describe Shoulda::Matchers::ActiveRecord::AcceptNestedAttributesForMatcher do
 
     matcher.matches?(rejecting_children).should be_false
 
-    matcher.failure_message_for_should.should == 'Expected Parent to accept nested attributes for children (is not declared)'
+    matcher.failure_message_for_should.
+      should eq 'Expected Parent to accept nested attributes for children (is not declared)'
   end
 
   context 'allow_destroy' do

data/spec/support/active_resource_builder.rb

@@ -0,0 +1,27 @@
+module ActiveResourceBuilder
+  def self.included(example_group)
+    example_group.class_eval do
+      after do
+        ActiveSupport::Dependencies.clear
+      end
+    end
+  end
+
+  def define_active_resource_class(class_name, attributes = {}, &block)
+    define_class(class_name, ActiveResource::Base) do
+      schema do
+        attributes.each do |attr, type|
+          attribute attr, type
+        end
+      end
+
+      if block_given?
+        class_eval(&block)
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include ActiveResourceBuilder
+end

data/spec/support/shared_examples/numerical_submatcher_spec.rb

@@ -0,0 +1,23 @@
+require 'spec_helper'
+
+shared_examples 'a numerical submatcher' do
+  it 'implements the with_message method' do
+    subject.should respond_to(:with_message).with(1).arguments
+  end
+
+  it 'implements the allowed_types method' do
+    subject.should respond_to(:allowed_types).with(0).arguments
+  end
+
+  it 'implements the matches? method' do
+    subject.should respond_to(:matches?).with(1).arguments
+  end
+
+  it 'implements the failure_message_for_should method' do
+    subject.should respond_to(:failure_message_for_should).with(0).arguments
+  end
+
+  it 'implements the failure_message_for_should_not method' do
+    subject.should respond_to(:failure_message_for_should_not).with(0).arguments
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.4.0.rc1
+  version: 2.4.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -196,6 +196,7 @@ files:
 - lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb
 - lib/shoulda/matchers/active_model/errors.rb
 - lib/shoulda/matchers/active_model/exception_message_finder.rb
+- lib/shoulda/matchers/active_model/have_secure_password_matcher.rb
 - lib/shoulda/matchers/active_model/helpers.rb
 - lib/shoulda/matchers/active_model/odd_even_number_matcher.rb
 - lib/shoulda/matchers/active_model/only_integer_matcher.rb
@@ -225,7 +226,6 @@ files:
 - lib/shoulda/matchers/rails_shim.rb
 - lib/shoulda/matchers/version.rb
 - shoulda-matchers.gemspec
-- spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/filter_param_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/redirect_to_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/render_template_matcher_spec.rb
@@ -243,6 +243,7 @@ files:
 - spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_length_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/exception_message_finder_spec.rb
+- spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
 - spec/shoulda/matchers/active_model/helpers_spec.rb
 - spec/shoulda/matchers/active_model/odd_even_number_matcher_spec.rb
 - spec/shoulda/matchers/active_model/only_integer_matcher_spec.rb
@@ -260,6 +261,7 @@ files:
 - spec/shoulda/matchers/active_record/serialize_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
+- spec/support/active_resource_builder.rb
 - spec/support/activemodel_helpers.rb
 - spec/support/class_builder.rb
 - spec/support/controller_builder.rb
@@ -267,6 +269,7 @@ files:
 - spec/support/i18n_faker.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
+- spec/support/shared_examples/numerical_submatcher_spec.rb
 homepage: http://thoughtbot.com/community/
 licenses:
 - MIT
@@ -282,12 +285,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: Making tests easy on the fingers and eyes
@@ -295,7 +298,6 @@ test_files:
 - features/rails_integration.feature
 - features/step_definitions/rails_steps.rb
 - features/support/env.rb
-- spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/filter_param_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/redirect_to_matcher_spec.rb
 - spec/shoulda/matchers/action_controller/render_template_matcher_spec.rb
@@ -313,6 +315,7 @@ test_files:
 - spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_length_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/exception_message_finder_spec.rb
+- spec/shoulda/matchers/active_model/have_secure_password_matcher_spec.rb
 - spec/shoulda/matchers/active_model/helpers_spec.rb
 - spec/shoulda/matchers/active_model/odd_even_number_matcher_spec.rb
 - spec/shoulda/matchers/active_model/only_integer_matcher_spec.rb
@@ -330,6 +333,7 @@ test_files:
 - spec/shoulda/matchers/active_record/serialize_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
+- spec/support/active_resource_builder.rb
 - spec/support/activemodel_helpers.rb
 - spec/support/class_builder.rb
 - spec/support/controller_builder.rb
@@ -337,3 +341,4 @@ test_files:
 - spec/support/i18n_faker.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
+- spec/support/shared_examples/numerical_submatcher_spec.rb

data/spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb

@@ -1,195 +0,0 @@
-require 'spec_helper'
-
-describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
-  context "a unique attribute" do
-    before do
-      @model = define_model(:example, :attr  => :string,
-                                      :other => :integer) do
-        attr_accessible :attr, :other
-        validates_uniqueness_of :attr
-      end.new
-    end
-
-    context "with an existing value" do
-      before do
-        @existing = Example.create!(:attr => 'value', :other => 1)
-      end
-
-      it "should require a unique value for that attribute" do
-        @model.should validate_uniqueness_of(:attr)
-      end
-
-      it "should pass when the subject is an existing record" do
-        @existing.should validate_uniqueness_of(:attr)
-      end
-
-      it "should fail when a scope is specified" do
-        @model.should_not validate_uniqueness_of(:attr).scoped_to(:other)
-      end
-    end
-
-    context "without an existing value" do
-      before do
-        Example.first.should be_nil
-        @matcher = validate_uniqueness_of(:attr)
-      end
-
-      it "does not not require a created instance" do
-        @model.should @matcher
-      end
-    end
-  end
-
-  context "a unique attribute with a custom error and an existing value" do
-    before do
-      @model = define_model(:example, :attr => :string) do
-        attr_accessible :attr
-        validates_uniqueness_of :attr, :message => 'Bad value'
-      end.new
-      Example.create!(:attr => 'value')
-    end
-
-    it "should fail when checking the default message" do
-      @model.should_not validate_uniqueness_of(:attr)
-    end
-
-    it "should fail when checking a message that doesn't match" do
-      @model.should_not validate_uniqueness_of(:attr).with_message(/abc/i)
-    end
-
-    it "should pass when checking a message that matches" do
-      @model.should validate_uniqueness_of(:attr).with_message(/bad/i)
-    end
-  end
-
-  context "a scoped unique attribute with an existing value" do
-    before do
-      @model = define_model(:example, :attr   => :string,
-                                      :scope1 => :integer,
-                                      :scope2 => :integer,
-                                      :other => :integer) do
-        attr_accessible :attr, :scope1, :scope2, :other
-        validates_uniqueness_of :attr, :scope => [:scope1, :scope2]
-      end.new
-      @existing = Example.create!(:attr => 'value', :scope1 => 1, :scope2 => 2, :other => 3)
-    end
-
-    it "should pass when the correct scope is specified" do
-      @model.should validate_uniqueness_of(:attr).scoped_to(:scope1, :scope2)
-    end
-
-    it "should pass when the subject is an existing record" do
-      @existing.should validate_uniqueness_of(:attr).scoped_to(:scope1, :scope2)
-    end
-
-    it "should fail when too narrow of a scope is specified" do
-      @model.should_not validate_uniqueness_of(:attr).scoped_to(:scope1, :scope2, :other)
-    end
-
-    it "should fail when too broad of a scope is specified" do
-      @model.should_not validate_uniqueness_of(:attr).scoped_to(:scope1)
-    end
-
-    it "should fail when a different scope is specified" do
-      @model.should_not validate_uniqueness_of(:attr).scoped_to(:other)
-    end
-
-    it "should fail when no scope is specified" do
-      @model.should_not validate_uniqueness_of(:attr)
-    end
-
-    it "should fail when a non-existent attribute is specified as a scope" do
-      @model.should_not validate_uniqueness_of(:attr).scoped_to(:fake)
-    end
-  end
-
-  context "a non-unique attribute with an existing value" do
-    before do
-      @model = define_model(:example, :attr => :string) do
-        attr_accessible :attr
-      end.new
-      Example.create!(:attr => 'value')
-    end
-
-    it "should not require a unique value for that attribute" do
-      @model.should_not validate_uniqueness_of(:attr)
-    end
-  end
-
-  context "a case sensitive unique attribute with an existing value" do
-    before do
-      @model = define_model(:example, :attr  => :string) do
-        attr_accessible :attr
-        validates_uniqueness_of :attr, :case_sensitive => true
-      end.new
-      Example.create!(:attr => 'value')
-    end
-
-    it "should not require a unique, case-insensitive value for that attribute" do
-      @model.should_not validate_uniqueness_of(:attr).case_insensitive
-    end
-
-    it "should require a unique, case-sensitive value for that attribute" do
-      @model.should validate_uniqueness_of(:attr)
-    end
-  end
-
-  context "a case sensitive unique integer attribute with an existing value" do
-    before do
-      @model = define_model(:example, :attr  => :integer) do
-        attr_accessible :attr
-        validates_uniqueness_of :attr, :case_sensitive => true
-      end.new
-      Example.create!(:attr => 'value')
-    end
-
-    it "should require a unique, case-insensitive value for that attribute" do
-      @model.should validate_uniqueness_of(:attr).case_insensitive
-    end
-
-    it "should require a unique, case-sensitive value for that attribute" do
-      @model.should validate_uniqueness_of(:attr)
-    end
-  end
-
-  context "when the validation allows nil" do
-    before do
-      @model = define_model(:example, :attr  => :integer) do
-        attr_accessible :attr
-        validates_uniqueness_of :attr, :allow_nil => true
-      end.new
-    end
-
-    context "when there is an existing entry with a nil" do
-      it "should allow_nil" do
-        Example.create!(:attr => nil)
-        @model.should validate_uniqueness_of(:attr).allow_nil
-      end
-    end
-
-    it "should create a nil and verify that it is allowed" do
-      @model.should validate_uniqueness_of(:attr).allow_nil
-      Example.all.any?{ |instance| instance.attr.nil? }
-    end
-  end
-
-  context "when the validation does not allow a nil" do
-    before do
-      @model = define_model(:example, :attr  => :integer) do
-        attr_accessible :attr
-        validates_uniqueness_of :attr
-      end.new
-    end
-
-    context "when there is an existing entry with a nil" do
-      it "should not allow_nil" do
-        Example.create!(:attr => nil)
-        @model.should_not validate_uniqueness_of(:attr).allow_nil
-      end
-    end
-
-    it "should not allow_nil" do
-      @model.should_not validate_uniqueness_of(:attr).allow_nil
-    end
-  end
-end