fixture_background 0.9.4 → 0.9.5

data/lib/fixture_background/background.rb

@@ -16,7 +16,9 @@ module FixtureBackground
             "#{parent_class.name}"
           end
         EOT
-
+        
+        background_to_use.generate!
+        
         klass.fixture_path = background_to_use.fixture_path
         klass.fixtures :all
         
@@ -39,7 +41,11 @@ module FixtureBackground
       @parent = parent
       @background_block = blk
       
-      Generator.new(@full_class_name, background_signature, fixture_path, ancestors_and_own_background_blocks, @test_unit_class) unless background_valid?
+      @generator = Generator.new(@full_class_name, background_signature, fixture_path, ancestors_and_own_background_blocks, @test_unit_class) unless background_valid?
+    end
+    
+    def generate!
+      @generator.generate! if @generator
     end
     
     def ancestors_and_own_background_blocks

data/lib/fixture_background/generator.rb

@@ -1,9 +1,10 @@
 module FixtureBackground
   class Generator
     def initialize(fixture_name, version, background_dir, blocks, test_unit_class)
-      @background_dir = background_dir
-      @test_unit_class = test_unit_class
-      
+      @fixture_name, @version, @background_dir, @blocks, @test_unit_class = fixture_name, version, background_dir, blocks, test_unit_class
+    end
+    
+    def generate!
       remove_background_dir
       create_background_dir
       
@@ -19,7 +20,7 @@ module FixtureBackground
         
         bm = Benchmark.realtime do
           dump_ivars do |klass|
-            blocks.each do |block|
+            @blocks.each do |block|
               klass.instance_eval(&block)
             end
           end
@@ -27,10 +28,10 @@ module FixtureBackground
         end
         
         File.open("#{@background_dir}/.version", 'w+') do |f| 
-          f.write version
+          f.write @version
         end
         
-        puts "Instanciating #{fixture_name} took #{bm}ms"
+        puts "Instanciating #{@fixture_name} took #{bm}ms"
       end
     rescue Exception
       remove_background_dir

data/lib/fixture_background/shoulda.rb

@@ -21,7 +21,7 @@ module Shoulda
     end
     
     def background(&blk)
-      @fixture_background = FixtureBackground::Background.new(full_class_name, test_unit_class, parent_fixture_background, blk) 
+      @fixture_background = FixtureBackground::Background.new(full_class_name, test_unit_class, parent_fixture_background, blk)
     end
     
     def class_for_test

data/lib/fixture_background/version.rb

@@ -1,4 +1,4 @@
 module FixtureBackground
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end
 

data/test/rails3/test/unit/person_test.rb

@@ -1,14 +1,21 @@
 require 'test_helper'
 
 class PersonTest < ActiveSupport::TestCase
+  
   background do
     some_test_helper_returning_one
+    instance_test_helper_defined_after_background_returning_one
     @hase = Person.create(:name => "bunny")
   end
 
+  def instance_test_helper_defined_after_background_returning_one
+    1
+  end
+
   context "with thies" do
     background do
       some_test_helper_returning_one
+      instance_test_helper_defined_after_background_returning_one
       @thies = Person.create(:name => "thies")
     end
     
@@ -56,4 +63,8 @@ class PersonTest < ActiveSupport::TestCase
       assert_equal 2, Person.count
     end
   end
+  
+  protected
+  
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Thies C. Arntzen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 +02:00
+date: 2011-04-05 00:00:00 +02:00
 default_executable: 
 dependencies: []