gherkin 2.0.2-i386-mswin32 → 2.1.0-i386-mswin32

data/spec/gherkin/i18n_lexer_spec.rb

@@ -8,14 +8,14 @@ module Gherkin
     end
 
     it "should store the i18n language of the last scanned feature" do
-      @lexer.scan("# language: fr\n", "fr.feature", 0)
+      @lexer.scan("# language: fr\n")
       @lexer.i18n_language.iso_code.should == "fr"
-      @lexer.scan("# language: no\n", "en.feature", 0)
+      @lexer.scan("# language: no\n")
       @lexer.i18n_language.iso_code.should == "no"
     end
 
     it "should use English i18n by default" do
-      @lexer.scan("Feature: foo\n", "foo.feature", 0)
+      @lexer.scan("Feature: foo\n")
       @lexer.i18n_language.iso_code.should == "en"
     end
 

data/spec/gherkin/i18n_spec.rb

@@ -9,14 +9,13 @@ module Gherkin
       end
 
       def scan_file(lexer, file)
-        lexer.scan(File.new(File.dirname(__FILE__) + "/fixtures/" + file).read, file, 0)
+        lexer.scan(File.new(File.dirname(__FILE__) + "/fixtures/" + file).read)
       end
 
       it "should recognize keywords in the language of the lexer" do
         lexer = Gherkin::I18nLexer.new(@listener, false)
         scan_file(lexer, "i18n_no.feature")
         @listener.to_sexp.should == [
-          [:location, "i18n_no.feature", 0],
           [:comment, "#language:no", 1],
           [:feature, "Egenskap", "i18n support", "", 2],
           [:scenario, "Scenario", "Parsing many languages", "", 4],
@@ -31,7 +30,6 @@ module Gherkin
         lexer = Gherkin::I18nLexer.new(@listener, false)
         scan_file(lexer, "i18n_zh-CN.feature")
         @listener.to_sexp.should == [
-          [:location, "i18n_zh-CN.feature", 0],
           [:comment, "#language:zh-CN", 1],
           [:feature, "功能", "加法", "", 2],
           [:scenario, "场景", "两个数相加", "", 4],
@@ -47,7 +45,6 @@ module Gherkin
         lexer = Gherkin::I18nLexer.new(@listener, false)
         scan_file(lexer, "i18n_fr.feature")
         @listener.to_sexp.should == [
-          [:location, "i18n_fr.feature", 0],
           [:comment, "#language:fr", 1],
           [:feature, "Fonctionnalité", "Addition", "", 2],
           [:scenario_outline, "Plan du scénario", "Addition de produits dérivés", "", 3],
@@ -89,6 +86,7 @@ module Gherkin
       | en-Scouse | Scouse                 | Scouse               |
       | en-au     | Australian             | Australian           |
       | en-lol    | LOLCAT                 | LOLCAT               |
+      | en-pirate | Pirate                 | Pirate               |
       | en-tx     | Texan                  | Texan                |
       | eo        | Esperanto              | Esperanto            |
       | es        | Spanish                | español              |

data/spec/gherkin/{json_lexer_spec.rb → json_parser_spec.rb}

@@ -1,19 +1,20 @@
 #encoding: utf-8
 require 'spec_helper'
-require 'gherkin/json_lexer'
+require 'gherkin/json_parser'
 
 module Gherkin
-  describe JSONLexer do 
+  describe JSONParser do 
 
     before do
       @listener = Gherkin::SexpRecorder.new
-      @lexer = Gherkin::JSONLexer.new(@listener)
+      @parser = Gherkin::JSONParser.new(nil)
     end
 
     describe "An empty feature" do
       it "should scan empty features" do
-        @lexer.scan('{}')
+        @parser.parse_with_listener('{}', @listener)
         @listener.to_sexp.should == [
+          [:location, "unknown.json"],
           [:eof]
         ]
       end
@@ -21,8 +22,9 @@ module Gherkin
 
     describe "A barely empty feature" do
       it "should scan a feature with no elements" do
-        @lexer.scan('{ "keyword": "Feature", "name": "One", "description": "", "line" : 3 }')
+        @parser.parse_with_listener('{ "keyword": "Feature", "name": "One", "description": "", "line" : 3 }', @listener)
         @listener.to_sexp.should == [
+          [:location, "unknown.json"],
           [:feature, "Feature", "One", "", 3],
           [:eof]
         ]
@@ -31,8 +33,9 @@ module Gherkin
 
     describe "Missing line numbers" do
       it "should indicate a line number of 0 if a line attribute doesn't exist" do
-        @lexer.scan('{ "name": "My Sweet Featur", "keyword": "Feature", "description": "" }')
+        @parser.parse_with_listener('{ "name": "My Sweet Featur", "keyword": "Feature", "description": "" }', @listener)
         @listener.to_sexp.should == [
+          [:location, "unknown.json"],
           [:feature, "Feature", "My Sweet Featur", "", 0],
           [:eof]
         ]
@@ -41,8 +44,9 @@ module Gherkin
 
     describe "Keywords" do
       it "should use the keyword from the source when provided" do
-        @lexer.scan('{ "name" : "My Sweet Featur", "language": "fr", "keyword": "Feature", "description": "" }')
+        @parser.parse_with_listener('{ "name" : "My Sweet Featur", "language": "fr", "keyword": "Feature", "description": "" }', @listener)
         @listener.to_sexp.should == [
+          [:location, "unknown.json"],
           [:feature, "Feature", "My Sweet Featur", "",  0],
           [:eof]
         ]
@@ -51,8 +55,9 @@ module Gherkin
 
     describe "A complex feature with tags, comments, multiple scenarios, and multiple steps and tables" do
       it "should find things in the right order" do
-        scan_file("complex.json")
+        @parser.parse_with_listener(fixture("complex.json"), @listener)
         @listener.to_sexp.should == [
+          [:location, "unknown.json"],
           [:tag, "@tag1", 0],
           [:tag, "@tag2", 0],
           [:feature, "Feature", "Feature Text","In order to test multiline forms", 0],

data/spec/gherkin/sexp_recorder.rb

@@ -1,5 +1,5 @@
 require 'gherkin/rubify'
-require 'gherkin/parser/row'
+require 'gherkin/formatter/model'
 
 module Gherkin
   class SexpRecorder
@@ -38,12 +38,18 @@ module Gherkin
     def sexpify(o)
       if (defined?(JRUBY_VERSION) && Java.java.util.Collection === o) || Array === o
         o.map{|e| sexpify(e)}
-      elsif(Parser::Row === o)
+      elsif(Formatter::Model::Row === o)
         {
-          "cells" => rubify(o.cells),
-          "comments" => rubify(o.comments),
+          "cells" => sexpify(o.cells),
+          "comments" => sexpify(o.comments),
           "line" => o.line,
         }
+      elsif(Formatter::Model::Comment === o)
+        o.value
+      elsif(Formatter::Model::Tag === o)
+        o.name
+      elsif(Formatter::Model::Statement === o)
+        "APE"
       else
         o
       end

data/spec/gherkin/shared/lexer_group.rb

@@ -12,7 +12,6 @@ module Gherkin
         it "should parse a one line comment" do
           scan("# My comment\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:comment, "# My comment", 1],
             [:eof]
           ]
@@ -21,7 +20,6 @@ module Gherkin
         it "should parse a multiline comment" do
           scan("# Hello\n\n# World\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:comment, "# Hello", 1],
             [:comment, "# World", 3],
             [:eof]
@@ -31,7 +29,6 @@ module Gherkin
         it "should not consume comments as part of a multiline name" do
           scan("Scenario: test\n#hello\n Scenario: another")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario, "Scenario", "test", "", 1],
             [:comment, "#hello", 2],
             [:scenario, "Scenario", "another", "", 3],
@@ -42,7 +39,6 @@ module Gherkin
         it "should not consume comments as part of a multiline example name" do
           scan("Examples: thing\n# ho hum\n| 1 | 2 |\n| 3 | 4 |\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:examples, "Examples", "thing", "", 1],
             [:comment,  "# ho hum", 2],
             [:row, ["1","2"], 3],
@@ -54,7 +50,6 @@ module Gherkin
         it "should allow empty comment lines" do 
           scan("#\n   # A comment\n   #\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:comment, "#", 1],
             [:comment, "# A comment", 2],
             [:comment, "#", 3],
@@ -73,7 +68,6 @@ module Gherkin
         it "should not take the tags as part of a multiline name feature element" do
           scan("Feature: hi\n Scenario: test\n\n@hello\n Scenario: another")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "hi", "", 1],
             [:scenario, "Scenario", "test", "", 2],
             [:tag, "@hello", 4],
@@ -87,7 +81,6 @@ module Gherkin
         it "should allow an empty background name and description" do
           scan("Background:\nGiven I am a step\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:background, "Background", "", "", 1],
             [:step, "Given ", "I am a step", 2],
             [:eof]
@@ -97,7 +90,6 @@ module Gherkin
         it "should allow an empty background description" do
           scan("Background: Yeah\nGiven I am a step\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:background, "Background", "Yeah", "", 1],
             [:step, "Given ", "I am a step", 2],
             [:eof]
@@ -107,7 +99,6 @@ module Gherkin
         it "should allow multiline names ending at eof" do
           scan("Background: I have several\n   Lines to look at\n None starting with Given")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:background, "Background", "I have several", "Lines to look at\nNone starting with Given", 1],
             [:eof]
           ]
@@ -121,7 +112,6 @@ Background: It is my ambition to say
             in a whole book.
 Given I am a step})
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Hi", "", 1],
             [:background, "Background", "It is my ambition to say", "in ten sentences\nwhat others say\nin a whole book.",2],
             [:step, "Given ", "I am a step", 6],
@@ -134,7 +124,6 @@ Given I am a step})
         it "should be parsed" do
           scan("Scenario: Hello\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario, "Scenario", "Hello", "", 1],
             [:eof]
           ]
@@ -146,7 +135,6 @@ Given I am a step})
                           Given baz
                           })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario, "Scenario", "bar", "", 1],
             [:step, "Given ", "baz", 3],
             [:eof]
@@ -161,7 +149,6 @@ Given I am a step})
                           Given I am a step
                           })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario, "Scenario", "It is my ambition to say", "in ten sentences\nwhat others say\nin a whole book.", 1],
             [:step, "Given ", "I am a step", 5],
             [:eof]
@@ -171,7 +158,6 @@ Given I am a step})
         it "should allow multiline names ending at eof" do
           scan("Scenario: I have several\n       Lines to look at\n None starting with Given")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario, "Scenario", "I have several", "Lines to look at\nNone starting with Given", 1],
             [:eof]
           ]
@@ -184,7 +170,6 @@ Given I am a step})
   But I might not because I am a Charles Dickens character
 })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario, "Scenario", "I have a Button", "Buttons are great", 1],
             [:step, "Given ", "I have some", 3],
             [:step, "But ", "I might not because I am a Charles Dickens character", 4],
@@ -198,7 +183,6 @@ Given I am a step})
 Given I am a step
 })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario, "Scenario", "When I have when in scenario", "I should be fine", 1],
             [:step, "Given ", "I am a step", 3],
             [:eof]
@@ -217,7 +201,6 @@ Given I am a step
                           |green|
                           })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario_outline, "Scenario Outline", "Hello", "With a description", 1],
             [:step, "Given ", "a <what> cucumber", 3],
             [:examples, "Examples", "With a name", "and a description", 4],
@@ -234,7 +217,6 @@ Given I am a step
                           Scenario: My Scenario
                           })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario_outline, "Scenario Outline", "Hello", "", 1],
             [:scenario, "Scenario", "My Scenario", "", 3],
             [:eof]
@@ -250,7 +232,6 @@ Given I am a step
 
                           })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:scenario_outline, "Scenario Outline", "It is my ambition to say", "in ten sentences\nwhat others say\nin a whole book.", 1],
             [:step, "Given ", "I am a step", 5],
             [:eof]
@@ -265,7 +246,6 @@ Given I am a step
                           |5|6|
                           })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:examples, "Examples", "", "", 1],
             [:row, ["x","y"], 2],
             [:row, ["5","6"], 3],
@@ -281,7 +261,6 @@ Given I am a step
                           |5|
                           })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:examples, "Examples", "I'm a multiline name", "and I'm ok\nf'real", 1],
             [:row, ["x"], 4],
             [:row, ["5"], 5],
@@ -296,7 +275,6 @@ Given I am a step
                           |a|b|
                           })
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:step, "Given ", "I have a table", 1],
             [:row, ['a','b'], 2],
             [:eof]
@@ -306,7 +284,6 @@ Given I am a step
         it "should parse steps with inline py_string" do
           scan("Given I have a string\n\"\"\"\nhello\nworld\n\"\"\"")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:step, "Given ", "I have a string", 1],
             [:py_string, "hello\nworld", 2],
             [:eof]
@@ -318,7 +295,6 @@ Given I am a step
         it "should find the feature, scenario, and step" do
           scan("Feature: Feature Text\n  Scenario: Reading a Scenario\n    Given there is a step\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Feature Text", "", 1],
             [:scenario, "Scenario", "Reading a Scenario", "", 2],
             [:step, "Given ", "there is a step", 3],
@@ -331,7 +307,6 @@ Given I am a step
         it "should not raise an error when whitespace follows the Feature, Scenario, and Steps" do
           scan("Feature: Feature Text\n Scenario: Reading a Scenario\n    Given there is a step\n    ")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Feature Text", "", 1],
             [:scenario, "Scenario", "Reading a Scenario", "", 2],
             [:step, "Given ", "there is a step", 3],
@@ -345,7 +320,6 @@ Given I am a step
         it "should find the feature, scenario, and three steps" do
           scan("Feature: Feature Text\n  Scenario: Reading a Scenario\n    Given there is a step\n    And another step\n   And a third step\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Feature Text", "", 1],
             [:scenario, "Scenario", "Reading a Scenario", "", 2],
             [:step, "Given ", "there is a step", 3],
@@ -360,7 +334,6 @@ Given I am a step
         it "should find the feature" do
           scan("Feature: Feature Text\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Feature Text", "", 1],
             [:eof]
           ]
@@ -369,7 +342,6 @@ Given I am a step
         it "should parse a one line feature with no newline" do
           scan("Feature: hi")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "hi", "", 1],
             [:eof]
           ]
@@ -380,7 +352,6 @@ Given I am a step
         it "should find the feature" do
           scan("Feature: Feature Text\n  And some more text")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Feature Text", "And some more text", 1],
             [:eof]
           ]
@@ -391,7 +362,6 @@ Given I am a step
         it "should find the feature and scenario" do
           scan("Feature: Feature Text\nScenario: Reading a Scenario\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Feature Text", "", 1],
             [:scenario, "Scenario", "Reading a Scenario", "", 2],
             [:eof]
@@ -403,7 +373,6 @@ Given I am a step
         it "should find the feature and two scenarios" do
           scan("Feature: Feature Text\nScenario: Reading a Scenario\n  Given a step\n\nScenario: A second scenario\n Given another step\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Feature Text", "", 1],
             [:scenario, "Scenario", "Reading a Scenario", "", 2],
             [:step, "Given ", "a step", 3],
@@ -416,7 +385,6 @@ Given I am a step
         it "should find the feature and two scenarios without indentation" do
           scan("Feature: Feature Text\nScenario: Reading a Scenario\nGiven a step\nScenario: A second scenario\nGiven another step\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "Feature Text", "", 1],
             [:scenario, "Scenario", "Reading a Scenario", "", 2],
             [:step, "Given ", "a step", 3],
@@ -431,7 +399,6 @@ Given I am a step
         it "should find the feature, scenarios, steps, and comments in the proper order" do
           scan_file("simple_with_comments.feature")
           @listener.to_sexp.should == [
-            [:location, 'simple_with_comments.feature', 0],
             [:comment, "# Here is a comment", 1],
             [:feature, "Feature", "Feature Text", "", 2],
             [:comment, "# Here is another # comment", 3],
@@ -446,7 +413,6 @@ Given I am a step
         it "should support comments in tables" do
           scan_file("comments_in_table.feature")
           @listener.to_sexp.should == [
-            [:location, 'comments_in_table.feature', 0],
             [:feature, "Feature", "x", "", 1], 
             [:scenario_outline, "Scenario Outline", "x", "", 3], 
             [:step, "Then ", "x is <state>", 4], 
@@ -463,7 +429,6 @@ Given I am a step
         it "should find the feature, scenario, step, and tags in the proper order" do
           scan_file("simple_with_tags.feature")
           @listener.to_sexp.should == [
-            [:location, 'simple_with_tags.feature', 0],
             [:comment, "# FC", 1],
             [:tag, "@ft",2],
             [:feature, "Feature", "hi", "", 3],
@@ -485,7 +450,6 @@ Given I am a step
         it "should lex this feature properly" do
           scan_file("1.feature")
           @listener.to_sexp.should == [
-            [:location, '1.feature', 0],
             [:feature, "Feature", "Logging in", "So that I can be myself", 1],
             [:comment, "# Comment", 3],
             [:scenario, "Scenario", "Anonymous user can get a login form.", "Scenery here", 4],
@@ -500,7 +464,6 @@ Given I am a step
         it "should find things in the right order" do
           scan_file("complex.feature")
           @listener.to_sexp.should == [
-            [:location, 'complex.feature', 0],
             [:comment, "#Comment on line 1", 1],
             [:comment, "#Comment on line 2", 2],
             [:tag, "@tag1", 3],
@@ -544,7 +507,6 @@ Given I am a step
         it "should find things in the right order for CRLF features" do
           scan_file("dos_line_endings.feature")
           @listener.to_sexp.should == [
-            [:location, 'dos_line_endings.feature', 0],
             [:comment, "#Comment on line 1", 1],
             [:comment, "#Comment on line 2", 2],
             [:tag, "@tag1", 3],
@@ -586,7 +548,6 @@ Given I am a step
         it "should cope with the retarded BOM that many Windows editors insert at the beginning of a file" do
           scan_file("with_bom.feature")
           @listener.to_sexp.should == [
-            [:location, 'with_bom.feature', 0],
             [:feature, "Feature", "Feature Text", "", 1],
             [:scenario, "Scenario", "Reading a Scenario", "", 2],
             [:step, "Given ", "there is a step", 3],
@@ -613,7 +574,6 @@ Given I am a step
         it "Feature keyword should terminate narratives for multiline capable tokens" do
           scan("Feature:\nBackground:\nFeature:\nScenario Outline:\nFeature:\nScenario:\nFeature:\nExamples:\nFeature:\n")
           @listener.to_sexp.should == [
-            [:location, 'test.feature', 0],
             [:feature, "Feature", "", "", 1],
             [:background, "Background", "", "", 2],
             [:feature, "Feature", "", "", 3],