mcmire-shoulda-matchers 2.5.0 → 2.6.1.docs.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c096e55f73b803885444d4c6403f05d415c2b46b
-  data.tar.gz: 98132edf5cea73a593f1ce2ffbd61a0412e7443a
+  metadata.gz: 913c5859d7601cc8a162435e24a1f9d2362a773e
+  data.tar.gz: 6d4d4fe735c6a340e91af04d75f9607d6f7c6a7f
 SHA512:
-  metadata.gz: 46e4382716b1e65c0c26231207e1663324164283f16425e9888b6cab729121b7b65f29703620b95bd7eee66d44474ff1eda17b0cdbb5761cf0d0c33006aa2def
-  data.tar.gz: a8c5297f2e1e6d10cbd4526db01fa884855a608d3cc30201b3e5cd9e547bb14d3f419278a92588cd6326aa45c24c1b53459d4059e33ed4c616d1ba3803bc55cb
+  metadata.gz: edb31670937686252dbb02b9093101d5fde04eb831a078a20c9113da3c9951c1ba108566a49a89a1400c88334c2c4a81181397953c4f59cfde82a08efe952f9f
+  data.tar.gz: 1456edfcbcc05930e12c5b88b51b10483a18ced6056560c6cd2bf4a996472197afdad588b19b125f7afc0f52fb6226de69709ea87ddf23c0421869caa849fc26

data/.gitignore

@@ -6,6 +6,7 @@
 .svn/
 .yardoc
 coverage
+doc
 pkg
 tags
 test/*/log/*.log

data/.travis.yml

@@ -16,17 +16,26 @@ matrix:
     - rvm: rbx-19mode
     - rvm: jruby-19mode
   include:
+    - rvm: 1.9.2
+      gemfile: gemfiles/3.1_1.9.2.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/4.0.0.gemfile
     - rvm: 1.9.3
       gemfile: gemfiles/4.0.1.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/4.1.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/3.2.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/4.0.0.gemfile
     - rvm: 2.0.0
       gemfile: gemfiles/4.0.1.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/4.1.gemfile
     - rvm: rbx-19mode
       gemfile: gemfiles/3.2.gemfile
     - rvm: jruby-19mode
       gemfile: gemfiles/3.2.gemfile
+  exclude:
+    - rvm: 1.9.2
+      gemfile: gemfiles/3.1.gemfile

data/.yardopts

@@ -1,6 +1,7 @@
 --no-private
 --protected
---files README.md lib/**/*.rb
+--readme README.md
+--files lib/**/*.rb
 --markup markdown
 --hide-tag return
 --hide-tag param

data/Appraisals

@@ -1,5 +1,26 @@
-rails_4_0 = proc do
+ruby_version = Gem::Version.new(RUBY_VERSION + '')
+
+rails_3 = proc do
+  gem 'strong_parameters'
+end
+
+rails_3_1 = proc do
+  instance_eval(&rails_3)
+  gem 'rails', '~> 3.1.8'
+  gem 'bcrypt-ruby', '~> 3.0.0'
   gem 'jquery-rails'
+  gem 'sass-rails', '~> 3.1.5'
+  gem 'coffee-rails', '~> 3.1.1'
+  gem 'uglifier', '>= 1.0.3'
+end
+
+rails_4 = proc do
+  gem 'uglifier', '>= 1.3.0'
+  gem 'coffee-rails', '~> 4.0.0'
+  gem 'jquery-rails'
+  gem 'turbolinks'
+  gem 'jbuilder', '~> 1.2'
+  gem 'sdoc'
   gem 'activeresource', '4.0.0'
   # Test suite makes heavy use of attr_accessible
   gem 'protected_attributes'
@@ -7,39 +28,58 @@ end
 
 #---
 
-if RUBY_VERSION < '2.0'
+if Gem::Requirement.new('< 2').satisfied_by?(ruby_version)
   appraise '3.0' do
+    instance_eval(&rails_3)
     gem 'rails', '~> 3.0.17'
-    gem 'strong_parameters'
   end
 
-  appraise '3.1' do
-    gem 'rails', '~> 3.1.8'
-    gem 'bcrypt-ruby', '~> 3.0.0'
-    gem 'jquery-rails'
-    gem 'sass-rails'
-    gem 'strong_parameters'
+  if Gem::Requirement.new('= 1.9.2').satisfied_by?(ruby_version)
+    appraise '3.1-1.9.2' do
+      instance_eval(&rails_3_1)
+      gem 'turn', '0.8.2'
+    end
+  else
+    appraise '3.1' do
+      instance_eval(&rails_3_1)
+      gem 'turn', '~> 0.8.3'
+    end
   end
 end
 
 appraise '3.2' do
+  instance_eval(&rails_3)
   gem 'rails', '~> 3.2.13'
   gem 'bcrypt-ruby', '~> 3.0.0'
   gem 'jquery-rails'
-  gem 'sass-rails'
-  gem 'strong_parameters'
+  gem 'sass-rails', '~> 3.2.3'
+  gem 'coffee-rails', '~> 3.2.1'
+  gem 'uglifier', '>= 1.0.3'
 end
 
-appraise '4.0.0' do
-  instance_eval(&rails_4_0)
-  gem 'rails', '4.0.0'
-  gem 'sass-rails', '4.0.0'
-  gem 'bcrypt-ruby', '~> 3.0.0'
-end
+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 'sass-rails', '~> 4.0.0'
+    gem 'bcrypt-ruby', '~> 3.0.0'
+  end
+
+  appraise '4.0.1' do
+    instance_eval(&rails_4)
+    gem 'rails', '4.0.1'
+    gem 'sass-rails', '~> 4.0.0'
+    gem 'bcrypt-ruby', '~> 3.1.2'
+  end
 
-appraise '4.0.1' do
-  instance_eval(&rails_4_0)
-  gem 'rails', '4.0.1'
-  gem 'sass-rails', '4.0.1'
-  gem 'bcrypt-ruby', '~> 3.1.2'
+  appraise '4.1' do
+    instance_eval(&rails_4)
+    gem 'rails', '~> 4.1.0'
+    gem 'jbuilder', '~> 2.0'
+    gem 'sass-rails', '~> 4.0.3'
+    gem 'sdoc', '~> 0.4.0'
+    gem 'bcrypt', '~> 3.1.7'
+    gem 'protected_attributes', "~> 1.0.6"
+    gem 'spring'
+  end
 end

data/Gemfile

@@ -19,7 +19,7 @@ gem 'pygments.rb'
 gem 'watchr'
 
 # For test Rails application
-gem 'shoulda-context', '~> 1.1.2'
+gem 'shoulda-context', '~> 1.2.0'
 gem 'sqlite3', :platform => :ruby
 
 # Can't wrap in platform :jruby do...end block because appraisal doesn't

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mcmire-shoulda-matchers (2.5.0)
+    mcmire-shoulda-matchers (2.6.1.docs.1)
       activesupport (>= 3.0.0)
 
 GEM
@@ -121,7 +121,7 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    shoulda-context (1.1.6)
+    shoulda-context (1.2.0)
     slop (3.4.7)
     sprockets (2.2.2)
       hike (~> 1.2)
@@ -159,7 +159,7 @@ DEPENDENCIES
   rake (>= 0.9.2)
   redcarpet
   rspec-rails (>= 2.13.1, < 3)
-  shoulda-context (~> 1.1.2)
+  shoulda-context (~> 1.2.0)
   sqlite3
   therubyrhino
   watchr

data/NEWS.md

@@ -1,5 +1,66 @@
 # HEAD
 
+* Revert change to `validate_uniqueness_of` made in 2.6.0 so that it no longer
+  provides default values for non-primary, non-nullable columns. This approach
+  was causing test failures because it makes the assumption that none of these
+  columns allow only specific values, which is not true. If you get an error
+  from `validate_uniqueness_of`, your best bet continues to be creating a record
+  manually and calling `validate_uniqueness_of` on that instead.
+
+# 2.6.1
+
+### 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 would fail. This is now fixed.
+
+* Fix regression in previous release where ActiveRecord matchers would not be
+  included when ActiveRecord wasn't defined (i.e. if you were using ActiveModel
+  only).
+
+* Revert the behavior of `allow_value` changed in 2.6.0 (it will no longer raise
+  CouldNotClearAttribute). This was originally done as a part of a fix for
+  `validate_presence_of` when used in conjunction with `has_secure_password`.
+  That fix has been updated so that it does not affect `allow_value`.
+
+* Fix callback matchers and correct test coverage.
+
+* Fix `permit` so that it does not interfere with different usages of `params`
+  in your controller action. Specifically, this will not raise an error:
+  `params.fetch(:foo, {}).permit(:bar, :baz)` (the `permit` will have no
+  problems recognizing that :bar and :baz are permitted params).
+
+* Fix `permit` on Rails 4.1 to use PATCH by default for #update instead of PUT.
+  Previously you had to specify this manually.
+
+* Fix `permit` so that it track multiple calls to #permit in your controller
+  action. Previously only the last usage of #permit would be considered in
+  determining whether the matcher matched.
+
+* Fix `permit` so that if the route for your action requires params (such as id)
+  then you can now specify those params:
+  `permit(:first_name, :last_name).for(:update, params: { id: 42 })`.
+
+* 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
+  consistency with other matchers.
+
 * Association matchers now test that the model being referred to (either
   implicitly or explicitly, using `:class_name`) actually exists.
 
@@ -25,10 +86,9 @@
 * Change `validate_uniqueness_of(...)` so that it provides default values for
   non-nullable attributes.
 
-* Running `rake` now installs Appraisals before running the test suite.
-
-* Additionally, we now manage Appraisals using the `appraisal` executable that
-  is coming in Appraisal 1.0.0 (we're using the beta for now).
+* Running `rake` now installs Appraisals before running the test suite. 
+  (Additionally, we now manage Appraisals using the `appraisal` executable in
+  Appraisal 1.0.0.)
 
 * Add `allow_nil` option to `validate_numericality_of` so that you can validate
   that numeric values are validated only if a value is supplied.
@@ -37,6 +97,29 @@
   `greater_than`, `greater_than_or_equal_to`, `less_than`, `less_than_or_equal_
   to` or `equal_to` is not appropriate.
 
+* Change `validate_presence_of` under Rails 4 so that if you are using it with a
+  user whose model `has_secure_password` and whose password is set to a value,
+  you will be instructed to use a user whose password is blank instead. The
+  reason for this change is due to the fact that Rails 4's version of
+  `has_secure_password` defines #password= such that `nil` will be ignored,
+  which interferes with how `validate_presence_of` works.
+
+* Add ability to test `belongs_to` associations defined with `:inverse_of`.
+
+* Add back matchers that were removed in 2.0.0: `permit`, for testing strong
+  parameters, and `delegate_method`, for testing delegation.
+
+* Add new matchers for testing controller filters: `before_filter`,
+  `after_filter`, and `around_filter` (aliased to `before_action`,
+  `after_action` and `around_action` for Rails 4).
+
+* Fix `rescue_from` matcher so that it does not raise an error when testing
+  a method handler which has been marked as protected or private.
+
+* Fix compatibility issues with Rails 4.1:
+  * `set_the_flash` and `have_and_belongs_to_many` no longer raise errors
+  * Minitest no longer prints warnings whenever shoulda-matchers is required
+
 # v 2.5.0
 
 * Fix Rails/Test::Unit integration to ensure that the test case classes we are

data/README.md

@@ -126,8 +126,8 @@ gem 'activemodel'
 ## Generating documentation
 
 YARD is used to generate documentation, which can be viewed online at
-<http://thoughtbot.github.com/shoulda-matchers/master>. You can preview changes
-you make to the documentation locally by running
+<http://thoughtbot.github.com/shoulda-matchers>. You can preview changes you
+make to the documentation locally by running
 
     yard doc
 

data/Rakefile

@@ -46,6 +46,12 @@ namespace :docs do
     end
   end
 
+  desc 'Generate docs for a particular version'
+  task :generate, [:version, :is_latest] => :setup do |t, args|
+    latest = (args.is_latest == 'true')
+    generate_docs(args.version, latest: latest)
+  end
+
   desc 'Generate docs for a particular version and push them to GitHub'
   task :publish, [:version, :is_latest] => :setup do |t, args|
     latest = (args.is_latest == 'true')
@@ -59,11 +65,23 @@ namespace :docs do
     publish_docs(CURRENT_VERSION, latest: true)
   end
 
+  def rewrite_index_to_inject_version(ref, version)
+    within_gh_pages do
+      filename = "#{ref}/index.html"
+      content = File.read(filename)
+      content.sub!(%r{<h1>shoulda-matchers.+</h1>}, "<h1>shoulda-matchers (#{version})</h1>")
+      File.open(filename, 'w') {|f| f.write(content) }
+    end
+  end
+
   def generate_docs(version, options = {})
     ref = determine_ref_from(version)
 
+    sh "rm -rf #{GH_PAGES_DIR}/#{ref}"
     sh "bundle exec yard -o #{GH_PAGES_DIR}/#{ref}"
 
+    rewrite_index_to_inject_version(ref, version)
+
     within_gh_pages do
       sh "git add #{ref}"
     end

data/features/activemodel_integration.feature

@@ -0,0 +1,15 @@
+Feature: integration with ActiveModel
+
+  Scenario: create a new project using matchers
+    When I generate a new ActiveModel application
+    And I configure the application to use "shoulda-matchers" from this project
+    And I write to "load_dependencies.rb" with:
+      """
+      require 'active_model'
+      require 'shoulda-matchers'
+
+      puts ActiveModel::VERSION::STRING
+      puts "Loaded all dependencies without errors"
+      """
+    When I successfully run `bundle exec ruby load_dependencies.rb`
+    Then the output should contain "Loaded all dependencies without errors"

data/features/rails_integration.feature

@@ -12,7 +12,7 @@ Feature: integrate with Rails
         end
       end
       """
-    When I successfully run `bundle exec rake db:migrate --trace`
+    When I successfully run `bundle exec rake db:migrate db:test:prepare --trace`
     And I write to "app/models/user.rb" with:
       """
       class User < ActiveRecord::Base

data/features/step_definitions/activemodel_steps.rb

@@ -0,0 +1,21 @@
+When 'I generate a new ActiveModel application' do
+  steps %{
+    When I run `mkdir #{APP_NAME}`
+    And I cd to "#{APP_NAME}"
+    And I run `bundle init`
+  }
+
+  # Figure out the ActiveModel version to use by reusing the Rails version from
+  # the Appraise gemfile.
+  if match = File.read(ENV['BUNDLE_GEMFILE']).match(/^gem "rails", "(.*)"/)
+    append_to_gemfile %(gem 'activemodel', '#{ match[1] }')
+  else
+    puts "Couldn't determine which ActiveModel version to load; using latest"
+    append_to_gemfile %(gem 'activemodel')
+  end
+
+  steps %{
+    And I set the "BUNDLE_GEMFILE" environment variable to "Gemfile"
+    And I install gems
+  }
+end

data/features/step_definitions/rails_steps.rb

@@ -67,7 +67,8 @@ When 'I configure the application to use rspec-rails in test and development' do
 end
 
 When 'I configure the application to use shoulda-context' do
-  append_to_gemfile %q(gem 'shoulda-context', '~> 1.0')
+  append_to_gemfile %q(gem 'shoulda-context', '~> 1.2.0')
+  append_to_gemfile %q(gem 'pry')
   steps %{And I install gems}
 end
 
@@ -112,7 +113,7 @@ Then /^the output should indicate that (\d+) tests? (?:was|were) run/ do |number
   # Rails 4 has slightly different output than Rails 3 due to
   # Test::Unit::TestCase -> MiniTest
   if rails_4?
-    steps %{Then the output should contain "#{number} tests, #{number} assertions, 0 failures, 0 errors, 0 skips"}
+    steps %{Then the output should match /#{number} (tests|runs), #{number} assertions, 0 failures, 0 errors, 0 skips/}
   else
     steps %{Then the output should contain "#{number} tests, #{number} assertions, 0 failures, 0 errors"}
   end
@@ -125,7 +126,7 @@ Then /^the output should indicate that (\d+) unit and (\d+) functional tests? we
   # Rails 3 runs separate test suites in separate processes, but Rails 4 does
   # not, so that's why we have to check for different things here
   if rails_4?
-    steps %{Then the output should contain "#{total} tests, #{total} assertions, 0 failures, 0 errors, 0 skips"}
+    steps %{Then the output should match /#{total} (tests|runs), #{total} assertions, 0 failures, 0 errors, 0 skips/}
   else
     steps %{Then the output should match /#{n1} tests, #{n1} assertions, 0 failures, 0 errors.+#{n2} tests, #{n2} assertions, 0 failures, 0 errors/}
   end
@@ -154,7 +155,7 @@ module FileHelpers
   end
 
   def rails_4?
-    match = ORIGINAL_BUNDLE_VARS['BUNDLE_GEMFILE'].match(/(\d)\.\d\.(\d\.)?gemfile$/)
+    match = ORIGINAL_BUNDLE_VARS['BUNDLE_GEMFILE'].match(/(\d)\.\d\.(\d\.)?(\w+\.)?gemfile$/)
     match.captures[0] == '4'
   end
 end

data/gemfiles/3.0.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "~> 0.4"
+gem "appraisal", "~> 1.0.0.beta2"
 gem "aruba"
 gem "bourne", "~> 1.3"
 gem "bundler", "~> 1.1"
@@ -11,14 +11,17 @@ gem "pry"
 gem "rake", ">= 0.9.2"
 gem "rspec-rails", ">= 2.13.1", "< 3"
 gem "yard"
-gem "shoulda-context", "~> 1.1.2"
+gem "redcarpet"
+gem "pygments.rb"
+gem "watchr"
+gem "shoulda-context", "~> 1.2.0"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
-gem "rails", "~> 3.0.17"
 gem "strong_parameters"
+gem "rails", "~> 3.0.17"
 
 gemspec :path=>".././"

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    shoulda-matchers (2.5.0)
+    shoulda-matchers (2.6.1)
       activesupport (>= 3.0.0)
 
 GEM
@@ -74,10 +74,14 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.7.1)
     polyglot (0.3.3)
+    posix-spawn (0.3.8)
     pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
+    pygments.rb (0.5.4)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.1.0)
     rack (1.2.8)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -100,6 +104,7 @@ GEM
     rake (10.0.3)
     rdoc (3.12.2)
       json (~> 1.4)
+    redcarpet (3.1.1)
     rspec-core (2.13.1)
     rspec-expectations (2.13.0)
       diff-lcs (>= 1.1.3, < 2.0)
@@ -111,7 +116,7 @@ GEM
       rspec-core (~> 2.13.0)
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
-    shoulda-context (1.1.4)
+    shoulda-context (1.2.0)
     slop (3.4.7)
     sqlite3 (1.3.7)
     strong_parameters (0.2.0)
@@ -123,7 +128,9 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.37)
-    yard (0.8.7.3)
+    watchr (0.7)
+    yajl-ruby (1.1.0)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby
@@ -139,12 +146,15 @@ DEPENDENCIES
   jdbc-sqlite3
   jruby-openssl
   pry
+  pygments.rb
   rails (~> 3.0.17)
   rake (>= 0.9.2)
+  redcarpet
   rspec-rails (>= 2.13.1, < 3)
-  shoulda-context (~> 1.1.2)
+  shoulda-context (~> 1.2.0)
   shoulda-matchers!
   sqlite3
   strong_parameters
   therubyrhino
+  watchr
   yard

data/gemfiles/3.1.gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "appraisal", "~> 0.4"
+gem "appraisal", "~> 1.0.0.beta2"
 gem "aruba"
 gem "bourne", "~> 1.3"
 gem "bundler", "~> 1.1"
@@ -11,17 +11,23 @@ gem "pry"
 gem "rake", ">= 0.9.2"
 gem "rspec-rails", ">= 2.13.1", "< 3"
 gem "yard"
-gem "shoulda-context", "~> 1.1.2"
+gem "redcarpet"
+gem "pygments.rb"
+gem "watchr"
+gem "shoulda-context", "~> 1.2.0"
 gem "sqlite3", :platform=>:ruby
 gem "activerecord-jdbc-adapter", :platform=>:jruby
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby
 gem "jdbc-sqlite3", :platform=>:jruby
 gem "jruby-openssl", :platform=>:jruby
 gem "therubyrhino", :platform=>:jruby
+gem "strong_parameters"
 gem "rails", "~> 3.1.8"
 gem "bcrypt-ruby", "~> 3.0.0"
 gem "jquery-rails"
-gem "sass-rails"
-gem "strong_parameters"
+gem "sass-rails", "~> 3.1.5"
+gem "coffee-rails", "~> 3.1.1"
+gem "uglifier", ">= 1.0.3"
+gem "turn", "~> 0.8.3"
 
 gemspec :path=>".././"