shoulda-matchers 1.5.4 → 1.5.5

data/CONTRIBUTING.md

@@ -11,7 +11,10 @@ a test!
 
 4. Make the test pass.
 
-5. Push to your fork and submit a pull request.
+5. Update NEWS.md with a brief description of your changes under the HEAD
+   heading.
+
+6. Push to your fork and submit a pull request.
 
 
 At this point you're waiting on us. We like to at least comment on, if not

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    shoulda-matchers (1.5.4)
+    shoulda-matchers (1.5.5)
       activesupport (>= 3.0.0)
       bourne (~> 1.3)
 

data/NEWS.md

@@ -1,5 +1,15 @@
 # HEAD
 
+# v 1.5.5
+* `AllowValueMatcher` checks that the right value is used for attempts at
+setting the attribute with it
+  * Please note that previously-passing tests might now fail. It is likely that
+  it's not a bug, but please make sure that the code you're testing is written
+  properly before submitting an issue.
+* Use DisallowValueMatcher for `disallows_value_of` method
+* Assert `class_name` value on real class name for `AssociationMatcher`
+* Correct the variable used for `validate_confirmation_of` matcher description
+
 # v 1.5.4
 * Properly-released version of 1.5.3
 

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/melissaxie/thoughtbot/shoulda-matchers
   specs:
-    shoulda-matchers (1.5.4)
+    shoulda-matchers (1.5.5)
       activesupport (>= 3.0.0)
       bourne (~> 1.3)
 

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/melissaxie/thoughtbot/shoulda-matchers
   specs:
-    shoulda-matchers (1.5.4)
+    shoulda-matchers (1.5.5)
       activesupport (>= 3.0.0)
       bourne (~> 1.3)
 

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/melissaxie/thoughtbot/shoulda-matchers
   specs:
-    shoulda-matchers (1.5.4)
+    shoulda-matchers (1.5.5)
       activesupport (>= 3.0.0)
       bourne (~> 1.3)
 

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

@@ -30,38 +30,40 @@ module Shoulda # :nodoc:
       class AllowValueMatcher # :nodoc:
         include Helpers
 
+        attr_accessor :options
+
         def initialize(*values)
-          @values_to_match = values
-          @message_finder_factory = ValidationMessageFinder
-          @options = {}
+          self.values_to_match = values
+          self.message_finder_factory = ValidationMessageFinder
+          self.options = {}
         end
 
         def for(attribute)
-          @attribute = attribute
+          self.attribute = attribute
           self
         end
 
         def with_message(message)
-          @options[:expected_message] = message
+          self.options[:expected_message] = message
           self
         end
 
         def strict
-          @message_finder_factory = ExceptionMessageFinder
+          self.message_finder_factory = ExceptionMessageFinder
           self
         end
 
         def matches?(instance)
-          @instance = instance
-          @values_to_match.none? do |value|
-            @value = value
-            @instance.send("#{@attribute}=", @value)
-            errors_match?
+          self.instance = instance
+
+          values_to_match.all? do |current_value|
+            set_attribute_on_instance(current_value)
+            matches_attribute_value?(current_value) && errors_do_not_match?
           end
         end
 
         def failure_message_for_should
-          "Did not expect #{expectation}, got error: #{@matched_error}"
+          "Did not expect #{expectation}, got error: #{matched_error}"
         end
 
         def failure_message_for_should_not
@@ -74,17 +76,29 @@ module Shoulda # :nodoc:
 
         private
 
-        def errors_match?
-          has_messages? && errors_for_attribute_match?
+        attr_accessor :values_to_match, :message_finder_factory,
+          :instance, :attribute, :value, :matched_error
+
+        def set_attribute_on_instance(current_value)
+          self.value = current_value
+          instance.send("#{attribute}=", current_value)
+        end
+
+        def matches_attribute_value?(current_value)
+          instance.send(attribute.to_sym) == current_value
+        end
+
+        def errors_do_not_match?
+          has_no_messages? || !errors_for_attribute_match?
         end
 
-        def has_messages?
-          message_finder.has_messages?
+        def has_no_messages?
+          !message_finder.has_messages?
         end
 
         def errors_for_attribute_match?
           if expected_message
-            @matched_error = errors_match_regexp? || errors_match_string?
+            self.matched_error = errors_match_regexp? || errors_match_string?
           else
             errors_for_attribute.compact.any?
           end
@@ -108,7 +122,7 @@ module Shoulda # :nodoc:
 
         def expectation
           includes_expected_message = expected_message ? "to include #{expected_message.inspect}" : ''
-          [error_source, includes_expected_message, "when #{@attribute} is set to #{@value.inspect}"].join(' ')
+          [error_source, includes_expected_message, "when #{attribute} is set to #{value.inspect}"].join(' ')
         end
 
         def error_source
@@ -120,19 +134,19 @@ module Shoulda # :nodoc:
         end
 
         def allowed_values
-          if @values_to_match.length > 1
-            "any of [#{@values_to_match.map(&:inspect).join(', ')}]"
+          if values_to_match.length > 1
+            "any of [#{values_to_match.map(&:inspect).join(', ')}]"
           else
-            @values_to_match.first.inspect
+            values_to_match.first.inspect
           end
         end
 
         def expected_message
-          if @options.key?(:expected_message)
-            if Symbol === @options[:expected_message]
+          if options.key?(:expected_message)
+            if Symbol === options[:expected_message]
               default_expected_message
             else
-              @options[:expected_message]
+              options[:expected_message]
             end
           end
         end
@@ -143,19 +157,19 @@ module Shoulda # :nodoc:
 
         def default_attribute_message
           default_error_message(
-            @options[:expected_message],
+            options[:expected_message],
             :model_name => model_name,
-            :instance => @instance,
-            :attribute => @attribute
+            :instance => instance,
+            :attribute => attribute
           )
         end
 
         def model_name
-          @instance.class.to_s.underscore
+          instance.class.to_s.underscore
         end
 
         def message_finder
-          @message_finder_factory.new(@instance, @attribute)
+          message_finder_factory.new(instance, attribute)
         end
       end
     end

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

@@ -24,9 +24,18 @@ module Shoulda # :nodoc:
           @allow_matcher.failure_message_for_should_not
         end
 
+        def failure_message_for_should_not
+          @allow_matcher.failure_message_for_should
+        end
+
         def allowed_types
           ''
         end
+
+        def strict
+          @allow_matcher.strict
+          self
+        end
       end
     end
   end

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

@@ -24,7 +24,7 @@ module Shoulda # :nodoc:
         end
 
         def description
-          "require #{@base_attribute} to match #{@attribute}"
+          "require #{@confirmation} to match #{@attribute}"
         end
 
         def matches?(subject)

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

@@ -38,14 +38,14 @@ module Shoulda # :nodoc:
         end
 
         def disallows_value_of(value, message = nil)
-          disallow = allow_value_matcher(value, message)
+          disallow = disallow_value_matcher(value, message)
 
           if disallow.matches?(@subject)
-            @failure_message_for_should = disallow.failure_message_for_should_not
-            false
-          else
             @failure_message_for_should_not = disallow.failure_message_for_should
             true
+          else
+            @failure_message_for_should = disallow.failure_message_for_should_not
+            false
           end
         end
 
@@ -62,6 +62,19 @@ module Shoulda # :nodoc:
           end
         end
 
+        def disallow_value_matcher(value, message)
+          matcher = DisallowValueMatcher.
+            new(value).
+            for(@attribute).
+            with_message(message)
+
+          if strict?
+            matcher.strict
+          else
+            matcher
+          end
+        end
+
         def strict?
           @strict
         end

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

@@ -4,7 +4,7 @@ module Shoulda # :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>:class_name</tt> - tests that the association resolves to class_name.
       # * <tt>:validate</tt> - tests that the association makes use of the validate
       # option.
       #
@@ -23,7 +23,7 @@ module Shoulda # :nodoc:
       # * <tt>through</tt> - association name for <tt>has_many :through</tt>
       # * <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>:class_name</tt> - tests that the association resoves to class_name.
       # * <tt>:validate</tt> - tests that the association makes use of the validate
       # option.
       #
@@ -43,7 +43,7 @@ module Shoulda # :nodoc:
       # Options:
       # * <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>:class_name</tt> - tests that the association resolves to class_name.
       # * <tt>:validate</tt> - tests that the association makes use of the validate
       # option.
       #
@@ -58,6 +58,7 @@ module Shoulda # :nodoc:
       # the join table is in place.
       #
       # Options:
+      # * <tt>:class_name</tt> - tests that the association resolves to class_name.
       # * <tt>:validate</tt> - tests that the association makes use of the validate
       # option.
       #
@@ -209,10 +210,10 @@ module Shoulda # :nodoc:
 
         def class_name_correct?
           if @options.key?(:class_name)
-            if @options[:class_name].to_s == reflection.options[:class_name].to_s
+            if @options[:class_name].to_s == reflection.klass.to_s
               true
             else
-              @missing = "#{@name} should have #{@options[:class_name]} as class_name"
+              @missing = "#{@name} should resolve to #{@options[:class_name]} for class_name"
               false
             end
           else

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = '1.5.4'.freeze
+    VERSION = '1.5.5'.freeze
   end
 end

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

@@ -80,6 +80,10 @@ describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
     it "rejects several bad values (#{bad_values.map(&:inspect).join(', ')})" do
       model.should_not allow_value(*bad_values).for(:attr)
     end
+
+    it "rejects a mix of both good and bad values" do
+      model.should_not allow_value('12345', *bad_values).for(:attr)
+    end
   end
 
   context 'with a single value' do

data/spec/shoulda/matchers/active_model/ensure_inclusion_of_matcher_spec.rb

@@ -79,6 +79,13 @@ describe Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher do
   end
 
   context 'an attribute which must be included in an array' do
+    context 'given an attribute that does not accept strings' do
+      it 'allows an attribute to be set as an integer' do
+        validating_inclusion(:in => [0,1,2], :column_type => :integer).
+          should ensure_inclusion_of(:attr).in_array([0,1,2])
+      end
+    end
+
     it 'accepts with correct array' do
       validating_inclusion(:in => %w(one two)).
         should ensure_inclusion_of(:attr).in_array(%w(one two))
@@ -165,7 +172,9 @@ describe Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher do
 end
 
 def validating_inclusion(options)
-  define_model(:example, :attr => :string) do
+  options[:column_type] ||= :string
+
+  define_model(:example, :attr => options[:column_type]) do
     validates_inclusion_of :attr, options
   end.new
 end

data/spec/shoulda/matchers/active_model/validate_confirmation_of_matcher_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::ValidateConfirmationOfMatcher do
+  context '#description' do
+    it 'states that the confirmation must match its base attribute' do
+      matcher.description.should == 'require attr_confirmation to match attr'
+    end
+  end
+
   context 'a model with a confirmation validation' do
     it 'accepts' do
       validating_confirmation.should matcher

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

@@ -64,14 +64,21 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       Child.new.should_not belong_to(:parent).conditions(:adopter => true)
     end
 
+    it 'accepts an association without a :class_name option' do
+      belonging_to_parent.should belong_to(:parent).class_name('Parent')
+    end
+
     it 'accepts an association with a valid :class_name option' do
-      belonging_to_parent(:class_name => 'TreeParent').
-        should belong_to(:parent).class_name('TreeParent')
+      define_model :tree_parent
+      define_model :child, :parent_id => :integer do
+        belongs_to :parent, :class_name => 'TreeParent'
+      end
+
+      Child.new.should belong_to(:parent).class_name('TreeParent')
     end
 
     it 'rejects an association with a bad :class_name option' do
-      belonging_to_parent(:class_name => 'TreeParent').
-        should_not belong_to(:parent).class_name('TreeChild')
+      belonging_to_parent.should_not belong_to(:parent).class_name('TreeChild')
     end
 
     context 'validate' do
@@ -231,6 +238,10 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       Parent.new.should_not have_many(:children).conditions(:adopted => true)
     end
 
+    it 'accepts an association without a :class_name option' do
+      having_many_children.should have_many(:children).class_name('Child')
+    end
+
     it 'accepts an association with a valid :class_name option' do
       define_model :node, :parent_id => :integer
       define_model :parent do
@@ -371,6 +382,10 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       Person.new.should_not have_one(:detail).conditions(:disabled => true)
     end
 
+    it 'accepts an association without a :class_name option' do
+      having_one_detail.should have_one(:detail).class_name('Detail')
+    end
+
     it 'accepts an association with a valid :class_name option' do
       define_model :person_detail, :person_id => :integer
       define_model :person do
@@ -439,7 +454,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
     end
 
     it 'rejects a nonexistent association' do
-      define_model :relatives
+      define_model :relative
       define_model :person
       define_model :people_relative, :id => false, :person_id => :integer,
         :relative_id => :integer
@@ -448,7 +463,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
     end
 
     it 'rejects an association with a nonexistent join table' do
-      define_model :relatives
+      define_model :relative
       define_model :person do
         has_and_belongs_to_many :relatives
       end
@@ -457,7 +472,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
     end
 
     it 'rejects an association of the wrong type' do
-      define_model :relatives, :person_id => :integer
+      define_model :relative, :person_id => :integer
       define_model :person do
         has_many :relatives
       end
@@ -466,7 +481,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
     end
 
     it 'accepts an association with a valid :conditions option' do
-      define_model :relatives, :adopted => :boolean
+      define_model :relative, :adopted => :boolean
       define_model :person do
         has_and_belongs_to_many :relatives, :conditions => { :adopted => true }
       end
@@ -477,7 +492,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
     end
 
     it 'rejects an association with a bad :conditions option' do
-      define_model :relatives, :adopted => :boolean
+      define_model :relative, :adopted => :boolean
       define_model :person do
         has_and_belongs_to_many :relatives
       end
@@ -487,16 +502,21 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
       Person.new.should_not have_and_belong_to_many(:relatives).conditions(:adopted => true)
     end
 
+    it 'accepts an association without a :class_name option' do
+      having_and_belonging_to_many_relatives.
+        should have_and_belong_to_many(:relatives).class_name('Relative')
+    end
+
     it 'accepts an association with a valid :class_name option' do
-      define_model :person_relatives, :adopted => :boolean
+      define_model :person_relative, :adopted => :boolean
       define_model :person do
-        has_and_belongs_to_many :relatives, :class_name => 'PersonRelatives'
+        has_and_belongs_to_many :relatives, :class_name => 'PersonRelative'
       end
 
       define_model :people_person_relative, :person_id => :integer,
         :person_relative_id => :integer
 
-      Person.new.should have_and_belong_to_many(:relatives).class_name('PersonRelatives')
+      Person.new.should have_and_belong_to_many(:relatives).class_name('PersonRelative')
     end
 
     it 'rejects an association with a bad :class_name option' do
@@ -527,7 +547,7 @@ describe Shoulda::Matchers::ActiveRecord::AssociationMatcher do
     end
 
     def having_and_belonging_to_many_relatives(options = {})
-      define_model :relatives
+      define_model :relative
       define_model :people_relative, :id => false, :person_id => :integer,
         :relative_id => :integer
       define_model :person do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-21 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -309,7 +309,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -725860603889119000
+      hash: -727795483328027229
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -725860603889119000
+      hash: -727795483328027229
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25