cucumber 0.8.5 → 0.8.6

data/lib/cucumber/ast/examples.rb

@@ -1,16 +1,24 @@
+require 'cucumber/ast/names'
+
 module Cucumber
   module Ast
     class Examples #:nodoc:
+      include Names
       attr_writer :outline_table
       
-      def initialize(comment, line, keyword, name, outline_table)
-        @comment, @keyword, @name, @outline_table = comment, keyword, name, outline_table
+      def initialize(comment, line, keyword, title, description, outline_table)
+        @comment, @keyword, @title, @description, @outline_table = comment, keyword, title, description, outline_table
+      end
+
+      attr_reader :gherkin_statement
+      def gherkin_statement(statement=nil)
+        @gherkin_statement ||= statement
       end
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
         visitor.visit_comment(@comment) unless @comment.empty?
-        visitor.visit_examples_name(@keyword, @name)
+        visitor.visit_examples_name(@keyword, name)
         visitor.visit_outline_table(@outline_table)
       end
 
@@ -27,7 +35,7 @@ module Cucumber
       end
 
       def to_sexp
-        sexp = [:examples, @keyword, @name]
+        sexp = [:examples, @keyword, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         sexp += [@outline_table.to_sexp]

data/lib/cucumber/ast/feature.rb

@@ -1,14 +1,22 @@
+require 'cucumber/ast/names'
+
 module Cucumber
   module Ast
     # Represents the root node of a parsed feature.
     class Feature #:nodoc:
+      include Names
+      
       attr_accessor :language
       attr_writer :features, :background
       attr_reader :file
-      attr_reader :name
 
-      def initialize(background, comment, tags, keyword, name, feature_elements)
-        @background, @comment, @tags, @keyword, @name, @feature_elements = background, comment, tags, keyword, name.strip, feature_elements
+      def initialize(background, comment, tags, keyword, title, description, feature_elements)
+        @background, @comment, @tags, @keyword, @title, @description, @feature_elements = background, comment, tags, keyword, title, description, feature_elements
+      end
+
+      attr_reader :gherkin_statement
+      def gherkin_statement(statement=nil)
+        @gherkin_statement ||= statement
       end
 
       def init
@@ -38,7 +46,7 @@ module Cucumber
 
       def indented_name
         indent = ""
-        @name.split("\n").map do |l|
+        name.split("\n").map do |l|
           s = "#{indent}#{l}"
           indent = "  "
           s
@@ -84,7 +92,7 @@ module Cucumber
 
       def to_sexp
         init
-        sexp = [:feature, @file, @name]
+        sexp = [:feature, @file, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/feature_element.rb

@@ -6,6 +6,11 @@ module Cucumber
     module FeatureElement #:nodoc:
       attr_accessor :feature
 
+      attr_reader :gherkin_statement, :raw_steps, :title, :description
+      def gherkin_statement(statement=nil)
+        @gherkin_statement ||= statement
+      end
+
       def add_step(step)
         @raw_steps << step
       end
@@ -27,10 +32,10 @@ module Cucumber
       end
 
       def name_line_lengths
-        if @name.strip.empty?
+        if name.strip.empty?
           [Ast::Step::INDENT + @keyword.unpack('U*').length + ': '.length]
         else
-          @name.split("\n").enum_for(:each_with_index).map do |line, line_number|
+          name.split("\n").enum_for(:each_with_index).map do |line, line_number|
             if line_number == 0
               Ast::Step::INDENT + @keyword.unpack('U*').length + ': '.length + line.unpack('U*').length
             else
@@ -41,10 +46,10 @@ module Cucumber
       end
 
       def matches_scenario_names?(scenario_name_regexps)
-        scenario_name_regexps.detect{|name| name =~ @name}
+        scenario_name_regexps.detect{|n| n =~ name}
       end
 
-      def backtrace_line(name = "#{@keyword}: #{@name}", line = @line)
+      def backtrace_line(name = "#{@keyword}: #{name}", line = @line)
         @feature.backtrace_line(name, line) if @feature
       end
 

data/lib/cucumber/ast/outline_table.rb

@@ -21,7 +21,7 @@ module Cucumber
         return if Cucumber.wants_to_quit
         init
         cells_rows.each_with_index do |row, n|
-          if(visitor.options[:expand])
+          if(visitor.configuration.expand?)
             row.accept(visitor)
           else
             visitor.visit_table_row(row)
@@ -96,7 +96,7 @@ module Cucumber
 
         def accept(visitor)
           return if Cucumber.wants_to_quit
-          visitor.options[:expand] ? accept_expand(visitor) : accept_plain(visitor)
+          visitor.configuration.expand? ? accept_expand(visitor) : accept_plain(visitor)
         end
 
         def accept_plain(visitor)
@@ -108,7 +108,7 @@ module Cucumber
           else
             visitor.step_mother.with_hooks(self) do
               @step_invocations.each do |step_invocation|
-                step_invocation.invoke(visitor.step_mother, visitor.options)
+                step_invocation.invoke(visitor.step_mother, visitor.configuration)
                 @exception ||= step_invocation.reported_exception
               end
 
@@ -127,7 +127,7 @@ module Cucumber
             visitor.step_mother.with_hooks(self) do
               @table.visit_scenario_name(visitor, self)
               @step_invocations.each do |step_invocation|
-                step_invocation.invoke(visitor.step_mother, visitor.options)
+                step_invocation.invoke(visitor.step_mother, visitor.configuration)
                 @exception ||= step_invocation.reported_exception
                 step_invocation.visit_step_result(visitor)
               end

data/lib/cucumber/ast/scenario.rb

@@ -1,11 +1,13 @@
 require 'cucumber/ast/feature_element'
+require 'cucumber/ast/names'
 
 module Cucumber
   module Ast
     class Scenario #:nodoc:
       include FeatureElement
+      include Names
       
-      attr_reader :name, :line
+      attr_reader :line
       
       class EmptyBackground 
         def failed?
@@ -24,9 +26,9 @@ module Cucumber
         end
       end
       
-      def initialize(background, comment, tags, line, keyword, name, raw_steps)
+      def initialize(background, comment, tags, line, keyword, title, description, raw_steps)
         @background = background || EmptyBackground.new
-        @comment, @tags, @line, @keyword, @name, @raw_steps = comment, tags, line, keyword, name, raw_steps
+        @comment, @tags, @line, @keyword, @title, @description, @raw_steps = comment, tags, line, keyword, title, description, raw_steps
         @exception = @executed = nil
       end
 
@@ -45,7 +47,7 @@ module Cucumber
         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))
+          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
@@ -90,7 +92,7 @@ module Cucumber
       end
 
       def to_sexp
-        sexp = [:scenario, @line, @keyword, @name]
+        sexp = [:scenario, @line, @keyword, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/scenario_outline.rb

@@ -1,10 +1,12 @@
+require 'cucumber/ast/feature_element'
+require 'cucumber/ast/names'
+
 module Cucumber
   module Ast
     class ScenarioOutline #:nodoc:
       include FeatureElement
+      include Names
       
-      attr_reader :name
-
       module ExamplesArray #:nodoc:
         def accept(visitor)
           return if Cucumber.wants_to_quit
@@ -20,12 +22,12 @@ module Cucumber
       # * Examples keyword
       # * Examples section name
       # * Raw matrix
-      def initialize(background, comment, tags, line, keyword, name, raw_steps, example_sections)
-        @background, @comment, @tags, @line, @keyword, @name, @raw_steps, @example_sections = background, comment, tags, line, keyword, name, raw_steps, example_sections
+      def initialize(background, comment, tags, line, keyword, title, description, raw_steps, example_sections)
+        @background, @comment, @tags, @line, @keyword, @title, @description, @raw_steps, @example_sections = background, comment, tags, line, keyword, title, description, raw_steps, example_sections
       end
 
-      def add_examples(example_section)
-        @example_sections << example_section
+      def add_examples(example_section, gherkin_examples)
+        @example_sections << [example_section, gherkin_examples]
       end
 
       def init
@@ -33,15 +35,21 @@ module Cucumber
         attach_steps(@raw_steps)
         @steps = StepCollection.new(@raw_steps)
 
-        @examples_array = @example_sections.map do |example_section|
-          examples_comment    = example_section[0]
-          examples_line       = example_section[1]
-          examples_keyword    = example_section[2]
-          examples_name       = example_section[3]
-          examples_matrix     = example_section[4]
+        @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]
+          examples_title       = example_section[3]
+          examples_description = example_section[4]
+          examples_matrix      = example_section[5]
 
           examples_table = OutlineTable.new(examples_matrix, self)
-          Examples.new(examples_comment, examples_line, examples_keyword, examples_name, examples_table)
+          ex = Examples.new(examples_comment, examples_line, examples_keyword, examples_title, examples_description, examples_table)
+          ex.gherkin_statement(gherkin_examples)
+          ex
         end
 
         @examples_array.extend(ExamplesArray)
@@ -53,7 +61,7 @@ module Cucumber
         return if Cucumber.wants_to_quit
         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))
+        visitor.visit_scenario_name(@keyword, name, file_colon_line(@line), source_indent(first_line_length))
         visitor.visit_steps(@steps)
 
         skip_invoke! if @background && @background.failed?
@@ -102,7 +110,7 @@ module Cucumber
 
       def to_sexp
         init
-        sexp = [:scenario_outline, @keyword, @name]
+        sexp = [:scenario_outline, @keyword, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp

data/lib/cucumber/ast/step.rb

@@ -14,6 +14,11 @@ module Cucumber
         @line, @keyword, @name, @multiline_arg = line, keyword, name, multiline_arg
       end
 
+      attr_reader :gherkin_statement
+      def gherkin_statement(statement=nil)
+        @gherkin_statement ||= statement
+      end
+
       def background?
         false
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -1,3 +1,4 @@
+require 'cucumber/errors'
 require 'cucumber/step_match'
 require 'cucumber/ast/table'
 require 'gherkin/rubify'
@@ -38,7 +39,7 @@ module Cucumber
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
-        invoke(visitor.step_mother, visitor.options)
+        invoke(visitor.step_mother, visitor.configuration)
         visit_step_result(visitor)
       end
 
@@ -54,63 +55,64 @@ module Cucumber
         )
       end
 
-      def invoke(step_mother, options)
-        find_step_match!(step_mother)
-        unless @skip_invoke || options[:dry_run] || @exception || @step_collection.exception
+      def invoke(step_mother, configuration)
+        find_step_match!(step_mother, configuration)
+        unless @skip_invoke || configuration.dry_run? || @exception || @step_collection.exception
           @skip_invoke = true
           begin
             @step_match.invoke(@multiline_arg)
             step_mother.after_step
             status!(:passed)
           rescue Pending => e
-            failed(options, e, false)
+            failed(configuration, e, false)
             status!(:pending)
           rescue Undefined => e
-            failed(options, e, false)
+            failed(configuration, e, false)
             status!(:undefined)
           rescue Cucumber::Ast::Table::Different => e
             @different_table = e.table
-            failed(options, e, false)
+            failed(configuration, e, false)
             status!(:failed)
           rescue Exception => e
-            failed(options, e, false)
+            failed(configuration, e, false)
             status!(:failed)
           end
         end
       end
 
-      def find_step_match!(step_mother)
+      def find_step_match!(step_mother, configuration)
         return if @step_match
         begin
           @step_match = step_mother.step_match(@name)
         rescue Undefined => e
-          failed(step_mother.options, e, true)
+          failed(configuration, e, true)
           status!(:undefined)
           @step_match = NoStepMatch.new(@step, @name)
         rescue Ambiguous => e
-          failed(step_mother.options, e, false)
+          failed(configuration, e, false)
           status!(:failed)
           @step_match = NoStepMatch.new(@step, @name)
         end
         step_mother.step_visited(self)
       end
 
-      def failed(options, e, clear_backtrace)
+      def failed(configuration, 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
-        if(options[:strict] || !(Undefined === e) || e.nested?)
+        if(configuration.strict? || !(Undefined === e) || e.nested?)
           @reported_exception = e
         else
           @reported_exception = nil
         end
       end
 
+      PWD_PATTERN = /#{Regexp.escape(Dir.pwd)}\//m
+
       def filter_backtrace(e)
         return e if Cucumber.use_full_backtrace
-        pwd = /#{Regexp.escape(Dir.pwd)}\//m
-        (e.backtrace || []).each{|line| line.gsub!(pwd, "./")}
+        (e.backtrace || []).each{|line| line.gsub!(PWD_PATTERN, "./")}
         
         filtered = (e.backtrace || []).reject do |line|
           BACKTRACE_FILTER_PATTERNS.detect { |p| line =~ p }
@@ -185,6 +187,10 @@ module Cucumber
         @step.language
       end
 
+      def gherkin_statement
+        @step.gherkin_statement
+      end
+
       def to_sexp
         [:step_invocation, @step.line, @step.keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end

data/lib/cucumber/ast/table.rb

@@ -1,4 +1,5 @@
 require 'gherkin/rubify'
+require 'gherkin/lexer/i18n_lexer'
 require 'gherkin/formatter/escaping'
 
 module Cucumber
@@ -60,7 +61,7 @@ module Cucumber
 
       def self.parse(text, uri, offset)
         builder = Builder.new
-        lexer = Gherkin::I18nLexer.new(builder)
+        lexer = Gherkin::Lexer::I18nLexer.new(builder)
         lexer.scan(text)
         new(builder.rows)
       end
@@ -73,7 +74,6 @@ module Cucumber
       def initialize(raw, conversion_procs = NULL_CONVERSIONS.dup)
         @cells_class = Cells
         @cell_class = Cell
-
         raw = ensure_array_of_array(rubify(raw))
         # Verify that it's square
         transposed = raw.transpose
@@ -153,7 +153,7 @@ module Cucumber
       #
       # gets converted into the following:
       #
-      #   [['a', 'b], ['c', 'd']]
+      #   [['a', 'b'], ['c', 'd']]
       #
       def raw
         cell_matrix.map do |row|
@@ -163,9 +163,14 @@ module Cucumber
         end
       end
 
-      # Same as #raw, but skips the first (header) row
+      def column_names	#:nodoc:
+        @col_names ||= cell_matrix[0].map { |cell| cell.value }
+      end
+
       def rows
-        raw[1..-1]
+        hashes.map do |hash|
+          hash.values_at *headers
+        end
       end
 
       def each_cells_row(&proc) #:nodoc:
@@ -271,8 +276,9 @@ module Cucumber
       #   end
       #
       def map_column!(column_name, strict=true, &conversion_proc)
-        verify_column(column_name) if strict
-        @conversion_procs[column_name] = conversion_proc
+        verify_column(column_name.to_s) if strict
+        @conversion_procs[column_name.to_s] = conversion_proc
+        self
       end
 
       # Compares +other_table+ to self. If +other_table+ contains columns
@@ -379,7 +385,7 @@ module Cucumber
         hash = Hash.new do |hash, key|
           hash[key.to_s] if key.is_a?(Symbol)
         end
-        raw[0].each_with_index do |column_name, column_index|
+        column_names.each_with_index do |column_name, column_index|
           value = @conversion_procs[column_name].call(cells.value(column_index))
           hash[column_name] = value
         end