aslakhellesoy-cucumber 0.3.4 → 0.3.5

data/History.txt

@@ -1,3 +1,10 @@
+== 0.3.5 2009-05-14
+
+Let's make a new release today because two annoying bugs are fixed.
+
+=== Bugfixes
+* Allow feature element names to contain Gherkin keywords as long as they are not the first word on a newline (#319, #307 Joseph Wilk)
+
 == 0.3.4 2009-05-14
 
 A couple of great new features in this release. Running with Rake is faster than before,
@@ -35,6 +42,7 @@ However, setting the RAILS_ENV is easy to forget, so I don't recommend relying o
 * Support for Catalan (Francesc Esplugas)
 
 === Changed features
+* --exclude flag now works on ruby files in addition to feature files (#312 Ben Mabey)
 * The Java example under examples/java uses Ant instead of Rake - and the new JUnit formatter.
 * Rake task should not shell out (#297 Aslak Hellesøy)
   The Cucumber Rake task will run Cucumber in the same Ruby interpreter as Rake itself

data/lib/cucumber/parser/feature.rb

@@ -1331,187 +1331,168 @@ module Cucumber
         return r0
       end
 
-      module LineToKeyword0
-      end
-
-      module LineToKeyword1
-        def white
+      module LinesToKeyword0
+        def eol
           elements[0]
         end
 
-        def text
-          elements[1]
+        def reserved_words_and_symbols
+          elements[2]
         end
       end
 
-      module LineToKeyword2
+      module LinesToKeyword1
+      end
+
+      module LinesToKeyword2
         def build
-          text.text_value.strip
+          self.text_value.split("\n").map{|s| s.strip }.join("\n")
         end
       end
 
-      def _nt_line_to_keyword
+      def _nt_lines_to_keyword
         start_index = index
-        if node_cache[:line_to_keyword].has_key?(index)
-          cached = node_cache[:line_to_keyword][index]
+        if node_cache[:lines_to_keyword].has_key?(index)
+          cached = node_cache[:lines_to_keyword][index]
           @index = cached.interval.end if cached
           return cached
         end
 
-        i0, s0 = index, []
-        r1 = _nt_white
-        s0 << r1
-        if r1
-          s2, i2 = [], index
-          loop do
-            i3, s3 = index, []
-            i4 = index
-            r5 = _nt_step_keyword
-            if r5
-              r4 = nil
-            else
-              self.index = i4
-              r4 = instantiate_node(SyntaxNode,input, index...index)
-            end
-            s3 << r4
-            if r4
-              i6 = index
-              r7 = _nt_scenario_keyword
-              if r7
-                r6 = nil
-              else
-                self.index = i6
-                r6 = instantiate_node(SyntaxNode,input, index...index)
-              end
-              s3 << r6
+        s0, i0 = [], index
+        loop do
+          i1, s1 = index, []
+          i2 = index
+          i3, s3 = index, []
+          r4 = _nt_eol
+          s3 << r4
+          if r4
+            s5, i5 = [], index
+            loop do
+              r6 = _nt_space
               if r6
-                i8 = index
-                r9 = _nt_scenario_outline_keyword
-                if r9
-                  r8 = nil
-                else
-                  self.index = i8
-                  r8 = instantiate_node(SyntaxNode,input, index...index)
-                end
-                s3 << r8
-                if r8
-                  i10 = index
-                  r11 = _nt_table
-                  if r11
-                    r10 = nil
-                  else
-                    self.index = i10
-                    r10 = instantiate_node(SyntaxNode,input, index...index)
-                  end
-                  s3 << r10
-                  if r10
-                    i12 = index
-                    r13 = _nt_tag
-                    if r13
-                      r12 = nil
-                    else
-                      self.index = i12
-                      r12 = instantiate_node(SyntaxNode,input, index...index)
-                    end
-                    s3 << r12
-                    if r12
-                      i14 = index
-                      r15 = _nt_comment_line
-                      if r15
-                        r14 = nil
-                      else
-                        self.index = i14
-                        r14 = instantiate_node(SyntaxNode,input, index...index)
-                      end
-                      s3 << r14
-                      if r14
-                        i16 = index
-                        r17 = _nt_eol
-                        if r17
-                          r16 = nil
-                        else
-                          self.index = i16
-                          r16 = instantiate_node(SyntaxNode,input, index...index)
-                        end
-                        s3 << r16
-                        if r16
-                          if index < input_length
-                            r18 = instantiate_node(SyntaxNode,input, index...(index + 1))
-                            @index += 1
-                          else
-                            terminal_parse_failure("any character")
-                            r18 = nil
-                          end
-                          s3 << r18
-                        end
-                      end
-                    end
-                  end
-                end
+                s5 << r6
+              else
+                break
               end
             end
-            if s3.last
-              r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
-              r3.extend(LineToKeyword0)
-            else
-              self.index = i3
-              r3 = nil
+            r5 = instantiate_node(SyntaxNode,input, i5...index, s5)
+            s3 << r5
+            if r5
+              r7 = _nt_reserved_words_and_symbols
+              s3 << r7
             end
-            if r3
-              s2 << r3
+          end
+          if s3.last
+            r3 = instantiate_node(SyntaxNode,input, i3...index, s3)
+            r3.extend(LinesToKeyword0)
+          else
+            self.index = i3
+            r3 = nil
+          end
+          if r3
+            r2 = nil
+          else
+            self.index = i2
+            r2 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s1 << r2
+          if r2
+            if index < input_length
+              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
             else
-              break
+              terminal_parse_failure("any character")
+              r8 = nil
             end
+            s1 << r8
           end
-          if s2.empty?
-            self.index = i2
-            r2 = nil
+          if s1.last
+            r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+            r1.extend(LinesToKeyword1)
           else
-            r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+            self.index = i1
+            r1 = nil
+          end
+          if r1
+            s0 << r1
+          else
+            break
           end
-          s0 << r2
-        end
-        if s0.last
-          r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-          r0.extend(LineToKeyword1)
-          r0.extend(LineToKeyword2)
-        else
-          self.index = i0
-          r0 = nil
         end
+        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+        r0.extend(LinesToKeyword2)
 
-        node_cache[:line_to_keyword][start_index] = r0
+        node_cache[:lines_to_keyword][start_index] = r0
 
         return r0
       end
 
-      module LinesToKeyword0
-        def build
-          elements.map{|s| s.build}.join("\n")
+      module ReservedWordsAndSymbols0
+        def step_keyword
+          elements[0]
+        end
+
+        def keyword_space
+          elements[1]
         end
       end
 
-      def _nt_lines_to_keyword
+      def _nt_reserved_words_and_symbols
         start_index = index
-        if node_cache[:lines_to_keyword].has_key?(index)
-          cached = node_cache[:lines_to_keyword][index]
+        if node_cache[:reserved_words_and_symbols].has_key?(index)
+          cached = node_cache[:reserved_words_and_symbols][index]
           @index = cached.interval.end if cached
           return cached
         end
 
-        s0, i0 = [], index
-        loop do
-          r1 = _nt_line_to_keyword
-          if r1
-            s0 << r1
+        i0 = index
+        i1, s1 = index, []
+        r2 = _nt_step_keyword
+        s1 << r2
+        if r2
+          r3 = _nt_keyword_space
+          s1 << r3
+        end
+        if s1.last
+          r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+          r1.extend(ReservedWordsAndSymbols0)
+        else
+          self.index = i1
+          r1 = nil
+        end
+        if r1
+          r0 = r1
+        else
+          r4 = _nt_scenario_keyword
+          if r4
+            r0 = r4
           else
-            break
+            r5 = _nt_scenario_outline_keyword
+            if r5
+              r0 = r5
+            else
+              r6 = _nt_table
+              if r6
+                r0 = r6
+              else
+                r7 = _nt_tag
+                if r7
+                  r0 = r7
+                else
+                  r8 = _nt_comment_line
+                  if r8
+                    r0 = r8
+                  else
+                    self.index = i0
+                    r0 = nil
+                  end
+                end
+              end
+            end
           end
         end
-        r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
-        r0.extend(LinesToKeyword0)
 
-        node_cache[:lines_to_keyword][start_index] = r0
+        node_cache[:reserved_words_and_symbols][start_index] = r0
 
         return r0
       end

data/lib/cucumber/parser/feature.tt

@@ -273,22 +273,18 @@ module Cucumber
         (!eol .)*
       end
 
-      rule line_to_keyword
-        white text:(!step_keyword !scenario_keyword !scenario_outline_keyword !table !tag !comment_line !eol .)+ {
-          def build
-            text.text_value.strip
-          end
-        }
-      end
-      
       rule lines_to_keyword
-        line_to_keyword* {
+        (!(eol space* reserved_words_and_symbols) .)* {
           def build
-            elements.map{|s| s.build}.join("\n")
+            self.text_value.split("\n").map{|s| s.strip}.join("\n")
           end
         }
       end
 
+      rule reserved_words_and_symbols
+        (step_keyword keyword_space) / scenario_keyword / scenario_outline_keyword / table / tag / comment_line
+      end
+
       rule py_string
         open_py_string s:(!close_py_string .)* close_py_string {
           def at_line?(line)

data/lib/cucumber/version.rb

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

data/spec/cucumber/parser/feature_parser_spec.rb

@@ -177,7 +177,7 @@ Given I have a string
         
         it "should allow multiline names" do
           parse(%{Feature: Hi
-Scenario: It is my ambition to say 
+Scenario: It is my ambition to say
           in ten sentences
           what others say 
           in a whole book.
@@ -188,7 +188,18 @@ Given I am a step
             [:scenario, 2, "Scenario:", "It is my ambition to say\nin ten sentences\nwhat others say\nin a whole book.",
               [:step_invocation, 6, "Given", "I am a step"]]]
         end
-        
+
+        it "should ignore gherkin keywords which are parts of other words in the name" do
+          parse(%{Feature: Parser bug
+Scenario: I have a Button
+          Buttons are great
+  Given I have it
+}).to_sexp.should ==
+            [:feature, nil, "Feature: Parser bug",
+            [:scenario, 2, "Scenario:", "I have a Button\nButtons are great",
+              [:step_invocation, 4, "Given", "I have it"]]]
+
+        end
       end
 
       describe "Scenario Outlines" do
@@ -306,16 +317,15 @@ Examples: I'm a multiline name
         end
 
         it "should allow Examples to have multiline names" do
-          pending('https://rspec.lighthouseapp.com/projects/16211/tickets/307-031-step-mother-parses-scenario-titles') do
             parse(%{Feature: Hi
 Scenario: When I have when in scenario
+          I should be fine
 Given I am a step
 }).to_sexp.should ==
             [:feature, nil, "Feature: Hi",
-              [:scenario, 2, "Scenario:", "When I have when in scenario",
-                [:step_invocation, 3, "Given", "I am a step"]]]
+              [:scenario, 2, "Scenario:", "When I have when in scenario\nI should be fine",
+                [:step_invocation, 4, "Given", "I am a step"]]]
           end
-        end
       end
 
       describe "Syntax" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aslakhellesoy-cucumber
 version: !ruby/object:Gem::Version 
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-14 00:00:00 -07:00
+date: 2009-05-15 00:00:00 -07:00
 default_executable: cucumber
 dependencies: 
 - !ruby/object:Gem::Dependency