cucumber 1.2.5 → 1.3.0

data/lib/cucumber/ast/features.rb

@@ -18,7 +18,6 @@ module Cucumber
       end
 
       def add_feature(feature)
-        feature.features = self
         @features << feature
       end
 
@@ -30,6 +29,10 @@ module Cucumber
         end
         @duration = Time.now - start
       end
+
+      def step_count
+        @features.inject(0) { |total, feature| total += feature.step_count }
+      end
     end
   end
 end

data/lib/cucumber/ast/has_steps.rb

@@ -4,23 +4,15 @@ require 'gherkin/tag_expression'
 module Cucumber
   module Ast
     module HasSteps #: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
-
       def attach_steps(steps)
-        steps.each {|step| step.feature_element = self}
-      end
-
-      def file_colon_line(line = @line)
-        @feature.file_colon_line(line) if @feature
+        steps.each do |step| 
+          step.feature_element = self
+        end
       end
 
       def first_line_length
@@ -49,8 +41,8 @@ module Cucumber
         scenario_name_regexps.detect{|n| n =~ name}
       end
 
-      def backtrace_line(name = "#{@keyword}: #{name}", line = @line)
-        @feature.backtrace_line(name, line) if @feature
+      def backtrace_line(step_name = "#{@keyword}: #{name}", line = self.line)
+        "#{location.on_line(line)}:in `#{step_name}'"
       end
 
       def source_indent(text_length)
@@ -58,8 +50,7 @@ module Cucumber
       end
 
       def max_line_length
-        init
-        @steps.max_line_length(self)
+        steps.max_line_length(self)
       end
 
       def accept_hook?(hook)
@@ -71,12 +62,13 @@ module Cucumber
       end
 
       def source_tags
-        (@tags.tags.to_a + (@feature ? @feature.source_tags.to_a : [])).uniq
+        @tags.tags.to_a + feature_tags.tags.to_a
       end
 
       def language
-        @feature.language if @feature
+        @language || raise("Language is required for a #{self.class}")
       end
+
     end
   end
 end

data/lib/cucumber/ast/location.rb

@@ -0,0 +1,41 @@
+module Cucumber
+  module Ast
+
+    class Location
+      attr_reader :file, :line
+
+      def initialize(file, line)
+        @file = file || raise(ArgumentError, "file is mandatory")
+        @line = line || raise(ArgumentError, "line is mandatory")
+      end
+
+      def to_s
+        "#{file}:#{line}"
+      end
+
+      def on_line(new_line)
+        Location.new(file, new_line)
+      end
+    end
+
+    module HasLocation
+      def file_colon_line
+        location.to_s
+      end
+
+      def file
+        location.file
+      end
+
+      def line
+        location.line
+      end
+
+      def location
+        raise('Please set @location in the constructor') unless @location
+        raise("@location must be an Ast::Location but is a #{@location.class}") unless @location.is_a?(Location)
+        @location
+      end
+    end
+  end
+end

data/lib/cucumber/ast/scenario.rb

@@ -1,66 +1,46 @@
 require 'cucumber/ast/has_steps'
 require 'cucumber/ast/names'
+require 'cucumber/ast/empty_background'
+require 'cucumber/ast/location'
+require 'cucumber/unit'
 
 module Cucumber
   module Ast
     class Scenario #:nodoc:
       include HasSteps
       include Names
+      include HasLocation
 
-      attr_reader :line
+      attr_reader   :feature_tags
+      attr_accessor :feature
 
-      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
+      def initialize(language, location, background, comment, tags, feature_tags, keyword, title, description, raw_steps)
+        @language, @location, @background, @comment, @tags, @feature_tags, @keyword, @title, @description, @raw_steps = language, location, background, comment, tags, feature_tags, keyword, title, description, raw_steps
         @exception = @executed = nil
-      end
-
-      def init
-        return if @steps
-        @background.init
-        @background.feature_elements << self
         attach_steps(@raw_steps)
-        step_invocations = @raw_steps.map{|step| step.step_invocation}
-        @steps = @background.step_collection(step_invocations)
       end
 
       def accept(visitor)
         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, source_indent(first_line_length))
+
+        skip_invoke! if @background.failed?
         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.runtime.with_hooks(self, skip_hooks?) do
-            skip_invoke! if failed?
-            visitor.visit_steps(@steps)
-          end
-          @executed = true
+          visitor.execute(self, skip_hooks?)
         end
+        @executed = true
+      end
+
+      def to_units(background)
+        [Unit.new(background.step_invocations + step_invocations)]
       end
 
       # Returns true if one or more steps failed
       def failed?
-        @steps.failed? || !!@exception
+        steps.failed? || !!@exception
       end
 
       def fail!(exception)
@@ -75,42 +55,49 @@ module Cucumber
 
       # Returns the first exception (if any)
       def exception
-        @exception || @steps.exception
+        @exception || steps.exception
       end
 
       # Returns the status
       def status
         return :failed if @exception
-        @steps.status
-      end
-
-      def skip_invoke!
-        @steps.each{|step_invocation| step_invocation.skip_invoke!}
+        steps.status
       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
         sexp += tags if tags.any?
-        steps = @steps.to_sexp
-        sexp += steps if steps.any?
+        sexp += steps.to_sexp if steps.any?
         sexp
       end
 
-
       def with_visitor(visitor)
         @current_visitor = visitor
         yield
         @current_visitor = nil
       end
 
+      def skip_invoke!
+        steps.skip_invoke!
+      end
+
+      def steps
+        @steps ||= @background.step_collection(step_invocations)
+      end
+
       private
 
+      def step_invocations
+        @raw_steps.map{|step| step.step_invocation}
+      end
+
       def skip_hooks?
         @background.failed? || @executed
       end
+
     end
   end
 end

data/lib/cucumber/ast/scenario_outline.rb

@@ -1,11 +1,16 @@
 require 'cucumber/ast/has_steps'
 require 'cucumber/ast/names'
+require 'cucumber/ast/empty_background'
 
 module Cucumber
   module Ast
     class ScenarioOutline #:nodoc:
       include HasSteps
       include Names
+      include HasLocation
+
+      attr_accessor :feature
+      attr_reader :feature_tags
 
       module ExamplesArray #:nodoc:
         def accept(visitor)
@@ -22,50 +27,29 @@ module Cucumber
       # * Examples keyword
       # * Examples section name
       # * Raw matrix
-      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, gherkin_examples)
-        @example_sections << [example_section, gherkin_examples]
-      end
-
-      def init
-        return if @steps
+      def initialize(language, location, background, comment, tags, feature_tags, keyword, title, description, raw_steps, example_sections)
+        @language, @location, @background, @comment, @tags, @feature_tags, @keyword, @title, @description, @raw_steps, @example_sections = language, location, background, comment, tags, feature_tags, keyword, title, description, raw_steps, example_sections
         attach_steps(@raw_steps)
-        @steps = StepCollection.new(@raw_steps)
-
-        @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)
-          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)
-
-        @background.feature_elements << self if @background
       end
 
       def accept(visitor)
         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_steps(@steps)
+        visitor.visit_scenario_name(@keyword, name, file_colon_line, source_indent(first_line_length))
+        visitor.visit_steps(steps)
 
-        skip_invoke! if @background && @background.failed?
-        visitor.visit_examples_array(@examples_array) unless @examples_array.empty?
+        skip_invoke! if @background.failed?
+        visitor.visit_examples_array(examples_array) unless examples_array.empty?
+      end
+
+      def to_units(background)
+        raise ArgumentError.new("#{background} != #{@background}") unless background == @background # maybe we don't need this argument, but it seems like the leaf AST nodes would be better not being aware of their parents. However step_invocations uses the ivar at the moment, so we'll just do this check to make sure its OK.
+        result = []
+        each_example_row do |row|
+          result << Unit.new(step_invocations(row))
+        end
+        result
       end
 
       def fail!(exception)
@@ -74,14 +58,11 @@ module Cucumber
       end
 
       def skip_invoke!
-        @examples_array.each{|examples| examples.skip_invoke!}
-        @feature.next_feature_element(self) do |next_one|
-          next_one.skip_invoke!
-        end
+        examples_array.each { |examples| examples.skip_invoke! }
       end
 
       def step_invocations(cells)
-        step_invocations = @steps.step_invocations_from_cells(cells)
+        step_invocations = steps.step_invocations_from_cells(cells)
         if @background
           @background.step_collection(step_invocations)
         else
@@ -90,36 +71,68 @@ module Cucumber
       end
 
       def each_example_row(&proc)
-        @examples_array.each do |examples|
+        examples_array.each do |examples|
           examples.each_example_row(&proc)
         end
       end
 
       def visit_scenario_name(visitor, row)
         visitor.visit_scenario_name(
-          @feature.language.keywords('scenario')[0],
+          language.keywords('scenario')[0],
           row.name,
-          file_colon_line(row.line),
+          Location.new(file, row.line).to_s,
           source_indent(first_line_length)
         )
       end
 
       def failed?
-        @examples_array.select{|examples| examples.failed?}.any?
+        examples_array.select { |examples| examples.failed? }.any?
       end
 
       def to_sexp
-        init
         sexp = [:scenario_outline, @keyword, name]
         comment = @comment.to_sexp
         sexp += [comment] if comment
         tags = @tags.to_sexp
         sexp += tags if tags.any?
-        steps = @steps.to_sexp
-        sexp += steps if steps.any?
-        sexp += @examples_array.map{|e| e.to_sexp}
+        sexp += steps.to_sexp if steps.any?
+        sexp += examples_array.map{|e| e.to_sexp}
         sexp
       end
+
+      private
+
+      attr_reader :line
+
+      def examples_array
+        return @examples_array if @examples_array
+        @examples_array = @example_sections.map do |section|
+          create_examples_table(section)
+        end
+        @examples_array.extend(ExamplesArray)
+        @examples_array
+      end
+
+      def create_examples_table(example_section_and_gherkin_examples)
+        example_section = example_section_and_gherkin_examples[0]
+        gherkin_examples = example_section_and_gherkin_examples[1]
+
+        examples_location    = example_section[0]
+        examples_comment     = 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)
+        ex = Examples.new(examples_location, examples_comment, examples_keyword, examples_title, examples_description, examples_table)
+        ex.gherkin_statement(gherkin_examples)
+        ex
+      end
+
+      def steps
+        @steps ||= StepCollection.new(@raw_steps)
+      end
     end
   end
 end

data/lib/cucumber/ast/step.rb

@@ -1,17 +1,21 @@
 require 'cucumber/core_ext/string'
 require 'cucumber/step_match'
+require 'cucumber/ast/location'
 
 module Cucumber
   module Ast
     class Step #:nodoc:
-      attr_reader :line, :keyword, :name
+      include HasLocation
+
+      attr_reader :keyword, :name, :language
       attr_writer :step_collection, :options
       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
+      def initialize(language, location, keyword, name, multiline_arg=nil)
+        @language, @location, @keyword, @name, @multiline_arg = language, location, keyword, name, multiline_arg
+        @language || raise("Language is required!")
       end
 
       attr_reader :gherkin_statement
@@ -29,7 +33,7 @@ module Cucumber
       end
 
       def step_invocation
-        StepInvocation.new(self, @name, @multiline_arg, [])
+        StepInvocation.new(self, name, @multiline_arg, [])
       end
 
       def step_invocation_from_cells(cells)
@@ -50,43 +54,35 @@ module Cucumber
       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)
+        visitor.visit_step_result(keyword, step_match, @multiline_arg, status, exception, source_indent, background, file_colon_line)
       end
 
       def first_match(visitor)
-        # @feature_element is always a ScenarioOutline in this case
-        @feature_element.each_example_row do |cells|
+        # feature_element is always a ScenarioOutline in this case
+        feature_element.each_example_row do |cells|
           argument_hash       = cells.to_hash
           delimited_arguments = delimit_argument_names(argument_hash)
-          name                = replace_name_arguments(delimited_arguments)
-          step_match          = visitor.runtime.step_match(name, @name) rescue nil
+          name_to_match       = replace_name_arguments(delimited_arguments)
+          step_match          = visitor.runtime.step_match(name_to_match, name) rescue nil
           return step_match if step_match
         end
-        NoStepMatch.new(self, @name)
+        NoStepMatch.new(self, name)
       end
 
       def to_sexp
-        [:step, @line, @keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
+        [:step, line, keyword, name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end
 
       def source_indent
-        @feature_element.source_indent(text_length)
+        feature_element.source_indent(text_length)
       end
 
-      def text_length(name=@name)
-        INDENT + INDENT + @keyword.unpack('U*').length + name.unpack('U*').length
+      def text_length(name=name)
+        INDENT + INDENT + keyword.unpack('U*').length + name.unpack('U*').length
       end
 
       def backtrace_line
-        @backtrace_line ||= @feature_element.backtrace_line("#{@keyword}#{@name}", @line) unless @feature_element.nil?
-      end
-
-      def file_colon_line
-        @file_colon_line ||= @feature_element.file_colon_line(@line) unless @feature_element.nil?
-      end
-
-      def language
-        @feature_element.language
+        @backtrace_line ||= feature_element.backtrace_line("#{keyword}#{name}", line) unless feature_element.nil?
       end
 
       def dom_id
@@ -101,7 +97,7 @@ module Cucumber
           header_cell = cell.table.header_cell(col_index)
           col_index += 1
           delimited = delimited(header_cell.value)
-          @name.index(delimited) || (@multiline_arg && @multiline_arg.has_text?(delimited))
+          name.index(delimited) || (@multiline_arg && @multiline_arg.has_text?(delimited))
         end
       end
 
@@ -114,10 +110,10 @@ module Cucumber
       end
 
       def replace_name_arguments(argument_hash)
-        name_with_arguments_replaced = @name
-        argument_hash.each do |name, value|
+        name_with_arguments_replaced = name
+        argument_hash.each do |key, value|
           value ||= ''
-          name_with_arguments_replaced = name_with_arguments_replaced.gsub(name, value)
+          name_with_arguments_replaced = name_with_arguments_replaced.gsub(key, value)
         end
         name_with_arguments_replaced
       end