cucumber 0.6.4 → 0.7.0.beta.1

data/lib/cucumber/ast/examples.rb

@@ -1,6 +1,8 @@
 module Cucumber
   module Ast
     class Examples #:nodoc:
+      attr_writer :outline_table
+      
       def initialize(comment, line, keyword, name, outline_table)
         @comment, @keyword, @name, @outline_table = comment, keyword, name, outline_table
       end

data/lib/cucumber/ast/feature.rb

@@ -3,30 +3,48 @@ module Cucumber
     # Represents the root node of a parsed feature.
     class Feature #:nodoc:
       attr_accessor :language
-      attr_writer :features
+      attr_writer :features, :background
       attr_reader :file
       attr_reader :name
 
-      def initialize(background, comment, tags, name, feature_elements)
-        @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name.strip, feature_elements
+      def initialize(background, comment, tags, keyword, name, feature_elements)
+        @background, @comment, @tags, @keyword, @name, @feature_elements = background, comment, tags, keyword, name.strip, feature_elements
+      end
 
-        background.feature = self if background
+      def init
+        @background.feature = self if @background
+        @background.init if @background
         @feature_elements.each do |feature_element|
+          feature_element.init
           feature_element.feature = self
         end
       end
 
+      def add_feature_element(feature_element)
+        @feature_elements << feature_element
+      end
+
       def accept(visitor)
         return if Cucumber.wants_to_quit
+        init
         visitor.visit_comment(@comment) unless @comment.empty?
         visitor.visit_tags(@tags)
-        visitor.visit_feature_name(@name)
+        visitor.visit_feature_name(@keyword, indented_name)
         visitor.visit_background(@background) if @background
         @feature_elements.each do |feature_element|
           visitor.visit_feature_element(feature_element)
         end
       end
 
+      def indented_name
+        indent = ""
+        @name.split("\n").map do |l|
+          s = "#{indent}#{l}"
+          indent = "  "
+          s
+        end.join("\n")
+      end
+
       def source_tag_names
         @tags.tag_names
       end
@@ -36,6 +54,7 @@ module Cucumber
       end
 
       def next_feature_element(feature_element, &proc)
+        init
         index = @feature_elements.index(feature_element)
         next_one = @feature_elements[index+1]
         proc.call(next_one) if next_one
@@ -55,6 +74,7 @@ module Cucumber
       end
 
       def tag_locations(tag)
+        init
         @feature_elements.select{|feature_element| feature_element.tagged_with?(tag)}
       end
 
@@ -68,6 +88,7 @@ module Cucumber
       end
 
       def to_sexp
+        init
         sexp = [:feature, @file, @name]
         comment = @comment.to_sexp
         sexp += [comment] if comment

data/lib/cucumber/ast/feature_element.rb

@@ -1,11 +1,15 @@
 require 'enumerator'
-require 'cucumber/tag_expression'
+require 'gherkin/parser/tag_expression'
 
 module Cucumber
   module Ast
     module FeatureElement #:nodoc:
       attr_accessor :feature
 
+      def add_step(step)
+        @raw_steps << step
+      end
+
       def attach_steps(steps)
         steps.each {|step| step.feature_element = self}
       end
@@ -14,20 +18,24 @@ module Cucumber
         @feature.file_colon_line(line) if @feature
       end
 
-      def text_length
-        name_line_lengths.max
-      end
-
       def first_line_length
         name_line_lengths[0]
       end
 
+      def text_length
+        name_line_lengths.max
+      end
+
       def name_line_lengths
         if @name.strip.empty?
-          [@keyword.jlength]
+          [Ast::Step::INDENT + @keyword.jlength + ': '.jlength]
         else
           @name.split("\n").enum_for(:each_with_index).map do |line, line_number|
-            line_number == 0 ? @keyword.jlength + line.jlength : line.jlength + Ast::Step::INDENT - 1 # We -1 as names which are not keyword lines are missing a space between keyword and name
+            if line_number == 0
+              Ast::Step::INDENT + @keyword.jlength + ': '.jlength + line.jlength
+            else
+              Ast::Step::INDENT + Ast::Step::INDENT + line.jlength
+            end
           end
         end
       end
@@ -36,7 +44,7 @@ module Cucumber
         scenario_name_regexps.detect{|name| name =~ @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
 
@@ -45,11 +53,12 @@ module Cucumber
       end
 
       def max_line_length
+        init
         @steps.max_line_length(self)
       end
 
       def accept_hook?(hook)
-        TagExpression.parse(hook.tag_expressions).eval(source_tag_names)
+        Gherkin::Parser::TagExpression.new(hook.tag_expressions).eval(source_tag_names)
       end
 
       def source_tag_names

data/lib/cucumber/ast/outline_table.rb

@@ -5,11 +5,20 @@ module Cucumber
         super(raw)
         @scenario_outline = scenario_outline
         @cells_class = ExampleRow
-        create_step_invocations_for_example_rows!(scenario_outline)
+      end
+
+      def init
+        create_step_invocations_for_example_rows!(@scenario_outline)
+      end
+
+      def to_sexp
+        init
+        super
       end
 
       def accept(visitor)
         return if Cucumber.wants_to_quit
+        init
         cells_rows.each_with_index do |row, n|
           if(visitor.options[:expand])
             row.accept(visitor)
@@ -29,12 +38,15 @@ module Cucumber
       end
 
       def skip_invoke!
+        init
         example_rows.each do |cells|
           cells.skip_invoke!
         end
       end
 
       def create_step_invocations_for_example_rows!(scenario_outline)
+        return if @dunit
+        @dunit = true
         example_rows.each do |cells|
           cells.create_step_invocations!(scenario_outline)
         end

data/lib/cucumber/ast/py_string.rb

@@ -17,23 +17,40 @@ module Cucumber
     # Note how the indentation from the source is stripped away.
     #
     class PyString #:nodoc:
+      class Builder
+        attr_reader :string
+
+        def initialize
+          @string = ''
+        end
+
+        def py_string(string, line_number)
+          @string = string
+        end
+
+        def eof
+        end
+      end
+
       attr_accessor :file
 
       def self.default_arg_name
         "string"
       end
 
-      def initialize(start_line, end_line, string, quotes_indent)
-        @start_line, @end_line = start_line, end_line
-        @string, @quotes_indent = string.gsub(/\\"/, '"'), quotes_indent
+      def self.parse(text)
+        builder = Builder.new
+        lexer = Gherkin::I18nLexer.new(builder)
+        lexer.scan(text)
+        new(builder.string)
+      end
+
+      def initialize(string)
+        @string = string
       end
 
       def to_s
-        # Assume all whitespace before the first triple quote is the same.
-        # Also assume the contents of the pystring is indented with the same prefix.
-        # This allows indentation with both " " and "\t" characters.
-        return @string if @quotes_indent == ""
-        @string.gsub(/^#{@quotes_indent[0..0]}{0,#{@quotes_indent.length}}/, "")
+        @string
       end
 
       def accept(visitor)
@@ -47,7 +64,7 @@ module Cucumber
           value ||= ''
           string = string.gsub(name, value)
         end
-        PyString.new(@start_line, @end_line, string, @quotes_indent)
+        PyString.new(string)
       end
 
       def has_text?(text)

data/lib/cucumber/ast/scenario.rb

@@ -19,18 +19,24 @@ module Cucumber
         def step_collection(step_invocations)
           StepCollection.new(step_invocations)
         end
+        
+        def init
+        end
       end
       
-      def initialize(background, comment, tags, line, keyword, name, steps)
+      def initialize(background, comment, tags, line, keyword, name, raw_steps)
         @background = background || EmptyBackground.new
-        @comment, @tags, @line, @keyword, @name = comment, tags, line, keyword, name
-        attach_steps(steps)
+        @comment, @tags, @line, @keyword, @name, @raw_steps = comment, tags, line, keyword, name, raw_steps
+        @exception = @executed = nil
+      end
 
-        step_invocations = steps.map{|step| step.step_invocation}
-        @steps = @background.step_collection(step_invocations)
+      def init
+        return if @steps
+        @background.init
         @background.feature_elements << self
-        
-        @exception = @executed = nil
+        attach_steps(@raw_steps)
+        step_invocations = @raw_steps.map{|step| step.step_invocation}
+        @steps = @background.step_collection(step_invocations)
       end
 
       def accept(visitor)

data/lib/cucumber/ast/scenario_outline.rb

@@ -2,6 +2,8 @@ module Cucumber
   module Ast
     class ScenarioOutline #:nodoc:
       include FeatureElement
+      
+      attr_reader :name
 
       module ExamplesArray #:nodoc:
         def accept(visitor)
@@ -18,12 +20,20 @@ module Cucumber
       # * Examples keyword
       # * Examples section name
       # * Raw matrix
-      def initialize(background, comment, tags, line, keyword, name, steps, example_sections)
-        @background, @comment, @tags, @line, @keyword, @name = background, comment, tags, line, keyword, name
-        attach_steps(steps)
-        @steps = StepCollection.new(steps)
+      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
+      end
+
+      def add_examples(example_section)
+        @example_sections << example_section
+      end
 
-        @examples_array = example_sections.map do |example_section|
+      def init
+        return if @steps
+        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]
@@ -33,6 +43,7 @@ module Cucumber
           examples_table = OutlineTable.new(examples_matrix, self)
           Examples.new(examples_comment, examples_line, examples_keyword, examples_name, examples_table)
         end
+
         @examples_array.extend(ExamplesArray)
 
         @background.feature_elements << self if @background
@@ -73,7 +84,7 @@ module Cucumber
 
       def visit_scenario_name(visitor, row)
         visitor.visit_scenario_name(
-          @feature.language.scenario_keywords[0] + ":",
+          @feature.language.keywords('scenario')[0],
           row.name, 
           file_colon_line(row.line), 
           source_indent(first_line_length)
@@ -85,6 +96,7 @@ module Cucumber
       end
 
       def to_sexp
+        init
         sexp = [:scenario_outline, @keyword, @name]
         comment = @comment.to_sexp
         sexp += [comment] if comment

data/lib/cucumber/ast/step.rb

@@ -4,9 +4,9 @@ require 'cucumber/step_match'
 module Cucumber
   module Ast
     class Step #:nodoc:
-      attr_reader :line, :keyword, :name, :multiline_arg
+      attr_reader :line, :keyword, :name
       attr_writer :step_collection, :options
-      attr_accessor :feature_element, :exception
+      attr_accessor :feature_element, :exception, :multiline_arg
 
       INDENT = 2
       
@@ -69,11 +69,11 @@ module Cucumber
       end
 
       def text_length(name=@name)
-        @keyword.jlength + name.jlength + INDENT # Add indent as steps get indented more than scenarios
+        INDENT + INDENT + @keyword.jlength + name.jlength
       end
 
       def backtrace_line
-        @backtrace_line ||= @feature_element.backtrace_line("#{@keyword} #{@name}", @line) unless @feature_element.nil?
+        @backtrace_line ||= @feature_element.backtrace_line("#{@keyword}#{@name}", @line) unless @feature_element.nil?
       end
 
       def file_colon_line

data/lib/cucumber/ast/step_invocation.rb

@@ -1,9 +1,12 @@
 require 'cucumber/step_match'
 require 'cucumber/ast/table'
+require 'gherkin/rubify'
 
 module Cucumber
   module Ast
     class StepInvocation #:nodoc:
+      include Gherkin::Rubify
+
       BACKTRACE_FILTER_PATTERNS = [
         /vendor\/rails|lib\/cucumber|bin\/cucumber:|lib\/rspec|gems\//
       ]
@@ -142,11 +145,11 @@ module Cucumber
       end
 
       def actual_keyword
-        repeat_keywords = [language.but_keywords(false), language.and_keywords(false)].flatten.uniq.reject{|kw| kw == '*'}
+        repeat_keywords = rubify([language.keywords('but'), language.keywords('and')]).flatten.uniq.reject{|kw| kw == '* '}
         if repeat_keywords.index(@step.keyword) && previous
           previous.actual_keyword
         else
-          keyword == '*' ? language.given_keyword : keyword
+          keyword == '* ' ? language.code_keywords.first : keyword
         end
       end
 

data/lib/cucumber/ast/table.rb

@@ -1,3 +1,5 @@
+require 'gherkin/rubify'
+
 module Cucumber
   module Ast
     # Step Definitions that match a plain text Step with a multiline argument table
@@ -29,7 +31,23 @@ module Cucumber
         end
       end
       
+      class Builder
+        attr_reader :rows
+
+        def initialize
+          @rows = []
+        end
+
+        def row(row, line_number)
+          @rows << row
+        end
+
+        def eof
+        end
+      end
+
       include Enumerable
+      include Gherkin::Rubify
       
       NULL_CONVERSIONS = Hash.new(lambda{ |cell_value| cell_value }).freeze
 
@@ -39,6 +57,13 @@ module Cucumber
         "table"
       end
 
+      def self.parse(text)
+        builder = Builder.new
+        lexer = Gherkin::I18nLexer.new(builder)
+        lexer.scan(text)
+        new(builder.rows)
+      end
+
       # Creates a new instance. +raw+ should be an Array of Array of String
       # or an Array of Hash (similar to what #hashes returns).
       # You don't typically create your own Table objects - Cucumber will do
@@ -48,7 +73,7 @@ module Cucumber
         @cells_class = Cells
         @cell_class = Cell
 
-        raw = ensure_array_of_array(raw)
+        raw = ensure_array_of_array(rubify(raw))
         # Verify that it's square
         transposed = raw.transpose
         create_cell_matrix(raw)