gherkin 2.5.4-java → 2.6.0-java

data/spec/gherkin/fixtures/complex.json

@@ -1,4 +1,6 @@
-{ 
+{
+  "id": "feature-text",
+  "uri": "some/nice.feature",
   "name": "Feature Text",
   "keyword": "Feature",
   "description": "In order to test multiline forms",
@@ -20,6 +22,7 @@
       ]
     },
     { "type": "scenario_outline",
+      "id": "feature-text/a-scenario-outline",
       "keyword": "Scenario Outline",
       "name": "An Scenario Outline",
       "description": "",
@@ -36,6 +39,7 @@
       ],
       "examples": [
         {
+          "id": "feature-text/a-scenario-outline/sweet-example",
           "name": "Sweet Example", 
           "keyword": "Examples",
           "description": "",
@@ -52,6 +56,7 @@
       ]
     },
     { "type" : "scenario",
+      "id": "feature-text/reading-a-scenario",
       "keyword": "Scenario",
       "name" : "Reading a Scenario",
       "description": "",
@@ -67,6 +72,7 @@
       ]
     },
     { "type" : "scenario",
+      "id": "feature-text/reading-a-second-scenario",
       "keyword": "Scenario",
       "name" : "Reading a second scenario",
       "description": "With two lines of text",
@@ -111,6 +117,7 @@
       ]
     },
     { "type" : "scenario",
+      "id": "feature-text/hammerzeit",
       "keyword": "Scenario",
       "name" : "Hammerzeit", 
       "description": "",

data/spec/gherkin/formatter/json_formatter_spec.rb

@@ -10,10 +10,10 @@ module Gherkin
         io = StringIO.new
         f = JSONFormatter.new(io)
         f.uri("f.feature")
-        f.feature(Model::Feature.new([], [], "Feature", "f", "", 1))
-        f.scenario(Model::Scenario.new([], [], "Feature", "f", "", 2))
-        f.step(Model::Step.new([], "Given ", "g", 3))
-        f.step(Model::Step.new([], "When ", "w", 4))
+        f.feature(Model::Feature.new([], [], "Feature", "ff", "", 1, "ff"))
+        f.scenario(Model::Scenario.new([], [], "Scenario", "ss", "", 2, "ff/ss"))
+        f.step(Model::Step.new([], "Given ", "g", 3, nil, nil))
+        f.step(Model::Step.new([], "When ", "w", 4, nil, nil))
 
         f.match(Model::Match.new([], "def.rb:33"))
         f.result(Model::Result.new(:passed, 1, nil))
@@ -22,49 +22,55 @@ module Gherkin
         f.result(Model::Result.new(:passed, 1, nil))
 
         f.eof
+        f.close
         
         expected = %{
-          {
-            "keyword": "Feature",
-            "name": "f",
-            "line": 1,
-            "description": "",
-            "elements": [
-              {
-                "keyword": "Feature",
-                "name": "f",
-                "line": 2,
-                "description": "",
-                "type": "scenario",
-                "steps": [
-                  {
-                    "keyword": "Given ",
-                    "name": "g",
-                    "line": 3,
-                    "match": {
-                      "location": "def.rb:33"
+          [
+            {
+              "id": "ff",
+              "uri": "f.feature",
+              "keyword": "Feature",
+              "name": "ff",
+              "line": 1,
+              "description": "",
+              "elements": [
+                {
+                  "id": "ff/ss",
+                  "keyword": "Scenario",
+                  "name": "ss",
+                  "line": 2,
+                  "description": "",
+                  "type": "scenario",
+                  "steps": [
+                    {
+                      "keyword": "Given ",
+                      "name": "g",
+                      "line": 3,
+                      "match": {
+                        "location": "def.rb:33"
+                      },
+                      "result": {
+                        "status": "passed",
+                        "duration": 1
+                      }
                     },
-                    "result": {
-                      "status": "passed",
-                      "duration": 1
+                    {
+                      "keyword": "When ",
+                      "name": "w",
+                      "line": 4,
+                      "match": {
+                        "location": "def.rb:44"
+                      },
+                      "result": {
+                        "status": "passed",
+                        "duration": 1
+                      }
                     }
-                  },
-                  {
-                    "keyword": "When ",
-                    "name": "w",
-                    "line": 4,
-                    "match": {
-                      "location": "def.rb:44"
-                    },
-                    "result": {
-                      "status": "passed",
-                      "duration": 1
-                    }
-                  }
-                ]
-              }
-            ]
-          }
+                  ]
+                }
+              ]
+            }
+          ]
         }
 
         JSON.parse(expected).should == JSON.parse(io.string)

data/spec/gherkin/formatter/model_spec.rb

@@ -14,12 +14,12 @@ module Gherkin
 
       describe Step do
         it "should provide arguments for outline tokens" do
-          step = Step.new([], 'Given ', "I have <number> cukes in <whose> belly", 10)
+          step = Step.new([], 'Given ', "I have <number> cukes in <whose> belly", 10, nil, nil)
           step.outline_args.map{|arg| [arg.offset, arg.val]}.should == [[7, "<number>"], [25, "<whose>"]]
         end
 
         it "should provide no arguments when there are no outline tokens" do
-          step = Step.new([], 'Given ', "I have 33 cukes in my belly", 10)
+          step = Step.new([], 'Given ', "I have 33 cukes in my belly", 10, nil, nil)
           step.outline_args.to_a.should == []
         end
       end

data/spec/gherkin/formatter/pretty_formatter_spec.rb

@@ -36,11 +36,11 @@ module Gherkin
 
       it "should print comments when scenario is longer" do
         @f.uri("features/foo.feature")
-        @f.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
+        @f.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1, "hello"))
 
-        @f.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
-        @f.step(Model::Step.new([], "Given ", "some stuff", 5))
-        @f.step(Model::Step.new([], "When ", "foo", 6))
+        @f.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4, "the-scenario"))
+        @f.step(Model::Step.new([], "Given ", "some stuff", 5, nil, nil))
+        @f.step(Model::Step.new([], "When ", "foo", 6, nil, nil))
 
         @f.match(Model::Match.new([], "features/step_definitions/bar.rb:56"))
         @f.result(Model::Result.new('passed', 22, nil))
@@ -61,12 +61,12 @@ module Gherkin
 
       it "should print comments when step is longer" do
         @f.uri("features/foo.feature")
-        @f.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1))
-        step = Model::Step.new([], "Given ", "some stuff that is longer", 5)
+        @f.feature(Model::Feature.new([], [], "Feature", "Hello", "World", 1, "hello"))
+        step = Model::Step.new([], "Given ", "some stuff that is longer", 5, nil, nil)
         match = Model::Match.new([], "features/step_definitions/bar.rb:56")
         result = Model::Result.new('passed', 0, nil)
 
-        @f.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4))
+        @f.scenario(Model::Scenario.new([], [], "Scenario", "The scenario", "", 4, "the-scenario"))
         @f.step(step)
         @f.match(match)
         @f.result(result)
@@ -82,8 +82,8 @@ module Gherkin
 
       it "should highlight arguments for regular steps" do
         @f.uri("foo.feature")
-        @f.scenario(Model::Scenario.new([], [], "Scenario", "Lots of cukes", "", 3))
-        @f.step(Model::Step.new([], "Given ", "I have 999 cukes in my belly", 3))
+        @f.scenario(Model::Scenario.new([], [], "Scenario", "Lots of cukes", "", 3, "lots-of-cukes"))
+        @f.step(Model::Step.new([], "Given ", "I have 999 cukes in my belly", 3, nil, nil))
         @f.match(Model::Match.new([Gherkin::Formatter::Argument.new(7, '999')], nil))
         @f.result(Model::Result.new('passed', 6, nil))
 
@@ -150,7 +150,7 @@ Feature: Feature Description
       it "should escape backslashes and pipes" do
         io = StringIO.new
         f = Gherkin::Formatter::PrettyFormatter.new(io, true, false)
-        f.__send__(:table, [Gherkin::Formatter::Model::Row.new([], ['|', '\\'], 1)])
+        f.__send__(:table, [Gherkin::Formatter::Model::DataTableRow.new([], ['|', '\\'], 1)])
         io.string.should == '      | \\| | \\\\ |' + "\n"
       end
     end

data/spec/gherkin/json_parser_spec.rb

@@ -1,4 +1,5 @@
 #encoding: utf-8
+require 'stringio'
 require 'spec_helper'
 require 'gherkin/json_parser'
 require 'gherkin/formatter/json_formatter'
@@ -10,100 +11,115 @@ module Gherkin
       io = StringIO.new
       f = Formatter::JSONFormatter.new(io)
       p = JSONParser.new(f, f)
-      p.parse(json, 'unknown.json', 0)
+      p.parse(json)
+      f.close
       expected = JSON.parse(json)
       actual   = JSON.parse(io.string)
       actual.should == expected
     end
 
     it "should parse a barely empty feature" do
-      check_json(%{{
-        "keyword": "Feature", 
-        "name": "One", 
-        "description": "", 
-        "line" : 3 
-      }})
+      check_json(%{[
+        {
+          "id": "one",
+          "uri": "test.feature",
+          "keyword": "Feature", 
+          "name": "One", 
+          "description": "", 
+          "line" : 3 
+        }
+      ]})
     end
 
     it "should parse feature with tags and one scenario" do
-      check_json(%{{
-        "tags": [
-          {
-            "name": "@foo",
-            "line": 22
-          }
-        ],
-        "keyword": "Feature", 
-        "name": "One", 
-        "description": "", 
-        "line": 3,
-        "elements": [
-          {
-            "type": "scenario",
-            "steps": [
-              {
-                "name": "Hello",
-                "rows": [
-                  {
-                    "cells": ["foo", "bar"]
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }})
+      check_json(%{[
+        {
+          "id": "one",
+          "uri": "test.feature",
+          "tags": [
+            {
+              "name": "@foo",
+              "line": 22
+            }
+          ],
+          "keyword": "Feature", 
+          "name": "One", 
+          "description": "", 
+          "line": 3,
+          "elements": [
+            {
+              "id": "one/two",
+              "type": "scenario",
+              "steps": [
+                {
+                  "name": "Hello",
+                  "rows": [
+                    {
+                      "cells": ["foo", "bar"]
+                    }
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]})
     end
 
     it "should parse feature with match, result and embedding" do
-      check_json(%{{
-        "tags": [
-          {
-            "name": "@foo",
-            "line": 22
-          }
-        ],
-        "keyword": "Feature", 
-        "name": "One", 
-        "description": "", 
-        "line": 3,
-        "elements": [
-          {
-            "type": "scenario",
-            "steps": [
-              {
-                "keyword": "Given ",
-                "name": "a passing step",
-                "line": 6,
-                "match": {
-                  "arguments": [
+      check_json(%{[
+        {
+          "id": "one",
+          "uri": "test.feature",
+          "tags": [
+            {
+              "name": "@foo",
+              "line": 22
+            }
+          ],
+          "keyword": "Feature", 
+          "name": "One", 
+          "description": "", 
+          "line": 3,
+          "elements": [
+            {
+              "id": "one/a-scenario",
+              "type": "scenario",
+              "steps": [
+                {
+                  "keyword": "Given ",
+                  "name": "a passing step",
+                  "line": 6,
+                  "match": {
+                    "arguments": [
+                      {
+                        "offset": 22,
+                        "val": "cukes"
+                      }
+                    ],
+                    "location": "features/step_definitions/steps.rb:1"
+                  },
+                  "result": {
+                    "status": "failed",
+                    "error_message": "You suck",
+                    "duration": -1
+                  },
+                  "embeddings": [
                     {
-                      "offset": 22,
-                      "val": "cukes"
+                      "mime_type": "text/plain",
+                      "data": "Tm8sIEknbSBub3QgaW50ZXJlc3RlZCBpbiBkZXZlbG9waW5nIGEgcG93ZXJmdWwgYnJhaW4uIEFsbCBJJ20gYWZ0ZXIgaXMganVzdCBhIG1lZGlvY3JlIGJyYWluLCBzb21ldGhpbmcgbGlrZSB0aGUgUHJlc2lkZW50IG9mIHRoZSBBbWVyaWNhbiBUZWxlcGhvbmUgYW5kIFRlbGVncmFwaCBDb21wYW55Lg=="
                     }
-                  ],
-                  "location": "features/step_definitions/steps.rb:1"
-                },
-                "result": {
-                  "status": "failed",
-                  "error_message": "You suck",
-                  "duration": -1
-                },
-                "embeddings": [
-                  {
-                    "mime_type": "text/plain",
-                    "data": "Tm8sIEknbSBub3QgaW50ZXJlc3RlZCBpbiBkZXZlbG9waW5nIGEgcG93ZXJmdWwgYnJhaW4uIEFsbCBJJ20gYWZ0ZXIgaXMganVzdCBhIG1lZGlvY3JlIGJyYWluLCBzb21ldGhpbmcgbGlrZSB0aGUgUHJlc2lkZW50IG9mIHRoZSBBbWVyaWNhbiBUZWxlcGhvbmUgYW5kIFRlbGVncmFwaCBDb21wYW55Lg=="
-                  }
-                ]
-              }
-            ]
-          }
-        ]
-      }})
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ]})
     end
 
     it "shoud parse a complex feature" do
-      check_json(fixture("complex.json"))
+      check_json('[' + fixture("complex.json") + ']')
     end
   end
 end

data/spec/gherkin/sexp_recorder.rb

@@ -12,9 +12,6 @@ module Gherkin
     # We can't use method_missing - therubyracer isn't able to invoke methods like that.
     [:comment, :tag, :feature, :background, :scenario, :scenario_outline, :examples, :step, :doc_string, :row, :eof, :uri, :syntax_error].each do |event|
       define_method(event) do |*args|
-        event = :scenario_outline if event == :scenarioOutline # Special Java Lexer handling
-        event = :doc_string if event == :docString # Special Java Lexer handling
-        event = :syntax_error if event == :syntaxError # Special Java Lexer handling
         args  = rubify(args)
         args  = sexpify(args)
         @sexps << [event] + args

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.6.0
   prerelease: 
 platform: java
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000Z
+date: 2011-10-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2156193900 !ruby/object:Gem::Requirement
+  requirement: &2152423780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,21 +23,21 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2156193900
+  version_requirements: *2152423780
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156178800 !ruby/object:Gem::Requirement
+  requirement: &2152422700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.1.1
   type: :development
   prerelease: false
-  version_requirements: *2156178800
+  version_requirements: *2152422700
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156167580 !ruby/object:Gem::Requirement
+  requirement: &2152422040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2156167580
+  version_requirements: *2152422040
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156161420 !ruby/object:Gem::Requirement
+  requirement: &2152421360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,21 +56,21 @@ dependencies:
         version: 1.0.21
   type: :development
   prerelease: false
-  version_requirements: *2156161420
+  version_requirements: *2152421360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156154640 !ruby/object:Gem::Requirement
+  requirement: &2152420580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2156154640
+  version_requirements: *2152420580
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2156149900 !ruby/object:Gem::Requirement
+  requirement: &2152419880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 0.9.8
   type: :development
   prerelease: false
-  version_requirements: *2156149900
+  version_requirements: *2152419880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156142340 !ruby/object:Gem::Requirement
+  requirement: &2152419380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *2156142340
+  version_requirements: *2152419380
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2156139660 !ruby/object:Gem::Requirement
+  requirement: &2152418840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2156139660
+  version_requirements: *2152418840
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2156138140 !ruby/object:Gem::Requirement
+  requirement: &2152418340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2156138140
+  version_requirements: *2152418340
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2156135060 !ruby/object:Gem::Requirement
+  requirement: &2152417620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,7 +122,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2156135060
+  version_requirements: *2152417620
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -290,7 +290,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.5.4
+summary: gherkin-2.6.0
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature