aslakhellesoy-cucumber 0.2.3.2 → 0.2.3.3

data/History.txt

@@ -21,6 +21,12 @@ still work.
 * Snippets for steps that use Step Tables or PyStrings include block param and object type hint comment (#247 Joseph Wilk)
 * Support description string for Backgrounds (#271 Joseph Wilk)
 
+=== Bugfixes
+* Fixed Background runs twice (#255 Aslak Hellesøy)
+* Fixed Background Transactions and :xx (#270 Aslak Hellesøy)
+* Fixed Autospec failing with cucumber 0.2 (#254 Aslak Hellesøy)
+* Sibling file detecting not working (#278 Aslak Hellesøy)
+
 === Removed/changed features
 * The visitor API has changed slightly:
 ** #visit_step_name, #visit_multiline_arg and #visit_exception are no longer official API methods.

data/Manifest.txt

@@ -179,6 +179,8 @@ examples/tickets/features/236.feature
 examples/tickets/features/241.feature
 examples/tickets/features/246.feature
 examples/tickets/features/248.feature
+examples/tickets/features/270/back.feature
+examples/tickets/features/270/back.steps.rb
 examples/tickets/features/lib/eatting_machine.rb
 examples/tickets/features/lib/pantry.rb
 examples/tickets/features/scenario_outline.feature
@@ -259,7 +261,6 @@ lib/cucumber/formatter/usage.rb
 lib/cucumber/formatters/unicode.rb
 lib/cucumber/languages.yml
 lib/cucumber/parser.rb
-lib/cucumber/parser/basic.rb
 lib/cucumber/parser/feature.rb
 lib/cucumber/parser/feature.tt
 lib/cucumber/parser/i18n.tt

data/examples/self_test/features/step_definitions/sample_steps.rb

@@ -25,9 +25,9 @@ Given /^call step "(.*)"$/ do |step|
 end
 
 Given /^'(.+)' cukes$/ do |cukes|
+  raise "We already have #{@cukes} cukes!" if @cukes
   @cukes = cukes
 end
-
 Then /^I should have '(.+)' cukes$/ do |cukes|
   @cukes.should == cukes
 end
@@ -52,7 +52,7 @@ Given /^multiline string$/ do |string|
 end
 
 Then /^the table should be$/ do |table|
-  @table.to_sexp.should == table.to_sexp
+  @table.raw.should == table.raw
 end
 
 Then /^the multiline string should be$/ do |string|

data/examples/tickets/features/270/back.feature

@@ -0,0 +1,14 @@
+Feature: Background
+  In for background to work properly
+  As a user
+  I want it to run transactionally and only once when I call an individual scenario
+  
+Background:
+  Given plop
+ 
+Scenario: Barping
+  When I barp
+ 
+ 
+Scenario: Wibbling
+  When I wibble

data/examples/tickets/features/270/back.steps.rb

@@ -0,0 +1,14 @@
+require 'spec/expectations'
+
+Given /^plop$/ do
+  raise "Only one plop!" if @plop
+  @plop = true
+end
+ 
+When /^I barp$/ do
+  @plop.should == true
+end
+ 
+When /^I wibble$/ do
+  @plop.should == true
+end

data/features/background.feature

@@ -16,7 +16,7 @@ Feature: backgrounds
         Then I should have '10' cukes
 
     1 scenario
-    3 passed steps
+    2 passed steps
     
     """
   
@@ -64,7 +64,7 @@ Feature: backgrounds
         | 10    |
 
     2 scenarios
-    5 passed steps
+    4 passed steps
 
     """
 
@@ -123,7 +123,7 @@ Feature: backgrounds
 
     2 scenarios
     1 failed step
-    4 skipped steps
+    3 skipped steps
 
     """
 

data/features/cucumber_cli_outlines.feature

@@ -41,7 +41,7 @@ Feature: Cucumber command line
       Feature: Outline Sample
 
         Scenario Outline: Test state          # features/outline_sample.feature:5
-          Given <state> without a table       # features/step_definitions/sample_steps.rb:12
+          Given <state> without a table       # features/step_definitions/sample_steps.rb:15
           Given <other_state> without a table # features/step_definitions/sample_steps.rb:12
 
         Examples: Rainbow colours

data/lib/cucumber/ast/examples.rb

@@ -26,10 +26,6 @@ module Cucumber
         @outline_table.cells_rows[1..-1].each(&proc)
       end
 
-      def matches_lines?(lines)
-        lines.index(@line) || @outline_table.matches_lines?(lines)
-      end
-
       def to_sexp
         [:examples, @keyword, @name, @outline_table.to_sexp]
       end

data/lib/cucumber/ast/feature.rb

@@ -3,11 +3,10 @@ module Cucumber
     # Represents the root node of a parsed feature.
     class Feature
       attr_accessor :file
-      attr_writer :features, :lines
+      attr_writer :features
 
       def initialize(background, comment, tags, name, feature_elements)
         @background, @comment, @tags, @name, @feature_elements = background, comment, tags, name, feature_elements
-        @lines = []
 
         @feature_elements.each do |feature_element|
           feature_element.feature = self
@@ -15,7 +14,6 @@ module Cucumber
       end
 
       def accept(visitor)
-        visitor.current_feature_lines = @lines
         visitor.visit_comment(@comment)
         visitor.visit_tags(@tags)
         visitor.visit_feature_name(@name)

data/lib/cucumber/ast/feature_element.rb

@@ -12,10 +12,6 @@ module Cucumber
       @keyword.jlength + @name.jlength
     end
 
-    def matches_lines?(lines)
-      lines.index(@line) || @steps.matches_lines?(lines) || @tags.matches_lines?(lines)
-    end
-
     def has_tags?(tags)
       @tags.has_tags?(tags) || @feature.has_tags?(tags)
     end

data/lib/cucumber/ast/outline_table.rb

@@ -5,10 +5,7 @@ module Cucumber
         super(raw)
         @scenario_outline = scenario_outline
         @cells_class = ExampleCells
-        
-        cells_rows.each do |cells|
-          cells.create_step_invocations!(scenario_outline)
-        end
+        create_step_invocations_for_example_rows!(scenario_outline)
       end
 
       def accept(visitor)
@@ -25,16 +22,25 @@ module Cucumber
       end
       
       def matches?(visitor, cells)
-        @scenario_outline.matches_tags_and_name?(visitor) &&
-        (visitor.matches_lines?(cells) || visitor.matches_lines?(@scenario_outline))
+        @scenario_outline.matches_tags_and_name?(visitor)
       end
       
       def skip_invoke!
-        cells_rows.each do |cells|
+        example_rows.each do |cells|
           cells.skip_invoke!
         end
       end
 
+      def create_step_invocations_for_example_rows!(scenario_outline)
+        example_rows.each do |cells|
+          cells.create_step_invocations!(scenario_outline)
+        end
+      end
+      
+      def example_rows
+        cells_rows[1..-1]
+      end
+
       class ExampleCells < Cells
         def create_step_invocations!(scenario_outline)
           @step_invocations = scenario_outline.step_invocations(self)

data/lib/cucumber/ast/py_string.rb

@@ -31,10 +31,6 @@ module Cucumber
         @string.indent(-@quotes_indent)
       end
 
-      def matches_lines?(lines)
-        lines.detect{|l| l >= @start_line && l <= @end_line}
-      end
-
       def accept(visitor)
         visitor.visit_py_string(to_s)
       end

data/lib/cucumber/ast/scenario.rb

@@ -8,7 +8,7 @@ module Cucumber
       def initialize(background, comment, tags, line, keyword, name, steps)
         @background, @comment, @tags, @line, @keyword, @name = background, comment, tags, line, keyword, name
         attach_steps(steps)
-        
+
         step_invocations = steps.map{|step| step.step_invocation}
         if @background
           @steps = @background.step_collection(step_invocations)
@@ -23,7 +23,6 @@ module Cucumber
       end
 
       def descend?(visitor)
-        visitor.matches_lines?(self) &&
         visitor.included_by_tags?(self) &&
         !visitor.excluded_by_tags?(self) &&
         visitor.matches_scenario_names?(self)

data/lib/cucumber/ast/step.rb

@@ -56,10 +56,6 @@ module Cucumber
         [:step, @line, @keyword, @name, (@multiline_arg.nil? ? nil : @multiline_arg.to_sexp)].compact
       end
 
-      def matches_lines?(lines)
-        lines.index(@line) || (@multiline_arg && @multiline_arg.matches_lines?(lines))
-      end
-
       def source_indent
         @feature_element.source_indent(text_length)
       end

data/lib/cucumber/ast/step_collection.rb

@@ -41,10 +41,6 @@ module Cucumber
         @steps[i-1]
       end
 
-      def matches_lines?(lines)
-        @steps.detect {|step| step.matches_lines?(lines)}
-      end
-
       def empty?
         @steps.empty?
       end

data/lib/cucumber/ast/step_invocation.rb

@@ -85,10 +85,6 @@ module Cucumber
         end
       end
 
-      def matches_lines?(lines)
-        @step.matches_lines?(lines)
-      end
-
       def text_length
         @step.text_length
       end

data/lib/cucumber/ast/table.rb

@@ -105,10 +105,6 @@ module Cucumber
         cells_rows.each(&proc)
       end
 
-      def matches_lines?(lines)
-        cells_rows.detect{|row| row.matches_lines?(lines)}
-      end
-
       def accept(visitor)
         cells_rows.each do |row|
           visitor.visit_table_row(row)
@@ -251,10 +247,6 @@ module Cucumber
           @table, @cells = table, cells
         end
 
-        def matches_lines?(lines)
-          lines.index(line)
-        end
-
         def accept(visitor)
           each do |cell|
             visitor.visit_table_cell(cell)
@@ -264,7 +256,7 @@ module Cucumber
 
         # For testing only
         def to_sexp #:nodoc:
-          [:row, *@cells.map{|cell| cell.to_sexp}]
+          [:row, line, *@cells.map{|cell| cell.to_sexp}]
         end
 
         def to_hash #:nodoc:

data/lib/cucumber/ast/tags.rb

@@ -15,10 +15,6 @@ module Cucumber
         (@tag_names & tags).any?
       end
 
-      def matches_lines?(lines)
-        lines.index(@line)
-      end
-
       def accept(visitor)
         @tag_names.each do |tag_name|
           visitor.visit_tag_name(tag_name)

data/lib/cucumber/ast/visitor.rb

@@ -8,15 +8,6 @@ module Cucumber
       def initialize(step_mother)
         @options = {}
         @step_mother = step_mother
-        @current_feature_lines = []
-      end
-
-      def current_feature_lines=(lines)
-        @current_feature_lines = lines
-      end
-
-      def matches_lines?(node)
-        @current_feature_lines.empty? || node.matches_lines?(@current_feature_lines)
       end
 
       def included_by_tags?(node)

data/lib/cucumber/cli/configuration.rb

@@ -257,11 +257,11 @@ module Cucumber
 
         potential_feature_files
       end
-    
+
     protected
   
       def feature_dirs
-        feature_files.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
+        @paths.map { |f| File.directory?(f) ? f : File.dirname(f) }.uniq
       end
     
       def constantize(camel_cased_word)

data/lib/cucumber/formatter/pretty.rb

@@ -19,6 +19,7 @@ module Cucumber
         @options = options
         @delim = delim
         @indent = 0
+        @exceptions = []
       end
 
       def visit_features(features)
@@ -120,30 +121,32 @@ module Cucumber
       end
 
       def visit_step_result(keyword, step_match, multiline_arg, status, exception, source_indent, background)
+        if exception
+          return if @exceptions.index(exception)
+          @exceptions << exception
+        end
+        return if status != :failed && @in_background ^ background
+
+        # @step_matches ||= []
+        # return if @step_matches.index(step_match)
+        # @step_matches << step_match
+
         @status = status
         super
       end
 
       def visit_step_name(keyword, step_match, status, source_indent, background)
-        @step_matches ||= []
-        non_failed_background_step_outside_background = !@in_background && background && (status != :failed)
-        @skip_step = @step_matches.index(step_match) || non_failed_background_step_outside_background
-        @step_matches << step_match
-        
-        unless(@skip_step)
-          source_indent = nil unless @options[:source]
-          formatted_step_name = format_step(keyword, step_match, status, source_indent)
-          @io.puts("    " + formatted_step_name)
-        end
+        source_indent = nil unless @options[:source]
+        formatted_step_name = format_step(keyword, step_match, status, source_indent)
+        @io.puts("    " + formatted_step_name)
       end
 
       def visit_multiline_arg(multiline_arg)
-        return if @options[:no_multiline] || @skip_step
+        return if @options[:no_multiline]
         super
       end
 
       def visit_exception(exception, status)
-        return if @skip_step
         print_exception(exception, status, @indent)
         @io.flush
       end
@@ -152,7 +155,9 @@ module Cucumber
         @io.print @delim.indent(@indent)
         super
         @io.puts
-        print_exception(table_row.exception, :failed, @indent) if table_row.exception
+        if table_row.exception && !@exceptions.index(table_row.exception)
+          print_exception(table_row.exception, :failed, @indent) 
+        end
       end
 
       def visit_py_string(string)

data/lib/cucumber/parser/feature.rb

@@ -56,14 +56,14 @@ module Cucumber
       end
 
       module Feature2
-        def build
+        def build(filter)
           background = bg.respond_to?(:build) ? bg.build : nil
           Ast::Feature.new(
             background, 
             comment.build, 
             tags.build, 
             header.text_value, 
-            feature_elements.build(background)
+            feature_elements.build(background, filter)
           )
         end
       end
@@ -205,6 +205,10 @@ module Cucumber
       end
 
       module Tags2
+        def at_line?(line)
+          ts.elements.detect{|e| e.tag.line == line}
+        end
+
         def build
           tag_names = ts.elements.map{|e| e.tag.tag_name.text_value}
           Ast::Tags.new(ts.line, tag_names)
@@ -565,8 +569,12 @@ module Cucumber
       end
 
       module FeatureElements0
-        def build(background)
-          elements.map{|s| s.build(background)}
+        def build(background, filter)
+          elements.map do |feature_element|
+            if filter.nil? || filter.accept?(feature_element)
+              feature_element.build(background, filter)
+            end
+          end.compact
         end
       end
 
@@ -642,7 +650,13 @@ module Cucumber
       end
 
       module Scenario1
-        def build(background)
+        def at_line?(line)
+          scenario_keyword.line == line ||
+          steps.at_line?(line) ||
+          tags.at_line?(line)
+        end
+
+        def build(background, filter)
           Ast::Scenario.new(
             background,
             comment.build, 
@@ -760,7 +774,18 @@ module Cucumber
       end
 
       module ScenarioOutline1
-        def build(background)
+        def at_line?(line)
+          outline_at_line?(line) ||
+          examples_sections.at_line?(line) ||
+          tags.at_line?(line)
+        end
+
+        def outline_at_line?(line)
+          scenario_outline_keyword.line == line ||
+          steps.at_line?(line)
+        end
+
+        def build(background, filter)
           Ast::ScenarioOutline.new(
             background,
             comment.build, 
@@ -769,7 +794,7 @@ module Cucumber
             scenario_outline_keyword.text_value, 
             name.text_value, 
             steps.build, 
-            examples_sections.build
+            examples_sections.build(filter, self)
           )
         end
       end
@@ -845,6 +870,10 @@ module Cucumber
       end
 
       module Steps0
+        def at_line?(line)
+          elements.detect{|e| e.at_line?(line)}
+        end
+
         def build
           elements.map{|e| e.build}
         end
@@ -902,6 +931,11 @@ module Cucumber
       end
 
       module Step1
+        def at_line?(line)
+          step_keyword.line == line ||
+          (multi.respond_to?(:at_line?) && multi.at_line?(line))
+        end
+
         def build
           if multi.respond_to?(:build)
             Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip, multi.build)
@@ -1005,8 +1039,16 @@ module Cucumber
       end
 
       module ExamplesSections0
-        def build
-          elements.map{|e| e.build}
+        def at_line?(line)
+          elements.detect { |e| e.at_line?(line) }
+        end
+
+        def build(filter, scenario_outline)
+          elements.map do |e| 
+            if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
+              e.build(filter, scenario_outline)
+            end
+          end.compact
         end
       end
 
@@ -1058,8 +1100,13 @@ module Cucumber
       end
 
       module Examples1
-        def build
-          [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw]
+        def at_line?(line)
+          examples_keyword.line == line ||
+          table.at_line?(line)
+        end
+
+        def build(filter, scenario_outline)
+          [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw(filter, scenario_outline)]
         end
       end
 
@@ -1233,6 +1280,10 @@ module Cucumber
       end
 
       module PyString2
+        def at_line?(line)
+          line >= open_py_string.line && line <= close_py_string.line
+        end
+
         def build
           Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
         end

data/lib/cucumber/parser/feature.tt

@@ -20,14 +20,14 @@ module Cucumber
         bg:background? 
         feature_elements
         comment? {
-          def build
+          def build(filter)
             background = bg.respond_to?(:build) ? bg.build : nil
             Ast::Feature.new(
               background, 
               comment.build, 
               tags.build, 
               header.text_value, 
-              feature_elements.build(background)
+              feature_elements.build(background, filter)
             )
           end
         }
@@ -35,6 +35,10 @@ module Cucumber
 
       rule tags
         white ts:(tag (space/eol)+)* {
+          def at_line?(line)
+            ts.elements.detect{|e| e.tag.line == line}
+          end
+
           def build
             tag_names = ts.elements.map{|e| e.tag.tag_name.text_value}
             Ast::Tags.new(ts.line, tag_names)
@@ -74,15 +78,25 @@ module Cucumber
 
       rule feature_elements
         (scenario / scenario_outline)* {
-          def build(background)
-            elements.map{|s| s.build(background)}
+          def build(background, filter)
+            elements.map do |feature_element|
+              if filter.nil? || filter.accept?(feature_element)
+                feature_element.build(background, filter)
+              end
+            end.compact
           end
         }
       end
 
       rule scenario
         comment tags white scenario_keyword space* name:line_to_eol white steps white {
-          def build(background)
+          def at_line?(line)
+            scenario_keyword.line == line ||
+            steps.at_line?(line) ||
+            tags.at_line?(line)
+          end
+
+          def build(background, filter)
             Ast::Scenario.new(
               background,
               comment.build, 
@@ -98,7 +112,18 @@ module Cucumber
 
       rule scenario_outline
         comment tags white scenario_outline_keyword space* name:line_to_eol white steps examples_sections white {
-          def build(background)
+          def at_line?(line)
+            outline_at_line?(line) ||
+            examples_sections.at_line?(line) ||
+            tags.at_line?(line)
+          end
+
+          def outline_at_line?(line)
+            scenario_outline_keyword.line == line ||
+            steps.at_line?(line)
+          end
+
+          def build(background, filter)
             Ast::ScenarioOutline.new(
               background,
               comment.build, 
@@ -107,7 +132,7 @@ module Cucumber
               scenario_outline_keyword.text_value, 
               name.text_value, 
               steps.build, 
-              examples_sections.build
+              examples_sections.build(filter, self)
             )
           end
         }
@@ -115,6 +140,10 @@ module Cucumber
 
       rule steps
         step* {
+          def at_line?(line)
+            elements.detect{|e| e.at_line?(line)}
+          end
+
           def build
             elements.map{|e| e.build}
           end
@@ -123,6 +152,11 @@ module Cucumber
 
       rule step
         comment space* step_keyword keyword_space name:line_to_eol (eol+ / eof) multi:multiline_arg? white {
+          def at_line?(line)
+            step_keyword.line == line ||
+            (multi.respond_to?(:at_line?) && multi.at_line?(line))
+          end
+
           def build
             if multi.respond_to?(:build)
               Ast::Step.new(step_keyword.line, step_keyword.text_value, name.text_value.strip, multi.build)
@@ -135,16 +169,29 @@ module Cucumber
 
       rule examples_sections
         examples* {
-          def build
-            elements.map{|e| e.build}
+          def at_line?(line)
+            elements.detect { |e| e.at_line?(line) }
+          end
+
+          def build(filter, scenario_outline)
+            elements.map do |e| 
+              if(filter.nil? || filter.accept?(e) || filter.outline_at_line?(scenario_outline))
+                e.build(filter, scenario_outline)
+              end
+            end.compact
           end
         }
       end
 
       rule examples
         space* examples_keyword space* name:line_to_eol? eol table white {
-          def build
-            [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw]
+          def at_line?(line)
+            examples_keyword.line == line ||
+            table.at_line?(line)
+          end
+
+          def build(filter, scenario_outline)
+            [examples_keyword.line, examples_keyword.text_value, name.text_value, table.raw(filter, scenario_outline)]
           end
         }
       end
@@ -159,6 +206,10 @@ module Cucumber
 
       rule py_string
         open_py_string s:(!close_py_string .)* close_py_string {
+          def at_line?(line)
+            line >= open_py_string.line && line <= close_py_string.line
+          end
+
           def build
             Ast::PyString.new(open_py_string.line, close_py_string.line, s.text_value, open_py_string.indentation)
           end

data/lib/cucumber/parser/table.rb

@@ -14,12 +14,20 @@ module Cucumber
       end
 
       module Table0
+        def at_line?(line)
+          elements.detect{|table_row| table_row.at_line?(line)}
+        end
+
         def build
           Ast::Table.new(raw)
         end
 
-        def raw
-          elements.map{|e| e.build}
+        def raw(filter=nil, scenario_outline=nil)
+          elements.map do |table_row|
+            if(filter.nil? || table_row == elements[0] || filter.at_line?(table_row) || (scenario_outline && filter.outline_at_line?(scenario_outline)))
+              table_row.build
+            end
+          end.compact
         end
       end
 
@@ -44,7 +52,7 @@ module Cucumber
           self.index = i0
           r0 = nil
         else
-          r0 = SyntaxNode.new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(Table0)
         end
 
@@ -68,6 +76,10 @@ module Cucumber
       end
 
       module TableRow2
+        def at_line?(line)
+          cells.line == line
+        end
+
         def build
           row = cells.elements.map do |elt| 
             value = elt.cell.text_value.strip
@@ -101,11 +113,11 @@ module Cucumber
             break
           end
         end
-        r1 = SyntaxNode.new(input, i1...index, s1)
+        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
         s0 << r1
         if r1
           if input.index('|', index) == index
-            r3 = (SyntaxNode).new(input, index...(index + 1))
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure('|')
@@ -120,7 +132,7 @@ module Cucumber
               s5 << r6
               if r6
                 if input.index('|', index) == index
-                  r7 = (SyntaxNode).new(input, index...(index + 1))
+                  r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
                   @index += 1
                 else
                   terminal_parse_failure('|')
@@ -129,7 +141,7 @@ module Cucumber
                 s5 << r7
               end
               if s5.last
-                r5 = (SyntaxNode).new(input, i5...index, s5)
+                r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
                 r5.extend(TableRow0)
               else
                 self.index = i5
@@ -145,7 +157,7 @@ module Cucumber
               self.index = i4
               r4 = nil
             else
-              r4 = SyntaxNode.new(input, i4...index, s4)
+              r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
             end
             s0 << r4
             if r4
@@ -158,7 +170,7 @@ module Cucumber
                   break
                 end
               end
-              r8 = SyntaxNode.new(input, i8...index, s8)
+              r8 = instantiate_node(SyntaxNode,input, i8...index, s8)
               s0 << r8
               if r8
                 i10 = index
@@ -175,7 +187,7 @@ module Cucumber
                   self.index = i11
                   r11 = nil
                 else
-                  r11 = SyntaxNode.new(input, i11...index, s11)
+                  r11 = instantiate_node(SyntaxNode,input, i11...index, s11)
                 end
                 if r11
                   r10 = r11
@@ -194,7 +206,7 @@ module Cucumber
           end
         end
         if s0.last
-          r0 = (SyntaxNode).new(input, i0...index, s0)
+          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
           r0.extend(TableRow1)
           r0.extend(TableRow2)
         else
@@ -224,7 +236,7 @@ module Cucumber
           i2 = index
           i3 = index
           if input.index('|', index) == index
-            r4 = (SyntaxNode).new(input, index...(index + 1))
+            r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure('|')
@@ -245,12 +257,12 @@ module Cucumber
             r2 = nil
           else
             self.index = i2
-            r2 = SyntaxNode.new(input, index...index)
+            r2 = instantiate_node(SyntaxNode,input, index...index)
           end
           s1 << r2
           if r2
             if index < input_length
-              r6 = (SyntaxNode).new(input, index...(index + 1))
+              r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure("any character")
@@ -259,7 +271,7 @@ module Cucumber
             s1 << r6
           end
           if s1.last
-            r1 = (SyntaxNode).new(input, i1...index, s1)
+            r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
             r1.extend(Cell0)
           else
             self.index = i1
@@ -271,7 +283,7 @@ module Cucumber
             break
           end
         end
-        r0 = SyntaxNode.new(input, i0...index, s0)
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
 
         node_cache[:cell][start_index] = r0
 
@@ -287,7 +299,7 @@ module Cucumber
         end
 
         if input.index(Regexp.new('[ \\t]'), index) == index
-          r0 = (SyntaxNode).new(input, index...(index + 1))
+          r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           r0 = nil
@@ -311,7 +323,7 @@ module Cucumber
 
         i0 = index
         if input.index("\n", index) == index
-          r1 = (SyntaxNode).new(input, index...(index + 1))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("\n")
@@ -322,7 +334,7 @@ module Cucumber
         else
           i2, s2 = index, []
           if input.index("\r", index) == index
-            r3 = (SyntaxNode).new(input, index...(index + 1))
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
             @index += 1
           else
             terminal_parse_failure("\r")
@@ -331,7 +343,7 @@ module Cucumber
           s2 << r3
           if r3
             if input.index("\n", index) == index
-              r5 = (SyntaxNode).new(input, index...(index + 1))
+              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
               @index += 1
             else
               terminal_parse_failure("\n")
@@ -340,12 +352,12 @@ module Cucumber
             if r5
               r4 = r5
             else
-              r4 = SyntaxNode.new(input, index...index)
+              r4 = instantiate_node(SyntaxNode,input, index...index)
             end
             s2 << r4
           end
           if s2.last
-            r2 = (SyntaxNode).new(input, i2...index, s2)
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
             r2.extend(Eol0)
           else
             self.index = i2
@@ -374,7 +386,7 @@ module Cucumber
 
         i0 = index
         if index < input_length
-          r1 = (SyntaxNode).new(input, index...(index + 1))
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
           terminal_parse_failure("any character")
@@ -384,7 +396,7 @@ module Cucumber
           r0 = nil
         else
           self.index = i0
-          r0 = SyntaxNode.new(input, index...index)
+          r0 = instantiate_node(SyntaxNode,input, index...index)
         end
 
         node_cache[:eof][start_index] = r0

data/lib/cucumber/parser/table.tt

@@ -10,18 +10,30 @@ module Cucumber
 
       rule table
         table_row+ {
+          def at_line?(line)
+            elements.detect{|table_row| table_row.at_line?(line)}
+          end
+
           def build
             Ast::Table.new(raw)
           end
 
-          def raw
-            elements.map{|e| e.build}
+          def raw(filter=nil, scenario_outline=nil)
+            elements.map do |table_row|
+              if(filter.nil? || table_row == elements[0] || filter.at_line?(table_row) || (scenario_outline && filter.outline_at_line?(scenario_outline)))
+                table_row.build
+              end
+            end.compact
           end
         }
       end
 
       rule table_row
         space* '|' cells:(cell '|')+ space* (eol+ / eof) {
+          def at_line?(line)
+            cells.line == line
+          end
+
           def build
             row = cells.elements.map do |elt| 
               value = elt.cell.text_value.strip

data/lib/cucumber/parser/treetop_ext.rb

@@ -12,7 +12,25 @@ end
 
 module Cucumber
   module Parser
-    module TreetopExt
+    class Filter
+      def initialize(lines)
+        @lines = lines
+      end
+
+      def accept?(syntax_node)
+        at_line?(syntax_node) # || more to come...
+      end
+
+      def at_line?(syntax_node)
+        @lines.detect{|line| syntax_node.at_line?(line)}
+      end
+
+      def outline_at_line?(syntax_node)
+        @lines.detect{|line| syntax_node.outline_at_line?(line)}
+      end
+    end
+
+    module TreetopExt      
       FILE_COLON_LINE_PATTERN = /^([\w\W]*?):([\d:]+)$/
 
       # Parses a file and returns a Cucumber::Ast
@@ -20,28 +38,28 @@ module Cucumber
         _, path, lines = *FILE_COLON_LINE_PATTERN.match(file)
         if path
           lines = lines.split(':').map { |line| line.to_i }
+          filter = Filter.new(lines)
         else
           path = file
-          lines = []
+          filter = nil
         end
 
-        loader = lambda { |io| parse_or_fail(io.read, path) }
+        loader = lambda { |io| parse_or_fail(io.read, filter, path) }
         feature = if path =~ /^http/
           require 'open-uri'
           open(path, &loader)
         else
           File.open(path, Cucumber.file_mode('r'), &loader) 
         end
-        feature.lines = lines
         feature
       end
 
-      def parse_or_fail(s, file=nil, line_offset=0)
-        parse_tree = parse(s)
+      def parse_or_fail(string, filter=nil, file=nil, line_offset=0)
+        parse_tree = parse(string)
         if parse_tree.nil?
           raise Cucumber::Parser::SyntaxError.new(self, file, line_offset)
         else
-          ast = parse_tree.build
+          ast = parse_tree.build(filter)
           ast.file = file
           ast
         end

data/lib/cucumber/version.rb

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

data/spec/cucumber/ast/feature_spec.rb

@@ -25,9 +25,9 @@ module Cucumber
             [:step_invocation, 3, "Given", "a passing step"], # From the background
             [:step_invocation, 10, "Given", "a passing step with an inline arg:",
               [:table, 
-                [:row, 
+                [:row, -1,
                   [:cell, "1"], [:cell, "22"], [:cell, "333"]], 
-                [:row, 
+                [:row, -1,
                   [:cell, "4444"], [:cell, "55555"], [:cell, "666666"]]]], 
             [:step_invocation, 11, "Given", "a happy step with an inline arg:", 
               [:py_string, "\n I like\nCucumber sandwich\n"]], 

data/spec/cucumber/ast/scenario_spec.rb

@@ -33,33 +33,6 @@ module Cucumber
         $y.should == nil
       end
 
-      it "should be at exact line" do
-        s = Scenario.new(background=nil, comment=Comment.new(""), 
-          tags=Tags.new(44, []), 45, keyword="", name="", steps=[])
-
-        s.should be_matches_lines([44])
-        s.should be_matches_lines([45])
-      end
-
-      it "should be at line if tags or steps are" do
-        s = Scenario.new(
-          background=nil,
-          comment=Comment.new(""), 
-          tags=Tags.new(43, []), 
-          line=45,
-          keyword="",
-          name="", 
-          steps=[
-            Step.new(46, "Given", ""),
-            Step.new(47, "Given", ""),
-            Step.new(48, "Given", ""),
-          ]
-        )
-
-        s.should be_matches_lines([43])
-        s.should be_matches_lines([47])
-        s.should_not be_matches_lines([49])
-      end
     end
   end
 end

data/spec/cucumber/ast/table_spec.rb

@@ -155,12 +155,12 @@ module Cucumber
       it "should convert to sexp" do
         @table.to_sexp.should == 
           [:table, 
-            [:row, 
+            [:row, -1,
               [:cell, "one"], 
               [:cell, "four"],
               [:cell, "seven"]
             ],
-            [:row, 
+            [:row, -1,
               [:cell, "4444"], 
               [:cell, "55555"],
               [:cell, "666666"]]]

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -36,23 +36,6 @@ Feature: hi
           [:feature, nil, "Feature: hi\n",
             [:comment, "# My comment\n"]]
         end
-        
-        it "should parse a comment within a scenario" do
-          pending "Store comment in node and output it in pretty formatter"
-          parse(%{Feature: Hi
-  Scenario: Hello
-    Given foo
-    # When bar
-    Then baz
-}).to_sexp.should == 
-          [:feature, nil, "Feature: Hi", 
-            [:scenario, 2, "Scenario:", "Hello", 
-              [:step, 3, "Given", "foo"],
-              [:comment, "# When bar\n"], 
-              [:step, 5, "Then", "baz"] 
-            ]
-          ]
-        end
 
         it "should parse a file with only a multiline comment" do
           parse(%{# Hello
@@ -149,7 +132,7 @@ Given I have a table
             [:scenario, 2, "Scenario:", "Hello",
               [:step_invocation, 3, "Given", "I have a table",
                 [:table,
-                  [:row,
+                  [:row, 4,
                     [:cell, "a"],
                     [:cell, "b"]]]]]]
         end
@@ -187,9 +170,10 @@ Examples:
               [:step, 3, "Given", "a <what> cucumber"],
               [:examples, "Examples:", "",
                 [:table, 
-                  [:row, 
+                  [:row, 5,
                     [:cell, "what"]], 
-                    [:row, [:cell, "green"]]]]]]
+                  [:row, 6,
+                    [:cell, "green"]]]]]]
         end
 
         it "should have line numbered steps with inline table" do
@@ -207,15 +191,15 @@ Examples:
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 4, "Given", "I have a table",
                 [:table, 
-                  [:row, 
+                  [:row, 6,
                     [:cell, "<a>"], 
                     [:cell, "<b>"]]]],
             [:examples, "Examples:", "",
               [:table,
-                [:row, 
+                [:row, 8,
                   [:cell, "a"], 
                   [:cell, "b"]],
-                [:row, 
+                [:row, 9,
                   [:cell, "c"], 
                   [:cell, "d"]]]]]]
         end
@@ -237,23 +221,18 @@ Examples:
             [:scenario_outline, "Scenario Outline:", "Hello",
               [:step, 5, "Given", "I have a table",
                 [:table,
-                  [:row,
+                  [:row, 6, 
                     [:cell, "1"],
                     [:cell, "2"]]]],
               [:examples, "Examples:", "",
                 [:table,
-                  [:row,
+                  [:row, 9,
                     [:cell, "x"],
                     [:cell, "y"]],
-                  [:row,
+                  [:row, 10,
                     [:cell, "5"],
                     [:cell, "6"]]]]]]
         end
-
-        it "should set line numbers on feature" do
-          feature = parse_file("empty_feature.feature:11:12")
-          feature.instance_variable_get('@lines').should == [11, 12]
-        end
       end
 
       describe "Syntax" do
@@ -277,6 +256,37 @@ Examples:
           parse_file("scenario_outline.feature")
         end
       end
+
+      describe "Filtering" do
+        it "should filter outline tables" do
+          f = parse_example_file('self_test/features/outline_sample.feature:12')
+          f.to_sexp.should ==
+          [:feature,
+           "./spec/cucumber/parser/../../../examples/self_test/features/outline_sample.feature",
+           "Feature: Outline Sample",
+           [:scenario_outline,
+            "Scenario Outline:",
+            "Test state",
+            [:step, 6, "Given", "<state> without a table"],
+            [:step, 7, "Given", "<other_state> without a table"],
+            [:examples,
+             "Examples:",
+             "Rainbow colours",
+             [:table,
+              [:row, 9, [:cell, "state"], [:cell, "other_state"]],
+#              [:row, 10, [:cell, "missing"], [:cell, "passing"]],
+#              [:row, 11, [:cell, "passing"], [:cell, "passing"]],
+              [:row, 12, [:cell, "failing"], [:cell, "passing"]]]]
+            # ,
+            # [:examples,
+            #  "Examples:",
+            #  "Only passing",
+            #  [:table,
+            #   [:row, 14, [:cell, "state"], [:cell, "other_state"]],
+            #   [:row, 15, [:cell, "passing"], [:cell, "passing"]]]]]
+              ]]
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.2.3.2
+  version: 0.2.3.3
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-06 00:00:00 -07:00
+date: 2009-04-07 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -266,6 +266,8 @@ files:
 - examples/tickets/features/241.feature
 - examples/tickets/features/246.feature
 - examples/tickets/features/248.feature
+- examples/tickets/features/270/back.feature
+- examples/tickets/features/270/back.steps.rb
 - examples/tickets/features/lib/eatting_machine.rb
 - examples/tickets/features/lib/pantry.rb
 - examples/tickets/features/scenario_outline.feature
@@ -346,7 +348,6 @@ files:
 - lib/cucumber/formatters/unicode.rb
 - lib/cucumber/languages.yml
 - lib/cucumber/parser.rb
-- lib/cucumber/parser/basic.rb
 - lib/cucumber/parser/feature.rb
 - lib/cucumber/parser/feature.tt
 - lib/cucumber/parser/i18n.tt