shared_should 0.8.1 → 0.8.2

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/shared_should.rb

@@ -1,25 +1,51 @@
 require 'shoulda'
 
+# Ruby 1.9 with MiniTest
+if defined?(MiniTest::Unit::TestCase)
+  class MiniTest::Unit::TestCase
+    class << self
+      # these methods need to be aliased for both the test class and the should context
+      alias_method :test_suites_without_shared_should_execute, :test_suites
+    end
+  
+    def self.test_suites
+      Test::Unit::TestCase.execute_class_shared_proxies
+    
+      test_suites_without_shared_should_execute
+    end
+  end
+end
+
+# Ruby 1.8 without MiniTest
+if defined?(Test::Unit::TestCase.suite)
+  class Test::Unit::TestCase
+    class << self
+      # these methods need to be aliased for both the test class and the should context
+      alias_method :suite_without_shared_should_execute, :suite
+    end
+  
+    def self.suite
+      # assuming 'suite' is called before executing any tests - may be a poor assumption. Find something better?
+      execute_class_shared_proxies
+    
+      suite_without_shared_should_execute
+    end
+  end
+end
+
+
 class Test::Unit::TestCase
   attr_accessor :shared_value
   @@shared_proxies_executed = {}
   @@setup_blocks = {}
 
-  class << self
-    # these methods need to be aliased for both the test class and the should context
-    alias_method :suite_without_shared_should_execute, :suite
-  end
-  
-  def self.suite
-    # assuming 'suite' is called before executing any tests - may be a poor assumption. Find something better?
+  def self.execute_class_shared_proxies
     unless @@shared_proxies_executed[self]
       shared_proxies.each do |shared_proxy|
         shared_proxy.share_execute
       end
       @@shared_proxies_executed[self] = true
     end
-    
-    suite_without_shared_should_execute
   end
   
   def self.shared_context_block_owner(context_or_test_class)
@@ -327,7 +353,8 @@ class Shoulda::SharedProxy
         end
         
         # share_description called when creating test names
-        eval("def share_description; #{shared_proxy.send(:escaped_test_description)}; end")
+        self.instance_variable_set("@share_description", shared_proxy.send(:test_description))
+        def self.share_description; @share_description; end
         merge_block(&shared_proxy.test_block)
       end
     else
@@ -342,10 +369,6 @@ class Shoulda::SharedProxy
   
 private
 
-  def escaped_test_description
-    test_description.nil? ? 'nil' : "'#{test_description.gsub('\\', '\\\\\\').gsub("'", "\\\\'")}'"
-  end
-  
   def setup_block_configs_description
     @setup_block_configs_description
   end

data/shared_should.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{shared_should}
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Pearce"]
-  s.date = %q{2011-05-24}
+  s.date = %q{2011-11-30}
   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

@@ -490,9 +490,16 @@ class TestSharedShould < Test::Unit::TestCase
         hash[expected_method_name] = true
         hash
       end
-      actual_method_names = self.class.suite.tests.inject({}) do |hash, test_case|
-        hash[test_case.method_name] = true
-        hash
+      if defined?(self.class.suite)
+        actual_method_names = self.class.suite.tests.inject({}) do |hash, test_case|
+          hash[test_case.method_name] = true
+          hash
+        end
+      else
+        actual_method_names = self.class.test_methods.inject({}) do |hash, method_name|
+          hash[method_name] = true
+          hash
+        end
       end
   
       actual_methods_not_found = []

data/test/test_shared_should_helper.rb

@@ -22,7 +22,6 @@ class Test::Unit::TestCase
   share_setup "for a true value for shared setup helper" do
     @value = true
   end
-  
 end
 
 class TestSharedShouldHelper < SubclassTestCase

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shared_should
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Michael Pearce
@@ -15,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-24 00:00:00 -07:00
+date: 2011-11-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,8 +31,8 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id001
+  name: shoulda
 - !ruby/object:Gem::Dependency 
-  name: bundler
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,8 +47,8 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id002
+  name: bundler
 - !ruby/object:Gem::Dependency 
-  name: jeweler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,8 +63,8 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id003
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rcov
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,8 +77,8 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id004
+  name: rcov
 - !ruby/object:Gem::Dependency 
-  name: shoulda
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -92,8 +91,8 @@ dependencies:
   prerelease: false
   type: :runtime
   requirement: *id005
-- !ruby/object:Gem::Dependency 
   name: shoulda
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -106,6 +105,7 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id006
+  name: shoulda
 description: Share and reuse shoulds, contexts, and setup in Shoulda.
 email: michael.pearce@bookrenter.com
 executables: []