gherkin 2.10.0-java → 2.11.0-java

data/History.md

@@ -1,3 +1,10 @@
+## [2.11.0](https://github.com/cucumber/gherkin/compare/v2.10.0...v2.11.0)
+
+* [Core] Alias Feature with Business Need and Ability. ([#167](https://github.com/cucumber/gherkin/issues/167) Aslak Hellesøy)
+* [Java] Better exception on bad filter mix. ([#179](https://github.com/cucumber/gherkin/issues/179) Aslak Hellesøy)
+* [Java, Ruby] Formatters don't deal well with things not associated with a step ([#172](https://github.com/cucumber/gherkin/issues/172) David Kowis, Aslak Hellesøy)
+* [Java] Make model classes implement `java.io.Serializable` ([#180](https://github.com/cucumber/gherkin/issues/180) Aslak Hellesøy)
+
 ## [2.10.0](https://github.com/cucumber/gherkin/compare/v2.9.3...v2.10.0)
 
 * [Core] Added Malay language support. ([#176](https://github.com/cucumber/gherkin/pull/176) Choon Siong)

data/README.md

@@ -1,5 +1,4 @@
 [![Build Status](https://secure.travis-ci.org/cucumber/gherkin.png)](http://travis-ci.org/cucumber/gherkin)
-[![Dependency Status](https://gemnasium.com/cucumber/gherkin.png)](https://gemnasium.com/cucumber/gherkin)
 
 A fast lexer and parser for the Gherkin language based on Ragel. Gherkin is two things:
 
@@ -55,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.10.0</version>
+        <version>2.11.0</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -203,7 +202,7 @@ Now we're ready to install the Windows rubies:
     rvm gemset use cucumber
     gem install bundler
     bundle install
-	PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.9.3-p194
+    PATH=/usr/local/mingw/bin:$PATH CC=/usr/local/mingw/bin/i686-w64-mingw32-gcc rake-compiler cross-ruby VERSION=1.9.3-p194
 
     # 1.8.7
     CC=gcc-4.2 rvm install 1.8.7-p352
@@ -217,7 +216,7 @@ Now we're ready to install the Windows rubies:
 Now you can build Windows gems:
 
     rake compile
-	mkdir release
+    mkdir release
     rake gems:win
 
 ## Release process

data/gherkin.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   # When both are building OK, do a `bundle exec rake install` in both cucumber and gherkin projects, revert the changes in the first 2 steps 
   # and release both projects. Do this for both ruby 1.8.7, ruby 1.9.3 and jruby.
   #
-  s.version     = "2.10.0"
+  s.version     = "2.11.0"
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser based on the Ragel State Machine Compiler."
   s.summary     = "#{s.name}-#{s.version}"
@@ -58,10 +58,10 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('json', '>= 1.4.6')
 
-  s.add_development_dependency('cucumber', '>= 1.2.0')
+  s.add_development_dependency('cucumber', '>= 1.2.1')
   s.add_development_dependency('rake', '>= 0.9.2')
   s.add_development_dependency('bundler', '>= 1.1.0')
-  s.add_development_dependency('rspec', '~> 2.9.0')
+  s.add_development_dependency('rspec', '~> 2.10.0')
   s.add_development_dependency('rubyzip', '>= 0.9.8')
 
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)

data/lib/gherkin/formatter/filter_formatter.rb

@@ -96,7 +96,7 @@ module Gherkin
     private
 
       def detect_filter(filters)
-        raise "Inconsistent filters: #{filters.inspect}" if filters.map{|filter| filter.class}.uniq.length > 1
+        raise "Inconsistent filters: #{filters.inspect}. Only one type [line,name,tag] can be used at once." if filters.map{|filter| filter.class}.uniq.length > 1
         case(filters[0])
         when Fixnum 
           LineFilter.new(filters)

data/lib/gherkin/formatter/json_formatter.rb

@@ -16,6 +16,7 @@ module Gherkin
         raise "Must be writeable" unless io.respond_to?(:write)
         @io = io
         @feature_hashes = []
+        @current_step_or_hook = nil
       end
 
       def done
@@ -34,17 +35,14 @@ module Gherkin
 
       def background(background)
         feature_elements << background.to_hash
-        @step_index = 0
       end
 
       def scenario(scenario)
         feature_elements << scenario.to_hash
-        @step_index = 0
       end
 
       def scenario_outline(scenario_outline)
         feature_elements << scenario_outline.to_hash
-        @step_index = 0
       end
 
       def examples(examples)
@@ -52,31 +50,44 @@ module Gherkin
       end
 
       def step(step)
-        current_steps << step.to_hash
+        @current_step_or_hook = step.to_hash
+        steps << @current_step_or_hook
       end
 
       def match(match)
-        current_steps[@step_index]['match'] = match.to_hash
+        @current_step_or_hook['match'] = match.to_hash
       end
 
       def result(result)
-        current_steps[@step_index]['result'] = result.to_hash
-        @step_index += 1
+        @current_step_or_hook['result'] = result.to_hash
       end
 
-      def last_step
-        current_steps[-1]
+      def before(match, result)
+        add_hook(match, result, "before")
+      end
+
+      def after(match, result)
+        add_hook(match, result, "after")
       end
 
       def embedding(mime_type, data)
         embeddings << {'mime_type' => mime_type, 'data' => encode64s(data)}
       end
 
+      def write(text)
+        output << text
+      end
+
       def eof
       end
 
     private
 
+      def add_hook(match, result, hook)
+        hooks = (feature_element[hook] ||= []);
+        hooks << {'match' => match.to_hash, 'result' => result.to_hash}
+      end
+
       def feature_elements
         @feature_hash['elements'] ||= []
       end
@@ -89,12 +100,16 @@ module Gherkin
         feature_element['examples'] ||= []
       end
 
-      def current_steps
+      def steps
         feature_element['steps'] ||= []
       end
 
       def embeddings
-        last_step['embeddings'] ||= []
+        @current_step_or_hook['embeddings'] ||= []
+      end
+
+      def output
+        @current_step_or_hook['output'] ||= []
       end
 
       def encode64s(data)

data/lib/gherkin/i18n.yml

@@ -13,7 +13,7 @@
 "en":
   name: English
   native: English
-  feature: Feature
+  feature: Feature|Business Need|Ability
   background: Background
   scenario: Scenario
   scenario_outline: Scenario Outline|Scenario Template

data/lib/gherkin/json_parser.rb

@@ -24,12 +24,23 @@ module Gherkin
         Formatter::Model::Feature.new(comments(f), tags(f), keyword(f), name(f), description(f), line(f), id(f)).replay(@formatter)
         (f["elements"] || []).each do |feature_element|
           feature_element(feature_element).replay(@formatter)
+
+          (feature_element["before"] || []).each do |hook|
+            before(hook)
+          end
+
           (feature_element["steps"] || []).each do |step|
             step(step).replay(@formatter)
             match(step)
             result(step)
             embeddings(step)
+            output(step)
           end
+
+          (feature_element["after"] || []).each do |hook|
+            after(hook)
+          end
+
           (feature_element["examples"] || []).each do |eo|
             Formatter::Model::Examples.new(comments(eo), tags(eo), keyword(eo), name(eo), description(eo), line(eo), id(eo), examples_rows(eo['rows'])).replay(@formatter)
           end
@@ -79,12 +90,34 @@ module Gherkin
       end
     end
 
+    def before(o)
+      m = o['match']
+      match = Formatter::Model::Match.new([], location(m))
+      r = o['result']
+      result = Formatter::Model::Result.new(status(r), duration(r), error_message(r))
+      @reporter.before(match, result)
+    end
+
+    def after(o)
+      m = o['match']
+      match = Formatter::Model::Match.new([], location(m))
+      r = o['result']
+      result = Formatter::Model::Result.new(status(r), duration(r), error_message(r))
+      @reporter.after(match, result)
+    end
+
     def embeddings(o)
       (o['embeddings'] || []).each do |embedding|
         @reporter.embedding(embedding['mime_type'], Base64::decode64(embedding['data']))
       end
     end
 
+    def output(o)
+      (o['output'] || []).each do |text|
+        @reporter.write(text)
+      end
+    end
+
     def examples_rows(o)
       o.map{|row| Formatter::Model::ExamplesTableRow.new(comments(row), row['cells'], row['line'], row['id'])}
     end

data/spec/gherkin/formatter/filter_formatter_spec.rb

@@ -31,6 +31,14 @@ module Gherkin
         io.string.strip.should == expected.strip
       end
 
+      context "invalid mix" do
+        it "should throw exception on different filters" do
+          lambda do
+            verify_filter(['@tag1', /regexp/, 88], 1..61)
+          end.should raise_exception(/Inconsistent filters/)
+        end
+      end
+
       context "tags" do
         it "should filter on feature tag" do
           verify_filter(['@tag1'], 1..61)

data/spec/gherkin/formatter/json_formatter_spec.rb

@@ -12,15 +12,17 @@ module Gherkin
         f.uri("f.feature")
         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.step(Model::Step.new([], "Given ", "g", 3, nil, nil))
         f.match(Model::Match.new([], "def.rb:33"))
         f.result(Model::Result.new(:passed, 1, nil))
 
+        f.step(Model::Step.new([], "When ", "w", 4, nil, nil))
         f.match(Model::Match.new([], "def.rb:44"))
         f.result(Model::Result.new(:passed, 1, nil))
 
+        f.after(Model::Match.new([], "def.rb:55"), Model::Result.new(:passed, 22, nil))
+
         f.eof
         f.done
         
@@ -66,6 +68,17 @@ module Gherkin
                         "duration": 1
                       }
                     }
+                  ],
+                  "after": [
+                    {
+                      "match":{
+                        "location":"def.rb:55"
+                      },
+                      "result":{
+                        "status":"passed",
+                        "duration": 22
+                      }
+                    }
                   ]
                 }
               ]

data/spec/gherkin/json_parser_spec.rb

@@ -79,55 +79,93 @@ module Gherkin
 
     it "should parse feature with match, result and embedding" do
       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": [
+                  "id":"one",
+                  "uri":"test.feature",
+                  "tags":[
+                      {
+                          "name":"@foo",
+                          "line":22
+                      }
+                  ],
+                  "keyword":"Feature",
+                  "name":"One",
+                  "description":"",
+                  "line":3,
+                  "elements":[
                       {
-                        "mime_type": "text/plain",
-                        "data": "Tm8sIEknbSBub3QgaW50ZXJlc3RlZCBpbiBkZXZlbG9waW5nIGEgcG93ZXJmdWwgYnJhaW4uIEFsbCBJJ20gYWZ0ZXIgaXMganVzdCBhIG1lZGlvY3JlIGJyYWluLCBzb21ldGhpbmcgbGlrZSB0aGUgUHJlc2lkZW50IG9mIHRoZSBBbWVyaWNhbiBUZWxlcGhvbmUgYW5kIFRlbGVncmFwaCBDb21wYW55Lg=="
+                          "id":"one/a-scenario",
+                          "type":"scenario",
+                          "before": [
+                              {
+                                  "match":{
+                                      "location":"features/step_definitions/hooks.rb:1"
+                                  },
+                                  "result":{
+                                      "status":"passed",
+                                      "error_message":"Passed hook",
+                                      "duration": 3
+                                  }
+                              },
+                              {
+                                  "match":{
+                                      "location":"features/step_definitions/hooks.rb:2"
+                                  },
+                                  "result":{
+                                      "status":"failed",
+                                      "error_message":"Failed hook",
+                                      "duration": 22
+                                  }
+                              }
+                          ],
+                          "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":[
+                                      {
+                                          "mime_type":"text/plain",
+                                          "data":"Tm8sIEknbSBub3QgaW50ZXJlc3RlZCBpbiBkZXZlbG9waW5nIGEgcG93ZXJmdWwgYnJhaW4uIEFsbCBJJ20gYWZ0ZXIgaXMganVzdCBhIG1lZGlvY3JlIGJyYWluLCBzb21ldGhpbmcgbGlrZSB0aGUgUHJlc2lkZW50IG9mIHRoZSBBbWVyaWNhbiBUZWxlcGhvbmUgYW5kIFRlbGVncmFwaCBDb21wYW55Lg=="
+                                      }
+                                  ],
+                                  "output":[
+                                      "Hello",
+                                      "World"
+                                  ]
+                              }
+                          ],
+                          "after": [
+                              {
+                                  "match":{
+                                      "location":"features/step_definitions/hooks.rb:3"
+                                  },
+                                  "result":{
+                                      "status":"failed",
+                                      "error_message":"Failed After",
+                                      "duration": 22
+                                  }
+                              }
+                          ]
                       }
-                    ]
-                  }
-                ]
+                  ]
               }
-            ]
-          }
-        ]
+          ]
       })
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.11.0
   prerelease: 
 platform: java
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -36,7 +36,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -92,7 +92,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +109,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.9.8
+- !ruby/object:Gem::Dependency
+  name: therubyracer
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -344,7 +360,7 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: gherkin-2.10.0
+summary: gherkin-2.11.0
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature