spicycode-micronaut 0.0.6 → 0.0.7

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems/specification'
 require 'date'
 
 GEM = "micronaut"
-GEM_VERSION = "0.0.6"
+GEM_VERSION = "0.0.7"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://spicycode.com"

data/examples/example_helper.rb

@@ -30,14 +30,6 @@ Micronaut.configure do |config|
   
   config.mock_with :mocha
   
-  config.before(:each, :pending => true) do 
-    raise "the roof"
-  end
-  
-  config.after(:each, :focused => true) do
-    puts 'was the focus worth it?'
-  end
-  
 end
 
 Micronaut::Runner.autorun

data/lib/micronaut/behaviour_group.rb

@@ -54,12 +54,8 @@ module Micronaut
       metadata[:description] = args.shift || ''
       metadata[:name] = "#{metadata[:described_type]} #{metadata[:description]}".strip
       
-      Micronaut.configuration.extra_modules[:extend].each do |mod, options|
-        send(:extend, mod) if options.empty?
-      end
-      
-      Micronaut.configuration.extra_modules[:include].each do |mod, options|
-        send(:include, mod) if options.empty?
+      Micronaut.configuration.find_modules(self).each do |include_or_extend, mod, opts|
+        send(include_or_extend, mod)
       end
     end
 
@@ -112,24 +108,32 @@ module Micronaut
     end
 
     def self.eval_before_alls(example)
+      Micronaut.configuration.find_before_or_after(:before, :all, self).each { |blk| example.instance_eval(&blk) }
+      
       before_ancestors.each do |ancestor| 
         ancestor.before_alls.each { |opts, blk| example.instance_eval(&blk) }
       end
     end
         
     def self.eval_before_eachs(example)
+      Micronaut.configuration.find_before_or_after(:before, :each, self).each { |blk| example.instance_eval(&blk) }
+      
       before_ancestors.each do |ancestor| 
         ancestor.before_eachs.each { |opts, blk| example.instance_eval(&blk) }
       end
     end
 
     def self.eval_after_alls(example)
+      Micronaut.configuration.find_before_or_after(:after, :all, self).each { |blk| example.instance_eval(&blk) }
+            
       after_ancestors.each do |ancestor| 
         ancestor.after_alls.each { |opts, blk| example.instance_eval(&blk) }
       end
     end
 
     def self.eval_after_eachs(example)
+      Micronaut.configuration.find_before_or_after(:after, :each, self).each { |blk| example.instance_eval(&blk) }
+      
       after_ancestors.each do |ancestor|
         ancestor.after_eachs.each { |opts, blk| example.instance_eval(&blk) }
       end
@@ -138,8 +142,8 @@ module Micronaut
     def self.run(reporter)
       return true if examples.empty?
       
+
       group = new
-      
       eval_before_alls(group)
       success = true
 

data/lib/micronaut/configuration.rb

@@ -14,32 +14,63 @@ module Micronaut
       Micronaut::BehaviourGroup.send(:include, @mock_framework)
     end
     
-    def befores
-      @befores ||= { :each => [], :all => {} }
+    def extra_modules
+      @extra_modules ||= []
     end
-    
-    def afters
-      @afters ||= { :each => [], :all => {} }
+        
+    def include(module_to_include, options={})
+      extra_modules << [:include, module_to_include, options]
     end
     
-    def extra_modules
-      @extra_modules ||= { :include => [], :extend => [] }
+    def extend(module_to_extend, options={})
+      extra_modules << [:extend, module_to_extend, options]
     end
     
-    def include(module_to_include, options={})
-      extra_modules[:include] << [module_to_include, options]
+    def find_modules(group)
+      extra_modules.select do |include_or_extend, mod, options|
+        options.all? do |key, value|
+          case value
+          when Hash
+            value.all? { |k, v| group.metadata[key][k] == v }
+          when Regexp
+            group.metadata[key] =~ value
+          when Proc
+            value.call(group.metadata[key]) rescue false
+          else
+            group.metadata[key] == value
+          end
+        end
+      end
     end
     
-    def extend(module_to_extend, options={})
-      extra_modules[:extend] << [module_to_extend, options]
+    def before_and_afters
+      @before_and_afters ||= []
     end
     
     def before(type=:each, options={}, &block)
-      befores[type] << [options, block]
+      before_and_afters << [:before, :each, options, block]
     end
     
     def after(type=:each, options={}, &block)
-      afters[type] << [options, block]
+      before_and_afters << [:after, :each, options, block]
+    end
+    
+    def find_before_or_after(desired_type, desired_each_or_all, group)
+      before_and_afters.select do |type, each_or_all, options, block|
+        type == desired_type && each_or_all == desired_each_or_all &&
+        options.all? do |key, value|
+          case value
+          when Hash
+            value.all? { |k, v| group.metadata[key][k] == v }
+          when Regexp
+            group.metadata[key] =~ value
+          when Proc
+            value.call(group.metadata[key]) rescue false
+          else
+            group.metadata[key] == value
+          end
+        end
+      end.map { |type, each_or_all, options, block| block }
     end
     
   end

data/lib/micronaut/expectations.rb

@@ -5,7 +5,7 @@ require 'micronaut/expectations/handler'
 require 'micronaut/expectations/wrap_expectation'
 
 module Micronaut
-  
+
   # Micronaut::Expectations lets you set expectations on your objects.
   #
   #   result.should == 37
@@ -31,15 +31,14 @@ module Micronaut
   # Micronaut ships with a standard set of useful matchers, and writing your own
   # matchers is quite simple. See Micronaut::Matchers for details.
   module Expectations
-    class << self
-      attr_accessor :differ
-
-      def fail_with(message, expected=nil, target=nil) # :nodoc:
-        if Array === message && message.length == 3
-          message, expected, target = message[0], message[1], message[2]
-        end
-        Kernel::raise(Micronaut::Expectations::ExpectationNotMetError.new(message))
+  
+    def self.fail_with(message, expected=nil, target=nil) # :nodoc:
+      if Array === message && message.length == 3
+        message, expected, target = message[0], message[1], message[2]
       end
+      Kernel::raise(Micronaut::Expectations::ExpectationNotMetError.new(message))
     end
+  
   end
-end
+  
+end

data/lib/micronaut/world.rb

@@ -30,7 +30,7 @@ module Micronaut
         end
       end
     end
-  
+    
   end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Chad Humphries