shoulda-matchers 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ff48aa28034edc27f14e97808a24f0e777cf3ab
-  data.tar.gz: 6432f92a9497036932281d941a437b40f5636e06
+  metadata.gz: e928b8bdcbb158173df075e2d49af0aeb4f584cc
+  data.tar.gz: 43b6015bf156cec9cb62f686a927e81eaea239b6
 SHA512:
-  metadata.gz: 7f64a534e64d8f070d5e5d524bb9b21df80fa2afe93f4be3cf7b44e6ecb7a33fff7c91b87756194548fb0670548d0302467ce2d83e1371c42bf80f7283c1673b
-  data.tar.gz: 940a2d667949ef94d42ada95554fda4a288af2d8cfa95f307900a3e345f46d867ca9cae347758e1f3bf2782e482397cc83a109aeb7359fbb3c69406f0abb0523
+  metadata.gz: 7a1d71a62c646c5607e59ace508393a28068e8c23c0744616a55f846b7bd2be2c7f31a2183c67f75ab72a7f51e03f8efc844ba9f22ad42817d5a17660c0cc0c2
+  data.tar.gz: f2834dcc2f6e3e052df77f725c676f55264e63ae6f6d20ac7c629728892ef4b0d515b2cedd75a00c1145d7d626d7ab1715eadcf20f0d8374adb446f69577822e

data/Appraisals

@@ -7,6 +7,7 @@ end
 
 rails_3 = proc do
   gem 'strong_parameters'
+  gem 'rspec-rails', '2.99.0'
 end
 
 rails_3_1 = proc do
@@ -17,6 +18,7 @@ rails_3_1 = proc do
   gem 'sass-rails', '~> 3.1.5'
   gem 'coffee-rails', '~> 3.1.1'
   gem 'uglifier', '>= 1.0.3'
+  gem 'rspec-rails', '2.99.0'
 end
 
 rails_3_2 = proc do
@@ -35,9 +37,9 @@ rails_4 = proc do
   gem 'coffee-rails', '~> 4.0.0'
   gem 'jquery-rails'
   gem 'turbolinks'
-  gem 'jbuilder', '~> 1.2'
   gem 'sdoc'
   gem 'activeresource', '4.0.0'
+  gem 'rspec-rails', '~> 3.0.1'
   # Test suite makes heavy use of attr_accessible
   gem 'protected_attributes'
 end
@@ -78,6 +80,7 @@ if Gem::Requirement.new('> 1.9.2').satisfied_by?(ruby_version)
   appraise '4.0.0' do
     instance_eval(&rails_4)
     gem 'rails', '4.0.0'
+    gem 'jbuilder', '~> 1.2'
     gem 'sass-rails', '~> 4.0.0'
     gem 'bcrypt-ruby', '~> 3.0.0'
   end
@@ -85,8 +88,10 @@ if Gem::Requirement.new('> 1.9.2').satisfied_by?(ruby_version)
   appraise '4.0.1' do
     instance_eval(&rails_4)
     gem 'rails', '4.0.1'
+    gem 'jbuilder', '~> 1.2'
     gem 'sass-rails', '~> 4.0.0'
     gem 'bcrypt-ruby', '~> 3.1.2'
+    gem 'rspec-rails', '2.99.0'
   end
 
   appraise '4.1' do

data/Gemfile

@@ -10,7 +10,7 @@ gem 'cucumber', '~> 1.1'
 gem 'pry'
 gem 'rails', '~> 3.0'
 gem 'rake', '>= 0.9.2'
-gem 'rspec-rails', '>= 2.13.1', '< 3'
+gem 'rspec-rails', '>= 2.99.0'
 
 # YARD
 gem 'yard'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shoulda-matchers (2.6.2)
+    shoulda-matchers (2.7.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -39,29 +39,29 @@ GEM
       rake
       thor (>= 0.14.0)
     arel (3.0.3)
-    aruba (0.5.3)
-      childprocess (~> 0.3.6)
+    aruba (0.6.0)
+      childprocess (>= 0.3.6)
       cucumber (>= 1.1.1)
       rspec-expectations (>= 2.7.0)
     bourne (1.5.0)
       mocha (>= 0.13.2, < 0.15)
     builder (3.0.4)
-    childprocess (0.3.9)
+    childprocess (0.5.3)
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.0)
-    cucumber (1.3.10)
+    cucumber (1.3.16)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.12)
       multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.0.2)
+      multi_test (>= 0.1.1)
     diff-lcs (1.2.5)
     erubis (2.7.0)
     ffi (1.9.3)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     hike (1.2.3)
-    i18n (0.6.9)
+    i18n (0.6.11)
     journey (1.0.4)
     json (1.8.1)
     mail (2.5.4)
@@ -72,8 +72,8 @@ GEM
     mime-types (1.25.1)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.4)
-    multi_test (0.0.3)
+    multi_json (1.10.1)
+    multi_test (0.1.1)
     polyglot (0.3.3)
     posix-spawn (0.3.8)
     pry (0.9.12.6)
@@ -86,7 +86,7 @@ GEM
     rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -105,22 +105,26 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (10.1.1)
+    rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
     redcarpet (3.0.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    rspec-rails (2.14.1)
+    rspec-core (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.3)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.2)
       actionpack (>= 3.0)
-      activemodel (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.3)
     shoulda-context (1.2.0)
     slop (3.4.7)
     sprockets (2.2.2)
@@ -129,7 +133,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.8)
-    thor (0.18.1)
+    thor (0.19.1)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
@@ -157,7 +161,7 @@ DEPENDENCIES
   rails (~> 3.0)
   rake (>= 0.9.2)
   redcarpet
-  rspec-rails (>= 2.13.1, < 3)
+  rspec-rails (>= 2.99.0)
   shoulda-context (~> 1.2.0)
   shoulda-matchers!
   sqlite3

data/NEWS.md

@@ -1,5 +1,56 @@
 # HEAD
 
+# 2.7.0
+
+### Deprecations
+
+* `ensure_inclusion_of` has been renamed to `validate_inclusion_of`.
+  `ensure_inclusion_of` is deprecated and will be removed in 3.0.0.
+
+* `ensure_exclusion_of` has been renamed to `validate_exclusion_of`.
+  `ensure_exclusion_of` is deprecated and will be removed in 3.0.0.
+
+### Bug fixes
+
+* Fix `delegate_method` so that it does not raise an error if the method that
+  returns the delegate object is private.
+
+* Warn when `ensure_inclusion_of` is chained with `.in_array([false, true])`
+  as well as with `.in_array([true, false])`.
+
+* Fix `set_session` so that the `to` qualifier if given nil checks that the
+  session variable in question was set to nil (previously this actually did
+  nothing).
+
+* Fix `filter_param` so that it works when `config.filter_parameters` contains
+  regexes.
+
+* Fix `delegate_method` so that it can be required independent of Active
+  Support.
+
+* Fix `validate_uniqueness_of`. When used against an unpersisted record whose
+  model contained a non-nullable column other than the one being validated, the
+  matcher would break. Even if the test set that column to a value beforehand,
+  the record had to be persisted in order for the matcher to work. Now this is
+  no longer the case and the record can remain unpersisted.
+
+* Fix `validate_absence_of`: it required that a string be passed as the
+  attribute name rather than a symbol (which is the usual and documented usage).
+
+### Improvements
+
+* `have_and_belongs_to_many` now checks to make sure that the join table
+  contains the correct columns for the left- and right-hand side of the
+  association.
+
+* Reword failure message for `delegate_method` so that it's a little more
+  helpful.
+
+### Features
+
+* Add new matcher `define_enum_for` to test usage of the `enum` macro introduced
+  in Rails 4.1.
+
 # 2.6.2
 
 ### Bug fixes
@@ -102,7 +153,7 @@
 * Change `validate_uniqueness_of(...)` so that it provides default values for
   non-nullable attributes.
 
-* Running `rake` now installs Appraisals before running the test suite. 
+* Running `rake` now installs Appraisals before running the test suite.
   (Additionally, we now manage Appraisals using the `appraisal` executable in
   Appraisal 1.0.0.)
 

data/README.md

@@ -12,10 +12,10 @@ complex, and error-prone.
   tests usage of Rails 3's `attr_accessible` and `attr_protected` macros.
 * **[allow_value](lib/shoulda/matchers/active_model/allow_value_matcher.rb)** tests usage of
   the `validates_format_of` validation.
-* **[ensure_inclusion_of](lib/shoulda/matchers/active_model/ensure_inclusion_of_matcher.rb)** tests
-  usage of `validates_inclusion_of`.
-* **[ensure_exclusion_of](lib/shoulda/matchers/active_model/ensure_exclusion_of_matcher.rb)** tests
-  usage of `validates_exclusion_of`.
+* **[validate_inclusion_of](lib/shoulda/matchers/active_model/validate_inclusion_of_matcher.rb)**
+  tests usage of `validates_inclusion_of`.
+* **[validate_exclusion_of](lib/shoulda/matchers/active_model/validate_exclusion_of_matcher.rb)**
+  tests usage of `validates_exclusion_of`.
 * **[ensure_length_of](lib/shoulda/matchers/active_model/ensure_length_of_matcher.rb)** tests usage
   of `validates_length_of`.
 * **[have_secure_password](lib/shoulda/matchers/active_model/have_secure_password_matcher.rb)** tests
@@ -35,6 +35,8 @@ complex, and error-prone.
   tests usage of the `accepts_nested_attributes_for` macro.
 * **[belong_to](lib/shoulda/matchers/active_record/association_matcher.rb)** tests
   your `belongs_to` associations.
+* **[define_enum_for](lib/shoulda/matchers/active_record/define_enum_for_matcher.rb)**
+  tests usage of the `enum` macro.
 * **[have_many](lib/shoulda/matchers/active_record/association_matcher.rb)** tests
   your `has_many` associations.
 * **[have_one](lib/shoulda/matchers/active_record/association_matcher.rb)** tests your
@@ -72,7 +74,7 @@ complex, and error-prone.
 
 ### Independent Matchers
 
-* **[delegate_matcher](lib/shoulda/matchers/independent/delegate_matcher.rb)**
+* **[delegate_method](lib/shoulda/matchers/independent/delegate_matcher.rb)**
   tests that an object forwards messages to other, internal objects by way of
   delegation.
 
@@ -170,6 +172,6 @@ and may be redistributed under the terms specified in the
 [fury]: http://badge.fury.io/rb/shoulda-matchers
 [travis-badge]: https://secure.travis-ci.org/thoughtbot/shoulda-matchers.png?branch=master
 [travis]: http://travis-ci.org/thoughtbot/shoulda-matchers
-[rubydocs]: http://rubydoc.info/github/thoughtbot/shoulda-matchers/master/frames
+[rubydocs]: http://thoughtbot.github.io/shoulda-matchers
 [community]: http://thoughtbot.com/community
 [contributors]: https://github.com/thoughtbot/shoulda-matchers/contributors

data/Rakefile

@@ -96,7 +96,7 @@ namespace :docs do
     rewrite_index_to_inject_version(ref, version)
 
     within_gh_pages do
-      sh "git add --ignore-removal #{ref}"
+      sh "git add #{ref}"
     end
 
     if options[:latest_version]

data/doc_config/gh-pages/index.html.erb

@@ -2,7 +2,7 @@
 <html>
   <head>
     <title>shoulda-matchers Documentation - latest</title>
-    <meta http-equiv="refresh" content="0;URL=http://mcmire.github.io/shoulda-matchers/<%= locals[:ref] %>">
+    <meta http-equiv="refresh" content="0;URL=http://thoughtbot.github.io/shoulda-matchers/<%= locals[:ref] %>">
   </head>
   <body>
   </body>

data/doc_config/yard/templates/default/fulldoc/html/css/global.css

@@ -1,4 +1,4 @@
-@import "http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,400,600,600italic,800|Droid+Sans+Mono";
+@import "http://fonts.googleapis.com/css?family=Source+Sans+Pro:300,300italic,400,400italic,600,600italic,800|Droid+Sans+Mono";
 
 body {
   font-size: 16px;

data/doc_config/yard/templates/default/fulldoc/html/css/style.css

@@ -209,6 +209,10 @@ h4 + h5 {
 
 /* Class/Module */
 
+.summary .deprecated {
+  display: none;
+}
+
 .method_details {}
   .method_details td {
     padding: 10px;
@@ -253,6 +257,28 @@ h4 + h5 {
       color: #93a1a1 /* Comment */
     }
 
+    .method_details .deprecated {
+      margin-bottom: 1em;
+      font-size: 1.1em;
+    }
+
+      .method_details .deprecated strong {
+        background-color: #F03434;
+        color: white;
+        text-transform: uppercase;
+        border-radius: 3px;
+        padding: 0 4px;
+      }
+
+      .method_details .deprecated .inline {
+        padding-left: 3px;
+      }
+
+      .method_details .deprecated div,
+      .method_details .deprecated p {
+        display: inline
+      }
+
 .docstring, .method_details .showSource, .method_details .source_code {
   margin-left: 1em;
 }

data/features/rails_integration.feature

@@ -66,6 +66,9 @@ Feature: integrate with Rails
     And I write to "spec/models/user_spec.rb" with:
       """
       require 'spec_helper'
+      if RSpec::Core::Version::STRING.to_i >= 3
+        require 'rails_helper'
+      end
 
       describe User do
         it { should validate_presence_of(:name) }
@@ -74,13 +77,16 @@ Feature: integrate with Rails
     When I write to "spec/controllers/examples_controller_spec.rb" with:
       """
       require 'spec_helper'
+      if RSpec::Core::Version::STRING.to_i >= 3
+        require 'rails_helper'
+      end
 
       describe ExamplesController, "show" do
         before { get :show }
         it { should respond_with(:success) }
       end
       """
-    When I successfully run `bundle exec rake spec SPEC_OPTS=-fs --trace`
+    When I successfully run `bundle exec rake spec SPEC_OPTS=-fd --trace`
     Then the output should contain "2 examples, 0 failures"
     And the output should contain "should require name to be set"
     And the output should contain "should respond with 200"
@@ -96,6 +102,9 @@ Feature: integrate with Rails
     And I write to "spec/models/user_spec.rb" with:
       """
       require 'spec_helper'
+      if RSpec::Core::Version::STRING.to_i >= 3
+        require 'rails_helper'
+      end
 
       describe User do
         it { should validate_presence_of(:name) }
@@ -104,6 +113,9 @@ Feature: integrate with Rails
     When I write to "spec/controllers/examples_controller_spec.rb" with:
       """
       require 'spec_helper'
+      if RSpec::Core::Version::STRING.to_i >= 3
+        require 'rails_helper'
+      end
 
       describe ExamplesController, "show" do
         before { get :show }
@@ -112,7 +124,7 @@ Feature: integrate with Rails
       end
       """
     When I run `bundle exec spring stop`
-    When I successfully run `bundle exec spring rspec spec -fs`
+    When I successfully run `bundle exec spring rspec spec -fd`
     Then the output should contain "3 examples, 0 failures"
     And the output should contain "should require name to be set"
     And the output should contain "should respond with 200"
@@ -124,6 +136,9 @@ Feature: integrate with Rails
     And I write to "spec/models/user_spec.rb" with:
       """
       require 'spec_helper'
+      if RSpec::Core::Version::STRING.to_i == 3
+        require 'rails_helper'
+      end
 
       describe User do
         it { should validate_presence_of(:name) }
@@ -140,6 +155,6 @@ Feature: integrate with Rails
         end
       end
       """
-    When I successfully run `bundle exec rake spec test:functionals SPEC_OPTS=-fs --trace`
+    When I successfully run `bundle exec rake spec test:functionals SPEC_OPTS=-fd --trace`
     Then the output should contain "1 example, 0 failures"
     Then the output should indicate that 1 test was run

data/features/step_definitions/rails_steps.rb

@@ -70,14 +70,16 @@ When 'I run the rspec generator' do
 end
 
 When 'I configure the application to use rspec-rails' do
-  append_to_gemfile %q(gem 'rspec-rails', '~> 2.13')
+  append_to_gemfile <<-GEMFILE
+  gem 'rspec-rails', '#{rspec_rails_version}'
+  GEMFILE
   steps %{And I install gems}
 end
 
 When 'I configure the application to use rspec-rails in test and development' do
   append_to_gemfile <<-GEMFILE
   group :test, :development do
-    gem 'rspec-rails', '~> 2.13'
+    gem 'rspec-rails', '#{rspec_rails_version}'
   end
   GEMFILE
   steps %{And I install gems}
@@ -90,7 +92,7 @@ When 'I configure the application to use shoulda-context' do
 end
 
 When 'I require shoulda-matchers following rspec-rails' do
-  insert_line_after 'spec/spec_helper.rb',
+  insert_line_after test_helper_path,
     "require 'rspec/rails'",
     "require 'shoulda/matchers'"
 end
@@ -204,6 +206,22 @@ module FileHelpers
   def rails_lt_4?
     Gem::Requirement.new('< 4').satisfied_by?(rails_version)
   end
+
+  def rspec_rails_version
+    Bundler.definition.specs['rspec-rails'][0].version
+    end
+
+  def rspec_rails_gte_3?
+    Gem::Requirement.new('>= 3').satisfied_by?(rspec_rails_version)
+  end
+
+  def test_helper_path
+    if rspec_rails_gte_3?
+      'spec/rails_helper.rb'
+    else
+      'spec/spec_helper.rb'
+    end
+  end
 end
 
 World(FileHelpers)