gherkin 2.7.7 → 2.8.0

data/Gemfile

@@ -1,4 +1,4 @@
 source "http://rubygems.org"
 gemspec
 
-#gem 'cucumber', :path => '../cucumber'
+# gem 'cucumber', :path => '../cucumber'

data/History.md

@@ -1,3 +1,7 @@
+## [2.8.0](https://github.com/cucumber/gherkin/compare/v2.7.7...v2.8.0)
+
+* [Ruby/Java] TagExpression.eval() now takes a list of Tag instead of a list of String. This slightly breaks the API (bump), but helps fix some bugs in Cucumber-JVM. (Aslak Hellesøy)
+
 ## [2.7.7](https://github.com/cucumber/gherkin/compare/v2.7.6...v2.7.7)
 
 * [C] Allow compilation with clang (datanoise)

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2011 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy
+Copyright (c) 2009-2012 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,4 +1,5 @@
 [![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:
 
@@ -54,7 +55,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.7.7</version>
+        <version>2.8.0</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)
@@ -235,4 +236,4 @@ Now you can build Windows gems:
 
 ## Copyright
 
-Copyright (c) 2009-2011 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy. See LICENSE for details.
+Copyright (c) 2009-2012 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy. See LICENSE for details.

data/features/.cucumber/stepdefs.json

@@ -1,5 +1,6 @@
 [
   {
+    "file_colon_line": "features/step_definitions/eyeball_steps.rb:1",
     "flags": "",
     "source": "^they have arrived$",
     "steps": [
@@ -12,6 +13,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:1",
     "flags": "",
     "source": "^a \"(ruby|native)\" \"([^\\\"]*)\" parser$",
     "steps": [
@@ -19,6 +21,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:5",
     "flags": "",
     "source": "^the\\ following\\ text\\ is\\ parsed:$",
     "steps": [
@@ -31,6 +34,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:9",
     "flags": "",
     "source": "^there\\ should\\ be\\ no\\ parse\\ errors$",
     "steps": [
@@ -43,6 +47,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:13",
     "flags": "",
     "source": "^there should be a parse error on (line \\d+)$",
     "steps": [
@@ -58,6 +63,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/gherkin_steps.rb:17",
     "flags": "",
     "source": "^there should be parse errors on (lines .*)$",
     "steps": [
@@ -109,6 +115,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/json_formatter_steps.rb:13",
     "flags": "",
     "source": "^a JSON formatter$",
     "steps": [
@@ -116,6 +123,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/json_formatter_steps.rb:18",
     "flags": "",
     "source": "^the outputted JSON should be:$",
     "steps": [
@@ -128,6 +136,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/json_parser_steps.rb:5",
     "flags": "",
     "source": "^a PrettyFormatter$",
     "steps": [
@@ -135,6 +144,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/json_parser_steps.rb:10",
     "flags": "",
     "source": "^a JSON lexer$",
     "steps": [
@@ -142,6 +152,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/json_parser_steps.rb:14",
     "flags": "",
     "source": "^the following JSON is parsed:$",
     "steps": [
@@ -154,6 +165,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/json_parser_steps.rb:18",
     "flags": "",
     "source": "^the outputted text should be:$",
     "steps": [
@@ -166,6 +178,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:50",
     "flags": "",
     "source": "^I have Cucumber's source code next to Gherkin's$",
     "steps": [
@@ -178,6 +191,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:55",
     "flags": "",
     "source": "^I find all of the \\.feature files$",
     "steps": [
@@ -190,6 +204,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:59",
     "flags": "",
     "source": "^I send each prettified original through the \"([^\"]*)\" machinery$",
     "steps": [
@@ -214,6 +229,7 @@
     ]
   },
   {
+    "file_colon_line": "features/step_definitions/pretty_formatter_steps.rb:83",
     "flags": "",
     "source": "^the machinery output should be identical to the prettified original$",
     "steps": [

data/gherkin.gemspec

@@ -2,8 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  # If bumping the major version here, comment out the cucumber dependency below and uncomment in the Gemfile to build against a local cucumber.
-  s.version     = "2.7.7"
+  # If the major version is bumped, verify that the change is ok:
+  #
+  # * Comment out cucumber dependency in gemspec
+  # * Uncomment cucumber location in Gemspec
+  # * Bump cucumber's gherkin dependency to the new version
+  # * bundle update
+  # * bundle exec rake
+  #
+  # Repeat these step for cucumber (swap `cucumber` with `gherkin`).
+  #
+  # 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.
+  #
+  s.version     = "2.8.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}"
@@ -46,11 +58,11 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('json', '>= 1.4.6')
 
-  s.add_development_dependency('cucumber', '>= 1.1.4')
+  s.add_development_dependency('cucumber', '>= 1.1.5')
   s.add_development_dependency('rake', '>= 0.9.2')
-  s.add_development_dependency('bundler', '>= 1.0.21')
+  s.add_development_dependency('bundler', '>= 1.0.22')
   s.add_development_dependency('rspec', '~> 2.7.0') # No 2.8.0 until this is fixed: https://github.com/rspec/rspec-expectations/issues/112
-  s.add_development_dependency('rubyzip', '>= 0.9.5')
+  s.add_development_dependency('rubyzip', '>= 0.9.6.1')
 
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
     s.add_development_dependency('therubyracer', '>= 0.9.9') if ENV['GHERKIN_JS']

data/lib/gherkin/formatter/tag_filter.rb

@@ -8,7 +8,7 @@ module Gherkin
       end
 
       def eval(tags, names, ranges)
-        @tag_expression.eval(tags.uniq.map{|tag| tag.name})
+        @tag_expression.eval(tags.uniq)
       end
 
       def filter_table_body_rows(rows)

data/lib/gherkin/tag_expression.rb

@@ -20,7 +20,7 @@ module Gherkin
 
     def eval(tags)
       return true if @ands.flatten.empty?
-      vars = Hash[*tags.map{|tag| [tag, true]}.flatten]
+      vars = Hash[*tags.map{|tag| [tag.name, true]}.flatten]
       !!Kernel.eval(ruby_expression)
     end
 

data/spec/gherkin/tag_expression_spec.rb

@@ -1,15 +1,20 @@
 require 'spec_helper'
 require 'gherkin/tag_expression'
+require 'gherkin/formatter/model'
 
 module Gherkin
   describe TagExpression do
+    def tag(name)
+      Formatter::Model::Tag.new(name, 0)
+    end
+    
     context "no tags" do
       before(:each) do
         @e = Gherkin::TagExpression.new([])
       end
 
       it "should match @foo" do
-        @e.eval(['@foo']).should == true
+        @e.eval([tag('@foo')]).should == true
       end
 
       it "should match empty tags" do
@@ -23,11 +28,11 @@ module Gherkin
       end
 
       it "should match @foo" do
-        @e.eval(['@foo']).should == true
+        @e.eval([tag('@foo')]).should == true
       end
 
       it "should not match @bar" do
-        @e.eval(['@bar']).should == false
+        @e.eval([tag('@bar')]).should == false
       end
 
       it "should not match no tags" do
@@ -41,11 +46,11 @@ module Gherkin
       end
 
       it "should match @bar" do
-        @e.eval(['@bar']).should == true
+        @e.eval([tag('@bar')]).should == true
       end
 
       it "should not match @foo" do
-        @e.eval(['@foo']).should == false
+        @e.eval([tag('@foo')]).should == false
       end
     end
 
@@ -55,15 +60,15 @@ module Gherkin
       end
 
       it "should match @foo" do
-        @e.eval(['@foo']).should == true
+        @e.eval([tag('@foo')]).should == true
       end
 
       it "should match @bar" do
-        @e.eval(['@bar']).should == true
+        @e.eval([tag('@bar')]).should == true
       end
 
       it "should not match @zap" do
-        @e.eval(['@zap']).should == false
+        @e.eval([tag('@zap')]).should == false
       end
     end
 
@@ -73,11 +78,11 @@ module Gherkin
       end
 
       it "should match @foo" do
-        @e.eval(['@foo']).should == true
+        @e.eval([tag('@foo')]).should == true
       end
 
       it "should not match @foo @zap" do
-        @e.eval(['@foo', '@zap']).should == false
+        @e.eval([tag('@foo'), tag('@zap')]).should == false
       end
     end
 
@@ -91,7 +96,7 @@ module Gherkin
       end
 
       it "should match @foo @zap" do
-        @e.eval(['@foo', '@zap']).should == true
+        @e.eval([tag('@foo'), tag('@zap')]).should == true
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.7.7
+  version: 2.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-08 00:00:00.000000000 Z
+date: 2012-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &2165788340 !ruby/object:Gem::Requirement
+  requirement: &2153119880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 0.7.9
   type: :development
   prerelease: false
-  version_requirements: *2165788340
+  version_requirements: *2153119880
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2165784440 !ruby/object:Gem::Requirement
+  requirement: &2153115980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,21 +34,21 @@ dependencies:
         version: 1.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2165784440
+  version_requirements: *2153115980
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2165783980 !ruby/object:Gem::Requirement
+  requirement: &2153115520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.5
   type: :development
   prerelease: false
-  version_requirements: *2165783980
+  version_requirements: *2153115520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2165799880 !ruby/object:Gem::Requirement
+  requirement: &2153115060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,21 +56,21 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2165799880
+  version_requirements: *2153115060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165799420 !ruby/object:Gem::Requirement
+  requirement: &2153114600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.21
+        version: 1.0.22
   type: :development
   prerelease: false
-  version_requirements: *2165799420
+  version_requirements: *2153114600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165798960 !ruby/object:Gem::Requirement
+  requirement: &2153114140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,21 +78,21 @@ dependencies:
         version: 2.7.0
   type: :development
   prerelease: false
-  version_requirements: *2165798960
+  version_requirements: *2153114140
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2165798500 !ruby/object:Gem::Requirement
+  requirement: &2153113680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.6.1
   type: :development
   prerelease: false
-  version_requirements: *2165798500
+  version_requirements: *2153113680
 - !ruby/object:Gem::Dependency
   name: therubyracer
-  requirement: &2165797960 !ruby/object:Gem::Requirement
+  requirement: &2153129520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: 0.9.9
   type: :development
   prerelease: false
-  version_requirements: *2165797960
+  version_requirements: *2153129520
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2165797500 !ruby/object:Gem::Requirement
+  requirement: &2153129060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *2165797500
+  version_requirements: *2153129060
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2165797040 !ruby/object:Gem::Requirement
+  requirement: &2153128600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2165797040
+  version_requirements: *2153128600
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &2165796580 !ruby/object:Gem::Requirement
+  requirement: &2153128140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: 1.0.6
   type: :development
   prerelease: false
-  version_requirements: *2165796580
+  version_requirements: *2153128140
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &2165796120 !ruby/object:Gem::Requirement
+  requirement: &2153127680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,7 +144,7 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *2165796120
+  version_requirements: *2153127680
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -490,7 +490,7 @@ rubyforge_project:
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: gherkin-2.7.7
+summary: gherkin-2.8.0
 test_files:
 - features/escaped_pipes.feature
 - features/feature_parser.feature