spicycode-micronaut 0.1.6 → 0.1.6.1

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 require 'rubygems/specification'
 
 GEM = "micronaut"
-GEM_VERSION = "0.1.6"
+GEM_VERSION = "0.1.6.1"
 AUTHOR = "Chad Humphries"
 EMAIL = "chad@spicycode.com"
 HOMEPAGE = "http://spicycode.com"

data/examples/lib/micronaut/behaviour_example.rb

@@ -29,14 +29,14 @@ describe Micronaut::Behaviour do
 
     end
 
-    describe '#described_type' do
+    describe '#describes' do
 
       it "should be the first parameter when it is a constant" do
-        Micronaut::Behaviour.describe(Object) { }.described_type.should == Object
+        Micronaut::Behaviour.describe(Object) { }.describes.should == Object
       end
 
       it "should be nil when the first parameter is a string" do
-        Micronaut::Behaviour.describe("i'm a computer") { }.described_type.should be_nil
+        Micronaut::Behaviour.describe("i'm a computer") { }.describes.should be_nil
       end
 
     end
@@ -168,7 +168,7 @@ describe Micronaut::Behaviour do
     describe "A sample nested describe", :just_testing => 'yep' do
     
       it "should set the described type to the constant Object" do
-        running_example.behaviour.described_type.should == Object
+        running_example.behaviour.describes.should == Object
       end
       
       it "should set the description to 'A sample nested describe'" do

data/examples/lib/micronaut/world_example.rb

@@ -46,20 +46,20 @@ describe Micronaut::World do
       @world.find([]).should == []
     end
   
-    it "should find three groups when searching for :described_type => Bar" do
-      @world.find(@behaviours, :described_type => Bar).should == [@bg1, @bg2, @bg3]
+    it "should find three groups when searching for :behaviour_describes => Bar" do
+      @world.find(@behaviours, :behaviour => { :describes => Bar }).should == [@bg1, @bg2, @bg3]
     end
     
     it "should find one group when searching for :description => 'find group-1'" do
-      @world.find(@behaviours, :description => 'find group-1').should == [@bg1]
+      @world.find(@behaviours, :behaviour => { :description => 'find group-1' }).should == [@bg1]
     end
     
     it "should find two groups when searching for :description => lambda { |v| v.include?('-1') || v.include?('-3') }" do
-      @world.find(@behaviours, :description => lambda { |v| v.include?('-1') || v.include?('-3') }).should == [@bg1, @bg3]
+      @world.find(@behaviours, :behaviour => { :description => lambda { |v| v.include?('-1') || v.include?('-3') } }).should == [@bg1, @bg3]
     end
     
     it "should find three groups when searching for :description => /find group/" do
-      @world.find(@behaviours, :description => /find group/).should == [@bg1, @bg2, @bg3]
+      @world.find(@behaviours, :behaviour => { :description => /find group/ }).should == [@bg1, @bg2, @bg3]
     end
     
     it "should find one group when searching for :foo => 1" do
@@ -87,9 +87,5 @@ describe Micronaut::World do
     end
 
   end
-  
-  describe '#filter_behaviours' do
-    
-  end
 
 end

data/lib/micronaut/behaviour.rb

@@ -75,20 +75,24 @@ module Micronaut
     # This method is friggin' gigantic, and must be stopped
     # 
     def self.set_it_up(*args)
-      @metadata = {}
+      @metadata = {:behaviour => {}}
       extra_metadata = args.last.is_a?(Hash) ? args.pop : {}
       if args.first.is_a?(String)
-        @metadata[:described_type] = self.superclass.metadata && self.superclass.metadata[:described_type]
+        @metadata[:behaviour][:describes] = self.superclass.metadata && self.superclass.metadata[:behaviour][:describes]
       else
-        @metadata[:described_type] = args.shift
+        @metadata[:behaviour][:describes] = args.shift
       end
-      @metadata[:description] = args.shift || ''
-      @metadata[:name] = "#{@metadata[:described_type]} #{@metadata[:description]}".strip
-      extra_metadata.each do |k,v|
-        @metadata[k] = v unless @metadata.has_key?(k)
-      end
-      @metadata[:file_path] = eval("caller(0)[0]", @metadata[:describe_block].binding)
+      @metadata[:behaviour][:description] = args.shift || ''
+      @metadata[:behaviour][:name] = "#{describes} #{description}".strip
+      @metadata[:behaviour][:block] = extra_metadata.delete(:behaviour_block)
+      @metadata[:behaviour][:file_path] = eval("caller(0)[0]", @metadata[:behaviour][:block].binding)
+      
+      extra_metadata.delete(:behaviour) # Remove it if it is present
+      @metadata.update(extra_metadata)
 
+      # should this be here?  I think it should be in the runner, the only possible 
+      # point of contention is whether or not inserted/extended modules should be 
+      # allowed to participate in adding metadata.  If they can, then earlier is better
       Micronaut.configuration.find_modules(self).each do |include_or_extend, mod, opts|
         if include_or_extend == :extend
           send(:extend, mod) unless extended_modules.include?(mod)
@@ -103,26 +107,26 @@ module Micronaut
     end
 
     def self.name
-      @metadata[:name]
+      @metadata[:behaviour][:name]
     end
 
-    def self.described_type
-      @metadata[:described_type]
+    def self.describes
+      @metadata[:behaviour][:describes]
     end
 
     def self.description
-      @metadata[:description]
+      @metadata[:behaviour][:description]
     end
    
-    def self.describe(*args, &describe_block)
+    def self.describe(*args, &behaviour_block)
       raise(ArgumentError, "No arguments given.  You must a least supply a type or description") if args.empty? 
-      raise(ArgumentError, "You must supply a block when calling describe") if describe_block.nil?
+      raise(ArgumentError, "You must supply a block when calling describe") if behaviour_block.nil?
       
       subclass('NestedLevel') do
         args << {} unless args.last.is_a?(Hash)
-        args.last.update(:describe_block => describe_block)
+        args.last.update(:behaviour_block => behaviour_block)
         set_it_up(*args)
-        module_eval(&describe_block)
+        module_eval(&behaviour_block)
       end
     end
 

data/lib/micronaut/example.rb

@@ -6,22 +6,9 @@ module Micronaut
   
     def initialize(behaviour, desc, options, example_block=nil)
       @behaviour, @description, @options, @example_block = behaviour, desc, options, example_block
-      @metadata = {}
-      behaviour.metadata.each do |k, v|
-        @metadata[k] = v
-      end
+      @metadata = @behaviour.metadata.dup
       @metadata[:description] = description
-      options.each do |k,v|
-        @metadata[k] = v
-      end
-          #       
-          # if @metadata[:options].has_key?(:focused)
-          #   puts "self.inspect => #{self.inspect}"
-          #   puts "@metadata[:description] => #{@metadata[:description]}"
-          #   puts "@options.has_key?(:focused) => #{@options.has_key?(:focused)}"
-          #   puts "@metadata[:options].has_key?(:focused) => #{@metadata[:options].has_key?(:focused)}"
-          #   puts
-          # end
+      @metadata.update(options)
     end
 
     def inspect

data/lib/micronaut/formatters/base_formatter.rb

@@ -107,7 +107,7 @@ module Micronaut
       def format_backtrace(backtrace, example)
         return "" if backtrace.nil?
         cleansed = backtrace.map { |line| backtrace_line(line) }.compact
-        original_file = example.behaviour.metadata[:file_path].split(':').first.strip
+        original_file = example.behaviour.metadata[:behaviour][:file_path].split(':').first.strip
         # cleansed = cleansed.select do |line|
         #   line.split(':').first.downcase == original_file.downcase
         # end
@@ -131,9 +131,12 @@ module Micronaut
           line.split(':').first.downcase == original_file.downcase
         end
         return "Unable to find matching line from backtrace" if matching_line.nil?
-        
         file_path, line_number = matching_line.split(':')
-        open(file_path, 'r') { |f| f.readlines[line_number.to_i - 1] }
+        if File.exist?(file_path)
+          open(file_path, 'r') { |f| f.readlines[line_number.to_i - 1] }
+        else
+          "Unable to find #{file_path} to read failed line"
+        end
       end
       
     end

data/lib/micronaut/world.rb

@@ -19,7 +19,7 @@ module Micronaut
         @behaviours_to_run = filter_behaviours
         puts "\nRun filtered using #{filter.inspect}"
         if @behaviours_to_run.size == 0 && Micronaut.configuration.run_all_when_everything_filtered?
-          puts "No behaviours where matched, running all"
+          puts "No behaviours were matched, running all"
           # reset the behaviour list to all behaviours, and add back all examples
           @behaviours_to_run = @behaviours
           @behaviours.each { |b| b.examples_to_run.replace(b.examples) }
@@ -38,26 +38,27 @@ module Micronaut
     def filter_behaviours
       behaviours.inject([]) do |list, b|
         b.examples_to_run.replace(find(b.examples, filter).uniq)
+        # Don't add behaviours with no examples to run onto the suite run
         list << (b.examples_to_run.size == 0 ? nil : b)
       end.compact
     end
 
     def find(collection, conditions={})
-      return [] if conditions.empty?
-
       collection.select do |item|
-        conditions.all? do |key, value|
-          case value
-          when Hash
-            value.all? { |k, v| item.metadata[key][k] == v }
-          when Regexp
-            item.metadata[key] =~ value
-          when Proc
-            value.call(item.metadata[key]) rescue false
-          else
-            item.metadata[key] == value
-          end
-        end
+        conditions.all? { |filter_on, filter| apply_condition(filter_on, filter, item.metadata) }
+      end
+    end
+
+    def apply_condition(filter_on, filter, metadata)
+      case filter
+      when Hash
+        filter.all? { |k, v| apply_condition(k, v, metadata[filter_on]) }
+      when Regexp
+        metadata[filter_on] =~ filter
+      when Proc
+        filter.call(metadata[filter_on]) rescue false
+      else
+        metadata[filter_on] == filter
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spicycode-micronaut
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
+  version: 0.1.6.1
 platform: ruby
 authors: 
 - Chad Humphries
@@ -9,7 +9,7 @@ autorequire: micronaut
 bindir: bin
 cert_chain: []
 
-date: 2008-12-22 00:00:00 -08:00
+date: 2008-12-23 00:00:00 -08:00
 default_executable: micronaut
 dependencies: []