cucumber 0.4.3 → 0.4.4

data/lib/cucumber/language_support/language_methods.rb

@@ -7,9 +7,9 @@ module Cucumber
       def create_step_match(step_definition, step_name, name_to_report, step_arguments)
         StepMatch.new(step_definition, step_name, name_to_report, step_arguments)
       end
-      
+
       def before(scenario)
-        begin_scenario
+        begin_scenario(scenario)
         execute_before(scenario)
       end
 
@@ -17,7 +17,7 @@ module Cucumber
         execute_after(scenario)
         end_scenario
       end
-      
+
       def after_configuration(configuration)
         hooks[:after_configuration].each do |hook|
           hook.invoke('AfterConfiguration', configuration)
@@ -38,6 +38,7 @@ module Cucumber
       end
 
       def add_hook(phase, hook)
+        hook.tag_name_lists = hook.tag_names.map {|tag_string| Ast::Tags.parse_tags(tag_string)}
         hooks[phase.to_sym] << hook
         hook
       end

data/lib/cucumber/languages.yml

@@ -86,7 +86,7 @@
   and: A
   but: Ond
   space_after_keyword: true
-"cz":
+"cs":
   name: Czech
   native: Česky
   encoding: UTF-8

data/lib/cucumber/parser.rb

@@ -2,5 +2,7 @@ require 'erb'
 require 'cucumber/platform'
 require 'cucumber/ast'
 require 'cucumber/parser/treetop_ext'
+require 'cucumber/parser/common'
 require 'cucumber/parser/table'
+require 'cucumber/parser/py_string'
 require 'cucumber/parser/feature'

data/lib/cucumber/parser/common.rb

@@ -0,0 +1,170 @@
+# Autogenerated from a Treetop grammar. Edits may be lost.
+
+
+module Cucumber
+  module Parser
+    module Common
+      include Treetop::Runtime
+
+      def root
+        @root || :white
+      end
+
+      def _nt_white
+        start_index = index
+        if node_cache[:white].has_key?(index)
+          cached = node_cache[:white][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        s0, i0 = [], index
+        loop do
+          i1 = index
+          r2 = _nt_space
+          if r2
+            r1 = r2
+          else
+            r3 = _nt_eol
+            if r3
+              r1 = r3
+            else
+              @index = i1
+              r1 = nil
+            end
+          end
+          if r1
+            s0 << r1
+          else
+            break
+          end
+        end
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+
+        node_cache[:white][start_index] = r0
+
+        r0
+      end
+
+      def _nt_space
+        start_index = index
+        if node_cache[:space].has_key?(index)
+          cached = node_cache[:space][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        if has_terminal?('\G[ \\t]', true, index)
+          r0 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          r0 = nil
+        end
+
+        node_cache[:space][start_index] = r0
+
+        r0
+      end
+
+      module Eol0
+      end
+
+      def _nt_eol
+        start_index = index
+        if node_cache[:eol].has_key?(index)
+          cached = node_cache[:eol][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        i0 = index
+        if has_terminal?("\n", false, index)
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure("\n")
+          r1 = nil
+        end
+        if r1
+          r0 = r1
+        else
+          i2, s2 = index, []
+          if has_terminal?("\r", false, index)
+            r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
+            @index += 1
+          else
+            terminal_parse_failure("\r")
+            r3 = nil
+          end
+          s2 << r3
+          if r3
+            if has_terminal?("\n", false, index)
+              r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure("\n")
+              r5 = nil
+            end
+            if r5
+              r4 = r5
+            else
+              r4 = instantiate_node(SyntaxNode,input, index...index)
+            end
+            s2 << r4
+          end
+          if s2.last
+            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+            r2.extend(Eol0)
+          else
+            @index = i2
+            r2 = nil
+          end
+          if r2
+            r0 = r2
+          else
+            @index = i0
+            r0 = nil
+          end
+        end
+
+        node_cache[:eol][start_index] = r0
+
+        r0
+      end
+
+      def _nt_eof
+        start_index = index
+        if node_cache[:eof].has_key?(index)
+          cached = node_cache[:eof][index]
+          @index = cached.interval.end if cached
+          return cached
+        end
+
+        i0 = index
+        if index < input_length
+          r1 = instantiate_node(SyntaxNode,input, index...(index + 1))
+          @index += 1
+        else
+          terminal_parse_failure("any character")
+          r1 = nil
+        end
+        if r1
+          r0 = nil
+        else
+          @index = i0
+          r0 = instantiate_node(SyntaxNode,input, index...index)
+        end
+
+        node_cache[:eof][start_index] = r0
+
+        r0
+      end
+
+    end
+
+    class CommonParser < Treetop::Runtime::CompiledParser
+      include Common
+    end
+
+  end
+end

data/lib/cucumber/parser/common.tt

@@ -0,0 +1,21 @@
+module Cucumber
+  module Parser
+    grammar Common
+      rule white
+        (space / eol)*
+      end
+
+      rule space
+        [ \t]
+      end
+
+      rule eol
+        "\n" / ("\r" "\n"?)
+      end
+
+      rule eof
+        !.
+      end
+    end
+  end
+end

data/lib/cucumber/parser/feature.rb

@@ -491,8 +491,8 @@ module Cucumber
           steps.at_line?(line)
         end
 
-        def matches_tags?(tag_names)
-          Ast::Tags.matches?(self.parent.tags.tag_names, tag_names)
+        def matches_tags?(tag_name_lists)
+          Ast::Tags.matches?(self.parent.tags.tag_names, tag_name_lists)
         end
 
         def build
@@ -687,10 +687,10 @@ module Cucumber
           tags.at_line?(line)
         end
 
-        def matches_tags?(tag_names)
+        def matches_tags?(tag_name_lists)
           feature_tag_names = self.parent.parent.tags.tag_names
           source_tag_names = (feature_tag_names + tags.tag_names).uniq
-          Ast::Tags.matches?(source_tag_names, tag_names)
+          Ast::Tags.matches?(source_tag_names, tag_name_lists)
         end
 
         def matches_name?(regexp_to_match)
@@ -826,10 +826,10 @@ module Cucumber
           steps.at_line?(line)
         end
 
-        def matches_tags?(tag_names)
+        def matches_tags?(tag_name_lists)
           feature_tag_names = self.parent.parent.tags.tag_names
           source_tag_names = (feature_tag_names + tags.tag_names).uniq
-          Ast::Tags.matches?(source_tag_names, tag_names)
+          Ast::Tags.matches?(source_tag_names, tag_name_lists)
         end
 
         def matches_name?(regexp_to_match)
@@ -1168,7 +1168,7 @@ module Cucumber
           table.at_line?(line)
         end
 
-        def matches_tags?(tag_names)
+        def matches_tags?(tag_name_lists)
           true
         end
 
@@ -1507,290 +1507,6 @@ module Cucumber
         r0
       end
 
-      module PyString0
-      end
-
-      module PyString1
-        def open_py_string
-          elements[0]
-        end
-
-        def s
-          elements[1]
-        end
-
-        def close_py_string
-          elements[2]
-        end
-      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
-      end
-
-      def _nt_py_string
-        start_index = index
-        if node_cache[:py_string].has_key?(index)
-          cached = node_cache[:py_string][index]
-          @index = cached.interval.end if cached
-          return cached
-        end
-
-        i0, s0 = index, []
-        r1 = _nt_open_py_string
-        s0 << r1
-        if r1
-          s2, i2 = [], index
-          loop do
-            i3, s3 = index, []
-            i4 = index
-            r5 = _nt_close_py_string
-            if r5
-              r4 = nil
-            else
-              @index = i4
-              r4 = instantiate_node(SyntaxNode,input, index...index)
-            end
-            s3 << r4
-            if r4
-              if index < input_length
-                r6 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                @index += 1
-              else
-                terminal_parse_failure("any character")
-                r6 = nil
-              end
-              s3 << r6
-            end
-            if s3.last
-              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-              r3.extend(PyString0)
-            else
-              @index = i3
-              r3 = nil
-            end
-            if r3
-              s2 << r3
-            else
-              break
-            end
-          end
-          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-          s0 << r2
-          if r2
-            r7 = _nt_close_py_string
-            s0 << r7
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(PyString1)
-          r0.extend(PyString2)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:py_string][start_index] = r0
-
-        r0
-      end
-
-      module OpenPyString0
-        def indent
-          elements[0]
-        end
-
-        def eol
-          elements[3]
-        end
-      end
-
-      module OpenPyString1
-        def indentation
-          indent.text_value.length
-        end
-
-        def line
-          indent.line
-        end
-      end
-
-      def _nt_open_py_string
-        start_index = index
-        if node_cache[:open_py_string].has_key?(index)
-          cached = node_cache[:open_py_string][index]
-          @index = cached.interval.end if cached
-          return cached
-        end
-
-        i0, s0 = index, []
-        s1, i1 = [], index
-        loop do
-          r2 = _nt_space
-          if r2
-            s1 << r2
-          else
-            break
-          end
-        end
-        r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
-        s0 << r1
-        if r1
-          if has_terminal?('"""', false, index)
-            r3 = instantiate_node(SyntaxNode,input, index...(index + 3))
-            @index += 3
-          else
-            terminal_parse_failure('"""')
-            r3 = nil
-          end
-          s0 << r3
-          if r3
-            s4, i4 = [], index
-            loop do
-              r5 = _nt_space
-              if r5
-                s4 << r5
-              else
-                break
-              end
-            end
-            r4 = instantiate_node(SyntaxNode,input, i4...index, s4)
-            s0 << r4
-            if r4
-              r6 = _nt_eol
-              s0 << r6
-            end
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(OpenPyString0)
-          r0.extend(OpenPyString1)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:open_py_string][start_index] = r0
-
-        r0
-      end
-
-      module ClosePyString0
-        def eol
-          elements[0]
-        end
-
-        def quotes
-          elements[2]
-        end
-
-        def white
-          elements[3]
-        end
-      end
-
-      module ClosePyString1
-        def line
-          quotes.line
-        end
-      end
-
-      def _nt_close_py_string
-        start_index = index
-        if node_cache[:close_py_string].has_key?(index)
-          cached = node_cache[:close_py_string][index]
-          @index = cached.interval.end if cached
-          return cached
-        end
-
-        i0, s0 = index, []
-        r1 = _nt_eol
-        s0 << r1
-        if r1
-          s2, i2 = [], index
-          loop do
-            r3 = _nt_space
-            if r3
-              s2 << r3
-            else
-              break
-            end
-          end
-          r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-          s0 << r2
-          if r2
-            if has_terminal?('"""', false, index)
-              r4 = instantiate_node(SyntaxNode,input, index...(index + 3))
-              @index += 3
-            else
-              terminal_parse_failure('"""')
-              r4 = nil
-            end
-            s0 << r4
-            if r4
-              r5 = _nt_white
-              s0 << r5
-            end
-          end
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(ClosePyString0)
-          r0.extend(ClosePyString1)
-        else
-          @index = i0
-          r0 = nil
-        end
-
-        node_cache[:close_py_string][start_index] = r0
-
-        r0
-      end
-
-      def _nt_white
-        start_index = index
-        if node_cache[:white].has_key?(index)
-          cached = node_cache[:white][index]
-          @index = cached.interval.end if cached
-          return cached
-        end
-
-        s0, i0 = [], index
-        loop do
-          i1 = index
-          r2 = _nt_space
-          if r2
-            r1 = r2
-          else
-            r3 = _nt_eol
-            if r3
-              r1 = r3
-            else
-              @index = i1
-              r1 = nil
-            end
-          end
-          if r1
-            s0 << r1
-          else
-            break
-          end
-        end
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-
-        node_cache[:white][start_index] = r0
-
-        r0
-      end
-
     end
 
     class FeatureParser < Treetop::Runtime::CompiledParser