shoulda-matchers 1.2.0 → 1.3.0

data/Gemfile.lock

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

data/NEWS.md

@@ -1,3 +1,21 @@
+# v1.3.0
+
+* `validate_format_of` will accept `allow_blank(bool)` and `allow_nil(bool)`
+
+* Prefer Test::Unit to Minitest when loading integrations so that RubyMine is
+  happy (#88).
+
+* `validates_uniqueness_of` will now create a record if one does not exist.
+  Previously, users were required to create a record in the database before
+  using this matcher.
+
+* Fix an edge case when where the matchers weren't loaded into Test::Unit when
+  mixing RSpec and Test::Unit tests and also loading both the 'rspec-rails' gem
+  and 'shoulda-matchers' gem from the same Gemfile group, namely [:test,
+  :development].
+
+* `controller.should_not render_partial` now correctly matches `render partial: "partial"`.
+
 # v1.2.0
 
 * `ensure_inclusion_of` now has an `in_array` parameter:

data/README.md

@@ -30,12 +30,7 @@ Matchers to test validations and mass assignments:
       it { should validate_presence_of(:body).with_message(/wtf/) }
       it { should validate_presence_of(:title) }
       it { should validate_numericality_of(:user_id) }
-
-      # validates_uniqueness_of requires an entry to be in the database already
-      it "validates uniqueness of title" do
-        Post.create!(title: "My Awesome Post", body: "whatever")
-        should validate_uniqueness_of(:title)
-      end
+      it { should ensure_inclusion_of(:status).in_array(['draft', 'public']) }
     end
 
     describe User do

data/features/rails_integration.feature

@@ -86,3 +86,31 @@ Feature: integrate with Rails
     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 assign @example"
+
+  Scenario: generate a Rails application that mixes Rspec and Test::Unit
+    When I configure the application to use rspec-rails in test and development
+    And I configure the application to use "shoulda-matchers" from this project in test and development
+    And I run the rspec generator
+    And I write to "spec/models/user_spec.rb" with:
+      """
+      require 'spec_helper'
+
+      describe User do
+        it { should validate_presence_of(:name) }
+      end
+      """
+    When I write to "test/functional/examples_controller_test.rb" with:
+      """
+      require 'test_helper'
+
+      class ExamplesControllerTest < ActionController::TestCase
+        test 'assigns to @example' do
+          get :show
+          assert assign_to(:example).matches?(@controller)
+        end
+      end
+      """
+    When I successfully run `bundle exec rake spec test:functionals SPEC_OPTS=-fs --trace`
+    Then the output should contain "1 example, 0 failures"
+    And the output should contain "1 tests, 1 assertions, 0 failures, 0 errors"
+    And the output should contain "should require name to be set"

data/features/step_definitions/rails_steps.rb

@@ -36,6 +36,15 @@ When /^I configure the application to use "([^\"]+)" from this project$/ do |nam
   steps %{And I run `bundle install --local`}
 end
 
+When /^I configure the application to use "([^\"]+)" from this project in test and development$/ do |name|
+  append_to_gemfile <<-GEMFILE
+  group :test, :development do
+    gem '#{name}', :path => '#{PROJECT_ROOT}'
+  end
+  GEMFILE
+  steps %{And I run `bundle install --local`}
+end
+
 When 'I run the rspec generator' do
   steps %{
     When I successfully run `rails generate rspec:install`
@@ -47,6 +56,15 @@ When 'I configure the application to use rspec-rails' do
   steps %{And I run `bundle install --local`}
 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.8.1'
+  end
+  GEMFILE
+  steps %{And I run `bundle install --local`}
+end
+
 When 'I configure the application to use shoulda-context' do
   append_to_gemfile "gem 'shoulda-context', '~> 1.0.0'"
   steps %{And I run `bundle install --local`}

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/gabe/thoughtbot/open-source/shoulda-matchers
+  remote: /Users/joshuaclayton/dev/gems/shoulda-matchers
   specs:
-    shoulda-matchers (1.2.0)
+    shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -46,8 +46,8 @@ GEM
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (2.1.2)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -57,18 +57,18 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (1.0.11)
+    ffi (1.1.5)
     gherkin (2.9.3)
       json (>= 1.4.6)
     i18n (0.5.0)
-    json (1.7.3)
+    json (1.7.5)
     mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.18)
+    mime-types (1.19)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     polyglot (0.3.3)

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/gabe/thoughtbot/open-source/shoulda-matchers
+  remote: /Users/joshuaclayton/dev/gems/shoulda-matchers
   specs:
-    shoulda-matchers (1.2.0)
+    shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -47,8 +47,8 @@ GEM
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -57,21 +57,21 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.0.11)
+    ffi (1.1.5)
     gherkin (2.9.3)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.19)
-      railties (~> 3.0)
+    jquery-rails (2.1.1)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.3)
+    json (1.7.5)
     mail (2.3.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.18)
+    mime-types (1.19)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
@@ -116,7 +116,7 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    sass (3.1.19)
+    sass (3.2.1)
     sass-rails (3.1.6)
       actionpack (~> 3.1.0)
       railties (~> 3.1.0)

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
-  remote: /Users/gabe/thoughtbot/open-source/shoulda-matchers
+  remote: /Users/joshuaclayton/dev/gems/shoulda-matchers
   specs:
-    shoulda-matchers (1.2.0)
+    shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -46,8 +46,8 @@ GEM
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
-    childprocess (0.3.2)
-      ffi (~> 1.0.6)
+    childprocess (0.3.5)
+      ffi (~> 1.0, >= 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -56,22 +56,22 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.0.11)
+    ffi (1.1.5)
     gherkin (2.9.3)
       json (>= 1.4.6)
     hike (1.2.1)
     i18n (0.6.0)
-    journey (1.0.3)
-    jquery-rails (2.0.2)
-      railties (>= 3.2.0, < 5.0)
+    journey (1.0.4)
+    jquery-rails (2.1.1)
+      railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.7.3)
+    json (1.7.5)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     metaclass (0.0.1)
-    mime-types (1.18)
+    mime-types (1.19)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
     multi_json (1.3.6)
@@ -114,7 +114,7 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec (~> 2.8.0)
-    sass (3.1.19)
+    sass (3.2.1)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)

data/lib/shoulda/matchers.rb

@@ -3,6 +3,6 @@ require 'shoulda/matchers/assertion_error'
 
 if defined?(RSpec)
   require 'shoulda/matchers/integrations/rspec'
-else
-  require 'shoulda/matchers/integrations/test_unit'
 end
+
+require 'shoulda/matchers/integrations/test_unit'

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

@@ -66,16 +66,7 @@ module Shoulda # :nodoc:
         end
 
         def rendered_layouts
-          if recorded_layouts.size > 0
-            recorded_layouts.keys.compact.map { |layout| layout.sub(%r{^layouts/}, '') }
-          else
-            layout = @controller.response.layout
-            if layout.nil?
-              []
-            else
-              [layout.split('/').last]
-            end
-          end
+          recorded_layouts.keys.compact.map { |layout| layout.sub(%r{^layouts/}, '') }
         end
 
         def recorded_layouts

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

@@ -7,6 +7,8 @@ module Shoulda # :nodoc:
       #
       # Options:
       # * <tt>with_message</tt> - value the test expects to find in
+      #   <tt>allow_blank</tt> - allows a blank value
+      #   <tt>allow_nil</tt> - allows a nil value
       #   <tt>errors.on(:attribute)</tt>. <tt>Regexp</tt> or <tt>String</tt>.
       #   Defaults to the translation for <tt>:invalid</tt>.
       # * <tt>with(string to test against)</tt>
@@ -28,6 +30,17 @@ module Shoulda # :nodoc:
 
         def initialize(attribute)
           super
+          @options = {}
+        end
+
+        def allow_blank(allow_blank = true)
+          @options[:allow_blank] = allow_blank
+          self
+        end
+
+        def allow_nil(allow_nil = true)
+          @options[:allow_nil] = allow_nil
+          self
         end
 
         def with_message(message)
@@ -50,14 +63,35 @@ module Shoulda # :nodoc:
         def matches?(subject)
           super(subject)
           @expected_message ||= :invalid
-          return disallows_value_of(@value_to_fail, @expected_message) if @value_to_fail
-          allows_value_of(@value_to_pass, @expected_message) if @value_to_pass
+
+          if @value_to_fail
+            disallows_value_of(@value_to_fail, @expected_message) && allows_blank_value? && allows_nil_value?
+          else
+            allows_value_of(@value_to_pass, @expected_message) && allows_blank_value? && allows_nil_value?
+          end
         end
 
         def description
           "#{@attribute} have a valid format"
         end
 
+        private
+
+        def allows_blank_value?
+          if @options.key?(:allow_blank)
+            @options[:allow_blank] == allows_value_of('')
+          else
+            true
+          end
+        end
+
+        def allows_nil_value?
+          if @options.key?(:allow_nil)
+            @options[:allow_nil] == allows_value_of(nil)
+          else
+            true
+          end
+        end
       end
 
     end

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

@@ -68,20 +68,25 @@ module Shoulda # :nodoc:
         def matches?(subject)
           @subject = subject.class.new
           @expected_message ||= :taken
-          has_existing? &&
-            set_scoped_attributes &&
+          set_scoped_attributes &&
             validate_attribute? &&
             validate_after_scope_change?
         end
 
         private
 
-        def has_existing?
-          if @existing = @subject.class.find(:first)
-            true
-          else
-            @failure_message = "Can't find first #{class_name}"
-            false
+        def existing
+          @existing ||= first_instance
+        end
+
+        def first_instance
+          @subject.class.first || create_instance_in_database
+        end
+
+        def create_instance_in_database
+          @subject.class.new.tap do |instance|
+            instance.send("#{@attribute}=", "arbitrary_string")
+            instance.save(:validate => false)
           end
         end
 
@@ -90,7 +95,7 @@ module Shoulda # :nodoc:
             @options[:scopes].all? do |scope|
               setter = :"#{scope}="
               if @subject.respond_to?(setter)
-                @subject.send("#{scope}=", @existing.send(scope))
+                @subject.send(setter, existing.send(scope))
                 true
               else
                 @failure_message = "#{class_name} doesn't seem to have a #{scope} attribute."
@@ -114,7 +119,7 @@ module Shoulda # :nodoc:
             true
           else
             @options[:scopes].all? do |scope|
-              previous_value = @existing.send(scope)
+              previous_value = existing.send(scope)
 
               # Assume the scope is a foreign key if the field is nil
               previous_value ||= 0
@@ -128,6 +133,8 @@ module Shoulda # :nodoc:
               @subject.send("#{scope}=", next_value)
 
               if allows_value_of(existing_value, @expected_message)
+                @subject.send("#{scope}=", previous_value)
+
                 @negative_failure_message <<
                   " (with different value of #{scope})"
                 true
@@ -144,7 +151,7 @@ module Shoulda # :nodoc:
         end
 
         def existing_value
-          value = @existing.send(@attribute)
+          value = existing.send(@attribute)
           if @options[:case_insensitive] && value.respond_to?(:swapcase!)
             value.swapcase!
           end

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

@@ -3,6 +3,12 @@ module Shoulda # :nodoc:
     module ActiveRecord # :nodoc:
       # Ensure that the belongs_to relationship exists.
       #
+      # Options:
+      # * <tt>:class_name</tt> - tests that the association makes use of the class_name option.
+      # * <tt>:validate</tt> - tests that the association makes use of the validate
+      # option.
+      #
+      # Example:
       #   it { should belong_to(:parent) }
       #
       def belong_to(name)
@@ -18,6 +24,8 @@ module Shoulda # :nodoc:
       # * <tt>dependent</tt> - tests that the association makes use of the
       #   dependent option.
       # * <tt>:class_name</tt> - tests that the association makes use of the class_name option.
+      # * <tt>:validate</tt> - tests that the association makes use of the validate
+      # option.
       #
       # Example:
       #   it { should have_many(:friends) }
@@ -36,6 +44,8 @@ module Shoulda # :nodoc:
       # * <tt>:dependent</tt> - tests that the association makes use of the
       #   dependent option.
       # * <tt>:class_name</tt> - tests that the association makes use of the class_name option.
+      # * <tt>:validate</tt> - tests that the association makes use of the validate
+      # option.
       #
       # Example:
       #   it { should have_one(:god) } # unless hindu
@@ -47,6 +57,11 @@ module Shoulda # :nodoc:
       # Ensures that the has_and_belongs_to_many relationship exists, and that
       # the join table is in place.
       #
+      # Options:
+      # * <tt>:validate</tt> - tests that the association makes use of the validate
+      # option.
+      #
+      # Example:
       #   it { should have_and_belong_to_many(:posts) }
       #
       def have_and_belong_to_many(name)
@@ -85,6 +100,11 @@ module Shoulda # :nodoc:
           self
         end
 
+        def validate(validate = true)
+          @validate = validate
+          self
+        end
+
         def matches?(subject)
           @subject = subject
           association_exists? &&
@@ -95,7 +115,8 @@ module Shoulda # :nodoc:
             class_name_correct? &&
             order_correct? &&
             conditions_correct? &&
-            join_table_exists?
+            join_table_exists? &&
+            validate_correct?
         end
 
         def failure_message
@@ -230,6 +251,15 @@ module Shoulda # :nodoc:
           end
         end
 
+        def validate_correct?
+          if !@validate && !reflection.options[:validate] || @validate == reflection.options[:validate]
+            true
+          else
+            @missing = "#{@name} should have #{@validate} as validate"
+            false
+          end
+        end
+
         def class_has_foreign_key?(klass)
           if klass.column_names.include?(foreign_key)
             true

data/lib/shoulda/matchers/assertion_error.rb

@@ -1,11 +1,13 @@
 module Shoulda
   module Matchers
-    if RUBY_VERSION > "1.9"
+    if Gem.ruby_version >= Gem::Version.new('1.8') && Gem.ruby_version < Gem::Version.new('1.9')
+      require 'test/unit'
+      AssertionError = Test::Unit::AssertionFailedError
+    elsif Gem.ruby_version >= Gem::Version.new("1.9")
       require 'minitest/unit'
       AssertionError = MiniTest::Assertion
     else
-      require 'test/unit/assertionfailederror'
-      AssertionError = Test::Unit::AssertionFailedError
+      raise "No unit test library available"
     end
   end
 end

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.3.0'.freeze
   end
 end

data/spec/shoulda/action_controller/render_with_layout_matcher_spec.rb

@@ -31,6 +31,14 @@ describe Shoulda::Matchers::ActionController::RenderWithLayoutMatcher do
     end
   end
 
+  context "a controller that renders a partial" do
+    let(:controller) { build_response { render :partial => 'partial' } }
+
+    it "should reject rendering with a layout" do
+      controller.should_not render_with_layout
+    end
+  end
+
   context "given a context with layouts" do
     let(:layout) { 'happy' }
     let(:controller) { build_response { render :layout => false } }

data/spec/shoulda/active_model/validate_format_of_matcher_spec.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::ValidateFormatOfMatcher do
-
   context "a postal code" do
     before do
       define_model :example, :attr => :string do
@@ -10,29 +9,71 @@ describe Shoulda::Matchers::ActiveModel::ValidateFormatOfMatcher do
       @model = Example.new
     end
 
-    it "should be valid" do
+    it "is valid" do
       @model.should validate_format_of(:attr).with('12345')
     end
 
-    it "should not be valid with alpha in zip" do
+    it "is not valid with blank" do
+      @model.should_not validate_format_of(:attr).with(' ')
+      @model.should validate_format_of(:attr).not_with(' ')
+    end
+
+    it "is not valid with nil" do
+      @model.should_not validate_format_of(:attr).with(nil)
+    end
+
+    it "is not valid with alpha in zip" do
       @model.should_not validate_format_of(:attr).with('1234a')
       @model.should validate_format_of(:attr).not_with('1234a')
     end
 
-    it "should not be valid with too few digits" do
+    it "is not valid with too few digits" do
       @model.should_not validate_format_of(:attr).with('1234')
       @model.should validate_format_of(:attr).not_with('1234')
     end
 
-    it "should not be valid with too many digits" do
+    it "is not valid with too many digits" do
       @model.should_not validate_format_of(:attr).with('123456')
       @model.should validate_format_of(:attr).not_with('123456')
     end
 
-    it "should raise error if you try to call both with and not_with" do
+    it "raises error if you try to call both with and not_with" do
       expect { validate_format_of(:attr).not_with('123456').with('12345') }.
         to raise_error(RuntimeError)
     end
   end
 
+  context "when allow_blank and allow_nil are set" do
+    before do
+      define_model :example, :attr => :string do
+        validates_format_of :attr, :with => /^\d{5}$/, :allow_blank => true, :allow_nil => true
+      end
+      @model = Example.new
+    end
+
+    it "is valid when attr is nil" do
+      @model.should validate_format_of(:attr).with(nil)
+    end
+
+    it "is valid when attr is blank" do
+      @model.should validate_format_of(:attr).with(' ')
+    end
+
+    describe "#allow_blank" do
+      it "allows allow_blank" do
+        @model.should validate_format_of(:attr).allow_blank
+        @model.should validate_format_of(:attr).allow_blank(true)
+        @model.should_not validate_format_of(:attr).allow_blank(false)
+      end
+    end
+
+    describe "#allow_nil" do
+      it "allows allow_nil" do
+        @model.should validate_format_of(:attr).allow_nil
+        @model.should validate_format_of(:attr).allow_nil(true)
+        @model.should_not validate_format_of(:attr).allow_nil(false)
+      end
+    end
+  end
+
 end

data/spec/shoulda/active_model/validate_uniqueness_of_matcher_spec.rb

@@ -34,13 +34,8 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
         @matcher = validate_uniqueness_of(:attr)
       end
 
-      it "should fail to require a unique value" do
-        @model.should_not @matcher
-      end
-
-      it "should alert the tester that an existing value is not present" do
-        @matcher.matches?(@model)
-        @matcher.negative_failure_message.should =~ /^Can't find first .*/
+      it "does not not require a created instance" do
+        @model.should @matcher
       end
     end
   end
@@ -71,11 +66,12 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
     before do
       @model = define_model(:example, :attr   => :string,
                                       :scope1 => :integer,
-                                      :scope2 => :integer) do
-        attr_accessible :attr, :scope1, :scope2
+                                      :scope2 => :integer,
+                                      :other => :integer) do
+        attr_accessible :attr, :scope1, :scope2, :other
         validates_uniqueness_of :attr, :scope => [:scope1, :scope2]
       end.new
-      @existing = Example.create!(:attr => 'value', :scope1 => 1, :scope2 => 2)
+      @existing = Example.create!(:attr => 'value', :scope1 => 1, :scope2 => 2, :other => 3)
     end
 
     it "should pass when the correct scope is specified" do
@@ -86,10 +82,18 @@ describe Shoulda::Matchers::ActiveModel::ValidateUniquenessOfMatcher do
       @existing.should validate_uniqueness_of(:attr).scoped_to(:scope1, :scope2)
     end
 
-    it "should fail when a different scope is specified" do
+    it "should fail when too narrow of a scope is specified" do
+      @model.should_not validate_uniqueness_of(:attr).scoped_to(:scope1, :scope2, :other)
+    end
+
+    it "should fail when too broad of a scope is specified" do
       @model.should_not validate_uniqueness_of(:attr).scoped_to(:scope1)
     end
 
+    it "should fail when a different scope is specified" do
+      @model.should_not validate_uniqueness_of(:attr).scoped_to(:other)
+    end
+
     it "should fail when no scope is specified" do
       @model.should_not validate_uniqueness_of(:attr)
     end

data/spec/shoulda/active_record/association_matcher_spec.rb

@@ -98,6 +98,46 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       end
       Child.new.should_not @matcher.class_name('TreeChild')
     end
+
+    context 'should accept an association with a false :validate option' do
+      before do
+        define_model :parent, :adopter => :boolean
+        define_model :child, :parent_id => :integer do
+          belongs_to :parent, :validate => false
+        end
+      end
+      subject { Child.new }
+      specify { subject.should @matcher.validate(false) }
+      specify { subject.should_not @matcher.validate(true) }
+      specify { subject.should_not @matcher.validate }
+    end
+
+    context 'should accept an association with a true :validate option' do
+      before do
+        define_model :parent, :adopter => :boolean
+        define_model :child, :parent_id => :integer do
+          belongs_to :parent, :validate => true
+        end
+      end
+      subject { Child.new }
+      specify { subject.should_not @matcher.validate(false) }
+      specify { subject.should @matcher.validate(true) }
+      specify { subject.should @matcher.validate }
+    end
+
+    context 'should accept an association without a :validate option' do
+      before do
+        define_model :parent, :adopter => :boolean
+        define_model :child, :parent_id => :integer do
+          belongs_to :parent
+        end
+      end
+      subject { Child.new }
+      specify { subject.should @matcher.validate(false) }
+      specify { subject.should_not @matcher.validate(true) }
+      specify { subject.should_not @matcher.validate }
+    end
+
   end
 
   context "have_many" do
@@ -240,6 +280,45 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       Parent.new.should_not @matcher.class_name('Node')
     end
 
+    context 'should accept an association with a false :validate option' do
+      before do
+        define_model :child, :parent_id => :integer, :adopted => :boolean
+        define_model :parent do
+          has_many :children, :validate => false
+        end
+      end
+      subject { Parent.new }
+      specify { subject.should @matcher.validate(false) }
+      specify { subject.should_not @matcher.validate(true) }
+      specify { subject.should_not @matcher.validate }
+    end
+
+    context 'should accept an association with a true :validate option' do
+      before do
+        define_model :child, :parent_id => :integer, :adopted => :boolean
+        define_model :parent do
+          has_many :children, :validate => true
+        end
+      end
+      subject { Parent.new }
+      specify { subject.should_not @matcher.validate(false) }
+      specify { subject.should @matcher.validate(true) }
+      specify { subject.should @matcher.validate }
+    end
+
+    context 'should accept an association without a :validate option' do
+      before do
+        define_model :child, :parent_id => :integer, :adopted => :boolean
+        define_model :parent do
+          has_many :children
+        end
+      end
+      subject { Parent.new }
+      specify { subject.should @matcher.validate(false) }
+      specify { subject.should_not @matcher.validate(true) }
+      specify { subject.should_not @matcher.validate }
+    end
+
     it "should accept an association with a nonstandard reverse foreign key, using :inverse_of" do
       define_model :child, :ancestor_id => :integer do
         belongs_to :ancestor, :inverse_of => :children, :class_name => :Parent
@@ -364,6 +443,70 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       Person.new.should_not @matcher.class_name('PersonDetail')
     end
 
+    it "should accept an association with a through" do
+      define_model :detail
+
+      define_model :account do
+        has_one :detail
+      end
+
+      define_model :person do
+        has_one :account
+        has_one :detail, :through => :account
+      end
+
+      Person.new.should @matcher.through(:account)
+    end
+
+    it "should reject an association with a through" do
+      define_model :detail
+
+      define_model :person do
+        has_one :detail
+      end
+
+      Person.new.should_not @matcher.through(:account)
+    end
+
+    context 'should accept an association with a false :validate option' do
+      before do
+        define_model :detail, :person_id => :integer, :disabled => :boolean
+        define_model :person do
+          has_one :detail, :validate => false
+        end
+      end
+      subject { Person.new }
+      specify { subject.should @matcher.validate(false) }
+      specify { subject.should_not @matcher.validate(true) }
+      specify { subject.should_not @matcher.validate }
+    end
+
+    context 'should accept an association with a true :validate option' do
+      before do
+        define_model :detail, :person_id => :integer, :disabled => :boolean
+        define_model :person do
+          has_one :detail, :validate => true
+        end
+      end
+      subject { Person.new }
+      specify { subject.should_not @matcher.validate(false) }
+      specify { subject.should @matcher.validate(true) }
+      specify { subject.should @matcher.validate }
+    end
+
+    context 'should accept an association without a :validate option' do
+      before do
+        define_model :detail, :person_id => :integer, :disabled => :boolean
+        define_model :person do
+          has_one :detail
+        end
+      end
+      subject { Person.new }
+      specify { subject.should @matcher.validate(false) }
+      specify { subject.should_not @matcher.validate(true) }
+      specify { subject.should_not @matcher.validate }
+    end
+
   end
 
   context "have_and_belong_to_many" do
@@ -445,5 +588,47 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       Person.new.should_not @matcher.class_name('PersonRelatives')
     end
 
+    context 'should accept an association with a false :validate option' do
+      before do
+        define_model :relatives, :adopted => :boolean
+        define_model :person do
+          has_and_belongs_to_many :relatives, :validate => false
+        end
+        define_model :people_relative, :person_id => :integer, :relative_id => :integer
+      end
+      subject { Person.new }
+      specify { subject.should @matcher.validate(false) }
+      specify { subject.should_not @matcher.validate(true) }
+      specify { subject.should_not @matcher.validate }
+    end
+
+    context 'should accept an association with a true :validate option' do
+      before do
+        define_model :relatives, :adopted => :boolean
+        define_model :person do
+          has_and_belongs_to_many :relatives, :validate => true
+        end
+        define_model :people_relative, :person_id => :integer, :relative_id => :integer
+      end
+      subject { Person.new }
+      specify { subject.should_not @matcher.validate(false) }
+      specify { subject.should @matcher.validate(true) }
+      specify { subject.should @matcher.validate }
+    end
+
+    context 'should accept an association without a :validate option' do
+      before do
+        define_model :relatives, :adopted => :boolean
+        define_model :person do
+          has_and_belongs_to_many :relatives
+        end
+        define_model :people_relative, :person_id => :integer, :relative_id => :integer
+      end
+      subject { Person.new }
+      specify { subject.should @matcher.validate(false) }
+      specify { subject.should_not @matcher.validate(true) }
+      specify { subject.should_not @matcher.validate }
+    end
+
   end
 end

data/spec/shoulda/active_record/serialize_matcher_spec.rb

@@ -59,7 +59,7 @@ describe Shoulda::Matchers::ActiveRecord::SerializeMatcher do
 
     context "a serializer that is an instance of a class" do
       before do
-        define_class(:ExampleSerializer, Object) do
+        define_class(:ExampleSerializer) do
           def load(*); end
           def dump(*); end
         end

data/spec/support/class_builder.rb

@@ -0,0 +1,42 @@
+module ClassBuilder
+  def self.included(example_group)
+    example_group.class_eval do
+      after do
+        teardown_defined_constants
+      end
+    end
+  end
+
+  def define_class(class_name, base = Object, &block)
+    class_name = class_name.to_s.camelize
+
+    # FIXME: ActionMailer 3.2 calls `name.underscore` immediately upon
+    # subclassing. Class.new.name == nil. So, Class.new(ActionMailer::Base)
+    # errors out since it's trying to do `nil.underscore`. This is very ugly but
+    # allows us to test against ActionMailer 3.2.x.
+    eval <<-A_REAL_CLASS_FOR_ACTION_MAILER_3_2
+    class ::#{class_name} < #{base}
+    end
+    A_REAL_CLASS_FOR_ACTION_MAILER_3_2
+
+    Object.const_get(class_name).tap do |constant_class|
+      constant_class.unloadable
+
+      if block_given?
+        constant_class.class_eval(&block)
+      end
+
+      if constant_class.respond_to?(:reset_column_information)
+        constant_class.reset_column_information
+      end
+    end
+  end
+
+  def teardown_defined_constants
+    ActiveSupport::Dependencies.clear
+  end
+end
+
+RSpec.configure do |config|
+  config.include ClassBuilder
+end

data/spec/support/controller_builder.rb

@@ -0,0 +1,78 @@
+module ControllerBuilder
+  TMP_VIEW_PATH =
+    File.expand_path(File.join(TESTAPP_ROOT, 'tmp', 'views')).freeze
+
+  def self.included(example_group)
+    example_group.class_eval do
+      after do
+        delete_temporary_views
+        restore_original_routes
+      end
+    end
+  end
+
+  def define_controller(class_name, &block)
+    class_name = class_name.to_s
+    class_name << 'Controller' unless class_name =~ /Controller$/
+    define_class(class_name, ActionController::Base, &block)
+  end
+
+  def define_routes(&block)
+    Rails.application.routes.draw(&block)
+    @routes = Rails.application.routes
+    class << self
+      include ActionDispatch::Assertions
+    end
+  end
+
+  def build_response(opts = {}, &block)
+    action = opts[:action] || 'example'
+    partial = opts[:partial] || '_partial'
+    block ||= lambda { render :nothing => true }
+    controller_class = define_controller('Examples') do
+      layout false
+      define_method(action, &block)
+    end
+    controller_class.view_paths = [TMP_VIEW_PATH]
+
+    define_routes do
+      match 'examples', :to => "examples##{action}"
+    end
+
+    create_view("examples/#{action}.html.erb", "abc")
+    create_view("examples/#{partial}.html.erb", "partial")
+
+    @controller = controller_class.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+
+    class << self
+      include ActionController::TestCase::Behavior
+    end
+    @routes = Rails.application.routes
+
+    get action
+
+    @controller
+  end
+
+  def create_view(path, contents)
+    full_path = File.join(TMP_VIEW_PATH, path)
+    FileUtils.mkdir_p(File.dirname(full_path))
+    File.open(full_path, 'w') { |file| file.write(contents) }
+  end
+
+  private
+
+  def delete_temporary_views
+    FileUtils.rm_rf(TMP_VIEW_PATH)
+  end
+
+  def restore_original_routes
+    Rails.application.reload_routes!
+  end
+end
+
+RSpec.configure do |config|
+  config.include ControllerBuilder
+end

data/spec/support/mailer_builder.rb

@@ -0,0 +1,10 @@
+module MailerBuilder
+  def define_mailer(name, paths, &block)
+    class_name = name.to_s.pluralize.classify
+    define_class(class_name, ActionMailer::Base, &block)
+  end
+end
+
+RSpec.configure do |config|
+  config.include MailerBuilder
+end

data/spec/support/model_builder.rb

@@ -1,7 +1,4 @@
 module ModelBuilder
-  TMP_VIEW_PATH =
-    File.expand_path(File.join(TESTAPP_ROOT, 'tmp', 'views')).freeze
-
   def self.included(example_group)
     example_group.class_eval do
       before do
@@ -9,7 +6,7 @@ module ModelBuilder
       end
 
       after do
-        teardown_defined_constants
+        drop_created_tables
       end
     end
   end
@@ -28,37 +25,12 @@ module ModelBuilder
     end
   end
 
-  def define_class(class_name, base = Object, &block)
-    class_name = class_name.to_s.camelize
-
-    # FIXME: ActionMailer 3.2 calls `name.underscore` immediately upon
-    # subclassing. Class.new.name == nil. So, Class.new(ActionMailer::Base)
-    # errors out since it's trying to do `nil.underscore`. This is very ugly but
-    # allows us to test against ActionMailer 3.2.x.
-    eval <<-A_REAL_CLASS_FOR_ACTION_MAILER_3_2
-    class ::#{class_name} < #{base}
-    end
-    A_REAL_CLASS_FOR_ACTION_MAILER_3_2
-
-    Object.const_get(class_name).tap do |constant_class|
-      constant_class.unloadable
-
-      if block_given?
-        constant_class.class_eval(&block)
-      end
-
-      if constant_class.respond_to?(:reset_column_information)
-        constant_class.reset_column_information
-      end
-    end
-  end
-
   def define_model_class(class_name, &block)
     define_class(class_name, ActiveRecord::Base, &block)
   end
 
   def define_active_model_class(class_name, options = {}, &block)
-    define_class(class_name, Object) do
+    define_class(class_name) do
       include ActiveModel::Validations
 
       options[:accessors].each do |column|
@@ -84,71 +56,12 @@ module ModelBuilder
     define_model_class(class_name, &block)
   end
 
-  def define_mailer(name, paths, &block)
-    class_name = name.to_s.pluralize.classify
-    define_class(class_name, ActionMailer::Base, &block)
-  end
-
-  def define_controller(class_name, &block)
-    class_name = class_name.to_s
-    class_name << 'Controller' unless class_name =~ /Controller$/
-    define_class(class_name, ActionController::Base, &block)
-  end
-
-  def define_routes(&block)
-    Rails.application.routes.draw(&block)
-    @routes = Rails.application.routes
-    class << self
-      include ActionDispatch::Assertions
-    end
-  end
-
-  def build_response(opts = {}, &block)
-    action = opts[:action] || 'example'
-    partial = opts[:partial] || '_partial'
-    klass = define_controller('Examples')
-    block ||= lambda { render :nothing => true }
-    klass.class_eval { layout false; define_method(action, &block) }
-    define_routes do
-      match 'examples', :to => "examples##{action}"
-    end
-
-    create_view("examples/#{action}.html.erb", "abc")
-    create_view("examples/#{partial}.html.erb", "partial")
-    klass.view_paths = [TMP_VIEW_PATH]
-
-    @controller = klass.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-
-    class << self
-      include ActionController::TestCase::Behavior
-    end
-    @routes = Rails.application.routes
-
-    get action
-
-    @controller
-  end
-
-  def create_view(path, contents)
-    full_path = File.join(TMP_VIEW_PATH, path)
-    FileUtils.mkdir_p(File.dirname(full_path))
-    File.open(full_path, 'w') { |file| file.write(contents) }
-  end
-
-  def teardown_defined_constants
-    ActiveSupport::Dependencies.clear
-
+  def drop_created_tables
     connection = ActiveRecord::Base.connection
 
     @created_tables.each do |table_name|
       connection.execute("DROP TABLE IF EXISTS #{table_name}")
     end
-
-    FileUtils.rm_rf(TMP_VIEW_PATH)
-
-    Rails.application.reload_routes!
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-14 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -266,6 +266,9 @@ files:
 - spec/shoulda/active_record/serialize_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
+- spec/support/class_builder.rb
+- spec/support/controller_builder.rb
+- spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
 homepage: http://thoughtbot.com/community/
 licenses: []
@@ -279,18 +282,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2813664721542156285
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2813664721542156285
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -340,4 +337,8 @@ test_files:
 - spec/shoulda/active_record/serialize_matcher_spec.rb
 - spec/spec_helper.rb
 - spec/support/active_model_versions.rb
+- spec/support/class_builder.rb
+- spec/support/controller_builder.rb
+- spec/support/mailer_builder.rb
 - spec/support/model_builder.rb
+has_rdoc: