Merge branch 'release/1.0.4'

CHANGES.md

@@ -1,3 +1,8 @@
+1.0.4 / 2011-06-10
+==================
+
+  * Fixed inability to comment pystrings
+
 1.0.3 / 2011-04-21
 ==================
 

src/Behat/Gherkin/Lexer.php

@@ -174,6 +174,8 @@ protected function getNextToken()
     {
         return $this->getDeferredToken()
             ?: $this->scanEOS()
+            ?: $this->scanLanguage()
+            ?: $this->scanComment()
             ?: $this->scanPyStringOperator()
             ?: $this->scanPyStringContent()
             ?: $this->scanStep()
@@ -184,8 +186,6 @@ protected function getNextToken()
             ?: $this->scanFeature()
             ?: $this->scanTags()
             ?: $this->scanTableRow()
-            ?: $this->scanLanguage()
-            ?: $this->scanComment()
             ?: $this->scanNewline()
             ?: $this->scanText();
     }
@@ -426,7 +426,7 @@ protected function scanTags()
      */
     protected function scanLanguage()
     {
-        if (false !== mb_strpos($this->line, '#') && false !== mb_strpos($this->line, 'language')) {
+        if (0 === mb_strpos(ltrim($this->line), '#') && false !== mb_strpos($this->line, 'language')) {
             return $this->scanInput('/^\s*\#\s*language:\s*([\w_\-]+)\s*$/', 'Language');
         }
     }

tests/Behat/Gherkin/Fixtures/etalons/commented_out.yml

@@ -0,0 +1,11 @@
+feature:
+  title:        Fibonacci
+  language:     en
+  line:         1
+  description:  |-
+    In order to calculate super fast fibonacci series
+    As a pythonista
+    I want to use Python for that
+
+  scenarios:    ~
+

tests/Behat/Gherkin/Fixtures/features/commented_out.feature

@@ -0,0 +1,34 @@
+Feature: Fibonacci
+  In order to calculate super fast fibonacci series
+  As a pythonista
+  I want to use Python for that
+
+#
+#  Background:
+#    Given passing without a table
+#
+#  Scenario: I'm a multiline name
+#            which goes on and on and on for three lines
+#            yawn
+#    Given passing without a table
+#
+#  Scenario:
+#    Then I should see
+#      """
+#      a string with #something
+#      """
+#
+#  Scenario Outline: Series
+#    When I ask python to calculate fibonacci up to <n>
+#    Then it should give me <series>
+#
+#    Examples:
+#      | n   | series                                 |
+#      | 1   | []                                     |
+#      | 2   | [1, 1]                                 |
+#      | 3   | [1, 1, 2]                              |
+#      | 4   | [1, 1, 2, 3]                           |
+#      | 6   | [1, 1, 2, 3, 5]                        |
+#      | 9   | [1, 1, 2, 3, 5, 8]                     |
+#      | 100 | [1, 1, 2, 3, 5, 8, 13, 21, 34, 55, 89] |
+#