shoulda-matchers 2.1.0 → 2.2.0

data/Gemfile.lock

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

data/NEWS.md

@@ -1,5 +1,15 @@
 # HEAD
 
+# v 2.2.0
+
+* Fix `have_and_belong_to_many` matcher issue for Rails 4.
+
+* Fix `validate_uniqueness_of.scoped_to` issue when the scoped field is already
+  taken (#207).
+
+* Add comparison submatchers to `validate_numericality_of` to correspond to the
+  comparison options you can give to `validates_numericality_of` (#244).
+
 # v 2.1.0
 
 * Add missing `failure_message_for_should_not` implementations to

data/gemfiles/3.0.gemfile.lock

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

data/gemfiles/3.1.gemfile.lock

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

data/gemfiles/3.2.gemfile.lock

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

data/lib/shoulda/matchers/active_model.rb

@@ -6,6 +6,7 @@ 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/comparison_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/comparison_matcher.rb

@@ -0,0 +1,52 @@
+module Shoulda # :nodoc:
+  module Matchers
+    module ActiveModel # :nodoc:
+      # Examples:
+      #   it { should validate_numericality_of(:attr).
+      #                 is_greater_than(6).
+      #                 less_than(20)...(and so on) }
+      class ComparisonMatcher < ValidationMatcher
+        def initialize(value, operator)
+          @value = value
+          @operator = operator
+        end
+
+        def for(attribute)
+          @attribute = attribute
+          self
+        end
+
+        def matches?(subject)
+          @subject = subject
+          disallows_value_of(value_to_compare)
+        end
+
+        def allowed_types
+          'integer'
+        end
+
+        private
+
+        def value_to_compare
+          case @operator
+            when :> then [@value, @value - 1].sample
+            when :>= then @value - 1
+            when :== then @value
+            when :< then [@value, @value + 1].sample
+            when :<= then @value + 1
+          end
+        end
+
+        def expectation
+          case @operator
+            when :> then "greater than"
+            when :>= then "greater than or equal to"
+            when :== then "equal to"
+            when :< then "less than"
+            when :<= then "less than or equal to"
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -32,8 +32,32 @@ module Shoulda # :nodoc:
         end
 
         def only_integer
-          only_integer_matcher = OnlyIntegerMatcher.new(@attribute)
-          add_submatcher(only_integer_matcher)
+          add_submatcher(OnlyIntegerMatcher.new(@attribute))
+          self
+        end
+
+        def is_greater_than(value)
+          add_submatcher(ComparisonMatcher.new(value, :>).for(@attribute))
+          self
+        end
+
+        def is_greater_than_or_equal_to(value)
+          add_submatcher(ComparisonMatcher.new(value, :>=).for(@attribute))
+          self
+        end
+
+        def is_equal_to(value)
+          add_submatcher(ComparisonMatcher.new(value, :==).for(@attribute))
+          self
+        end
+
+        def is_less_than(value)
+          add_submatcher(ComparisonMatcher.new(value, :<).for(@attribute))
+          self
+        end
+
+        def is_less_than_or_equal_to(value)
+          add_submatcher(ComparisonMatcher.new(value, :<=).for(@attribute))
           self
         end
 
@@ -98,7 +122,7 @@ module Shoulda # :nodoc:
         end
 
         def failing_submatchers
-          @failing_submatchers ||= @submatchers.select { |matcher| !matcher.matches?(@subject) }
+          @failing_submatchers ||= @submatchers.select { |matcher| !matcher.matches?(@subject.dup) }
         end
 
         def allowed_types

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

@@ -156,15 +156,13 @@ module Shoulda # :nodoc:
           @existing_record = create_record_in_database
         end
 
-        # TODO:  There is a chance that we could change the scoped field
-        # to a value that's already taken.  An alternative implementation
-        # could actually find all values for scope and create a unique
         def validate_after_scope_change?
           if @options[:scopes].blank?
             true
           else
+            all_records = @subject.class.all
             @options[:scopes].all? do |scope|
-              previous_value = existing_record.send(scope)
+              previous_value = all_records.map(&scope).max
 
               # Assume the scope is a foreign key if the field is nil
               previous_value ||= correct_type_for_column(@subject.class.columns_hash[scope.to_s])

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

@@ -34,10 +34,10 @@ module Shoulda # :nodoc:
           allow = allow_value_matcher(value, message)
 
           if allow.matches?(@subject)
-            @failure_message_for_should_not = allow.failure_message_for_should
+            @failure_message_for_should_not = allow.failure_message_for_should_not
             true
           else
-            @failure_message_for_should = allow.failure_message_for_should_not
+            @failure_message_for_should = allow.failure_message_for_should
             false
           end
         end
@@ -46,10 +46,10 @@ module Shoulda # :nodoc:
           disallow = disallow_value_matcher(value, message)
 
           if disallow.matches?(@subject)
-            @failure_message_for_should_not = disallow.failure_message_for_should
+            @failure_message_for_should_not = disallow.failure_message_for_should_not
             true
           else
-            @failure_message_for_should = disallow.failure_message_for_should_not
+            @failure_message_for_should = disallow.failure_message_for_should
             false
           end
         end

data/lib/shoulda/matchers/active_record/association_matcher.rb

@@ -309,7 +309,11 @@ module Shoulda # :nodoc:
         end
 
         def join_table
-          reflection.options[:join_table].to_s
+          if reflection.respond_to? :join_table
+            reflection.join_table.to_s
+          else
+            reflection.options[:join_table].to_s
+          end
         end
 
         def associated_class

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = '2.1.0'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

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

@@ -0,0 +1,40 @@
+require 'spec_helper'
+
+describe Shoulda::Matchers::ActiveModel::ComparisonMatcher do
+  context 'is_greater_than' do
+    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_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_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_without_validations.should_not matcher.is_less_than_or_equal_to(2) }
+  end
+
+  def instance_with_validations(options = {})
+    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
+      attr_accessible :attr
+    end.new
+  end
+
+  def matcher
+    validate_numericality_of(:attr)
+  end
+end

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

@@ -29,8 +29,13 @@ describe Shoulda::Matchers::ActiveModel::ValidatePresenceOfMatcher do
 
   context 'an ActiveModel class without a presence validation' do
     it 'rejects' do
-      define_active_model_class('Example', :accessors => [:attr]).new.
-        should_not matcher
+      active_model.should_not matcher
+    end
+
+    it 'provides the correct failure message' do
+      message = %{Expected errors to include "can't be blank" when attr is set to nil, got no errors}
+
+      expect { active_model.should matcher }.to fail_with_message(message)
     end
   end
 
@@ -125,10 +130,12 @@ describe Shoulda::Matchers::ActiveModel::ValidatePresenceOfMatcher do
     end.new
   end
 
+  def active_model(&block)
+    define_active_model_class('Example', :accessors => [:attr], &block).new
+  end
+
   def active_model_validating_presence
-    define_active_model_class('Example', :accessors => [:attr]) do
-      validates_presence_of :attr
-    end.new
+    active_model { validates_presence_of :attr }
   end
 
   def has_many_children(options = {})

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

@@ -118,6 +118,13 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
           should matcher.scoped_to(:scope1)
       end
 
+      context 'with an existing record that conflicts with scope.next' do
+        it 'accepts' do
+          validating_scoped_uniqueness_with_conflicting_next(:scope1, :date, :scope1 => Date.today).
+            should matcher.scoped_to(:scope1)
+        end
+      end
+
       context 'when too narrow of a scope is specified' do
         it 'rejects' do
           validating_scoped_uniqueness([:scope1, :scope2], :date, :scope1 => Date.today, :scope2 => Date.today).
@@ -132,6 +139,13 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
           should matcher.scoped_to(:scope1)
       end
 
+      context 'with an existing record that conflicts with scope.next' do
+        it 'accepts' do
+          validating_scoped_uniqueness_with_conflicting_next(:scope1, :datetime, :scope1 => DateTime.now).
+            should matcher.scoped_to(:scope1)
+        end
+      end
+
       context 'with a nil value' do
         it 'accepts' do
           validating_scoped_uniqueness([:scope1], :datetime, :scope1 => nil).
@@ -145,11 +159,22 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
             should_not matcher.scoped_to(:scope1, :scope2, :other)
         end
       end
+
+      context 'with an existing record that conflicts with scope.next' do
+        it 'accepts' do
+          validating_scoped_uniqueness_with_conflicting_next(:scope1, :scope1 => 1).
+            should matcher.scoped_to(:scope1)
+        end
+      end
     end
 
     def create_existing_record(attributes = {})
+      @existing ||= create_record(attributes)
+    end
+
+    def create_record(attributes = {})
       default_attributes = {:attr => 'value', :scope1 => 1, :scope2 => 2, :other => 3}
-      @existing ||= Example.create!(default_attributes.merge(attributes))
+      Example.create!(default_attributes.merge(attributes))
     end
 
     def define_scoped_model(scope, scope_attr_type = :integer)
@@ -166,6 +191,16 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
       create_existing_record(attributes)
       model
     end
+
+    def validating_scoped_uniqueness_with_conflicting_next(*args)
+      attributes = args.extract_options!
+      model = define_scoped_model(*args).new
+      2.times do
+        attributes[:scope1] = attributes[:scope1].next
+        create_record(attributes)
+      end
+      model
+    end
   end
 
   context 'a model with a case-sensitive uniqueness validation on a string attribute and an existing record' do

data/spec/support/fail_with_message_matcher.rb

@@ -0,0 +1,32 @@
+RSpec::Matchers.define :fail_with_message do |expected|
+  match do |block|
+    @actual = nil
+
+    begin
+      block.call
+    rescue RSpec::Expectations::ExpectationNotMetError => ex
+      @actual = ex.message
+    end
+
+    @actual && @actual == expected
+  end
+
+  failure_message_for_should do
+    msg = "Expectation should have failed with message '#{expected}'"
+
+    if @actual
+      msg << ", actually failed with '#{@actual}'"
+    else
+      msg << ", but did not fail."
+    end
+
+    msg
+  end
+
+  failure_message_for_should_not do
+    msg  = "Expectation should not have failed with message '#{expected}'"
+    msg << ", but did."
+
+    msg
+  end
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Tammer Saleh
@@ -13,11 +14,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -25,6 +27,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -32,6 +35,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -39,6 +43,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,6 +51,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -53,6 +59,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -60,6 +67,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -67,6 +75,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -74,6 +83,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -81,6 +91,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,6 +99,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -95,6 +107,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,6 +115,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -109,6 +123,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -116,6 +131,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -123,6 +139,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -130,6 +147,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -137,6 +155,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -144,6 +163,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: strong_parameters
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -151,6 +171,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -194,6 +215,7 @@ files:
 - lib/shoulda/matchers/active_model.rb
 - lib/shoulda/matchers/active_model/allow_mass_assignment_of_matcher.rb
 - lib/shoulda/matchers/active_model/allow_value_matcher.rb
+- lib/shoulda/matchers/active_model/comparison_matcher.rb
 - lib/shoulda/matchers/active_model/disallow_value_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb
 - lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb
@@ -233,6 +255,7 @@ files:
 - spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
+- spec/shoulda/matchers/active_model/comparison_matcher_spec.rb
 - spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
@@ -258,32 +281,37 @@ files:
 - spec/support/activemodel_helpers.rb
 - spec/support/class_builder.rb
 - spec/support/controller_builder.rb
+- spec/support/fail_with_message_matcher.rb
 - spec/support/i18n_faker.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
 homepage: http://thoughtbot.com/community/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -819827211326946957
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Making tests easy on the fingers and eyes
 test_files:
 - features/rails_integration.feature
@@ -300,6 +328,7 @@ test_files:
 - spec/shoulda/matchers/action_controller/set_the_flash_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_mass_assignment_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/allow_value_matcher_spec.rb
+- spec/shoulda/matchers/active_model/comparison_matcher_spec.rb
 - spec/shoulda/matchers/active_model/disallow_value_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_exclusion_of_matcher_spec.rb
 - spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb
@@ -325,6 +354,7 @@ test_files:
 - spec/support/activemodel_helpers.rb
 - spec/support/class_builder.rb
 - spec/support/controller_builder.rb
+- spec/support/fail_with_message_matcher.rb
 - spec/support/i18n_faker.rb
 - spec/support/mailer_builder.rb
 - spec/support/model_builder.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YzVkMDJkYmRiNjE2ODM0MDMzMzQxODQwZTBjMWEzM2RmYTMyZTIzYQ==
-  data.tar.gz: !binary |-
-    NTExOTlmMTUyOGU1NjVlZjM0YzVhN2FiNDVjYTE3NmI0ZDU0ZjNiMQ==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    NWI5ZTA2ZGJjMTJmNjgxYjI0Mjk1NGZhYjZkYzUyMmIwNjJjZmJhYjRjZGRh
-    NTA2MjIwZDMzZjQ3YmIxMTNjNGUwMjEzYzg1ZjkzZDA2ZThlY2UyZWY5OGNm
-    OTY0ZTg4ZjM2ODQxZTU0OTg4MDhmMTA0ZDU3YjEyNTcxZmVlNDQ=
-  data.tar.gz: !binary |-
-    N2FkMWNjZTgzOTgwZjcwOWE2YjE2NzU1ZDNmMDQwZDEzNjQzMjVhMTAxYjQy
-    NjJjYmI0NmFlN2E3OTZkOGU0ODIzNDllMDgwZjlhNjRmNTRmMWQ3YWU5ZGNk
-    NzA0NmE5MzVkM2JhODAzNjMyNDU3NzBlYzIyZWUwYmRiNzEwMjI=