cucumber 0.3.97 → 0.3.98

data/History.txt

@@ -1,3 +1,12 @@
+== 0.3.98 2009-08-25
+
+Just a small release to help Cuke4Duke, which will be presented at Agile2009
+in 2 days.
+
+=== New Features
+* Backtrace filtering now happens in StepInvocation class, meaning other languages (Cuke4Duke) can get backtraces stripped. (Aslak Hellesøy)
+* Cucumber::Ast::Table#map_headers now allows for a block that will convert all the headers. See docs for details. (Ben Mabey)
+
 == 0.3.97 2009-08-23
 
 The AA-FTT release. Creating a release for the AA-FTT meeting in Chicago so that we can play

data/Manifest.txt

@@ -324,7 +324,6 @@ lib/cucumber/cli/main.rb
 lib/cucumber/cli/options.rb
 lib/cucumber/cli/profile_loader.rb
 lib/cucumber/constantize.rb
-lib/cucumber/core_ext/exception.rb
 lib/cucumber/core_ext/instance_exec.rb
 lib/cucumber/core_ext/proc.rb
 lib/cucumber/core_ext/string.rb

data/gem_tasks/rspec.rake

@@ -42,4 +42,4 @@ if require_spec
     t.rcov_opts = %w{--exclude osx\/objc,gems\/,spec\/}
     t.verbose = true
   end
-end
+end

data/lib/cucumber.rb

@@ -8,4 +8,3 @@ require 'cucumber/version'
 require 'cucumber/step_mother'
 require 'cucumber/cli/main'
 require 'cucumber/broadcaster'
-require 'cucumber/core_ext/exception'

data/lib/cucumber/ast/step_invocation.rb

@@ -3,6 +3,10 @@ require 'cucumber/step_match'
 module Cucumber
   module Ast
     class StepInvocation #:nodoc:
+      BACKTRACE_FILTER_PATTERNS = [
+        /vendor\/rails|lib\/cucumber|bin\/cucumber:|lib\/rspec|gems\//
+      ]
+
       attr_writer :step_collection, :background
       attr_reader :name, :matched_cells, :status, :reported_exception
       attr_accessor :exception
@@ -68,6 +72,7 @@ module Cucumber
       end
 
       def failed(options, e, clear_backtrace)
+        e = filter_backtrace(e)
         e.set_backtrace([]) if clear_backtrace
         e.backtrace << @step.backtrace_line unless @step.backtrace_line.nil?
         @exception = e
@@ -78,6 +83,23 @@ module Cucumber
         end
       end
 
+      def filter_backtrace(e)
+        return e if Cucumber.use_full_backtrace
+        filtered = (e.backtrace || []).reject do |line|
+          BACKTRACE_FILTER_PATTERNS.detect { |p| line =~ p }
+        end
+        
+        if Cucumber::JRUBY
+          # In order to filter backtraces properly on JRuby, we need to
+          # create a new Exception - otherwise the backtrace is *not*
+          # filtered. The rescue is for org.jruby.NativeException, which
+          # cannot be new'ed.
+          e = e.class.new(e.message) rescue Exception.new(e.message)
+        end
+        e.set_backtrace(filtered)
+        e
+      end
+
       def status!(status)
         @status = status
         @matched_cells.each do |cell|

data/lib/cucumber/ast/table.rb

@@ -164,8 +164,26 @@ module Cucumber
       #   table.hashes
       #   # => [{:phone => '123456', :address => 'xyz'}, {:phone => '345678', :address => 'abc'}]
       #
-      def map_headers!(mappings)
+      # You may also pass in a block if you wish to convert all of the headers:
+      #
+      #   table.map_headers! { |header| header.downcase }
+      #   table.hashes.keys
+      #   # => ['phone number', 'address']
+      #
+      # When a block is passed in along with a hash then the mappings in the hash take precendence:
+      #
+      #   table.map_headers!('Address' => 'ADDRESS') { |header| header.downcase }
+      #   table.hashes.keys
+      #   # => ['phone number', 'ADDRESS']
+      #
+      def map_headers!(mappings={}, &block)
         header_cells = cell_matrix[0]
+
+        if block_given?
+          header_values = header_cells.map { |cell| cell.value } - mappings.keys
+          mappings = mappings.merge(Hash[*header_values.zip(header_values.map(&block)).flatten])
+        end
+
         mappings.each_pair do |pre, post|
           mapped_cells = header_cells.select{|cell| pre === cell.value}
           raise "No headers matched #{pre.inspect}" if mapped_cells.empty?
@@ -178,7 +196,7 @@ module Cucumber
       end
 
       # Returns a new Table where the headers are redefined. See #map_headers!
-      def map_headers(mappings)
+      def map_headers(mappings={})
         table = self.dup
         table.map_headers!(mappings)
         table

data/lib/cucumber/cli/options.rb

@@ -195,7 +195,7 @@ module Cucumber
             @quiet = true
           end
           opts.on("-b", "--backtrace", "Show full backtrace for all errors.") do
-            Exception.cucumber_full_backtrace = true
+            Cucumber.use_full_backtrace = true
           end
           opts.on("-S", "--strict", "Fail if there are any undefined steps.") do
             @options[:strict] = true

data/lib/cucumber/core_ext/instance_exec.rb

@@ -45,11 +45,29 @@ class Object #:nodoc:
       yield
     rescue Exception => e
       instance_exec_invocation_line = "#{__FILE__}:#{__LINE__ - 2}:in `cucumber_run_with_backtrace_filtering'"
-      Exception.cucumber_strip_backtrace!((e.backtrace || []), instance_exec_invocation_line, pseudo_method)
+      replace_instance_exec_invocation_line!((e.backtrace || []), instance_exec_invocation_line, pseudo_method)
       raise e
     end
   end
-  
+
+  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_1_9 || Cucumber::JRUBY) ? -3 : -4
+
+  def replace_instance_exec_invocation_line!(backtrace, instance_exec_invocation_line, pseudo_method)
+    return if Cucumber.use_full_backtrace
+
+    instance_exec_pos = backtrace.index(instance_exec_invocation_line)
+    if instance_exec_pos
+      replacement_line = instance_exec_pos + INSTANCE_EXEC_OFFSET
+      backtrace[replacement_line].gsub!(/`.*'/, "`#{pseudo_method}'") if pseudo_method
+      backtrace[replacement_line+1..-1] = nil
+
+      backtrace.compact!
+    else
+      # This happens with rails, because they screw up the backtrace
+      # before we get here (injecting erb stacktrace and such)
+    end
+  end
+
   unless defined? instance_exec # 1.9
     # http://eigenclass.org/hiki/bounded+space+instance_exec
     module InstanceExecHelper #:nodoc:

data/lib/cucumber/platform.rb

@@ -15,8 +15,13 @@ module Cucumber
   RAILS         = defined?(Rails)
   RUBY_BINARY   = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
   RUBY_1_9      = RUBY_VERSION =~ /^1\.9/
-  
-  def self.file_mode(m) #:nodoc:
-    RUBY_1_9 ? "#{m}:UTF-8" : m
+
+  class << self
+    attr_accessor :use_full_backtrace
+
+    def file_mode(m) #:nodoc:
+      RUBY_1_9 ? "#{m}:UTF-8" : m
+    end
   end
+  self.use_full_backtrace = false
 end

data/lib/cucumber/rb_support/rb_language.rb

@@ -46,7 +46,7 @@ module Cucumber
           load_code_file(code_file)
           step_definitions
         rescue LoadError => e
-          e.message << "\nFailed to load #{code_filr}"
+          e.message << "\nFailed to load #{code_file}"
           raise e
         ensure
           @step_definitions = nil

data/lib/cucumber/version.rb

@@ -2,7 +2,7 @@ module Cucumber #:nodoc:
   class VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 97
+    TINY  = 98
     PATCH = nil # Set to nil for official release
 
     STRING = [MAJOR, MINOR, TINY, PATCH].compact.join('.')

data/spec/cucumber/ast/table_spec.rb

@@ -84,7 +84,7 @@ module Cucumber
           ])
           table.rows_hash.should == {'one' => '1111', 'two' => '22222'}
         end
-        
+
         it "should fail if the table doesn't have two columns" do
           faulty_table = Table.new([
             %w{one 1111 abc},
@@ -95,21 +95,50 @@ module Cucumber
           }.should raise_error('The table must have exactly 2 columns')
         end
       end
-        
-      it "should allow renaming columns" do
-        table2 = @table.map_headers('one' => :three)
-        table2.hashes.first[:three].should == '4444'
-      end
 
-      it "should allow renaming columns using regexp" do
-        table2 = @table.map_headers(/one|uno/ => :three)
-        table2.hashes.first[:three].should == '4444'
-      end
+      describe '#map_headers' do
+        it "renames the columns to the specified values in the provided hash" do
+          table2 = @table.map_headers('one' => :three)
+          table2.hashes.first[:three].should == '4444'
+        end
+
+        it "allows renaming columns using regexp" do
+          table2 = @table.map_headers(/one|uno/ => :three)
+          table2.hashes.first[:three].should == '4444'
+        end
+
+        it "copies column mappings" do
+          @table.map_column!('one') { |v| v.to_i }
+          table2 = @table.map_headers('one' => 'three')
+          table2.hashes.first['three'].should == 4444
+        end
+
+        it "takes a block and operates on all the headers with it" do
+          table = Table.new([
+          ['HELLO', 'WORLD'],
+          %w{4444 55555}
+          ])
+
+          table.map_headers! do |header|
+            header.downcase
+          end
+
+          table.hashes.first.keys.should =~ %w[hello world]
+        end
+
+        it "treats the mappings in the provided hash as overrides when used with a block" do
+          table = Table.new([
+          ['HELLO', 'WORLD'],
+          %w{4444 55555}
+          ])
+
+          table.map_headers!('WORLD' => 'foo') do |header|
+            header.downcase
+          end
+
+          table.hashes.first.keys.should =~ %w[hello foo]
+        end
 
-      it "should copy column mappings when mapping headers" do
-        @table.map_column!('one') { |v| v.to_i }
-        table2 = @table.map_headers('one' => 'three')
-        table2.hashes.first['three'].should == 4444
       end
 
       describe "replacing arguments" do

data/spec/cucumber/cli/configuration_spec.rb

@@ -312,7 +312,7 @@ END_OF_MESSAGE
 
     describe "--backtrace" do
       before do
-        Exception.cucumber_full_backtrace = false
+        Cucumber.use_full_backtrace = false
       end
 
       it "should show full backtrace when --backtrace is present" do
@@ -325,7 +325,7 @@ END_OF_MESSAGE
       end
 
       after do
-        Exception.cucumber_full_backtrace = false
+        Cucumber.use_full_backtrace = false
       end
     end
 

data/spec/cucumber/cli/options_spec.rb

@@ -244,7 +244,7 @@ module Cli
       context '-b or --backtrace' do
         it "turns on cucumber's full backtrace" do
           when_parsing("-b") do
-            Exception.should_receive(:cucumber_full_backtrace=).with(true)
+            Cucumber.should_receive(:use_full_backtrace=).with(true)
           end
         end
       end

data/spec/cucumber/core_ext/proc_spec.rb

@@ -1,5 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
-require 'cucumber/core_ext/instance_exec'
+require 'cucumber/core_ext/proc'
 
 describe Proc do
   it "should remove extraneous path info for file" do

data/spec/cucumber/core_ext/string_spec.rb

@@ -1,3 +1,4 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
 require File.dirname(__FILE__) + '/../../../lib/cucumber/core_ext/string'
 
 describe String, "#gzub" do

data/spec/cucumber/formatter/ansicolor_spec.rb

@@ -6,10 +6,6 @@ module Cucumber
     describe ANSIColor do
       include ANSIColor
       
-      after do
-        ::Term::ANSIColor.coloring = true
-      end
-      
       it "should wrap passed_param with bold green and reset to green" do
         passed_param("foo").should == "\e[32m\e[1mfoo\e[0m\e[0m\e[32m"
       end

data/spec/cucumber/formatter/progress_spec.rb

@@ -5,15 +5,12 @@ module Cucumber
   module Formatter
     describe Progress do
 
-      before(:all) do
-        Term::ANSIColor.coloring = false
-      end
-
       before(:each) do
+        Term::ANSIColor.coloring = false
         @out = StringIO.new
         @progress = Progress.new(mock("step mother"), @out, {})
       end
-
+ 
       describe "visiting a table cell value without a status" do
         it "should take the status from the last run step" do
           @progress.visit_step_result('', '', nil, :failed, nil, 10, nil)

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -9,6 +9,10 @@ module Cucumber
         @parser = NaturalLanguage.get(@step_mother, 'en').parser
       end
 
+      after do
+        NaturalLanguage.instance_variable_set(:@languages, nil) # So that new StepMothers can be created and have adverbs registered
+      end
+
       def parse(text)
         feature = @parser.parse_or_fail(text)
       end

data/spec/cucumber/parser/table_parser_spec.rb

@@ -9,6 +9,10 @@ module Cucumber
         @parser = NaturalLanguage.get(StepMother.new, 'en').parser
       end
       
+      after do
+        NaturalLanguage.instance_variable_set(:@languages, nil)
+      end
+
       def parse(text)
         @parser.__send__(:prepare_to_parse, text)
         @parser.root = :table

data/spec/cucumber/rails/world_spec.rb

@@ -5,6 +5,11 @@ describe "Rails world" do
 
   it "should run without Test::Unit.run defined" do
     require "mini_rails"
+
+    step_mother = Cucumber::StepMother.new
+    step_mother.load_natural_language('en')
+    rb = step_mother.load_programming_language('rb')
+
     require "cucumber/rails/world"
   end
 

data/spec/spec_helper.rb

@@ -8,6 +8,11 @@ $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'cucumber'
 $:.unshift(File.dirname(__FILE__))
 
-::Term::ANSIColor.coloring = true
+Spec::Runner.configure do |config|
+  config.before(:each) do
+    ::Term::ANSIColor.coloring = true
+    Cucumber::Parser::NaturalLanguage.instance_variable_set(:@languages, nil)
+  end
+end
 
 alias running lambda

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.97
+  version: 0.3.98
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-23 00:00:00 -05:00
+date: 2009-08-25 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -401,7 +401,6 @@ files:
 - lib/cucumber/cli/options.rb
 - lib/cucumber/cli/profile_loader.rb
 - lib/cucumber/constantize.rb
-- lib/cucumber/core_ext/exception.rb
 - lib/cucumber/core_ext/instance_exec.rb
 - lib/cucumber/core_ext/proc.rb
 - lib/cucumber/core_ext/string.rb

data/lib/cucumber/core_ext/exception.rb

@@ -1,53 +0,0 @@
-# Exception extension that tweaks Exception backtraces:
-#
-# * The line of the failing .feature line is appended to the backtrace
-# * The line that calls #cucumber_instance_exec is replaced with the StepDefinition's regexp
-# * Non intersting lines are stripped out
-#
-# The result is that backtraces look like this:
-#
-#   features/step_definitions/the_step_definition.rb:in `/some step/'
-#   features/the_feature_file.feature:41:in `Given some step'
-#
-# or if the exception is raised in the tested code:
-#
-#   lib/myapp/some_file.rb:in `/some_method/'
-#   lib/myapp/some_other_file.rb:in `/some_other_method/'
-#   features/step_definitions/the_step_definition.rb:in `/some step/'
-#   features/the_feature_file.feature:41:in `Given some step'
-#
-# All backtrace munging can be turned off with the <tt>--backtrace</tt> switch
-#
-class Exception #:nodoc:
-  CUCUMBER_FILTER_PATTERNS = [
-    /vendor\/rails|lib\/cucumber|bin\/cucumber:|lib\/rspec|gems\//
-  ]
-
-  INSTANCE_EXEC_OFFSET = (Cucumber::RUBY_1_9 || Cucumber::JRUBY) ? -3 : -4
-
-  def self.cucumber_full_backtrace=(v)
-    @@cucumber_full_backtrace = v
-  end
-  self.cucumber_full_backtrace = false
-
-  # Strips the backtrace from +line+ and down
-  def self.cucumber_strip_backtrace!(backtrace, instance_exec_invocation_line, pseudo_method)
-    return if @@cucumber_full_backtrace
-
-    instance_exec_pos = backtrace.index(instance_exec_invocation_line)
-    if instance_exec_pos
-      replacement_line = instance_exec_pos + INSTANCE_EXEC_OFFSET
-      backtrace[replacement_line].gsub!(/`.*'/, "`#{pseudo_method}'") if pseudo_method
-      backtrace[replacement_line+1..-1] = nil
-
-      backtrace.compact!
-    else
-      # This happens with rails, because they screw up the backtrace
-      # before we get here (injecting erb stacktrace and such)
-    end
-
-    backtrace.reject! do |line|
-      CUCUMBER_FILTER_PATTERNS.detect{|p| line =~ p}
-    end
-  end
-end