shoulda 2.10.2 → 2.10.3

data/lib/shoulda.rb

@@ -1,5 +1,5 @@
 module Shoulda
-  VERSION = "2.10.2"
+  VERSION = "2.10.3"
 end
 
 if defined? Spec

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

@@ -65,7 +65,7 @@ module Shoulda # :nodoc:
 
         def stringify_params!
           @params.each do |key, value|
-            @params[key] = value.to_param
+            @params[key] = value.is_a?(Array) ? value.collect {|v| v.to_param } : value.to_param
           end
         end
 

data/lib/shoulda/context.rb

@@ -230,11 +230,7 @@ module Shoulda
     # The subject is used by all macros that require an instance of the class
     # being tested.
     def subject
-      if subject_block
-        instance_eval(&subject_block)
-      else
-        get_instance_of(self.class.described_type)
-      end
+      @shoulda_subject ||= construct_subject
     end
 
     def subject_block # :nodoc:
@@ -262,6 +258,16 @@ module Shoulda
     def instance_variable_name_for(klass) # :nodoc:
       klass.to_s.split('::').last.underscore
     end
+
+    private
+
+    def construct_subject
+      if subject_block
+        instance_eval(&subject_block)
+      else
+        get_instance_of(self.class.described_type)
+      end
+    end
   end
 
   class Context # :nodoc:
@@ -321,6 +327,11 @@ module Shoulda
       self.subject_block = block
     end
 
+    def subject_block
+      return @subject_block if @subject_block
+      parent.subject_block
+    end
+
     def full_name
       parent_name = parent.full_name if am_subcontext?
       return [parent_name, name].join(" ").strip

data/test/matchers/controller/route_matcher_test.rb

@@ -2,6 +2,23 @@ require File.join(File.dirname(__FILE__), '..', '..', 'test_helper')
 
 class RouteToMatcherTest < ActionController::TestCase # :nodoc:
 
+  context "given a controller with a defined glob url" do
+    setup do
+      @controller = define_controller('Examples').new
+      define_routes do |map|
+        map.connect 'examples/*id', :controller => 'examples',
+                                    :action     => 'example'
+      end
+    end
+
+    should "accept glob route" do
+      assert_accepts route(:get, '/examples/foo/bar').
+                      to(:action => 'example', :id => ['foo', 'bar']),
+                    @controller
+    end
+
+  end
+
   context "given a controller with a defined route" do
     setup do
       @controller = define_controller('Examples').new

data/test/other/context_test.rb

@@ -169,6 +169,12 @@ class ContextTest < ActiveSupport::TestCase # :nodoc:
       should "return the result of the block as the subject" do
         assert_equal @expected, subject
       end
+      
+      context "nested context block without a subject block" do
+        should "return the result of the parent context's subject block" do
+          assert_equal @expected, subject
+        end
+      end
     end
   end
 end
@@ -187,3 +193,11 @@ class SubjectTest < ActiveSupport::TestCase
     assert_equal @expected, subject
   end
 end
+
+class SubjectLazinessTest < ActiveSupport::TestCase
+  subject { Subject.new }
+  
+  should "only build the subject once" do
+    assert_equal subject, subject
+  end
+end

data/test/rails_root/app/models/post.rb

@@ -7,6 +7,6 @@ class Post < ActiveRecord::Base
 
   validates_uniqueness_of :title
   validates_presence_of :title
-  validates_presence_of :body, :message => 'Seriously...  wtf'
+  validates_presence_of :body, :message => 'Seriously, wtf'
   validates_numericality_of :user_id
 end

data/test/rails_root/config/environment.rb

@@ -1,6 +1,6 @@
 # Specifies gem version of Rails to use when vendor/rails is not present
 old_verbose, $VERBOSE = $VERBOSE, nil
-RAILS_GEM_VERSION = '= 2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '>= 2.3.2' unless defined? RAILS_GEM_VERSION
 $VERBOSE = old_verbose
 
 require File.join(File.dirname(__FILE__), 'boot')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shoulda
 version: !ruby/object:Gem::Version 
-  version: 2.10.2
+  version: 2.10.3
 platform: ruby
 authors: 
 - Tammer Saleh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-15 00:00:00 -04:00
+date: 2010-01-16 00:00:00 -05:00
 default_executable: convert_to_should_syntax
 dependencies: []