spicycode-micronaut 0.2.3 → 0.2.4

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 3
+:patch: 4
 :major: 0
 :minor: 2

data/examples/example_helper.rb

@@ -11,6 +11,7 @@ end
 with_ruby("1.8") do
   gem :mocha
 end
+
 require File.expand_path(File.dirname(__FILE__) + "/resources/example_classes")
 
 module Micronaut
@@ -29,13 +30,20 @@ def remove_last_describe_from_world
   Micronaut.world.behaviours.pop
 end
 
+def isolate_behaviour
+  if block_given?
+    yield
+    Micronaut.world.behaviours.pop
+  end
+end
+
 def not_in_editor?
-  ['TM_MODE', 'EMACS', 'VIM'].all? { |k| !ENV.has_key?(k) }
+  !(ENV.has_key?('TM_MODE') || ENV.has_key?('EMACS') || ENV.has_key?('VIM'))
 end
 
 Micronaut.configure do |c|
   c.mock_with :mocha
   c.color_enabled = not_in_editor?
   c.filter_run :focused => true
-  c.formatter = :documentation
+  #c.formatter = :documentation
 end

data/examples/lib/micronaut/behaviour_example.rb

@@ -2,9 +2,6 @@ require File.expand_path(File.dirname(__FILE__) + "/../../example_helper")
 
 describe Micronaut::Behaviour do
 
-  before(:all) { puts "ba: describe Micronaut::Behaviour" }
-  after(:all)  { puts "aa: describe Micronaut::Behaviour" }
-
   def empty_behaviour_group
     group = Micronaut::Behaviour.describe(Object, 'Empty Behaviour Group') { }
     remove_last_describe_from_world
@@ -12,9 +9,6 @@ describe Micronaut::Behaviour do
 
   describe "describing behaviour with #describe" do
     
-    before(:all) { puts "ba: describing behaviour with #describe" }
-    after(:all)  { puts "aa: describing behaviour with #describe" }
-
     example "an ArgumentError is raised if no type or description is given" do
       lambda { Micronaut::Behaviour.describe() {} }.should raise_error(ArgumentError, "No arguments given.  You must a least supply a type or description")
     end
@@ -26,13 +20,15 @@ describe Micronaut::Behaviour do
     describe '#name' do
 
       it "should expose the first parameter as name" do
-        Micronaut::Behaviour.describe("my favorite pony") { }.name.should == 'my favorite pony'
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe("my favorite pony") { }.name.should == 'my favorite pony'
+        end
       end
 
       it "should call to_s on the first parameter in case it is a constant" do
-        Micronaut::Behaviour.describe(Object) { }.name.should == 'Object'
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object) { }.name.should == 'Object'
+        end
       end
 
     end
@@ -40,13 +36,15 @@ describe Micronaut::Behaviour do
     describe '#describes' do
 
       it "should be the first parameter when it is a constant" do
-        Micronaut::Behaviour.describe(Object) { }.describes.should == Object
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object) { }.describes.should == Object
+        end
       end
 
       it "should be nil when the first parameter is a string" do
-        Micronaut::Behaviour.describe("i'm a computer") { }.describes.should be_nil
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe("i'm a computer") { }.describes.should be_nil
+        end
       end
 
     end
@@ -54,13 +52,15 @@ describe Micronaut::Behaviour do
     describe '#description' do
 
       it "should expose the second parameter as description" do
-        Micronaut::Behaviour.describe(Object, "my desc") { }.description.should == 'my desc'
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object, "my desc") { }.description.should == 'my desc'
+        end
       end
 
       it "should allow the second parameter to be nil" do
-        Micronaut::Behaviour.describe(Object, nil) { }.description.size.should == 0
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object, nil) { }.description.size.should == 0
+        end
       end
 
     end
@@ -68,28 +68,33 @@ describe Micronaut::Behaviour do
     describe '#metadata' do
 
       it "should add the third parameter to the metadata" do
-        Micronaut::Behaviour.describe(Object, nil, 'foo' => 'bar') { }.metadata.should include({ "foo" => 'bar' })
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object, nil, 'foo' => 'bar') { }.metadata.should include({ "foo" => 'bar' })
+        end
       end
 
       it "should add the caller to metadata" do
-        Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:caller][4].should =~ /#{__FILE__}:#{__LINE__}/
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:caller][4].should =~ /#{__FILE__}:#{__LINE__}/
+        end
       end
 
       it "should add the the file_path to metadata" do
-        Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:file_path].should == __FILE__
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:file_path].should == __FILE__
+        end
       end
 
       it "should have a reader for file_path" do
-        Micronaut::Behaviour.describe(Object) { }.file_path.should == __FILE__
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object) { }.file_path.should == __FILE__
+        end
       end
 
       it "should add the line_number to metadata" do
-        Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:line_number].should == __LINE__
-        remove_last_describe_from_world
+        isolate_behaviour do
+          Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:line_number].should == __LINE__
+        end
       end
 
       it "should add file path and line number metadata for arbitrarily nested describes" do
@@ -99,10 +104,8 @@ describe Micronaut::Behaviour do
             Micronaut::Behaviour.describe(Object) { }.metadata[:behaviour][:line_number].should == __LINE__
           end
         end
-        remove_last_describe_from_world
-        remove_last_describe_from_world
-        remove_last_describe_from_world
-        remove_last_describe_from_world
+
+        4.times { remove_last_describe_from_world }
       end
 
     end
@@ -269,13 +272,13 @@ describe Micronaut::Behaviour do
   
   describe "how instance variables inherit" do
     
-    before do
-      @before_each_top_level = 'before_each_top_level'
-    end
-    
     before(:all) do
       @before_all_top_level = 'before_all_top_level'
     end
+
+    before(:each) do
+      @before_each_top_level = 'before_each_top_level'
+    end
     
     it "should be able to access a before each ivar at the same level" do
       @before_each_top_level.should == 'before_each_top_level'
@@ -284,6 +287,11 @@ describe Micronaut::Behaviour do
     it "should be able to access a before all ivar at the same level" do
       @before_all_top_level.should == 'before_all_top_level'
     end
+
+
+    it "should be able to access the before all ivars in the before_all_ivars hash" do
+      running_example.behaviour.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
+    end
     
     describe "but now I am nested" do
       
@@ -291,12 +299,24 @@ describe Micronaut::Behaviour do
         @before_each_top_level.should == 'before_each_top_level'
       end
       
-      it "should not be able to access a parent behaviours before all ivar at a nested level (YET)" do
-        @before_all_top_level.should be_nil
+      it "should be able to access a parent behaviours before all ivar at a nested level" do
+        @before_all_top_level.should == "before_all_top_level"
+      end
+
+      it "changes to before all ivars from within an example do not persist outside the current describe" do
+        @before_all_top_level = "ive been changed"
+      end
+
+      describe "accessing a before_all ivar that was changed in a parent behaviour" do
+        
+        it "should have access to the modified version" do
+          @before_all_top_level.should == 'ive been changed'
+        end
+
       end
       
     end
     
   end
 
-end
+end

data/lib/micronaut/behaviour.rb

@@ -156,31 +156,31 @@ module Micronaut
       @_after_ancestors ||= ancestors(true)
     end
 
+    def self.before_all_ivars
+      @before_all_ivars ||= {}
+    end
+
     def self.eval_before_alls(running_behaviour)
+      superclass.before_all_ivars.each { |ivar, val| running_behaviour.instance_variable_set(ivar, val) }
       Micronaut.configuration.find_before_or_after(:before, :all, self).each { |blk| running_behaviour.instance_eval(&blk) }
       
       before_alls.each { |blk| running_behaviour.instance_eval(&blk) }
+      running_behaviour.instance_variables.each { |ivar| before_all_ivars[ivar] = running_behaviour.instance_variable_get(ivar) }
     end
         
     def self.eval_before_eachs(running_behaviour)
       Micronaut.configuration.find_before_or_after(:before, :each, self).each { |blk| running_behaviour.instance_eval(&blk) }
-      
-      before_ancestors.each do |ancestor| 
-        ancestor.before_eachs.each { |blk| running_behaviour.instance_eval(&blk) }
-      end
+      before_ancestors.each { |ancestor| ancestor.before_eachs.each { |blk| running_behaviour.instance_eval(&blk) } }
     end
 
     def self.eval_after_alls(running_behaviour)
       after_alls.each { |blk| running_behaviour.instance_eval(&blk) }
-      
       Micronaut.configuration.find_before_or_after(:after, :all, self).each { |blk| running_behaviour.instance_eval(&blk) }
+      before_all_ivars.keys.each { |ivar| before_all_ivars[ivar] = running_behaviour.instance_variable_get(ivar) }
     end
 
     def self.eval_after_eachs(running_behaviour)
-      after_ancestors.each do |ancestor|
-        ancestor.after_eachs.each { |blk| running_behaviour.instance_eval(&blk) }
-      end
-      
+      after_ancestors.each { |ancestor| ancestor.after_eachs.each { |blk| running_behaviour.instance_eval(&blk) } }
       Micronaut.configuration.find_before_or_after(:after, :each, self).each { |blk| running_behaviour.instance_eval(&blk) }
     end
 
@@ -214,4 +214,4 @@ module Micronaut
     end
    
   end
-end
+end

data/lib/micronaut/configuration.rb

@@ -149,8 +149,8 @@ module Micronaut
       before_and_afters[:after][each_or_all] << [options, block]
     end
     
-    def find_before_or_after(desired_type, desired_each_or_all, group)
-      before_and_afters[desired_type][desired_each_or_all].select do |options, block|
+    def find_before_or_after(desired_before_or_after, desired_each_or_all, group)
+      before_and_afters[desired_before_or_after][desired_each_or_all].select do |options, block|
         options.all? do |filter_on, filter|
           Micronaut.world.apply_condition(filter_on, filter, group.metadata)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-02-13 00:00:00 -08:00
 default_executable: micronaut
 dependencies: []