shoulda-matchers 1.4.0 → 1.4.1

data/Gemfile.lock

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

data/NEWS.md

@@ -1,3 +1,8 @@
+# v1.4.1
+* Fixes an issue when used with Test::Unit on the allow value matcher.
+
+* Fixes an issue with using ensure_inclusion_of(:attr) given an array of true or false values.
+
 # v1.4.0
 
 * Added `strict` option to validation matchers.

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/draper/Dropbox/Development/shoulda-matchers
   specs:
-    shoulda-matchers (1.3.0)
+    shoulda-matchers (1.4.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -38,16 +38,16 @@ GEM
       bundler
       rake
     arel (2.0.10)
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+    aruba (0.5.0)
+      childprocess (= 0.2.3)
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
+      rspec-expectations (>= 2.7.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (2.1.2)
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.2.3)
+      ffi (~> 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -57,7 +57,7 @@ GEM
     diff-lcs (1.1.3)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    ffi (1.1.5)
+    ffi (1.0.11)
     gherkin (2.9.3)
       json (>= 1.4.6)
     i18n (0.5.0)
@@ -111,7 +111,7 @@ GEM
     sqlite3 (1.3.6)
     term-ansicolor (1.0.7)
     thor (0.14.6)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/draper/Dropbox/Development/shoulda-matchers
   specs:
-    shoulda-matchers (1.3.0)
+    shoulda-matchers (1.4.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -39,16 +39,16 @@ GEM
       bundler
       rake
     arel (2.2.3)
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+    aruba (0.5.0)
+      childprocess (= 0.2.3)
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
+      rspec-expectations (>= 2.7.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.3)
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.2.3)
+      ffi (~> 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -57,7 +57,7 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.1.5)
+    ffi (1.0.11)
     gherkin (2.9.3)
       json (>= 1.4.6)
     hike (1.2.1)
@@ -131,7 +131,7 @@ GEM
     term-ansicolor (1.0.7)
     thor (0.14.6)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/draper/Dropbox/Development/shoulda-matchers
   specs:
-    shoulda-matchers (1.3.0)
+    shoulda-matchers (1.4.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -38,16 +38,16 @@ GEM
       bundler
       rake
     arel (3.0.2)
-    aruba (0.4.11)
-      childprocess (>= 0.2.3)
+    aruba (0.5.0)
+      childprocess (= 0.2.3)
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
-      rspec (>= 2.7.0)
+      rspec-expectations (>= 2.7.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.3)
-    childprocess (0.3.5)
-      ffi (~> 1.0, >= 1.0.6)
+    childprocess (0.2.3)
+      ffi (~> 1.0.6)
     cucumber (1.1.9)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -56,7 +56,7 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     erubis (2.7.0)
-    ffi (1.1.5)
+    ffi (1.0.11)
     gherkin (2.9.3)
       json (>= 1.4.6)
     hike (1.2.1)
@@ -128,7 +128,7 @@ GEM
     term-ansicolor (1.0.7)
     thor (0.16.0)
     tilt (1.3.3)
-    treetop (1.4.10)
+    treetop (1.4.11)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)

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

@@ -57,11 +57,21 @@ module Shoulda # :nodoc:
         end
 
         def description
-          "allow mass assignment of #{@attribute}"
+          [base_description, role_description].compact.join(" ")
         end
 
         private
 
+        def base_description
+          "allow mass assignment of #{@attribute}"
+        end
+
+        def role_description
+          if role != :default
+            "as #{role}"
+          end
+        end
+
         def role
           @options[:role] || :default
         end

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

@@ -154,7 +154,7 @@ module Shoulda # :nodoc:
         end
 
         def message_finder
-          @message_finder ||= @message_finder_factory.new(@instance, @attribute)
+          @message_finder_factory.new(@instance, @attribute)
         end
       end
     end

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

@@ -22,6 +22,8 @@ module Shoulda # :nodoc:
       end
 
       class EnsureInclusionOfMatcher < ValidationMatcher # :nodoc:
+        ARBITRARY_OUTSIDE_STRING = "shouldamatchersteststring"
+
         def initialize(attribute)
           super(attribute)
           @options = {}
@@ -138,20 +140,14 @@ module Shoulda # :nodoc:
         end
 
         def disallows_value_outside_of_array?
-          if value_outside_of_array
-            disallows_value_of(value_outside_of_array)
-          else
-            raise CouldNotDetermineValueOutsideOfArray
-          end
+          disallows_value_of(value_outside_of_array)
         end
 
         def value_outside_of_array
-          found = @array.detect do |item|
-            !@array.include?(item.next)
-          end
-
-          if found
-            found.next
+          if @array.include?(ARBITRARY_OUTSIDE_STRING)
+            raise CouldNotDetermineValueOutsideOfArray
+          else
+            ARBITRARY_OUTSIDE_STRING
           end
         end
       end

data/lib/shoulda/matchers/version.rb

@@ -1,5 +1,5 @@
 module Shoulda
   module Matchers
-    VERSION = '1.4.0'.freeze
+    VERSION = '1.4.1'.freeze
   end
 end

data/spec/shoulda/active_model/allow_mass_assignment_of_matcher_spec.rb

@@ -1,6 +1,24 @@
 require 'spec_helper'
 
 describe Shoulda::Matchers::ActiveModel::AllowMassAssignmentOfMatcher do
+  describe "#description" do
+    context 'without a role' do
+      it 'includes the attribute name' do
+        matcher = Shoulda::Matchers::ActiveModel::AllowMassAssignmentOfMatcher.new(:attr)
+        matcher.description.should eq("allow mass assignment of attr")
+      end
+    end
+
+    if active_model_3_1?
+      context 'with a role' do
+        it 'includes the attribute name and the role' do
+          matcher = Shoulda::Matchers::ActiveModel::AllowMassAssignmentOfMatcher.new(:attr).as(:admin)
+          matcher.description.should eq("allow mass assignment of attr as admin")
+        end
+      end
+    end
+  end
+
   context "an attribute that is blacklisted from mass-assignment" do
     let(:model) do
       define_model(:example, :attr => :string) do

data/spec/shoulda/active_model/allow_value_matcher_spec.rb

@@ -79,6 +79,14 @@ describe Shoulda::Matchers::ActiveModel::AllowValueMatcher do
       matcher = allow_value("foo").for(:baz)
       matcher.description.should eq('allow baz to be set to "foo"')
     end
+
+    it "allows you to call description before calling matches?" do
+      model = define_model(:example, :attr => :string).new
+      matcher = Shoulda::Matchers::ActiveModel::AllowValueMatcher.new("foo").for(:attr)
+      matcher.description
+
+      expect { matcher.matches?(model) }.not_to raise_error
+    end
   end
 
   context "an AllowValueMatcher with no values" do

data/spec/shoulda/active_model/ensure_inclusion_of_matcher_spec.rb

@@ -12,11 +12,20 @@ describe Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher do
     end
   end
 
+  context "with true/false values" do
+    it "can verify outside values to ensure the negative case" do
+      model = define_model(:example, :attr => :string).new
+
+      model.should_not ensure_inclusion_of(:attr).in_array([true, false])
+    end
+  end
+
   context "where we cannot determine a value outside the array" do
     it "should raise a custom exception" do
-      @model = define_model(:example, :attr => :string).new
+      model = define_model(:example, :attr => :string).new
 
-      expect { @model.should ensure_inclusion_of(:attr).in_array([""]) }.to raise_error Shoulda::Matchers::ActiveModel::CouldNotDetermineValueOutsideOfArray
+      arbitrary_string = Shoulda::Matchers::ActiveModel::EnsureInclusionOfMatcher::ARBITRARY_OUTSIDE_STRING
+      expect { model.should ensure_inclusion_of(:attr).in_array([arbitrary_string]) }.to raise_error Shoulda::Matchers::ActiveModel::CouldNotDetermineValueOutsideOfArray
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -289,7 +289,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 813377459972856034
+      hash: 2974632708122422691
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -298,7 +298,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 813377459972856034
+      hash: 2974632708122422691
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24