cucumber 1.2.1 → 1.2.2

data/lib/cucumber/ast/comment.rb

@@ -22,10 +22,10 @@ module Cucumber
           visitor.visit_comment_line(line.strip)
         end
       end
-      
+
       def to_sexp
         (@value.nil? || @value == '') ? nil : [:comment, @value]
       end
     end
   end
-end
+end

data/lib/cucumber/ast/doc_string.rb

@@ -38,7 +38,7 @@ module Cucumber
         return if Cucumber.wants_to_quit
         visitor.visit_doc_string(self)
       end
-      
+
       def arguments_replaced(arguments) #:nodoc:
         string = self
         arguments.each do |name, value|

data/lib/cucumber/ast/examples.rb

@@ -5,7 +5,7 @@ module Cucumber
     class Examples #:nodoc:
       include Names
       attr_writer :outline_table
-      
+
       def initialize(comment, line, keyword, title, description, outline_table)
         @comment, @keyword, @title, @description, @outline_table = comment, keyword, title, description, outline_table
       end

data/lib/cucumber/ast/feature.rb

@@ -5,7 +5,7 @@ module Cucumber
     # Represents the root node of a parsed feature.
     class Feature #:nodoc:
       include Names
-      
+
       attr_accessor :language
       attr_writer :features, :background
       attr_reader :file, :feature_elements
@@ -80,7 +80,7 @@ module Cucumber
         file = file.gsub(/\//, '\\') if Cucumber::WINDOWS && file && !ENV['CUCUMBER_FORWARD_SLASH_PATHS']
         @file = file
       end
-      
+
       def file_colon_line(line)
         "#{@file}:#{line}"
       end

data/lib/cucumber/ast/feature_element.rb

@@ -65,7 +65,7 @@ module Cucumber
       def accept_hook?(hook)
         Gherkin::TagExpression.new(hook.tag_expressions).eval(source_tags)
       end
-      
+
       def source_tag_names
         source_tags.map { |tag| tag.name }
       end

data/lib/cucumber/ast/multiline_argument.rb

@@ -10,7 +10,7 @@ module Cucumber
         def from(argument)
           return unless argument
           return argument if argument.respond_to?(:to_step_definition_arg)
-          
+
           case(rubify(argument))
           when String
             # TODO: this duplicates work that gherkin does. We should really pass the string to gherkin and let it parse it.
@@ -27,4 +27,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/ast/names.rb

@@ -2,7 +2,7 @@ module Cucumber
   module Ast
     module Names
       attr_reader :title, :description
-      
+
       def name
         s = @title
         s += "\n#{@description}" if @description != ""
@@ -10,4 +10,4 @@ module Cucumber
       end
     end
   end
-end
+end

data/lib/cucumber/ast/outline_table.rb

@@ -114,9 +114,9 @@ module Cucumber
               visitor.visit_table_cell(cell)
             end
           else
-            visitor.step_mother.with_hooks(self) do
+            visitor.runtime.with_hooks(self) do
               @step_invocations.each do |step_invocation|
-                step_invocation.invoke(visitor.step_mother, visitor.configuration)
+                step_invocation.invoke(visitor.runtime, visitor.configuration)
                 @exception ||= step_invocation.reported_exception
               end
 
@@ -132,12 +132,11 @@ module Cucumber
         def accept_expand(visitor)
           if header?
           else
-            visitor.step_mother.with_hooks(self) do
+            visitor.runtime.with_hooks(self) do
               @table.visit_scenario_name(visitor, self)
               @step_invocations.each do |step_invocation|
-                step_invocation.invoke(visitor.step_mother, visitor.configuration)
+                visitor.visit_step(step_invocation)
                 @exception ||= step_invocation.reported_exception
-                step_invocation.visit_step_result(visitor)
               end
             end
           end

data/lib/cucumber/ast/scenario.rb

@@ -6,26 +6,26 @@ module Cucumber
     class Scenario #:nodoc:
       include FeatureElement
       include Names
-      
+
       attr_reader :line
-      
-      class EmptyBackground 
+
+      class EmptyBackground
         def failed?
           false
         end
-        
+
         def feature_elements
           []
         end
-        
+
         def step_collection(step_invocations)
           StepCollection.new(step_invocations)
         end
-        
+
         def init
         end
       end
-      
+
       def initialize(background, comment, tags, line, keyword, title, description, raw_steps)
         @background = background || EmptyBackground.new
         @comment, @tags, @line, @keyword, @title, @description, @raw_steps = comment, tags, line, keyword, title, description, raw_steps
@@ -43,14 +43,14 @@ module Cucumber
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        
+
         with_visitor(visitor) do
           visitor.visit_comment(@comment) unless @comment.empty?
           visitor.visit_tags(@tags)
           visitor.visit_scenario_name(@keyword, name, file_colon_line(@line), source_indent(first_line_length))
 
           skip_invoke! if @background.failed?
-          visitor.step_mother.with_hooks(self, skip_hooks?) do
+          visitor.runtime.with_hooks(self, skip_hooks?) do
             skip_invoke! if failed?
             visitor.visit_steps(@steps)
           end
@@ -62,7 +62,7 @@ module Cucumber
       def failed?
         @steps.failed? || !!@exception
       end
-      
+
       def fail!(exception)
         @exception = exception
         @current_visitor.visit_exception(@exception, :failed)
@@ -101,16 +101,16 @@ module Cucumber
         sexp += steps if steps.any?
         sexp
       end
-      
-      
+
+
       def with_visitor(visitor)
         @current_visitor = visitor
         yield
         @current_visitor = nil
       end
-      
+
       private
-      
+
       def skip_hooks?
         @background.failed? || @executed
       end

data/lib/cucumber/ast/scenario_outline.rb

@@ -6,7 +6,7 @@ module Cucumber
     class ScenarioOutline #:nodoc:
       include FeatureElement
       include Names
-      
+
       module ExamplesArray #:nodoc:
         def accept(visitor)
           return if Cucumber.wants_to_quit
@@ -38,7 +38,7 @@ module Cucumber
         @examples_array = @example_sections.map do |example_section_and_gherkin_examples|
           example_section = example_section_and_gherkin_examples[0]
           gherkin_examples = example_section_and_gherkin_examples[1]
-          
+
           examples_comment     = example_section[0]
           examples_line        = example_section[1]
           examples_keyword     = example_section[2]
@@ -98,8 +98,8 @@ module Cucumber
       def visit_scenario_name(visitor, row)
         visitor.visit_scenario_name(
           @feature.language.keywords('scenario')[0],
-          row.name, 
-          file_colon_line(row.line), 
+          row.name,
+          file_colon_line(row.line),
           source_indent(first_line_length)
         )
       end

data/lib/cucumber/ast/step.rb

@@ -9,7 +9,7 @@ module Cucumber
       attr_accessor :feature_element, :exception, :multiline_arg
 
       INDENT = 2
-      
+
       def initialize(line, keyword, name, multiline_arg=nil)
         @line, @keyword, @name, @multiline_arg = line, keyword, name, multiline_arg
       end
@@ -48,7 +48,7 @@ module Cucumber
         # Otherwise it's always StepInvocation that gets visited instead.
         visit_step_result(visitor, first_match(visitor), @multiline_arg, :skipped, nil, nil)
       end
-      
+
       def visit_step_result(visitor, step_match, multiline_arg, status, exception, background)
         visitor.visit_step_result(@keyword, step_match, @multiline_arg, status, exception, source_indent, background, file_colon_line)
       end
@@ -59,7 +59,7 @@ module Cucumber
           argument_hash       = cells.to_hash
           delimited_arguments = delimit_argument_names(argument_hash)
           name                = replace_name_arguments(delimited_arguments)
-          step_match          = visitor.step_mother.step_match(name, @name) rescue nil
+          step_match          = visitor.runtime.step_match(name, @name) rescue nil
           return step_match if step_match
         end
         NoStepMatch.new(self, @name)

data/lib/cucumber/ast/step_collection.rb

@@ -3,21 +3,21 @@ module Cucumber
     # Holds an Array of Step or StepDefinition
     class StepCollection #:nodoc:
       include Enumerable
-      
+
       def initialize(steps)
         @steps = steps
         @steps.each{|step| step.step_collection = self}
       end
 
-      def accept(visitor, &proc)
+      def accept(visitor)
         return if Cucumber.wants_to_quit
         @steps.each do |step|
-          visitor.visit_step(step) if proc.nil? || proc.call(step)
+          visitor.visit_step(step)
         end
       end
 
       def step_invocations(background = false)
-        StepCollection.new(@steps.map{ |step| 
+        StepCollection.new(@steps.map{ |step|
           i = step.step_invocation
           i.background = background
           i
@@ -62,7 +62,7 @@ module Cucumber
       def passed?
         status == :passed
       end
-      
+
       def status
         @steps.each{|step_invocation| return step_invocation.status if step_invocation.status != :passed}
         :passed

data/lib/cucumber/ast/step_invocation.rb

@@ -35,7 +35,7 @@ module Cucumber
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        invoke(visitor.step_mother, visitor.configuration)
+        invoke(visitor.runtime, visitor.configuration)
         visit_step_result(visitor)
       end
 
@@ -52,13 +52,13 @@ module Cucumber
         )
       end
 
-      def invoke(step_mother, configuration)
-        find_step_match!(step_mother, configuration)
+      def invoke(runtime, configuration)
+        find_step_match!(runtime, configuration)
         unless @skip_invoke || configuration.dry_run? || @exception || @step_collection.exception
           @skip_invoke = true
           begin
             @step_match.invoke(@multiline_arg)
-            step_mother.after_step
+            runtime.after_step
             status!(:passed)
           rescue Pending => e
             failed(configuration, e, false)
@@ -77,10 +77,10 @@ module Cucumber
         end
       end
 
-      def find_step_match!(step_mother, configuration)
+      def find_step_match!(runtime, configuration)
         return if @step_match
         begin
-          @step_match = step_mother.step_match(@name)
+          @step_match = runtime.step_match(@name)
         rescue Undefined => e
           failed(configuration, e, true)
           status!(:undefined)
@@ -90,7 +90,7 @@ module Cucumber
           status!(:failed)
           @step_match = NoStepMatch.new(@step, @name)
         end
-        step_mother.step_visited(self)
+        runtime.step_visited(self)
       end
 
       def failed(configuration, e, clear_backtrace)
@@ -113,7 +113,7 @@ module Cucumber
       def filter_backtrace(e)
         return e if Cucumber.use_full_backtrace
         e.backtrace.each{|line| line.gsub!(PWD_PATTERN, "./")}
-        
+
         filtered = (e.backtrace || []).reject do |line|
           BACKTRACE_FILTER_PATTERNS.detect { |p| line =~ p }
         end

data/lib/cucumber/ast/table.rb

@@ -5,7 +5,7 @@ require 'gherkin/formatter/escaping'
 module Cucumber
   module Ast
     # Step Definitions that match a plain text Step with a multiline argument table
-    # will receive it as an instance of Table. A Table object holds the data of a 
+    # will receive it as an instance of Table. A Table object holds the data of a
     # table parsed from a feature file and lets you access and manipulate the data
     # in different ways.
     #
@@ -26,13 +26,13 @@ module Cucumber
     class Table
       class Different < StandardError
         attr_reader :table
-        
+
         def initialize(table)
           super('Tables were not identical')
           @table = table
         end
       end
-      
+
       class Builder
         attr_reader :rows
 
@@ -50,7 +50,7 @@ module Cucumber
 
       include Enumerable
       include Gherkin::Rubify
-      
+
       NULL_CONVERSIONS = Hash.new({ :strict => false, :proc => lambda{ |cell_value| cell_value } }).freeze
 
       attr_accessor :file
@@ -76,7 +76,7 @@ module Cucumber
         @cell_class = Cell
         raw = ensure_array_of_array(rubify(raw))
         # Verify that it's square
-        transposed = raw.transpose
+        raw.transpose
         create_cell_matrix(raw)
         @conversion_procs = conversion_procs
         @header_mappings = header_mappings
@@ -108,7 +108,7 @@ module Cucumber
       def transpose
         self.class.new(raw.transpose, @conversion_procs.dup, @header_mappings.dup, @header_conversion_proc)
       end
-      
+
       # Converts this table into an Array of Hash where the keys of each
       # Hash are the headers in the table. For example, a Table built from
       # the following plain text:
@@ -126,7 +126,7 @@ module Cucumber
       def hashes
         @hashes ||= build_hashes
       end
-      
+
       # Converts this table into a Hash where the first column is
       # used as keys and the second column is used as values
       #
@@ -137,7 +137,7 @@ module Cucumber
       #
       #   {'a' => '2', 'b' => '3'}
       #
-      # The table must be exactly two columns wide 
+      # The table must be exactly two columns wide
       #
       def rows_hash
         return @rows_hash if @rows_hash
@@ -163,7 +163,7 @@ module Cucumber
         end
       end
 
-      def column_names	#:nodoc:
+      def column_names #:nodoc:
         @col_names ||= cell_matrix[0].map { |cell| cell.value }
       end
 
@@ -193,7 +193,7 @@ module Cucumber
       #  | x             | y             |
       #
       #  table.match(/table:column_1_name,column_2_name/) #=> non-nil
-      #  
+      #
       # Note: must use 'table:' prefix on match
       def match(pattern)
         header_to_match = "table:#{headers.join(',')}"
@@ -218,7 +218,7 @@ module Cucumber
       #   | 123456       | xyz     |
       #   | 345678       | abc     |
       #
-      # A StepDefinition receiving this table can then map the columns 
+      # A StepDefinition receiving this table can then map the columns
       # with both Regexp and String:
       #
       #   table.map_headers!(/phone( number)?/i => :phone, 'Address' => :address)
@@ -238,6 +238,7 @@ module Cucumber
       #   # => ['phone number', 'ADDRESS']
       #
       def map_headers!(mappings={}, &block)
+        clear_cache!
         @header_mappings = mappings
         @header_conversion_proc = block
       end
@@ -250,8 +251,8 @@ module Cucumber
       end
 
       # Change how #hashes converts column values. The +column_name+ argument identifies the column
-      # and +conversion_proc+ performs the conversion for each cell in that column. If +strict+ is 
-      # true, an error will be raised if the column named +column_name+ is not found. If +strict+ 
+      # and +conversion_proc+ performs the conversion for each cell in that column. If +strict+ is
+      # true, an error will be raised if the column named +column_name+ is not found. If +strict+
       # is false, no error will be raised. Example:
       #
       #   Given /^an expense report for (.*) with the following posts:$/ do |table|
@@ -269,7 +270,7 @@ module Cucumber
       # Compares +other_table+ to self. If +other_table+ contains columns
       # and/or rows that are not in self, new columns/rows are added at the
       # relevant positions, marking the cells in those rows/columns as
-      # <tt>surplus</tt>. Likewise, if +other_table+ lacks columns and/or 
+      # <tt>surplus</tt>. Likewise, if +other_table+ lacks columns and/or
       # rows that are present in self, these are marked as <tt>missing</tt>.
       #
       # <tt>surplus</tt> and <tt>missing</tt> cells are recognised by formatters
@@ -300,7 +301,7 @@ module Cucumber
       # an Array of Hash (similar to the structure returned by #hashes).
       #
       # Calling this method is particularly useful in <tt>Then</tt> steps that take
-      # a Table argument, if you want to compare that table to some actual values. 
+      # a Table argument, if you want to compare that table to some actual values.
       #
       def diff!(other_table, options={})
         options = {
@@ -315,7 +316,7 @@ module Cucumber
         other_table.convert_headers!
         other_table.convert_columns!
         ensure_green!
-                
+
         convert_headers!
         convert_columns!
 
@@ -339,7 +340,7 @@ module Cucumber
         last_change = nil
         missing_row_pos = nil
         insert_row_pos  = nil
-        
+
         changes.each do |change|
           if(change.action == '-')
             missing_row_pos = change.position + inserted
@@ -368,9 +369,9 @@ module Cucumber
             end
           end
         end
-        
+
         clear_cache!
-        should_raise = 
+        should_raise =
           missing_row_pos && options[:missing_row] ||
           insert_row_pos  && options[:surplus_row] ||
           missing_col     && options[:missing_col] ||
@@ -396,7 +397,7 @@ module Cucumber
       def verify_column(column_name) #:nodoc:
         raise %{The column named "#{column_name}" does not exist} unless raw[0].include?(column_name)
       end
-      
+
       def verify_table_width(width) #:nodoc:
         raise %{The table must have exactly #{width} columns} unless raw[0].size == width
       end
@@ -429,7 +430,7 @@ module Cucumber
       def headers #:nodoc:
         raw.first
       end
-      
+
       def header_cell(col) #:nodoc:
         cells_rows[0][col]
       end
@@ -452,7 +453,7 @@ module Cucumber
         formatter = Formatter::Pretty.new(nil, io, options)
         formatter.instance_variable_set('@indent', options[:indent])
         TreeWalker.new(nil, [formatter]).visit_multiline_arg(self)
-        
+
         Cucumber::Term::ANSIColor.coloring = c
         io.rewind
         s = "\n" + io.read + (" " * (options[:indent] - 2))
@@ -498,7 +499,7 @@ module Cucumber
         @conversion_procs.each do |column_name, conversion_proc|
           verify_column(column_name) if conversion_proc[:strict]
         end
-        
+
         cell_matrix.transpose.each do |col|
           column_name = col[0].value
           conversion_proc = @conversion_procs[column_name][:proc]
@@ -537,7 +538,7 @@ module Cucumber
       end
 
       def clear_cache! #:nodoc:
-        @hashes = @rows_hash = @rows = @columns = nil
+        @hashes = @rows_hash = @col_names = @rows = @columns = nil
       end
 
       def columns #:nodoc:
@@ -580,7 +581,7 @@ module Cucumber
         end
 
         unmapped_cols.each_with_index do |col, col_index|
-          empty_col = (0...cell_matrix.length).map do |row| 
+          empty_col = (0...cell_matrix.length).map do |row|
             SurplusCell.new(nil, self, -1)
           end
           cols << empty_col
@@ -600,7 +601,7 @@ module Cucumber
       end
 
       def hashes_to_array(hashes) #:nodoc:
-        header = hashes[0].keys
+        header = hashes[0].keys.sort
         [header] + hashes.map{|hash| header.map{|key| hash[key]}}
       end
 
@@ -698,12 +699,20 @@ module Cucumber
           SurplusCell === o || value == o.value
         end
 
+        def eql?(o)
+          self == o
+        end
+
+        def hash
+          0
+        end
+
         # For testing only
         def to_sexp #:nodoc:
           [:cell, @value]
         end
       end
-      
+
       class SurplusCell < Cell #:nodoc:
         def status
           :comment
@@ -712,6 +721,10 @@ module Cucumber
         def ==(o)
           true
         end
+
+        def hash
+          0
+        end
       end
     end
   end