running_man 0.2.1 → 0.3.0

data/lib/running_man.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
 
 module RunningMan
-  VERSION = '0.2.1'
+  VERSION = '0.3.0'
 
   # Public: Sets up any helper class methods in TestClassMethods on the 
   # specified test case class.
@@ -42,4 +42,4 @@ module RunningMan
   autoload :ActiveRecordBlock, 'running_man/active_record_block'
 end
 
-require 'running_man/block'
+require 'running_man/block'

data/lib/running_man/active_record_block.rb

@@ -6,30 +6,20 @@ module RunningMan
   # See README for instructions on use.
   class ActiveRecordBlock < Block
     module TestClassMethods
+      # Runs this block once, which should insert records through ActiveRecord.
+      # Test Cases should only have one #fixtures call, and it should be at the
+      # first run callback.
       def fixtures(&block)
-        test_block = RunningMan::ActiveRecordBlock.new(block)
-        active_record_fixtures_setup(test_block)
-        active_record_fixtures_teardown
-      end
-
-      def active_record_fixtures_setup(test_block)
-        setup do
-          test_block.run(self)
-          # Open a new transaction before running any test.
-          ActiveRecord::Base.connection.increment_open_transactions
-          ActiveRecord::Base.connection.begin_db_transaction
-        end
+        RunningMan::ActiveRecordBlock.new(block).setup(self)
       end
+    end
 
-      def active_record_fixtures_teardown
-        teardown do
-          # Rollback our transaction, returning our fixtures to a pristine
-          # state.
-          ActiveRecord::Base.connection.rollback_db_transaction
-          ActiveRecord::Base.connection.decrement_open_transactions
-          ActiveRecord::Base.clear_active_connections!
-        end
-      end
+    # Ensure the block is setup to run first, and that the test run is wrapped
+    # in a database transaction.
+    def setup(test_class)
+      block = self
+      test_class.setup    { block.run(self) }
+      test_class.teardown { block.teardown_transaction }
     end
 
     # Clear the database before running the block.
@@ -38,6 +28,25 @@ module RunningMan
       super
     end
 
+    # Sets up an ActiveRecord transition before every test.
+    def run(binding)
+      super
+      setup_transaction
+    end
+
+    # Open a new transaction before running any test.
+    def setup_transaction
+      ActiveRecord::Base.connection.increment_open_transactions
+      ActiveRecord::Base.connection.begin_db_transaction
+    end
+
+    # Rollback our transaction, returning our fixtures to a pristine state.
+    def teardown_transaction
+      ActiveRecord::Base.connection.rollback_db_transaction
+      ActiveRecord::Base.connection.decrement_open_transactions
+      ActiveRecord::Base.clear_active_connections!
+    end
+
     # reload any AR instances
     def set_ivar(binding, ivar, value)
       if value.class.respond_to?(:find)
@@ -53,4 +62,4 @@ module RunningMan
       end
     end
   end
-end
+end

data/lib/running_man/block.rb

@@ -1,10 +1,9 @@
 module RunningMan
   class Block
     module TestClassMethods
-      # Runs the given block 
+      # Runs the given block
       def setup_once(&block)
-        test_block = RunningMan::Block.new(block)
-        setup { test_block.run(self) }
+        RunningMan::Block.new(block).setup(self)
       end
 
       def teardown_once(&block)
@@ -26,7 +25,19 @@ module RunningMan
       end
     end
 
-    # Public: This is what is run in the test/unit callback.  #run_once is 
+    # Public: Makes sure the test case class runs this block first.  By default,
+    # This is added as a single #setup callback.  Override this method if the
+    # underlying TestCase #setup implementation varies.
+    #
+    # test_class - A class inheriting from Test::Unit::TestCase
+    #
+    # Returns nothing.
+    def setup(test_class)
+      block = self
+      test_class.setup { block.run(self) }
+    end
+
+    # Public: This is what is run in the test/unit callback.  #run_once is
     # called only the first time, and #run_always is always called.
     #
     # binding - Object that is running the test (usually a Test::Unit::TestCase).
@@ -112,4 +123,4 @@ if defined?(Test::Unit::TestSuite) && defined?(Test::Unit::TestCase)
       end
     end
   end
-end
+end

data/running_man.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'running_man'
-  s.version           = '0.2.1'
-  s.date              = '2010-05-03'
+  s.version           = '0.3.0'
+  s.date              = '2011-07-13'
   s.rubyforge_project = 'running_man'
 
   ## Make sure your summary is short. The description may be as long

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: running_man
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - rick
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-03 00:00:00 -07:00
+date: 2011-07-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -51,20 +46,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: running_man
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: Simple class for test/unit setup blocks that run just once.