add true option for dependent matcher and test all options

.gitignore

@@ -11,3 +11,4 @@ pkg
 tags
 test/*/log/*.log
 tmp
+.ruby-version

lib/shoulda/matchers/active_record/association_matcher.rb

@@ -162,6 +162,12 @@ module ActiveRecord
       #       should belong_to(:world).dependent(:destroy)
       #     end
       #
+      # To test that any :dependent option was specified, pass true.
+      #     # RSpec
+      #     describe Person do
+      #       it { should belong_to(:world).dependent(true) }
+      #     end
+      #
       # ##### counter_cache
       #
       # Use `counter_cache` to assert that the `:counter_cache` option was
@@ -993,7 +999,7 @@ def macro_correct?
         end
 
         def macro_supports_primary_key?
-          macro == :belongs_to || 
+          macro == :belongs_to ||
             ([:has_many, :has_one].include?(macro) && !through?)
         end
 

lib/shoulda/matchers/active_record/association_matchers/dependent_matcher.rb

@@ -18,11 +18,10 @@ def description
 
           def matches?(subject)
             self.subject = ModelReflector.new(subject, name)
-
-            if option_verifier.correct_for_string?(:dependent, dependent)
+            if correct_for?(dependent)
               true
             else
-              self.missing_option = "#{name} should have #{dependent} dependency"
+              self.missing_option = missing_option_for(name, dependent)
               false
             end
           end
@@ -34,6 +33,18 @@ def matches?(subject)
           def option_verifier
             @option_verifier ||= OptionVerifier.new(subject)
           end
+
+          def correct_for?(dependent=dependent)
+            case dependent
+            when true, false then option_verifier.correct_for_boolean?(:dependent, dependent)
+            else option_verifier.correct_for_string?(:dependent, dependent)
+            end
+          end
+
+          def missing_option_for(name=name, dependent=dependent)
+            "#{name} should have #{dependent == true ? "a" : dependent} dependency"
+          end
+
         end
       end
     end

spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb

@@ -1,5 +1,16 @@
 require 'unit_spec_helper'
 
+def each_dependent_option(rails_version)
+  case rails_version
+  when /\A3/
+    [:destroy, :delete, :nullify, :restrict]
+  when /\A4/
+    [:destroy, :delete, :nullify, :restrict_with_exception, :restrict_with_error]
+  end.each do |option|
+    yield option
+  end
+end
+
 describe Shoulda::Matchers::ActiveRecord::AssociationMatcher, type: :model do
   context 'belong_to' do
     it 'accepts a good association with the default foreign key' do
@@ -645,9 +656,29 @@ def having_many_non_existent_class(model_name, assoc_name, options = {})
       expect(Person.new).not_to have_one(:detail)
     end
 
-    it 'accepts an association with a valid :dependent option' do
-      expect(having_one_detail(dependent: :destroy)).
-        to have_one(:detail).dependent(:destroy)
+    each_dependent_option(Rails.version) do |option|
+      it 'accepts an association with a valid :dependent option' do
+        expect(having_one_detail(dependent: option)).
+        to have_one(:detail).dependent(option)
+      end
+    end
+
+    it 'accepts any dependent option if true' do
+      each_dependent_option(Rails.version) do |option|
+        expect(having_one_detail(dependent: option)).
+          to have_one(:detail).dependent(true)
+      end
+    end
+
+    it 'rejects any dependent options if false' do
+      each_dependent_option(Rails.version) do |option|
+        expect(having_one_detail(dependent: option)).
+          to_not have_one(:detail).dependent(false)
+      end
+    end
+
+    it 'accepts a nil dependent option if false' do
+      expect(having_one_detail).to have_one(:detail).dependent(false)
     end
 
     it 'rejects an association with a bad :dependent option' do