shoulda-matchers 2.6.1.rc1 → 2.6.1.rc2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 8f8f865b9ee2e09b27b831e0e107beea74dc14e8
+  data.tar.gz: c58cab17d485bfa69d7601e8475d26520c19995d
+SHA512:
+  metadata.gz: 03120f384bc8795a623bd9af2db57acd7722bc4322809a2ae791b0d0bc7928091e6d1ed40c50c8766aaad4b585936ef25d5ab931cfae0fcf4da31b0b962eb626
+  data.tar.gz: 12bf17877fa26dff8f5df3a274a5416c541f2c59105edb693aa98fef7969cf84b2859948ef815ca894875a471e1a10243791fe5c4a22ba063d98608e03adfd2c

data/Gemfile.lock

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

data/NEWS.md

@@ -1,7 +1,19 @@
 # HEAD
 
-* Fix `ComparisonMatcher` so that `validate_numericality_of` comparison matchers
-  work with large numbers.
+## Features
+
+* Teach `with_message` qualifier on `allow_value` to accept a hash of i18n
+  interpolation values:
+  `allow_value('foo').for(:attr).with_message(:greater_than, values: { count: 20 })`.
+
+## Bug fixes
+
+* Revert changes to `validate_numericality_of` made in the last release, which
+  made it so that comparison qualifiers specified on the validation are tested
+  using a very small decimal number offset rather than a whole number by
+  default, except if the matcher was qualified with `only_integer`. This means
+  that prior to 2.6.0, if your validation specified `only_integer` and you did
+  not, then after 2.6.0 that test now fails.
 
 * Fix so that ActiveRecord matchers aren't included when ActiveRecord
   isn't defined (i.e. if you are using ActiveModel only).
@@ -32,6 +44,8 @@
 * Fix `delegate_method` so that it does not stub the target method forever,
   returning it to its original implementation after the match ends.
 
+* Fix `validate_uniqueness_of` to work with Rails 4.1 enum columns.
+
 # 2.6.0
 
 * The boolean argument to `have_db_index`'s `unique` option is now optional, for

data/gemfiles/3.0.gemfile.lock

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

data/gemfiles/3.1.gemfile.lock

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

data/gemfiles/3.2.gemfile.lock

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

data/gemfiles/4.0.0.gemfile.lock

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

data/gemfiles/4.0.1.gemfile.lock

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

data/gemfiles/4.1.gemfile.lock

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

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

@@ -53,9 +53,12 @@ module Shoulda # :nodoc:
 
         def with_message(message, options={})
           self.options[:expected_message] = message
+          self.options[:expected_message_values] = options.fetch(:values, {})
+
           if options.key?(:against)
             self.attribute_to_check_message_against = options[:against]
           end
+
           self
         end
 
@@ -173,10 +176,18 @@ module Shoulda # :nodoc:
         def default_attribute_message
           default_error_message(
             options[:expected_message],
+            default_attribute_message_values
+          )
+        end
+
+        def default_attribute_message_values
+          defaults = {
             model_name: model_name,
             instance: instance,
-            attribute: attribute_to_set
-          )
+            attribute: attribute_to_set,
+          }
+
+          defaults.merge(options[:expected_message_values])
         end
 
         def model_name

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

@@ -7,8 +7,13 @@ module Shoulda # :nodoc:
         #                 is_greater_than(6).
         #                 less_than(20)...(and so on) }
         class ComparisonMatcher < ValidationMatcher
-          DIFF_TO_COMPARE_PRECISION_CHANGE_NUMBER = 2**34
-          attr_reader :diff_to_compare
+          ERROR_MESSAGES = {
+            :> => :greater_than,
+            :>= => :greater_than_or_equal_to,
+            :< => :less_than,
+            :<= => :less_than_or_equal_to,
+            :== => :equal_to
+          }
 
           def initialize(numericality_matcher, value, operator)
             unless numericality_matcher.respond_to? :diff_to_compare
@@ -17,8 +22,8 @@ module Shoulda # :nodoc:
             @numericality_matcher = numericality_matcher
             @value = value
             @operator = operator
-            @message = nil
-            @diff_to_compare = value.abs < DIFF_TO_COMPARE_PRECISION_CHANGE_NUMBER ? 0.000_001 : 1
+            @message = ERROR_MESSAGES[operator]
+            @comparison_combos = comparison_combos
           end
 
           def for(attribute)
@@ -71,8 +76,10 @@ module Shoulda # :nodoc:
           end
 
           def all_bounds_correct?
-            comparison_combos.all? do |diff, checker_type|
-              __send__(checker_type, @value + diff, @message)
+            @comparison_combos.all? do |diff, checker_type|
+              __send__(checker_type, @value + diff) do |matcher|
+                matcher.with_message(@message, values: { count: @value })
+              end
             end
           end
         end

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

@@ -26,7 +26,8 @@ module Shoulda # :nodoc:
       class ValidateNumericalityOfMatcher
         NUMERIC_NAME = 'numbers'
         NON_NUMERIC_VALUE = 'abcd'
-        DEFAULT_DIFF_TO_COMPARE = 0.000_000_000_001
+        DEFAULT_DIFF_TO_COMPARE = 1
+
         attr_reader :diff_to_compare
 
         def initialize(attribute)

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

@@ -173,7 +173,12 @@ module Shoulda # :nodoc:
               previous_value ||= correct_type_for_column(@subject.class.columns_hash[scope.to_s])
 
               next_value =
-                if previous_value.respond_to?(:next)
+                if @subject.class.respond_to?(:defined_enums) && @subject.defined_enums[scope.to_s]
+                  available_values = @subject.defined_enums[scope.to_s].reject do |key, _|
+                    key == previous_value
+                  end
+                  available_values.keys.last
+                elsif previous_value.respond_to?(:next)
                   previous_value.next
                 elsif previous_value.respond_to?(:to_datetime)
                   previous_value.to_datetime.next

data/lib/shoulda/matchers/version.rb

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

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

@@ -261,7 +261,7 @@ describe Shoulda::Matchers::ActionController::StrongParametersMatcher do
     end
 
     context 'when given :update' do
-      if rails_gte_41?
+      if rails_gte_4_1?
         it 'PATCHes to the controller' do
           controller = ActionController::Base.new
           context = mock()

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

@@ -68,6 +68,24 @@ describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
       expect(validating_format(with: /abc/, message: 'bad value')).
         not_to allow_value('xyz').for(:attr).with_message(/bad/)
     end
+
+    it 'allows interpolation values for the message to be provided' do
+      options = {
+        attribute_name: :attr,
+        attribute_type: :string
+      }
+
+      record = record_with_custom_validation(options) do
+        if self.attr == 'xyz'
+          self.errors.add :attr, :greater_than, count: 2
+        end
+      end
+
+      expect(record).
+        not_to allow_value('xyz').
+        for(:attr).
+        with_message(:greater_than, values: { count: 2 })
+    end
   end
 
   context 'an attribute where the message occurs on another attribute' do

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

@@ -5,12 +5,6 @@ describe Shoulda::Matchers::ActiveModel::NumericalityMatchers::ComparisonMatcher
 
   it_behaves_like 'a numerical submatcher'
 
-  describe '#diff_to_compare' do
-    it { expect(subject.diff_to_compare).to eq 0.000_001 }
-    it { expect(described_class.new(matcher, 2**34, :>).diff_to_compare).to eq 1 }
-    it { expect(described_class.new(matcher, -2**34, :>).diff_to_compare).to eq 1 }
-  end
-
   context 'when initialized without correct numerical matcher' do
     it 'raises an argument error' do
       fake_matcher = matcher

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

@@ -122,6 +122,40 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
         not_to matcher.scoped_to(:fake)
     end
 
+    if rails_gte_4_1?
+      context 'when the scoped attribute is an enum' do
+        it 'accepts' do
+          expect(validating_scoped_uniqueness_with_enum([:scope1], scope1: 0)).
+            to matcher.scoped_to(:scope1)
+        end
+
+        context 'with a nil value' do
+          it 'accepts' do
+            expect(validating_scoped_uniqueness_with_enum([:scope1], scope1: nil)).
+              to matcher.scoped_to(:scope1)
+          end
+        end
+
+        context 'when too narrow of a scope is specified' do
+          it 'rejects' do
+            expect(validating_scoped_uniqueness_with_enum_with_two_scopes).
+              not_to matcher.scoped_to(:scope1, :scope2, :other)
+          end
+        end
+
+        context 'when too broad of a scope is specified' do
+          it 'rejects' do
+            expect(validating_scoped_uniqueness_with_enum_with_two_scopes).
+              not_to matcher.scoped_to(:scope1)
+          end
+        end
+
+        def validating_scoped_uniqueness_with_enum_with_two_scopes
+          validating_scoped_uniqueness_with_enum([:scope1, :scope2], scope1: 0, scope2: 0)
+        end
+      end
+    end
+
     context 'when the scoped attribute is a date' do
       it "accepts" do
         expect(validating_scoped_uniqueness([:scope1], :date, scope1: Date.today)).
@@ -250,6 +284,14 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
       model
     end
 
+    def validating_scoped_uniqueness_with_enum(*args)
+      attributes = args.extract_options!
+      model = define_scoped_model(*args)
+      model.enum scope1: [:foo, :bar]
+      create_existing_record(attributes)
+      model.new
+    end
+
     def validating_scoped_uniqueness_with_conflicting_next(*args)
       attributes = args.extract_options!
       model = define_scoped_model(*args).new

data/spec/support/activemodel_helpers.rb

@@ -1,11 +1,15 @@
 module ActiveModelHelpers
-  def custom_validation(&block)
-    define_model(:example, attr: :integer) do
+  def custom_validation(options = {}, &block)
+    attribute_name = options.fetch(:attribute_name, :attr)
+    attribute_type = options.fetch(:attribute_type, :integer)
+
+    define_model(:example, attribute_name => attribute_type) do
       validate :custom_validation
 
       define_method(:custom_validation, &block)
     end.new
   end
+  alias record_with_custom_validation custom_validation
 
   def validating_format(options)
     define_model :example, attr: :string do

data/spec/support/rails_versions.rb

@@ -11,7 +11,7 @@ module RailsVersions
     Gem::Requirement.new('~> 4.0').satisfied_by?(rails_version)
   end
 
-  def rails_gte_41?
+  def rails_gte_4_1?
     Gem::Requirement.new('>= 4.1').satisfied_by?(rails_version)
   end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 2.6.1.rc1
-  prerelease: 6
+  version: 2.6.1.rc2
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,28 +13,25 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -43,7 +39,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -51,39 +46,34 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bourne
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -91,7 +81,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -99,7 +88,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -107,7 +95,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -115,7 +102,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -123,7 +109,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -131,7 +116,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -139,7 +123,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -147,25 +130,22 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.2
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.1
     - - <
@@ -174,9 +154,8 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.13.1
     - - <
@@ -359,27 +338,26 @@ files:
 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: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Making tests easy on the fingers and eyes
 test_files:
 - features/activemodel_integration.feature