shoulda-matchers 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 958afbf8d323fd9b923340fdffc6156b7a3249cc
-  data.tar.gz: d20c30587592682f62e4b061619d32254625de23
+  metadata.gz: f5c8e2ffc80ab293ff70c3b4635ba8bcbcb1f9ac
+  data.tar.gz: f9c362c8e26ec64f5275eb7e0f61dbe9e472de8d
 SHA512:
-  metadata.gz: b2141dd710f58fa62201e4fa3de70c324bbb9e6d225f41d88ecef413c401a10f1426f59025849e466c58d7c58bf6f94b0330b6e82c7577e3797f6bd0f91d97a2
-  data.tar.gz: d22c37a1994c433c9213b1a3090f6cd06201a49d19fbc7cdbeca7bc826fec4b0853a7a216e8977df578b1627011eb23786fe276dc12e2a906116822dd88f0f1b
+  metadata.gz: 32dd5209bade6bc80dd860bd7de9f4ba7b772c37633ff555110663abf2dd250d7807b6e5d19dd6160ba834a3dff41d9f90e2100d25e65143feab0a29117527b8
+  data.tar.gz: 38aa6e350fce49d688d6874e0afc50489310821ef27bb8f54a5c2787f43967d6f1359f0989f8fbb5201819eaa8b1a794f832218749bcc8d0c7ea77d0d19cf534

data/Gemfile

@@ -4,7 +4,7 @@ gem 'appraisal', '~> 2.0'
 gem 'bundler', '~> 1.1'
 gem 'pry', github: 'pry/pry'
 gem 'pry-byebug'
-gem 'rake', '~> 10.0'
+gem 'rake', '>= 10.5.0', '< 11'
 gem 'rspec', '~> 3.2'
 gem 'zeus'
 

data/Gemfile.lock

@@ -28,7 +28,7 @@ GEM
     pygments.rb (0.3.7)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rake (10.4.2)
+    rake (10.5.0)
     redcarpet (3.0.0)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -60,11 +60,11 @@ DEPENDENCIES
   pry!
   pry-byebug
   pygments.rb
-  rake (~> 10.0)
+  rake (>= 10.5.0, < 11)
   redcarpet
   rspec (~> 3.2)
   yard
   zeus
 
 BUNDLED WITH
-   1.11.1
+   1.11.2

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2006-2014, Tammer Saleh, thoughtbot, inc.
+Copyright (c) 2006-2016, Tammer Saleh, thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/NEWS.md

@@ -1,3 +1,55 @@
+# 3.1.1
+
+### Bug fixes
+
+* Some matchers make use of ActiveSupport's `in?` method, but do not include the
+  file where this is defined in ActiveSupport. This causes problems with
+  projects using shoulda-matchers that do not include all of ActiveSupport by
+  default. To fix this, replace `in?` with Ruby's builtin `include?`.
+
+  * *Pull request: [#879]*
+
+* `validate_uniqueness_of` works by creating a record if it doesn't exist, and
+  then testing against a new record with various attributes set that are equal
+  to (or different than) corresponding attributes in the existing record. In
+  3.1.0 a change was made whereby when the uniqueness matcher is given a new
+  record and creates an existing record out of it, it ensures that the record is
+  valid before continuing on. This created a problem because if the subject,
+  before it was saved, was empty and therefore in an invalid state, it could not
+  effectively be saved. While ideally this should be enforced, doing so would be
+  a backward-incompatible change, so this behavior has been rolled back.
+  ([#880], [#884], [#885])
+
+  * *Commit: [45de869]*
+  * *Issues: [#880], [#884], [#885]*
+
+* Fix an issue with `validate_uniqueness_of` + `scoped_to` when used against a
+  model where the attribute has multiple uniqueness validations and each
+  validation has a different set of scopes. In this case, a test written for the
+  first validation (and its scopes) would pass, but tests for the other
+  validations (and their scopes) would not, as the matcher only considered the
+  first set of scopes as the *actual* set of scopes.
+
+  * *Commit: [28bd9a1]*
+  * *Issues: [#830]*
+
+### Improvements
+
+* Update `validate_uniqueness_of` so that if an existing record fails to be
+  created because a column is non-nullable and was not filled in, raise an
+  ExistingRecordInvalid exception with details on how to fix the test.
+
+  * *Commit: [78ccfc5]*
+
+[#879]: https://github.com/thoughtbot/shoulda-matchers/issues/879
+[45de869]: https://github.com/thoughtbot/shoulda-matchers/commit/45de8698487d57f559c5bf35818d1c1ee82b0e77
+[#880]: https://github.com/thoughtbot/shoulda-matchers/issues/880
+[#884]: https://github.com/thoughtbot/shoulda-matchers/issues/884
+[#885]: https://github.com/thoughtbot/shoulda-matchers/issues/885
+[78ccfc5]: https://github.com/thoughtbot/shoulda-matchers/commit/78ccfc50b52fa686c109d614df66744b0da65380
+[28bd9a1]: https://github.com/thoughtbot/shoulda-matchers/commit/28bd9a10c71af4d541b692d6204163c394ebd33c
+[#830]: https://github.com/thoughtbot/shoulda-matchers/issues/830
+
 # 3.1.0
 
 ### Bug fixes

data/README.md

@@ -109,7 +109,32 @@ group :test do
 end
 ```
 
-[Then, configure the gem to integrate with RSpec](#configuration).
+Now you need to tell the gem a couple of things:
+
+* Which test framework you're using
+* Which portion of the matchers you want to use
+
+You can supply this information by using a configuration block. Place the
+following in `rails_helper.rb`:
+
+``` ruby
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    # Choose a test framework:
+    with.test_framework :rspec
+    with.test_framework :minitest
+    with.test_framework :minitest_4
+    with.test_framework :test_unit
+
+    # Choose one or more libraries:
+    with.library :active_record
+    with.library :active_model
+    with.library :action_controller
+    # Or, choose the following (which implies all of the above):
+    with.library :rails
+  end
+end
+```
 
 Now you can use matchers in your tests. For instance a model test might look
 like this:
@@ -149,7 +174,7 @@ end
 Then you can say:
 
 ``` ruby
-describe MyModel, type: :model do
+describe MySpecialModel, type: :model do
   # ...
 end
 ```
@@ -184,8 +209,6 @@ group :test do
 end
 ```
 
-[Then, configure the gem to integrate with Minitest](#configuration).
-
 Now you can use matchers in your tests. For instance a model test might look
 like this:
 
@@ -195,36 +218,6 @@ class PersonTest < ActiveSupport::TestCase
 end
 ```
 
-### Configuration
-
-Before you can use Shoulda Matchers, you'll need to tell it a couple of things:
-
-* Which test framework you're using
-* Which portion of the matchers you want to use
-
-You can supply this information by using a configuration block. Place the
-following in `rails_helper.rb` (if you're using RSpec) or `test_helper.rb` (if
-you're using Minitest):
-
-``` ruby
-Shoulda::Matchers.configure do |config|
-  config.integrate do |with|
-    # Choose a test framework:
-    with.test_framework :rspec
-    with.test_framework :minitest
-    with.test_framework :minitest_4
-    with.test_framework :test_unit
-
-    # Choose one or more libraries:
-    with.library :active_record
-    with.library :active_model
-    with.library :action_controller
-    # Or, choose the following (which implies all of the above):
-    with.library :rails
-  end
-end
-```
-
 ## Running tests
 
 ### Unit tests

data/custom_plan.rb

@@ -1,12 +1,27 @@
-require 'zeus/rails'
+require 'zeus'
+require 'zeus/plan'
 require_relative 'spec/support/tests/current_bundle'
 
-class CustomPlan < Zeus::Plan
-  def initialize
-    super
-    @rails_plan = Zeus::Rails.new
+class CouldNotBootZeusError < StandardError
+  def self.create(underlying_error:)
+    new(<<-MESSAGE)
+Couldn't boot Zeus.
+
+Bundler tried to load a gem that has already been loaded (but the
+versions are different).
+
+Note that Appraisal requires Rake, and so you'll want to make sure that
+the Gemfile is pointing to the same version of Rake that you have
+installed locally.
+
+The original message is as follows:
+
+#{underlying_error.message}
+    MESSAGE
   end
+end
 
+class CustomPlan < Zeus::Plan
   def boot
     ENV['BUNDLE_GEMFILE'] = File.expand_path(
       "../gemfiles/#{latest_appraisal}.gemfile",
@@ -19,10 +34,11 @@ class CustomPlan < Zeus::Plan
     $LOAD_PATH << File.expand_path('../spec', __FILE__)
 
     require_relative 'spec/support/unit/load_environment'
+  rescue Gem::LoadError => error
+    raise CouldNotBootZeusError.create(underlying_error: error)
   end
 
   def after_fork
-    # @rails_plan.reconnect_activerecord
   end
 
   def test_environment

data/gemfiles/4.0.0.gemfile

@@ -6,7 +6,7 @@ gem "appraisal", "~> 2.0"
 gem "bundler", "~> 1.1"
 gem "pry", :github => "pry/pry"
 gem "pry-byebug"
-gem "rake", "~> 10.0"
+gem "rake", ">= 10.5.0", "< 11"
 gem "rspec", "~> 3.2"
 gem "zeus"
 gem "yard"

data/gemfiles/4.0.0.gemfile.lock

@@ -115,7 +115,7 @@ GEM
       activesupport (= 4.0.0)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     rdoc (4.2.0)
     redcarpet (3.3.2)
     rspec (3.4.0)
@@ -203,7 +203,7 @@ DEPENDENCIES
   pry-byebug
   pygments.rb
   rails (= 4.0.0)
-  rake (~> 10.0)
+  rake (>= 10.5.0, < 11)
   redcarpet
   rspec (~> 3.2)
   rspec-rails (>= 3.2.0, < 4)
@@ -220,4 +220,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.11.1
+   1.11.2

data/gemfiles/4.0.1.gemfile

@@ -6,7 +6,7 @@ gem "appraisal", "~> 2.0"
 gem "bundler", "~> 1.1"
 gem "pry", :github => "pry/pry"
 gem "pry-byebug"
-gem "rake", "~> 10.0"
+gem "rake", ">= 10.5.0", "< 11"
 gem "rspec", "~> 3.2"
 gem "zeus"
 gem "yard"

data/gemfiles/4.0.1.gemfile.lock

@@ -117,7 +117,7 @@ GEM
       activesupport (= 4.0.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     rdoc (4.2.0)
     redcarpet (3.3.2)
     rspec (3.4.0)
@@ -205,7 +205,7 @@ DEPENDENCIES
   pry-byebug
   pygments.rb
   rails (= 4.0.1)
-  rake (~> 10.0)
+  rake (>= 10.5.0, < 11)
   redcarpet
   rspec (~> 3.2)
   rspec-rails (>= 3.2.0, < 4)
@@ -222,4 +222,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.11.1
+   1.11.2

data/gemfiles/4.1.gemfile

@@ -6,7 +6,7 @@ gem "appraisal", "~> 2.0"
 gem "bundler", "~> 1.1"
 gem "pry", :github => "pry/pry"
 gem "pry-byebug"
-gem "rake", "~> 10.0"
+gem "rake", ">= 10.5.0", "< 11"
 gem "rspec", "~> 3.2"
 gem "zeus"
 gem "yard"

data/gemfiles/4.1.gemfile.lock

@@ -113,7 +113,7 @@ GEM
       activesupport (= 4.1.13)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     rdoc (4.2.0)
     redcarpet (3.3.2)
     rspec (3.4.0)
@@ -200,7 +200,7 @@ DEPENDENCIES
   pry-byebug
   pygments.rb
   rails (~> 4.1.0)
-  rake (~> 10.0)
+  rake (>= 10.5.0, < 11)
   redcarpet
   rspec (~> 3.2)
   rspec-rails (>= 3.2.0, < 4)
@@ -217,4 +217,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.11.1
+   1.11.2

data/gemfiles/4.2.gemfile

@@ -6,7 +6,7 @@ gem "appraisal", "~> 2.0"
 gem "bundler", "~> 1.1"
 gem "pry", :github => "pry/pry"
 gem "pry-byebug"
-gem "rake", "~> 10.0"
+gem "rake", ">= 10.5.0", "< 11"
 gem "rspec", "~> 3.2"
 gem "zeus"
 gem "yard"

data/gemfiles/4.2.gemfile.lock

@@ -138,7 +138,7 @@ GEM
       activesupport (= 4.2.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
+    rake (10.5.0)
     rdoc (4.2.0)
     redcarpet (3.3.2)
     rspec (3.4.0)
@@ -223,7 +223,7 @@ DEPENDENCIES
   pry-byebug
   pygments.rb
   rails (~> 4.2.0)
-  rake (~> 10.0)
+  rake (>= 10.5.0, < 11)
   redcarpet
   rspec (~> 3.2)
   rspec-rails (>= 3.2.0, < 4)
@@ -240,4 +240,4 @@ DEPENDENCIES
   zeus
 
 BUNDLED WITH
-   1.11.1
+   1.11.2

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

@@ -42,7 +42,7 @@ module Shoulda
         end
 
         def symbolize_or_stringify(key, value)
-          if key.in?(PARAMS_TO_SYMBOLIZE)
+          if PARAMS_TO_SYMBOLIZE.include?(key)
             value.to_sym
           else
             stringify(value)

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

@@ -603,7 +603,7 @@ pass, or do something else entirely.
         def inspected_values_to_set
           Shoulda::Matchers::Util.inspect_values(values_to_set).to_sentence(
             two_words_connector: " or ",
-            last_word_connector: ", or"
+            last_word_connector: ", or "
           )
         end
 

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

@@ -1,4 +1,5 @@
 require 'bigdecimal'
+require 'date'
 
 module Shoulda
   module Matchers

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

@@ -53,23 +53,34 @@ module Shoulda
       #       it { should validate_uniqueness_of(:title) }
       #     end
       #
-      # However, running this test will fail with something like:
+      # However, running this test will fail with an exception such as:
       #
-      #     Failures:
+      #     Shoulda::Matchers::ActiveRecord::ValidateUniquenessOfMatcher::ExistingRecordInvalid:
+      #       validate_uniqueness_of works by matching a new record against an
+      #       existing record. If there is no existing record, it will create one
+      #       using the record you provide.
       #
-      #       1) Post should validate :title to be case-sensitively unique
-      #          Failure/Error: it { should validate_uniqueness_of(:title) }
-      #          ActiveRecord::StatementInvalid:
-      #            SQLite3::ConstraintException: posts.content may not be NULL: INSERT INTO "posts" ("title") VALUES (?)
+      #       While doing this, the following error was raised:
+      #
+      #         PG::NotNullViolation: ERROR:  null value in column "content" violates not-null constraint
+      #         DETAIL:  Failing row contains (1, null, null).
+      #         : INSERT INTO "posts" DEFAULT VALUES RETURNING "id"
+      #
+      #       The best way to fix this is to provide the matcher with a record where
+      #       any required attributes are filled in with valid values beforehand.
+      #
+      # (The exact error message will differ depending on which database you're
+      # using, but you get the idea.)
       #
       # This happens because `validate_uniqueness_of` tries to create a new post
       # but cannot do so because of the `content` attribute: though unrelated to
-      # this test, it nevertheless needs to be filled in. The solution is to
-      # build a custom Post object ahead of time with `content` filled in:
+      # this test, it nevertheless needs to be filled in. As indicated at the
+      # end of the error message, the solution is to build a custom Post object
+      # ahead of time with `content` filled in:
       #
       #     describe Post do
       #       describe "validations" do
-      #         subject { Post.new(content: 'Here is the content') }
+      #         subject { Post.new(content: "Here is the content") }
       #         it { should validate_uniqueness_of(:title) }
       #       end
       #     end
@@ -259,8 +270,8 @@ module Shoulda
           @failure_reason = nil
           @failure_reason_when_negated = nil
           @attribute_setters = {
-            existing_record: [],
-            new_record: []
+            existing_record: AttributeSetters.new,
+            new_record: AttributeSetters.new
           }
         end
 
@@ -313,10 +324,9 @@ module Shoulda
           @given_record = given_record
           @all_records = model.all
 
-          existing_record_valid? &&
-            validate_attribute_present? &&
-            validate_scopes_present? &&
-            scopes_match? &&
+          validate_attribute_present_on_model? &&
+            validate_scopes_present_on_model? &&
+            validate_scopes_match? &&
             validate_two_records_with_same_non_blank_value_cannot_coexist? &&
             validate_case_sensitivity? &&
             validate_after_scope_change? &&
@@ -370,14 +380,14 @@ module Shoulda
           end
         end
 
-        def validation
-          model._validators[@attribute].detect do |validator|
+        def validations
+          model._validators[@attribute].select do |validator|
             validator.is_a?(::ActiveRecord::Validations::UniquenessValidator)
           end
         end
 
-        def scopes_match?
-          if expected_scopes == actual_scopes
+        def validate_scopes_match?
+          if scopes_match?
             true
           else
             @failure_reason = 'Expected the validation'
@@ -388,7 +398,7 @@ module Shoulda
               @failure_reason << " to be scoped to #{inspected_expected_scopes}"
             end
 
-            if actual_scopes.empty?
+            if actual_sets_of_scopes.empty?
               @failure_reason << ', but it was not scoped to anything.'
             else
               @failure_reason << ', but it was scoped to '
@@ -399,24 +409,42 @@ module Shoulda
           end
         end
 
-        def expected_scopes
-          Array.wrap(@options[:scopes])
+        def scopes_match?
+          actual_sets_of_scopes.empty? && expected_scopes.empty? ||
+            actual_sets_of_scopes.any? { |scopes| scopes == expected_scopes }
         end
 
         def inspected_expected_scopes
           expected_scopes.map(&:inspect).to_sentence
         end
 
-        def actual_scopes
-          if validation
-            Array.wrap(validation.options[:scope])
+        def inspected_actual_scopes
+          inspected_actual_sets_of_scopes.to_sentence(
+            words_connector: " or ",
+            last_word_connector: ", or"
+          )
+        end
+
+        def inspected_actual_sets_of_scopes
+          inspected_sets_of_scopes = actual_sets_of_scopes.map do |scopes|
+            scopes.map(&:inspect)
+          end
+
+          if inspected_sets_of_scopes.many?
+            inspected_sets_of_scopes.map { |x| "(#{x.to_sentence})" }
           else
-            []
+            inspected_sets_of_scopes.map(&:to_sentence)
           end
         end
 
-        def inspected_actual_scopes
-          actual_scopes.map(&:inspect).to_sentence
+        def expected_scopes
+          Array.wrap(@options[:scopes])
+        end
+
+        def actual_sets_of_scopes
+          validations.map do |validation|
+            Array.wrap(validation.options[:scope])
+          end.reject(&:empty?)
         end
 
         def allows_nil?
@@ -437,18 +465,6 @@ module Shoulda
           end
         end
 
-        def existing_record_valid?
-          if existing_record.valid?
-            true
-          else
-            @failure_reason =
-              "The record you provided could not be created, " +
-              "as it failed with the following validation errors:\n\n" +
-              format_validation_errors(existing_record.errors)
-            false
-          end
-        end
-
         def existing_record
           unless defined?(@existing_record)
             find_or_create_existing_record
@@ -479,20 +495,10 @@ module Shoulda
         def create_existing_record
           @given_record.tap do |existing_record|
             ensure_secure_password_set(existing_record)
-            existing_record.save
-          end
-        end
-
-        def update_existing_record!(value)
-          if existing_value_read != value
-            set_attribute_on!(
-              :existing_record,
-              existing_record,
-              @attribute,
-              value
-            )
-            existing_record.save!
+            existing_record.save(validate: false)
           end
+        rescue ::ActiveRecord::StatementInvalid => error
+          raise ExistingRecordInvalid.create(underlying_exception: error)
         end
 
         def ensure_secure_password_set(instance)
@@ -502,6 +508,15 @@ module Shoulda
           end
         end
 
+        def update_existing_record!(value)
+          if existing_value_read != value
+            set_attribute_on_existing_record!(@attribute, value)
+            # It would be nice if we could ensure that the record was valid,
+            # but that would break users' existing tests
+            existing_record.save(validate: false)
+          end
+        end
+
         def arbitrary_non_blank_value
           limit = column_limit_for(@attribute)
           non_blank_value = 'an arbitrary value'
@@ -532,8 +547,8 @@ module Shoulda
           @new_record
         end
 
-        def validate_attribute_present?
-          if model.method_defined?("#{attribute}=")
+        def validate_attribute_present_on_model?
+          if attribute_present_on_model?
             true
           else
             @failure_reason =
@@ -542,7 +557,12 @@ module Shoulda
           end
         end
 
-        def validate_scopes_present?
+        def attribute_present_on_model?
+          model.method_defined?("#{attribute}=") ||
+            model.columns_hash.key?(attribute.to_s)
+        end
+
+        def validate_scopes_present_on_model?
           if all_scopes_present_on_model?
             true
           else
@@ -697,7 +717,7 @@ module Shoulda
         end
 
         def boolean_value?(value)
-          value.in?([true, false])
+          [true, false].include?(value)
         end
 
         def defined_as_enum?(scope)
@@ -748,6 +768,11 @@ module Shoulda
           @attribute_setters[:existing_record].last
         end
 
+        def attribute_setters_for_new_record
+          @attribute_setters[:new_record] +
+            [last_attribute_setter_used_on_new_record]
+        end
+
         def attribute_names_under_test
           [@attribute] + expected_scopes
         end
@@ -793,7 +818,7 @@ module Shoulda
             prefix << "After taking the given #{model.name}"
 
             if attribute_setter_for_existing_record
-              prefix << ', setting its '
+              prefix << ', setting '
               prefix << description_for_attribute_setter(
                 attribute_setter_for_existing_record
               )
@@ -806,7 +831,7 @@ module Shoulda
           else
             if attribute_setter_for_existing_record
               prefix << "Given an existing #{model.name},"
-              prefix << ' after setting its '
+              prefix << ' after setting '
               prefix << description_for_attribute_setter(
                 attribute_setter_for_existing_record
               )
@@ -821,12 +846,9 @@ module Shoulda
             end
           end
 
-          prefix << " making a new #{model.name} and setting its "
+          prefix << " making a new #{model.name} and setting "
 
-          prefix << description_for_attribute_setter(
-            last_attribute_setter_used_on_new_record,
-            same_as_existing: existing_and_new_values_are_same?
-          )
+          prefix << descriptions_for_attribute_setters_for_new_record
 
           prefix << ", the matcher expected the new #{model.name} to be"
 
@@ -849,7 +871,7 @@ different altogether.
         end
 
         def description_for_attribute_setter(attribute_setter, same_as_existing: nil)
-          description = ":#{attribute_setter.attribute_name} to "
+          description = "its :#{attribute_setter.attribute_name} to "
 
           if same_as_existing == false
             description << 'a different value, '
@@ -874,6 +896,23 @@ different altogether.
           description
         end
 
+        def descriptions_for_attribute_setters_for_new_record
+          attribute_setter_descriptions_for_new_record.to_sentence
+        end
+
+        def attribute_setter_descriptions_for_new_record
+          attribute_setters_for_new_record.map do |attribute_setter|
+            same_as_existing = (
+              attribute_setter.value_written ==
+              existing_value_written
+            )
+            description_for_attribute_setter(
+              attribute_setter,
+              same_as_existing: same_as_existing
+            )
+          end
+        end
+
         def existing_and_new_values_are_same?
           last_value_set_on_new_record == existing_value_written
         end
@@ -886,6 +925,50 @@ different altogether.
           last_submatcher_run.last_value_set
         end
 
+        # @private
+        class AttributeSetters
+          include Enumerable
+
+          def initialize
+            @attribute_setters = []
+          end
+
+          def <<(given_attribute_setter)
+            index = find_index_of(given_attribute_setter)
+
+            if index
+              @attribute_setters[index] = given_attribute_setter
+            else
+              @attribute_setters << given_attribute_setter
+            end
+          end
+
+          def +(other_attribute_setters)
+            dup.tap do |attribute_setters|
+              other_attribute_setters.each do |attribute_setter|
+                attribute_setters << attribute_setter
+              end
+            end
+          end
+
+          def each(&block)
+            @attribute_setters.each(&block)
+          end
+
+          def last
+            @attribute_setters.last
+          end
+
+          private
+
+          def find_index_of(given_attribute_setter)
+            @attribute_setters.find_index do |attribute_setter|
+              attribute_setter.attribute_name ==
+                given_attribute_setter.attribute_name
+            end
+          end
+        end
+
         # @private
         class NonCaseSwappableValueError < Shoulda::Matchers::Error
           attr_accessor :model, :attribute, :value
@@ -895,7 +978,7 @@ different altogether.
 Your #{model.name} model has a uniqueness validation on :#{attribute} which is
 declared to be case-sensitive, but the value the uniqueness matcher used,
 #{value.inspect}, doesn't contain any alpha characters, so using it to
-to test the case-sensitivity part of the validation is ineffective. There are
+test the case-sensitivity part of the validation is ineffective. There are
 two possible solutions for this depending on what you're trying to do here:
 
 a) If you meant for the validation to be case-sensitive, then you need to give
@@ -912,6 +995,28 @@ http://matchers.shoulda.io/docs/v#{Shoulda::Matchers::VERSION}/file.NonCaseSwapp
             MESSAGE
           end
         end
+
+        # @private
+        class ExistingRecordInvalid < Shoulda::Matchers::Error
+          include Shoulda::Matchers::ActiveModel::Helpers
+
+          attr_accessor :underlying_exception
+
+          def message
+            <<-MESSAGE.strip
+validate_uniqueness_of works by matching a new record against an
+existing record. If there is no existing record, it will create one
+using the record you provide.
+
+While doing this, the following error was raised:
+
+#{Shoulda::Matchers::Util.indent(underlying_exception.message, 2)}
+
+The best way to fix this is to provide the matcher with a record where
+any required attributes are filled in with valid values beforehand.
+            MESSAGE
+          end
+        end
       end
     end
   end

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '3.1.0'.freeze
+    VERSION = '3.1.1'.freeze
   end
 end

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

@@ -10,7 +10,7 @@ end
 
 describe Shoulda::Matchers::ActiveModel::AllowValueMatcher, type: :model do
   context "#description" do
-    it 'describes itself with multiple values' do
+    it 'describes itself with two values' do
       matcher = allow_value('foo', 'bar').for(:baz)
 
       expect(matcher.description).to eq(
@@ -18,6 +18,14 @@ describe Shoulda::Matchers::ActiveModel::AllowValueMatcher, type: :model do
       )
     end
 
+    it 'describes itself with more than two values' do
+      matcher = allow_value('foo', 'bar', 'qux').for(:baz)
+
+      expect(matcher.description).to eq(
+        'allow :baz to be ‹"foo"›, ‹"bar"›, or ‹"qux"›'
+      )
+    end
+
     it 'describes itself with a single value' do
       matcher = allow_value('foo').for(:baz)
 

data/spec/unit/shoulda/matchers/active_record/validate_uniqueness_of_matcher_spec.rb

@@ -227,6 +227,94 @@ within the scope of :non_existent1 and :non_existent2.
       end
     end
 
+    context 'when there is more than one validation on the same attribute with different scopes' do
+      context 'when a record exists beforehand, where all scopes are set' do
+        if column_type != :boolean
+          context 'when each validation has the same (default) message' do
+            it 'accepts' do
+              pending 'this needs another qualifier to properly fix'
+
+              model = define_model(
+                'Example',
+                attribute_name => :string,
+                scope1: column_type,
+                scope2: column_type
+              ) do |m|
+                m.validates_uniqueness_of(attribute_name, scope: [:scope1])
+                m.validates_uniqueness_of(attribute_name, scope: [:scope2])
+              end
+
+              model.create!(
+                attribute_name => dummy_value_for(:string),
+                scope1: dummy_value_for(column_type),
+                scope2: dummy_value_for(column_type)
+              )
+
+              expect(model.new).to validate_uniqueness.scoped_to(:scope1)
+              expect(model.new).to validate_uniqueness.scoped_to(:scope2)
+            end
+          end
+        end
+
+        context 'when each validation has a different message' do
+          it 'accepts' do
+            model = define_model(
+              'Example',
+              attribute_name => :string,
+              scope1: column_type,
+              scope2: column_type
+            ) do |m|
+              m.validates_uniqueness_of(
+                attribute_name,
+                scope: [:scope1],
+                message: 'first message'
+              )
+              m.validates_uniqueness_of(
+                attribute_name,
+                scope: [:scope2],
+                message: 'second message'
+              )
+            end
+
+            model.create!(
+              attribute_name => dummy_value_for(:string),
+              scope1: dummy_value_for(column_type),
+              scope2: dummy_value_for(column_type)
+            )
+
+            expect(model.new).
+              to validate_uniqueness.
+              scoped_to(:scope1).
+              with_message('first message')
+
+            expect(model.new).
+              to validate_uniqueness.
+              scoped_to(:scope2).
+              with_message('second message')
+          end
+        end
+      end
+
+      context 'when no record exists beforehand' do
+        it 'accepts' do
+          pending 'this needs another qualifier to properly fix'
+
+          model = define_model(
+            'Example',
+            attribute_name => :string,
+            scope1: column_type,
+            scope2: column_type
+          ) do |m|
+            m.validates_uniqueness_of(attribute_name, scope: [:scope1])
+            m.validates_uniqueness_of(attribute_name, scope: [:scope2])
+          end
+
+          expect(model.new).to validate_uniqueness.scoped_to(:scope1)
+          expect(model.new).to validate_uniqueness.scoped_to(:scope2)
+        end
+      end
+    end
+
     define_method(:build_attribute) do |attribute_options|
       attribute_options.deep_merge(
         column_type: column_type,
@@ -268,7 +356,7 @@ Example did not properly validate that :attr is case-sensitively unique.
       end
     end
 
-    context 'when the record is created beforehand' do
+    context 'when the existing record was created beforehand' do
       context 'when the subject is a new record' do
         it 'accepts' do
           create_record_validating_uniqueness
@@ -277,63 +365,169 @@ Example did not properly validate that :attr is case-sensitively unique.
         end
       end
 
-      context 'when the subject is an existing record' do
+      context 'when the subject is itself the existing record' do
         it 'accepts' do
           expect(existing_record_validating_uniqueness).to validate_uniqueness
         end
       end
+    end
 
-      context 'when the validation has no scope and a scope is specified' do
-        it 'rejects with an appropriate failure message' do
-          model = define_model_validating_uniqueness(
-            additional_attributes: [:other]
-          )
-          create_record_from(model)
-          record = build_record_from(model)
+    context 'when the existing record was not created beforehand' do
+      context 'and the subject is empty' do
+        context 'and the attribute being tested is required' do
+          it 'can save the subject without the attribute being set' do
+            options = { attribute_name: :attr }
+            model = define_model_validating_uniqueness(options) do |m|
+              m.validates_presence_of :attr
+            end
 
-          assertion = lambda do
-            expect(record).to validate_uniqueness.scoped_to(:other)
+            record = model.new
+
+            expect(record).to validate_uniqueness
           end
+        end
 
-          message = <<-MESSAGE
-Example did not properly validate that :attr is case-sensitively unique
-within the scope of :other.
-  Expected the validation to be scoped to :other, but it was not scoped
-  to anything.
-          MESSAGE
+        context 'and the attribute being tested are required along with other attributes' do
+          it 'can save the subject without the attributes being set' do
+            options = {
+              attribute_name: :attr,
+              additional_attributes: [:required_attribute]
+            }
+            model = define_model_validating_uniqueness(options) do |m|
+              m.validates_presence_of :attr
+              m.validates_presence_of :required_attribute
+            end
 
-          expect(&assertion).to fail_with_message(message)
+            expect(model.new).to validate_uniqueness
+          end
         end
-      end
-    end
 
-    context 'when the record is not created beforehand' do
-      it 'creates the record automatically' do
-        model = define_model_validating_uniqueness
-        assertion = -> {
-          record = build_record_from(model)
-          expect(record).to validate_uniqueness
-        }
-        expect(&assertion).to change(model, :count).from(0).to(1)
+        context 'and the attribute being tested has other validations on it' do
+          it 'can save the subject without it being completely valid' do
+            options = { attribute_name: :attr }
+
+            model = define_model_validating_uniqueness(options) do |m|
+              m.validates_presence_of :attr
+              m.validates_numericality_of :attr
+            end
+
+            expect(model.new).to validate_uniqueness
+          end
+        end
+
+        context 'and the table has non-nullable columns other than the attribute being validated' do
+          context 'which are set beforehand' do
+            it 'can save the subject' do
+              options = {
+                additional_attributes: [
+                  { name: :required_attribute, options: { null: false } }
+                ]
+              }
+              model = define_model_validating_uniqueness(options)
+              record = model.new
+              record.required_attribute = 'something'
+
+              expect(record).to validate_uniqueness
+            end
+          end
+
+          context 'which are not set beforehand' do
+            it 'raises a useful exception' do
+              options = {
+                additional_attributes: [
+                  { name: :required_attribute, options: { null: false } }
+                ]
+              }
+              model = define_model_validating_uniqueness(options)
+
+              assertion = lambda do
+                expect(model.new).to validate_uniqueness
+              end
+
+              expect(&assertion).to raise_error(
+                described_class::ExistingRecordInvalid
+              )
+            end
+          end
+        end
+
+        context 'and the model has required attributes other than the attribute being validated' do
+          it 'can save the subject without the attributes being set' do
+            options = {
+              additional_attributes: [:required_attribute]
+            }
+            model = define_model_validating_uniqueness(options) do |m|
+              m.validates_presence_of :required_attribute
+            end
+
+            expect(model.new).to validate_uniqueness
+          end
+        end
       end
 
-      context 'and the table has required attributes other than the attribute being validated, set beforehand' do
-        it 'does not require the record to be persisted' do
-          options = {
-            additional_attributes: [
-              { name: :required_attribute, options: { null: false } }
-            ]
+      context 'and the subject is not empty' do
+        it 'creates the record automatically from the subject' do
+          model = define_model_validating_uniqueness
+          assertion = -> {
+            record = build_record_from(model)
+            expect(record).to validate_uniqueness
           }
-          model = define_model_validating_uniqueness(options) do |m|
-            m.validates_presence_of :required_attribute
+          expect(&assertion).to change(model, :count).from(0).to(1)
+        end
+
+        context 'and the table has required attributes other than the attribute being validated, set beforehand' do
+          it 'can save the subject' do
+            options = {
+              additional_attributes: [
+                { name: :required_attribute, options: { null: false } }
+              ]
+            }
+            model = define_model_validating_uniqueness(options)
+
+            record = build_record_from(model, required_attribute: 'something')
+            expect(record).to validate_uniqueness
           end
+        end
 
-          record = build_record_from(model, required_attribute: 'something')
-          expect(record).to validate_uniqueness
+        context 'and the model has required attributes other than the attribute being validated, set beforehand' do
+          it 'can save the subject' do
+            options = {
+              additional_attributes: [:required_attribute]
+            }
+            model = define_model_validating_uniqueness(options) do |m|
+              m.validates_presence_of :required_attribute
+            end
+
+            record = build_record_from(model, required_attribute: 'something')
+            expect(record).to validate_uniqueness
+          end
         end
       end
     end
 
+    context 'when the validation has no scope and a scope is specified' do
+      it 'rejects with an appropriate failure message' do
+        model = define_model_validating_uniqueness(
+          additional_attributes: [:other]
+        )
+        create_record_from(model)
+        record = build_record_from(model)
+
+        assertion = lambda do
+          expect(record).to validate_uniqueness.scoped_to(:other)
+        end
+
+        message = <<-MESSAGE
+Example did not properly validate that :attr is case-sensitively unique
+within the scope of :other.
+  Expected the validation to be scoped to :other, but it was not scoped
+  to anything.
+        MESSAGE
+
+        expect(&assertion).to fail_with_message(message)
+      end
+    end
+
     context 'and the validation has a custom message' do
       context 'when no message is specified' do
         it 'rejects with an appropriate failure message' do
@@ -1307,7 +1501,7 @@ Example did not properly validate that :name is case-sensitively unique.
       SecureRandom.uuid
     elsif value.is_a?(Time)
       value + 1
-    elsif value.in?([true, false])
+    elsif [true, false].include?(value)
       !value
     elsif value.respond_to?(:next)
       value.next

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,20 +14,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-10 00:00:00.000000000 Z
+date: 2016-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: Making tests easy on the fingers and eyes
@@ -36,11 +36,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .hound.yml
-- .hound_config/ruby.yml
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".hound.yml"
+- ".hound_config/ruby.yml"
+- ".travis.yml"
+- ".yardopts"
 - Appraisals
 - CONTRIBUTING.md
 - Gemfile
@@ -355,17 +355,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Making tests easy on the fingers and eyes