gherkin-ruby 0.1.0 → 0.2.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm use --create 1.9.3@gherkin-ruby

data/.travis.yml

@@ -1,8 +1,7 @@
 env:
- - RBXOPT=-X19 JRUBY_OPTS="--1.9"
+ - RBXOPT=-X19
 rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
   - rbx-head
-  - jruby

data/Rakefile

@@ -15,7 +15,7 @@ task :regenerate do
 
   if has_rex && has_racc
     `rex lib/gherkin/parser/gherkin.rex -o lib/gherkin/parser/lexer.rb`
-    `racc lib/gherkin/parser/gherkin.y -o lib/gherkin/parser/parser.rb`
+    `racc #{'--debug' if ENV['DEBUG_RACC']} lib/gherkin/parser/gherkin.y -o lib/gherkin/parser/parser.rb`
   else
     puts "You need both Rexical and Racc to do that. Install them by doing:"
     puts

data/Readme.md

@@ -1,6 +1,8 @@
-# gherkin-ruby
+# gherkin-ruby [![Build Status](https://secure.travis-ci.org/codegram/gherkin-ruby.png)](http://travis-ci.org/codegram/gherkin-ruby) [![Dependency Status](https://gemnasium.com/codegram/gherkin-ruby.png)](http://gemnasium.com/codegram/gherkin-ruby)
 Gherkin-ruby is a pure Ruby implementation of a [Gherkin](http://github.com/cucumber/gherkin) parser.
 
+Tested with MRI 1.9.2, 1.9.3, ruby-head and Rubinius head.
+
 ## Why this one over the official, fast, Ragel-based Gherkin parser?
 
 * Less than 200 LOC.

data/gherkin-ruby.gemspec

@@ -7,15 +7,15 @@ Gem::Specification.new do |s|
   s.version     = Gherkin::VERSION
   s.authors     = ["Marc Divins", "Josep M. Bach"]
   s.email       = ["marcdivc@gmail.com", "josep.m.bach@gmail.com"]
-  s.homepage    = "http://github.com/codegram/gherkin"
-  s.summary     = %q{Gherkin-ruby is a Gherkin parser in pure Ruby using Parslet}
-  s.description = %q{Gherkin-ruby is a Gherkin parser in pure Ruby using Parslet}
+  s.homepage    = "http://github.com/codegram/gherkin-ruby"
+  s.summary     = %q{Gherkin-ruby is a Gherkin parser in pure Ruby using Rexical and Racc}
+  s.description = %q{Gherkin-ruby is a Gherkin parser in pure Ruby using Rexical and Racc}
 
   s.rubyforge_project = "gherkin-ruby"
 
   s.add_runtime_dependency 'rexical'
-  s.add_runtime_dependency 'racc'
   s.add_development_dependency 'minitest'
+  s.add_development_dependency 'racc'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/gherkin/ast.rb

@@ -14,14 +14,15 @@ module Gherkin
     end
 
     class Feature < Node
-      attr_reader :name, :background, :scenarios
-      attr_writer :background, :scenarios
+      attr_reader :name, :background, :scenarios, :tags
+      attr_writer :background, :scenarios, :tags
 
       include Enumerable
 
-      def initialize(name, scenarios=[], background=nil)
+      def initialize(name, scenarios=[], tags=[], background=nil)
         @name       = name
         @background = background
+        @tags       = tags
         @scenarios  = scenarios
       end
 

data/lib/gherkin/parser/gherkin.rex

@@ -19,7 +19,7 @@ rule
   Scenario:                             { [:SCENARIO, text[0..-2]] }
 
   # Tags
-  @\w+                                  { [:TAG, text[1..-1]] }
+  @(\w|-)+                              { [:TAG, text[1..-1]] }
 
   # Step keywords
   Given                                 { [:GIVEN, text] }

data/lib/gherkin/parser/gherkin.y

@@ -16,6 +16,9 @@ rule
   |
     Feature
       Scenarios { result = val[0]; result.scenarios = val[1] }
+  | FeatureTags Feature { result = val[1]; result.tags = val[0] }
+  | FeatureTags Feature 
+      Scenarios { result = val[1]; result.scenarios = val[2]; result.tags = val[0] }
   ;
 
   Newline:
@@ -23,6 +26,10 @@ rule
   | Newline NEWLINE
   ;
 
+  FeatureTags:
+    Tags { result = val[0] }
+  | Newline Tags { result = val[1] }
+
   Feature:
     FeatureHeader { result = val[0] }
   | FeatureHeader
@@ -56,8 +63,9 @@ rule
   ;
 
   Steps:
-    Step Newline          { result = [val[0]] }
-  | Steps Step Newline    { result = val[0] << val[1] }
+    Step                  { result = [val[0]] }
+  | Step Newline          { result = [val[0]] }
+  | Step Newline Steps    { val[2].unshift(val[0]); result = val[2] }
   ;
 
   Step:
@@ -71,7 +79,6 @@ rule
   Scenarios:
     Scenario              { result = [val[0]] }
   | Scenarios Scenario    { result = val[0] << val[1] }
-  | Scenarios Newline Scenario { result = val[0] << val[2] }
   ;
 
   Scenario:
@@ -96,5 +103,6 @@ end
 ---- inner
 
   def parse(input)
+    @yydebug = true if ENV['DEBUG_RACC']
     scan_str(input)
   end

data/lib/gherkin/parser/lexer.rb

@@ -77,7 +77,7 @@ class Gherkin::Parser < Racc::Parser
       when (text = @ss.scan(/Scenario:/))
          action { [:SCENARIO, text[0..-2]] }
 
-      when (text = @ss.scan(/@\w+/))
+      when (text = @ss.scan(/@(\w|-)+/))
          action { [:TAG, text[1..-1]] }
 
       when (text = @ss.scan(/Given/))

data/lib/gherkin/parser/parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.7
+# This file is automatically generated by Racc 1.4.8
 # from Racc grammer file "".
 #
 
@@ -12,108 +12,113 @@ require 'racc/parser.rb'
 module Gherkin
   class Parser < Racc::Parser
 
-module_eval(<<'...end gherkin.y/module_eval...', 'gherkin.y', 97)
+module_eval(<<'...end gherkin.y/module_eval...', 'gherkin.y', 104)
 
   def parse(input)
+    @yydebug = true if ENV['DEBUG_RACC']
     scan_str(input)
   end
 ...end gherkin.y/module_eval...
 ##### State transition tables begin ###
 
 racc_action_table = [
-    14,     3,    14,    15,    14,    26,    14,    11,    13,     3,
-    38,    31,    32,    33,    34,    35,    14,    14,    11,    13,
-    41,    31,    32,    33,    34,    35,    31,    32,    33,    34,
-    35,    31,    32,    33,    34,    35,    31,    32,    33,    34,
-    35,     3,     3,     7,    11,    13,    31,    32,    33,    34,
-    35,     3,     3,     3,    18,     3,    44,    14,    45,    20,
-    21,    48,     3,    14,     3,    14,    27,     3,    14,    14,
-     8,    24 ]
+    18,    18,    20,     4,    26,    10,    18,    21,    14,    10,
+    43,    36,    37,    38,    39,    40,    18,    18,    14,    10,
+    45,    36,    37,    38,    39,    40,    18,    14,    10,     4,
+     9,    36,    37,    38,    39,    40,    36,    37,    38,    39,
+    40,     4,     9,    14,    10,    10,    18,    20,    32,    24,
+    21,     4,     4,    29,    21,     4,    47,    18,    48,     4,
+    27,    51,    11,     4,    18,     4,    18,     4 ]
 
 racc_action_check = [
-    19,    12,     4,     4,    22,    12,    51,    22,    22,    38,
-    19,    51,    51,    51,    51,    51,    40,    25,     2,     2,
-    25,    40,    40,    40,    40,    40,    47,    47,    47,    47,
-    47,    52,    52,    52,    52,    52,    17,    17,    17,    17,
-    17,     9,     0,     0,     9,     9,    28,    28,    28,    28,
-    28,     6,    24,    18,     5,    29,    30,    36,    37,     7,
-     8,    41,    42,    43,    45,    46,    15,    48,    49,    50,
-     1,    11 ]
+    25,     5,     5,    15,     9,     5,    54,    15,    31,    31,
+    25,    54,    54,    54,    54,    54,    44,    30,    12,    12,
+    30,    44,    44,    44,    44,    44,    46,     2,     2,     3,
+     3,    46,    46,    46,    46,    46,    23,    23,    23,    23,
+    23,     0,     0,    16,    16,     0,    17,    17,    20,     7,
+     6,     8,    29,    14,    19,    34,    35,    41,    42,    43,
+    11,    45,     1,    48,    49,    51,    53,    24 ]
 
 racc_action_pointer = [
-    40,    70,    13,   nil,     0,    50,    49,    47,    60,    39,
-   nil,    59,    -1,   nil,   nil,    54,   nil,    29,    51,    -2,
-   nil,   nil,     2,   nil,    50,    15,   nil,   nil,    39,    53,
-    44,   nil,   nil,   nil,   nil,   nil,    55,    46,     7,   nil,
-    14,    49,    60,    61,   nil,    62,    63,    19,    65,    66,
-    67,     4,    24 ]
+    39,    62,    22,    27,   nil,    -1,    44,    45,    49,    -8,
+   nil,    60,    13,   nil,    41,     1,    38,    44,   nil,    48,
+    36,   nil,   nil,    29,    65,    -2,   nil,   nil,   nil,    50,
+    15,     3,   nil,   nil,    53,    44,   nil,   nil,   nil,   nil,
+   nil,    55,    46,    57,    14,    49,    24,   nil,    61,    62,
+   nil,    63,   nil,    64,     4,   nil ]
 
 racc_action_default = [
-   -31,   -31,    -1,    -3,   -31,    -5,    -7,   -31,   -31,    -2,
-   -24,   -31,   -31,   -29,    -4,   -31,    -6,   -31,   -31,    -8,
-   -10,    53,   -31,   -25,   -31,   -31,   -30,   -11,   -14,   -31,
-   -31,   -19,   -20,   -21,   -22,   -23,   -15,    -9,   -31,   -26,
-   -31,   -31,   -31,   -16,   -18,   -31,   -12,   -27,   -31,   -17,
-   -13,   -31,   -28 ]
+   -35,   -35,    -1,   -35,    -5,   -35,    -7,    -9,   -11,   -35,
+   -33,   -35,    -2,   -29,   -35,   -35,    -3,   -35,    -6,    -8,
+   -35,   -34,   -10,   -35,   -35,   -12,   -14,    56,   -30,   -35,
+   -35,    -4,   -15,   -18,   -20,   -35,   -24,   -25,   -26,   -27,
+   -28,   -19,   -13,   -35,   -35,   -35,   -21,   -23,   -35,   -16,
+   -31,   -35,   -22,   -17,   -35,   -32 ]
 
 racc_goto_table = [
-     4,    10,    28,    42,     6,    16,    19,     5,    23,    22,
-    37,    17,    25,     9,     2,     1,   nil,   nil,    36,   nil,
-   nil,    39,    42,   nil,    40,    47,   nil,    42,   nil,    43,
-   nil,   nil,   nil,   nil,   nil,   nil,    52,   nil,    46,   nil,
-   nil,   nil,    49,   nil,   nil,    50,   nil,   nil,    51 ]
+     5,    28,    33,    17,    12,     6,     2,    23,    25,    16,
+    19,    42,    22,     3,     1,    30,   nil,   nil,    31,   nil,
+    28,   nil,   nil,    50,    41,    52,   nil,   nil,   nil,    44,
+   nil,   nil,   nil,    55,    46,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    49,   nil,   nil,   nil,   nil,    53,   nil,
+   nil,    54 ]
 
 racc_goto_check = [
-     4,    13,    10,    11,     7,     6,     4,     5,    13,     4,
-     8,     9,     4,     3,     2,     1,   nil,   nil,     4,   nil,
-   nil,    13,    11,   nil,     4,    10,   nil,    11,   nil,     4,
-   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,     4,   nil,
-   nil,   nil,     4,   nil,   nil,     4,   nil,   nil,     4 ]
+     5,    15,    12,     5,     3,     6,     2,    11,     5,     2,
+     6,    10,     8,     4,     1,     5,   nil,   nil,     3,   nil,
+    15,   nil,   nil,    12,     5,    12,   nil,   nil,   nil,     5,
+   nil,   nil,   nil,    12,     5,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,     5,   nil,   nil,   nil,   nil,     5,   nil,
+   nil,     5 ]
 
 racc_goto_pointer = [
-   nil,    15,    14,    11,     0,     7,     0,     4,    -9,     6,
-   -15,   -25,   nil,    -1,   nil ]
+   nil,    14,     6,     2,    13,     0,     5,   nil,     5,   nil,
+   -14,     0,   -21,   nil,   nil,   -11 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,    29,    30,   nil,    12 ]
+   nil,   nil,   nil,   nil,   nil,   nil,    15,     7,   nil,     8,
+   nil,   nil,   nil,    34,    35,    13 ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
   1, 14, :_reduce_1,
   2, 14, :_reduce_2,
-  1, 17, :_reduce_none,
-  2, 17, :_reduce_none,
-  1, 15, :_reduce_5,
-  2, 15, :_reduce_6,
-  1, 18, :_reduce_7,
-  2, 18, :_reduce_8,
-  3, 18, :_reduce_9,
-  2, 20, :_reduce_10,
-  3, 20, :_reduce_11,
-  2, 21, :_reduce_none,
-  3, 21, :_reduce_none,
-  2, 19, :_reduce_14,
-  2, 22, :_reduce_15,
-  2, 23, :_reduce_16,
-  3, 23, :_reduce_17,
-  2, 24, :_reduce_18,
-  1, 25, :_reduce_none,
-  1, 25, :_reduce_none,
-  1, 25, :_reduce_none,
-  1, 25, :_reduce_none,
-  1, 25, :_reduce_none,
-  1, 16, :_reduce_24,
-  2, 16, :_reduce_25,
-  3, 16, :_reduce_26,
-  4, 26, :_reduce_27,
-  6, 26, :_reduce_28,
-  1, 27, :_reduce_29,
-  2, 27, :_reduce_30 ]
-
-racc_reduce_n = 31
-
-racc_shift_n = 53
+  2, 14, :_reduce_3,
+  3, 14, :_reduce_4,
+  1, 18, :_reduce_none,
+  2, 18, :_reduce_none,
+  1, 17, :_reduce_7,
+  2, 17, :_reduce_8,
+  1, 15, :_reduce_9,
+  2, 15, :_reduce_10,
+  1, 20, :_reduce_11,
+  2, 20, :_reduce_12,
+  3, 20, :_reduce_13,
+  2, 22, :_reduce_14,
+  3, 22, :_reduce_15,
+  2, 23, :_reduce_none,
+  3, 23, :_reduce_none,
+  2, 21, :_reduce_18,
+  2, 24, :_reduce_19,
+  1, 25, :_reduce_20,
+  2, 25, :_reduce_21,
+  3, 25, :_reduce_22,
+  2, 26, :_reduce_23,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 16, :_reduce_29,
+  2, 16, :_reduce_30,
+  4, 28, :_reduce_31,
+  6, 28, :_reduce_32,
+  1, 19, :_reduce_33,
+  2, 19, :_reduce_34 ]
+
+racc_reduce_n = 35
+
+racc_shift_n = 56
 
 racc_token_table = {
   false => 0,
@@ -168,7 +173,9 @@ Racc_token_to_s_table = [
   "Root",
   "Feature",
   "Scenarios",
+  "FeatureTags",
   "Newline",
+  "Tags",
   "FeatureHeader",
   "Background",
   "FeatureName",
@@ -177,8 +184,7 @@ Racc_token_to_s_table = [
   "Steps",
   "Step",
   "Keyword",
-  "Scenario",
-  "Tags" ]
+  "Scenario" ]
 
 Racc_debug_parser = false
 
@@ -200,152 +206,180 @@ module_eval(<<'.,.,', 'gherkin.y', 17)
   end
 .,.,
 
-# reduce 3 omitted
+module_eval(<<'.,.,', 'gherkin.y', 18)
+  def _reduce_3(val, _values, result)
+     result = val[1]; result.tags = val[0] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'gherkin.y', 20)
+  def _reduce_4(val, _values, result)
+     result = val[1]; result.scenarios = val[2]; result.tags = val[0] 
+    result
+  end
+.,.,
+
+# reduce 5 omitted
+
+# reduce 6 omitted
+
+module_eval(<<'.,.,', 'gherkin.y', 29)
+  def _reduce_7(val, _values, result)
+     result = val[0] 
+    result
+  end
+.,.,
 
-# reduce 4 omitted
+module_eval(<<'.,.,', 'gherkin.y', 30)
+  def _reduce_8(val, _values, result)
+     result = val[1] 
+    result
+  end
+.,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 26)
-  def _reduce_5(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 33)
+  def _reduce_9(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 28)
-  def _reduce_6(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 35)
+  def _reduce_10(val, _values, result)
      result = val[0]; result.background = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 32)
-  def _reduce_7(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 39)
+  def _reduce_11(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 33)
-  def _reduce_8(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 40)
+  def _reduce_12(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 35)
-  def _reduce_9(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 42)
+  def _reduce_13(val, _values, result)
      result = val[0] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 39)
-  def _reduce_10(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 46)
+  def _reduce_14(val, _values, result)
      result = AST::Feature.new(val[1]); result.pos(filename, lineno) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 40)
-  def _reduce_11(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 47)
+  def _reduce_15(val, _values, result)
      result = AST::Feature.new(val[2]); result.pos(filename, lineno) 
     result
   end
 .,.,
 
-# reduce 12 omitted
+# reduce 16 omitted
 
-# reduce 13 omitted
+# reduce 17 omitted
 
-module_eval(<<'.,.,', 'gherkin.y', 50)
-  def _reduce_14(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 57)
+  def _reduce_18(val, _values, result)
      result = val[0]; result.steps = val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 54)
-  def _reduce_15(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 61)
+  def _reduce_19(val, _values, result)
      result = AST::Background.new; result.pos(filename, lineno) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 58)
-  def _reduce_16(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 65)
+  def _reduce_20(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 59)
-  def _reduce_17(val, _values, result)
-     result = val[0] << val[1] 
+module_eval(<<'.,.,', 'gherkin.y', 66)
+  def _reduce_21(val, _values, result)
+     result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 63)
-  def _reduce_18(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 67)
+  def _reduce_22(val, _values, result)
+     val[2].unshift(val[0]); result = val[2] 
+    result
+  end
+.,.,
+
+module_eval(<<'.,.,', 'gherkin.y', 71)
+  def _reduce_23(val, _values, result)
      result = AST::Step.new(val[1], val[0]); result.pos(filename, lineno) 
     result
   end
 .,.,
 
-# reduce 19 omitted
+# reduce 24 omitted
 
-# reduce 20 omitted
+# reduce 25 omitted
 
-# reduce 21 omitted
+# reduce 26 omitted
 
-# reduce 22 omitted
+# reduce 27 omitted
 
-# reduce 23 omitted
+# reduce 28 omitted
 
-module_eval(<<'.,.,', 'gherkin.y', 71)
-  def _reduce_24(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 79)
+  def _reduce_29(val, _values, result)
      result = [val[0]] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 72)
-  def _reduce_25(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 80)
+  def _reduce_30(val, _values, result)
      result = val[0] << val[1] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 73)
-  def _reduce_26(val, _values, result)
-     result = val[0] << val[2] 
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'gherkin.y', 78)
-  def _reduce_27(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 85)
+  def _reduce_31(val, _values, result)
      result = AST::Scenario.new(val[1], val[3]); result.pos(filename, lineno - 1) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 81)
-  def _reduce_28(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 88)
+  def _reduce_32(val, _values, result)
      result = AST::Scenario.new(val[3], val[5], val[0]); result.pos(filename, lineno - 2) 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 85)
-  def _reduce_29(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 92)
+  def _reduce_33(val, _values, result)
      result = [AST::Tag.new(val[0])] 
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'gherkin.y', 86)
-  def _reduce_30(val, _values, result)
+module_eval(<<'.,.,', 'gherkin.y', 93)
+  def _reduce_34(val, _values, result)
      result = val[0] << AST::Tag.new(val[1]) 
     result
   end

data/lib/gherkin/version.rb

@@ -1,3 +1,3 @@
 module Gherkin
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/gherkin/ast_test.rb

@@ -42,39 +42,41 @@ module Gherkin
 
     describe Feature do
       it 'is Enumerable' do
+        tags = ['-foo', '-bar']
         background = ['foo', 'bar']
         elements = ['+foo', '+bar']
 
-        instance = Feature.new("My feature", elements, background )
+        instance = Feature.new("My feature", elements, tags, background )
+        instance.tags.each.to_a.must_equal ['-foo', '-bar']
         instance.background.each.to_a.must_equal ['foo', 'bar']
         instance.each.to_a.must_equal ['+foo', '+bar']
       end
     end
 
     describe Scenario do
-      let(:steps) do
-        steps = [
+      before do
+        @steps = [
           OpenStruct.new(line: 4),
           OpenStruct.new(line: 5),
         ]
       end
 
       it 'is Enumerable' do
-        instance = Scenario.new("Name", steps)
-        instance.each.to_a.must_equal steps
+        instance = Scenario.new("Name", @steps)
+        instance.each.to_a.must_equal @steps
       end
 
       it 'has tags' do
         tags  = ['javascript', 'wip']
 
-        instance = Scenario.new("Name", steps, tags)
+        instance = Scenario.new("Name", @steps, tags)
         instance.tags.must_equal tags
       end
     end
 
     describe Background do
-      let(:steps) do
-        steps = [
+      before do
+        @steps = [
           OpenStruct.new(line: 4),
           OpenStruct.new(line: 5),
         ]
@@ -85,13 +87,13 @@ module Gherkin
       end
 
       it 'is Enumerable' do
-        instance = Background.new(steps)
-        instance.each.to_a.must_equal steps
+        instance = Background.new(@steps)
+        instance.each.to_a.must_equal @steps
       end
 
       describe 'when there are background steps' do
         it 'records line' do
-          instance = Background.new(steps)
+          instance = Background.new(@steps)
           instance.pos("file", 3)
           instance.line.must_equal 3
         end

data/test/gherkin/parser/lexer_test.rb

@@ -2,22 +2,24 @@ require 'test_helper'
 
 module Gherkin
   describe Parser do
-    let(:lexer) { Parser.new }
+    before do
+      @lexer = Parser.new
+    end
 
     it 'ignores commments' do
-      lexer.tokenize("# this is a comment").must_equal []
+      @lexer.tokenize("# this is a comment").must_equal []
     end
 
     it 'parses newlines' do
-      lexer.tokenize("\n\n").must_equal [[:NEWLINE, "\n"], [:NEWLINE, "\n"]]
+      @lexer.tokenize("\n\n").must_equal [[:NEWLINE, "\n"], [:NEWLINE, "\n"]]
     end
 
     it 'parses text and strips it' do
-      lexer.tokenize("  Arbitrary text ").must_equal [[:TEXT, "Arbitrary text"]]
+      @lexer.tokenize("  Arbitrary text ").must_equal [[:TEXT, "Arbitrary text"]]
     end
 
     it 'parses tags' do
-      lexer.tokenize("@javascript @wip").must_equal [
+      @lexer.tokenize("@javascript @wip").must_equal [
         [:TAG, "javascript"],
         [:TAG, "wip"],
       ]
@@ -27,7 +29,7 @@ module Gherkin
       %w(Feature: Background: Scenario:).each do |keyword|
         it "parses #{keyword}:" do
           name = keyword[0..-2]
-          lexer.tokenize(keyword).must_equal [[name.upcase.to_sym, name]]
+          @lexer.tokenize(keyword).must_equal [[name.upcase.to_sym, name]]
         end
       end
     end
@@ -35,7 +37,7 @@ module Gherkin
     describe 'Step keywords' do
       %w(Given When Then And But).each do |keyword|
         it "parses #{keyword}" do
-          lexer.tokenize(keyword).must_equal [[keyword.upcase.to_sym, keyword]]
+          @lexer.tokenize(keyword).must_equal [[keyword.upcase.to_sym, keyword]]
         end
       end
     end

data/test/gherkin/parser/parser_test.rb

@@ -24,6 +24,24 @@ module Gherkin
         feature.name.must_equal "my feature"
       end
 
+      it 'parses feature with tags' do
+        feature = parse("""
+@wip @with-dash
+Feature: Do something
+""")
+        feature.name.must_equal "Do something"
+        feature.tags.first.name.must_equal "wip"
+        feature.tags.last.name.must_equal "with-dash"
+      end
+
+      it 'parses feature with tagsi event without newline at start' do
+        feature = parse(
+          "@wip\nFeature: Do something"
+        )
+        feature.name.must_equal "Do something"
+        feature.tags.first.name.must_equal "wip"
+      end
+
       it 'parses feature with background' do
         feature = parse("""
 Feature: Do something
@@ -71,6 +89,23 @@ Feature: Do something
         last_scenario.steps.last.name.must_equal "something else"
       end
 
+      it 'parses feature with no ending newline' do
+        feature = parse(%(
+Feature: Do something
+
+  Scenario: Foo bar baz
+    Given blah foo bar
+    Then something else))
+        scenarios = feature.scenarios
+        scenarios.size.must_equal 1
+
+        first_scenario = scenarios.first
+
+        first_scenario.name.must_equal "Foo bar baz"
+        first_scenario.steps.first.name.must_equal "blah foo bar"
+        first_scenario.steps.last.name.must_equal "something else"
+      end
+
       it 'parses feature with scenarios with tags' do
         feature = parse("""
 Feature: Do something
@@ -79,7 +114,7 @@ Feature: Do something
     Given blah foo bar
     Then something else
 
-  @javascript @wip
+  @javascript @wip @with-vcr
   Scenario: Foo bar baz blah
     Given blah foo bar
     Then something else
@@ -88,8 +123,9 @@ Feature: Do something
 
         last_scenario  = scenarios.last
 
-        last_scenario.tags.first.name.must_equal "javascript"
-        last_scenario.tags.last.name.must_equal "wip"
+        last_scenario.tags[0].name.must_equal "javascript"
+        last_scenario.tags[1].name.must_equal "wip"
+        last_scenario.tags[2].name.must_equal "with-vcr"
       end
     end
   end

metadata

@@ -1,78 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gherkin-ruby
-version: !ruby/object:Gem::Version 
-  hash: 1322991910812937300
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 0
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Marc Divins
 - Josep M. Bach
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-30 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rexical
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: racc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 2002549777813010636
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: Gherkin-ruby is a Gherkin parser in pure Ruby using Parslet
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Gherkin-ruby is a Gherkin parser in pure Ruby using Rexical and Racc
+email:
 - marcdivc@gmail.com
 - josep.m.bach@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .rvmrc
 - .travis.yml
 - Gemfile
 - Rakefile
@@ -91,41 +88,31 @@ files:
 - test/gherkin/parser/parser_test.rb
 - test/gherkin/parser_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: http://github.com/codegram/gherkin
+homepage: http://github.com/codegram/gherkin-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 2002549777813010636
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: gherkin-ruby
-rubygems_version: 1.5.2
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: Gherkin-ruby is a Gherkin parser in pure Ruby using Parslet
-test_files: 
+summary: Gherkin-ruby is a Gherkin parser in pure Ruby using Rexical and Racc
+test_files:
 - test/gherkin/ast_test.rb
 - test/gherkin/parser/lexer_test.rb
 - test/gherkin/parser/parser_test.rb