shared_should 0.8.0 → 0.8.1

data/README.md

@@ -103,7 +103,7 @@ Sharing whole contexts? Schmeasy!
                 use_context "for a book available for checkout"
             end
             
-            ### ...or DRY it up by using .when and an initialization block
+            ### ...or DRY it up with chaining
             setup("with a rentable book") { @book.rentable = true }.use_context("for a book available for checkout")
             setup("with a purchasable book") { @book.purchasable = true }.use_context("for a book available for checkout")
         end
@@ -123,7 +123,7 @@ Some rules:
 
 Shared Should provides powerful chaining capabilities.
 
-Chained <tt>setup</tt>s and <tt>use\_setup</tt>s are applied to their parent context:
+Chained setups and use\_setups are applied to their parent context.
 
     context "Book" do
         share_setup "for an in-stock book" do
@@ -137,7 +137,7 @@ Chained <tt>setup</tt>s and <tt>use\_setup</tt>s are applied to their parent con
         end
     end
 
-Or chained <tt>setup</tt>s and <tt>use\_setup</tt>s can be chained to a <tt>should</tt>, <tt>use\_should</tt>, <tt>context</tt>, or <tt>use\_context</tt>:
+Or chained setups and use\_setups can be chained to a <tt>should</tt>, <tt>use\_should</tt>, <tt>context</tt>, or <tt>use\_context</tt>. These setups will not be applied to the parent context.
 
     context "Book" do
         share_setup "for an in-stock book" do
@@ -151,7 +151,7 @@ Or chained <tt>setup</tt>s and <tt>use\_setup</tt>s can be chained to a <tt>shou
 
 ### Parameterizing Shares
 
-Shared functions can also be parameterized using block parameters. This can be done for shared setups, shared shoulds, and the <tt>setup</tt>s and <tt>should</tt>s contained within a shared context. The value passed to the shared function is the return value of the <tt>given</tt> parameterization block. The below example parameterizes a shared setup.
+Shared functions can also be parameterized using block parameters. This can be done for shared setups, shared shoulds, and the setups and shoulds contained within a shared context. The value passed to the shared function is the return value of the <tt>given</tt> parameterization block. The below example parameterizes a shared setup.
 
     context "Book" do
         share_setup "for an in-stock book" do |rentable|

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/shared_should.rb

@@ -14,7 +14,7 @@ class Test::Unit::TestCase
     # assuming 'suite' is called before executing any tests - may be a poor assumption. Find something better?
     unless @@shared_proxies_executed[self]
       shared_proxies.each do |shared_proxy|
-        shared_proxy.execute
+        shared_proxy.share_execute
       end
       @@shared_proxies_executed[self] = true
     end
@@ -45,6 +45,7 @@ class Test::Unit::TestCase
   end
   
   def call_block_with_shared_value(test_block)
+    return nil unless test_block
     execute_class_shared_setups_if_not_executed
     if test_block.arity == 1
       # check arity of 1 before checking if value is an array. If one parameter, never treat the shared_value as variable args
@@ -56,8 +57,9 @@ class Test::Unit::TestCase
     end
   end
   
-  def call_block_shared_value(test_block)
-    self.shared_value = call_block_with_shared_value(test_block)
+  def call_block_config(block_config)
+    ret_val = call_block_with_shared_value(block_config[:block])
+    self.shared_value = ret_val if block_config[:action] == :given
   end
 end
 
@@ -107,7 +109,7 @@ module Shoulda::SharedContext
     def use_setup(shared_name)
       return add_shared_proxy.use_setup(shared_name)
     end
-  
+    
     def setup(name = nil, &block)
       return add_shared_proxy.setup(name, &block)
     end
@@ -118,7 +120,7 @@ module Shoulda::SharedContext
           block.bind(self).call
         
           shared_proxies.each do |shared_proxy|
-            shared_proxy.execute
+            shared_proxy.share_execute
           end
         end
         shared_proxies_executing_block.bind(eval("self", block.binding))
@@ -263,6 +265,21 @@ class Shoulda::SharedProxy
     add_setup_block(:use_setup, share_name, &source_context.find_shared_block(:setup, share_name))
   end
   
+  # deprecated
+  def with_setup(share_name)
+    return use_setup(share_name)
+  end
+  
+  # deprecated
+  def with(share_name = nil, &initialization_block)
+    return setup(share_name ? "with #{share_name}" : nil, &initialization_block)
+  end
+
+  # deprecated
+  def when(share_name = nil, &initialization_block)
+    return setup(share_name ? "when #{share_name}" : nil, &initialization_block)
+  end
+
   def given(description = nil, &initialization_block)
     valid_share_types = [:use_setup, :use_should, :use_context]
     @failed = true and raise ArgumentError, "'given' can only appear after #{valid_share_types.join(', ')}" unless valid_share_types.include?(current_action)
@@ -296,7 +313,7 @@ class Shoulda::SharedProxy
     add_test_block(:use_context, share_name, &source_context.find_shared_block(:context, share_name))
   end
   
-  def execute
+  def share_execute
     return if @failed
     
     shared_proxy = self
@@ -305,7 +322,7 @@ class Shoulda::SharedProxy
       source_context.context setup_block_configs_description do
         setup_without_param_support do
           shared_proxy.setup_block_configs.each do |config|
-            call_block_shared_value(config[:block])
+            call_block_config(config)
           end
         end
         
@@ -317,7 +334,7 @@ class Shoulda::SharedProxy
       # call setups directly in this context
       source_context.setup_without_param_support do
         shared_proxy.setup_block_configs.each do |config|
-          call_block_shared_value(config[:block])
+          call_block_config(config)
         end
       end
     end
@@ -345,7 +362,7 @@ private
 
   def add_setup_block(action, description, &block)
     if test_type
-      @failed = true and raise ArgumentError, "'#{action}' may not be applied" unless action == :given
+      #@failed = true and raise ArgumentError, "'#{action}' may not be applied" unless action == :given
       # add final given description to test description
       self.test_description = "#{test_description} #{description}" if description
       description = nil

data/shared_should.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shared_should}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Pearce"]
-  s.date = %q{2011-04-05}
+  s.date = %q{2011-05-24}
   s.description = %q{Share and reuse shoulds, contexts, and setup in Shoulda.}
   s.email = %q{michael.pearce@bookrenter.com}
   s.extra_rdoc_files = [

data/test/test_shared_should.rb

@@ -221,6 +221,30 @@ class TestSharedShould < Test::Unit::TestCase
     end
   end
   
+  context "deprecated features" do
+    share_should "be true value" do
+      assert @value
+    end
+    
+    context "with_setup" do
+      share_setup "for a true value" do
+        @value = true
+      end
+      
+      use_should("be true value").use_setup("for a true value")
+    end
+    
+    context "with" do
+      use_should("be true value").with { @value = true }
+      use_should("be true value").with("a true value") { @value = true }
+    end
+    
+    context "when" do
+      use_should("be true value").when { @value = true }
+      use_should("be true value").when("a true value") { @value = true }
+    end
+  end
+  
   context "context directly under test class" do
     share_setup "for a true value" do
       @value = true
@@ -306,32 +330,32 @@ class TestSharedShould < Test::Unit::TestCase
       end
     end
     
-    context "with invalid setup chain to should" do
-      begin
-        setup {}.should("1") { assert false }.setup { assert false }
-        raise "Should not allow setup chained after should"
-      rescue ArgumentError
-        # correct
-      end
-    end
-    
-    context "with invalid chain to should" do
-      begin
-        setup {}.should("1") { assert false }.should("2") { assert false }
-        raise "Should not allow chained shoulds"
-      rescue ArgumentError
-        # correct
-      end
-    end
-    
-    context "with invalid chained contexts" do
-      begin
-        setup {}.context("1") { should("1") { assert false } }.should("2") { assert false }
-        raise "Should not allow chain to context"
-      rescue ArgumentError
-        # correct
-      end
-    end
+    # context "with invalid setup chain to should" do
+    #   begin
+    #     setup {}.should("1") { assert false }.setup { assert false }
+    #     raise "Should not allow setup chained after should"
+    #   rescue ArgumentError
+    #     # correct
+    #   end
+    # end
+    # 
+    # context "with invalid chain to should" do
+    #   begin
+    #     setup {}.should("1") { assert false }.should("2") { assert false }
+    #     raise "Should not allow chained shoulds"
+    #   rescue ArgumentError
+    #     # correct
+    #   end
+    # end
+    # 
+    # context "with invalid chained contexts" do
+    #   begin
+    #     setup {}.context("1") { should("1") { assert false } }.should("2") { assert false }
+    #     raise "Should not allow chain to context"
+    #   rescue ArgumentError
+    #     # correct
+    #   end
+    # end
     
     context "with should" do
       setup("for true value") { @value = true }.should("be true value") do
@@ -456,7 +480,12 @@ class TestSharedShould < Test::Unit::TestCase
           "test: .share_setup without params without initialization block should have a true value from shared setup. ",
           "test: SharedShould should execute setup instance method. ",
           "test: with unusual characters in name -- \\ ' \" -- should be valid. ",
-          "test: with unusual characters in name should -- \\ ' \" --. "
+          "test: with unusual characters in name should -- \\ ' \" --. ",
+          "test: deprecated features with_setup should be true value for a true value. ",
+          "test: deprecated features when should be true value. ",
+          "test: deprecated features with should be true value. ",
+          "test: deprecated features with should be true value with a true value. ",
+          "test: deprecated features when should be true value when a true value. "
       ].inject({}) do |hash, expected_method_name|
         hash[expected_method_name] = true
         hash

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shared_should
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Michael Pearce
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-05 00:00:00 -07:00
+date: 2011-05-24 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency