shoulda-matchers 2.8.0.rc1 → 2.8.0.rc2

data/gemfiles/4.0.1.gemfile

@@ -6,7 +6,7 @@ gem "appraisal", "~> 1.0"
 gem "aruba"
 gem "bourne", "~> 1.3"
 gem "bundler", "~> 1.1"
-gem "pry"
+gem "pry-nav"
 gem "rails", "4.0.1"
 gem "rake", ">= 0.9.2"
 gem "rspec-rails", "2.99.0"

data/gemfiles/4.0.1.gemfile.lock

@@ -98,10 +98,12 @@ GEM
       hashie (>= 1.1.0)
     protected_attributes (1.0.5)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
     pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
@@ -151,7 +153,7 @@ GEM
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
     shoulda-context (1.2.0)
-    slop (3.4.7)
+    slop (3.6.0)
     spring (1.1.3)
     spring-commands-rspec (1.0.2)
       spring (>= 0.9.1)
@@ -200,7 +202,7 @@ DEPENDENCIES
   jruby-openssl
   minitest-reporters
   protected_attributes
-  pry
+  pry-nav
   pygments.rb
   rails (= 4.0.1)
   rake (>= 0.9.2)

data/gemfiles/4.1.gemfile

@@ -6,7 +6,7 @@ gem "appraisal", "~> 1.0"
 gem "aruba"
 gem "bourne", "~> 1.3"
 gem "bundler", "~> 1.1"
-gem "pry"
+gem "pry-nav"
 gem "rails", "~> 4.1.0"
 gem "rake", ">= 0.9.2"
 gem "rspec-rails", "~> 3.0.1"

data/gemfiles/4.1.gemfile.lock

@@ -94,10 +94,12 @@ GEM
     posix-spawn (0.3.8)
     protected_attributes (1.0.7)
       activemodel (>= 4.0.1, < 5.0)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
     pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
@@ -152,7 +154,7 @@ GEM
       json (~> 1.8)
       rdoc (~> 4.0, < 5.0)
     shoulda-context (1.2.0)
-    slop (3.4.7)
+    slop (3.6.0)
     spring (1.1.2)
     spring-commands-rspec (1.0.2)
       spring (>= 0.9.1)
@@ -199,7 +201,7 @@ DEPENDENCIES
   jruby-openssl
   minitest-reporters
   protected_attributes (~> 1.0.6)
-  pry
+  pry-nav
   pygments.rb
   rails (~> 4.1.0)
   rake (>= 0.9.2)

data/gemfiles/4.2.gemfile

@@ -6,7 +6,7 @@ gem "appraisal", "~> 1.0"
 gem "aruba"
 gem "bourne", "~> 1.3"
 gem "bundler", "~> 1.1"
-gem "pry"
+gem "pry-nav"
 gem "rails", "~> 4.2.0"
 gem "rake", ">= 0.9.2"
 gem "rspec-rails", "~> 3.0.1"
@@ -24,13 +24,15 @@ gem "therubyrhino", :platform => :jruby
 gem "spring"
 gem "spring-commands-rspec"
 gem "uglifier", ">= 1.3.0"
-gem "coffee-rails", "~> 4.0.0"
+gem "coffee-rails", "~> 4.1.0"
 gem "jquery-rails"
 gem "turbolinks"
 gem "sdoc", "~> 0.4.0"
 gem "activeresource", "4.0.0"
 gem "protected_attributes", "~> 1.0.6"
 gem "minitest-reporters"
-gem "jbuilder", "~> 2.0"
 gem "sass-rails", "~> 5.0"
+gem "jbuilder", "~> 2.0"
 gem "bcrypt", "~> 3.1.7"
+gem "byebug"
+gem "web-console", "~> 2.0"

data/gemfiles/4.2.gemfile.lock

@@ -51,25 +51,34 @@ GEM
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     bcrypt (3.1.9)
+    binding_of_caller (0.7.2)
+      debug_inspector (>= 0.0.1)
     bourne (1.6.0)
       mocha (~> 1.1)
     builder (3.2.2)
+    byebug (3.5.1)
+      columnize (~> 0.8)
+      debugger-linecache (~> 1.2)
+      slop (~> 3.6)
     childprocess (0.5.5)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    coffee-rails (4.0.1)
+    coffee-rails (4.1.0)
       coffee-script (>= 2.2.0)
       railties (>= 4.0.0, < 5.0)
     coffee-script (2.3.0)
       coffee-script-source
       execjs
     coffee-script-source (1.8.0)
+    columnize (0.9.0)
     cucumber (1.3.17)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.1)
+    debug_inspector (0.0.2)
+    debugger-linecache (1.2.0)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     execjs (2.2.2)
@@ -87,7 +96,7 @@ GEM
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
@@ -95,8 +104,8 @@ GEM
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
     minitest-reporters (1.0.8)
       ansi
       builder
@@ -106,7 +115,7 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     multi_test (0.1.1)
-    nokogiri (1.6.5)
+    nokogiri (1.6.6.1)
       mini_portile (~> 0.6.0)
     posix-spawn (0.3.9)
     protected_attributes (1.0.8)
@@ -115,11 +124,13 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
     pygments.rb (0.6.0)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
     rack (1.6.0)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
       actionmailer (= 4.2.0)
@@ -204,6 +215,11 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     watchr (0.7)
+    web-console (2.0.0)
+      activemodel (~> 4.0)
+      binding_of_caller (>= 0.7.2)
+      railties (~> 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
     yajl-ruby (1.1.0)
     yard (0.8.7.6)
 
@@ -219,14 +235,15 @@ DEPENDENCIES
   bcrypt (~> 3.1.7)
   bourne (~> 1.3)
   bundler (~> 1.1)
-  coffee-rails (~> 4.0.0)
+  byebug
+  coffee-rails (~> 4.1.0)
   jbuilder (~> 2.0)
   jdbc-sqlite3
   jquery-rails
   jruby-openssl
   minitest-reporters
   protected_attributes (~> 1.0.6)
-  pry
+  pry-nav
   pygments.rb
   rails (~> 4.2.0)
   rake (>= 0.9.2)
@@ -242,4 +259,5 @@ DEPENDENCIES
   turbolinks
   uglifier (>= 1.3.0)
   watchr
+  web-console (~> 2.0)
   yard

data/lib/shoulda/matchers/action_controller/set_flash_matcher.rb

@@ -149,6 +149,8 @@ module Shoulda
         SetFlashMatcher.new
       end
 
+      # @deprecated Use {#set_flash} instead.
+      # @return [SetFlashMatcher]
       def set_the_flash
         Shoulda::Matchers.warn_about_deprecated_method(
           :set_the_flash,

data/lib/shoulda/matchers/active_model.rb

@@ -1,7 +1,8 @@
 require 'shoulda/matchers/active_model/helpers'
 require 'shoulda/matchers/active_model/validation_matcher'
-require 'shoulda/matchers/active_model/validation_message_finder'
-require 'shoulda/matchers/active_model/exception_message_finder'
+require 'shoulda/matchers/active_model/validator'
+require 'shoulda/matchers/active_model/strict_validator'
+require 'shoulda/matchers/active_model/validator_with_captured_range_error'
 require 'shoulda/matchers/active_model/allow_value_matcher'
 require 'shoulda/matchers/active_model/disallow_value_matcher'
 require 'shoulda/matchers/active_model/validate_length_of_matcher'

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

@@ -177,9 +177,9 @@ module Shoulda
 
         def initialize(*values)
           self.values_to_match = values
-          self.message_finder_factory = ValidationMessageFinder
           self.options = {}
           self.after_setting_value_callback = -> {}
+          self.validator = Validator.new
         end
 
         def for(attribute)
@@ -189,7 +189,7 @@ module Shoulda
         end
 
         def on(context)
-          @context = context
+          validator.context = context
           self
         end
 
@@ -205,7 +205,7 @@ module Shoulda
         end
 
         def strict
-          self.message_finder_factory = ExceptionMessageFinder
+          validator.strict = true
           self
         end
 
@@ -215,16 +215,18 @@ module Shoulda
 
         def matches?(instance)
           self.instance = instance
+          validator.record = instance
 
           values_to_match.none? do |value|
+            validator.reset
             self.value = value
-            set_value(value)
-            errors_match?
+            set_attribute(value)
+            errors_match? || any_range_error_occurred?
           end
         end
 
         def failure_message
-          "Did not expect #{expectation},\ngot error: #{matched_error}"
+          "Did not expect #{expectation},\ngot#{error_description}"
         end
         alias failure_message_for_should failure_message
 
@@ -234,26 +236,45 @@ module Shoulda
         alias failure_message_for_should_not failure_message_when_negated
 
         def description
-          message_finder.allow_description(allowed_values)
+          validator.allow_description(allowed_values)
         end
 
         protected
 
-        attr_accessor :values_to_match, :message_finder_factory,
-          :instance, :attribute_to_set, :attribute_to_check_message_against,
-          :context, :value, :matched_error, :after_setting_value_callback
+        attr_reader :attribute_to_check_message_against
+        attr_accessor :values_to_match, :instance, :attribute_to_set, :value,
+          :matched_error, :after_setting_value_callback, :validator
 
-        def set_value(value)
-          instance.__send__("#{attribute_to_set}=", value)
+        def attribute_to_check_message_against=(attribute)
+          @attribute_to_check_message_against = attribute
+          validator.attribute = attribute
+        end
+
+        def set_attribute(value)
+          set_attribute_ignoring_range_errors(value)
           after_setting_value_callback.call
         end
 
+        def set_attribute_ignoring_range_errors(value)
+          instance.__send__("#{attribute_to_set}=", value)
+        rescue RangeError => exception
+          # Have to reset the attribute so that we don't get a RangeError the
+          # next time we attempt to write the attribute (ActiveRecord seems to
+          # set the attribute to the "bad" value anyway)
+          reset_attribute
+          validator.capture_range_error(exception)
+        end
+
+        def reset_attribute
+          instance.send(:raw_write_attribute, attribute_to_set, nil)
+        end
+
         def errors_match?
           has_messages? && errors_for_attribute_match?
         end
 
         def has_messages?
-          message_finder.has_messages?
+          validator.has_messages?
         end
 
         def errors_for_attribute_match?
@@ -265,7 +286,7 @@ module Shoulda
         end
 
         def errors_for_attribute
-          message_finder.messages
+          validator.formatted_messages
         end
 
         def errors_match_regexp?
@@ -280,30 +301,25 @@ module Shoulda
           end
         end
 
+        def any_range_error_occurred?
+          validator.captured_range_error?
+        end
+
         def expectation
           parts = [
-            error_source,
-            includes_expected_message,
+            expected_messages_description,
             "when #{attribute_to_set} is set to #{value.inspect}"
           ]
 
           parts.join(' ').squeeze(' ')
         end
 
-        def includes_expected_message
-          if expected_message
-            "to include #{expected_message.inspect}"
-          else
-            ''
-          end
-        end
-
-        def error_source
-          message_finder.source_description
+        def expected_messages_description
+          validator.expected_messages_description(expected_message)
         end
 
         def error_description
-          message_finder.messages_description
+          validator.messages_description
         end
 
         def allowed_values
@@ -325,7 +341,7 @@ module Shoulda
         end
 
         def default_expected_message
-          message_finder.expected_message_from(default_attribute_message)
+          validator.expected_message_from(default_attribute_message)
         end
 
         def default_attribute_message
@@ -348,10 +364,6 @@ module Shoulda
         def model_name
           instance.class.to_s.underscore
         end
-
-        def message_finder
-          message_finder_factory.new(instance, attribute_to_check_message_against, context)
-        end
       end
     end
   end

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

@@ -24,32 +24,18 @@ module Shoulda
           end.join("\n")
         end
 
-        # Helper method that determines the default error message used by Active
-        # Record.  Works for both existing Rails 2.1 and Rails 2.2 with the newly
-        # introduced I18n module used for localization. Use with Rails 3.0 and
-        # up will delegate to ActiveModel::Errors.generate_error if a model
-        # instance is given.
-        #
-        #   default_error_message(:blank)
-        #   default_error_message(:too_short, count: 5)
-        #   default_error_message(:too_long, count: 60)
-        #   default_error_message(:blank, model_name: 'user', attribute: 'name')
-        #   default_error_message(:blank, instance: #<Model>, attribute: 'name')
-        def default_error_message(key, options = {})
+        def default_error_message(type, options = {})
           model_name = options.delete(:model_name)
           attribute = options.delete(:attribute)
           instance = options.delete(:instance)
 
-          if instance && instance.errors.respond_to?(:generate_message)
-            instance.errors.generate_message(attribute.to_sym, key, options)
-          else
-            default_translation = [ :"activerecord.errors.models.#{model_name}.#{key}",
-                                    :"activerecord.errors.messages.#{key}",
-                                    :"errors.attributes.#{attribute}.#{key}",
-                                    :"errors.messages.#{key}" ]
-            I18n.translate(:"activerecord.errors.models.#{model_name}.attributes.#{attribute}.#{key}",
-              { default: default_translation }.merge(options))
-          end
+          RailsShim.generate_validation_message(
+            instance,
+            attribute.to_sym,
+            type,
+            model_name,
+            options
+          )
         end
       end
     end