gherkin 2.11.8-java → 2.12.0-java

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MDVmNWEyMmE1MzkxNmI3ZDU0MzQ0YjRjYjMyMmRlNzhlYWY5Y2ZhMQ==
+  data.tar.gz: !binary |-
+    ZWQwNWMxZDVhYWM0YzEzNGNkMmZlZmNiNTA2ZWYxNDIzM2NhYTU3Nw==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    NjQ1YWI1ZmJhMTFiYjI4MDI4ZDEyMDhlNzI4ZDUzMmViNDczOTBkNWNhMzJk
+    ODdkNmIyZmVlM2U3MWI3YzJmZDRkNmI0Zjk1MGFhOTg1ZGE3Yzk5ZDc1MzA1
+    YzUwODRmMDI5MjI2NjUxZWRmYzY1ZDVjODg4ODliMGQ1ZmY4OWQ=
+  data.tar.gz: !binary |-
+    MzBjYTZhYzU2ZGViNTEzMmZhMTdkOTk3NzY1NWY2MDIzODRlOWEwNjMyYmUy
+    MWQwOTM0YjViN2U0YzI2ZGQwNzJhMzBkZjk3YjMwNWQ2MzkyMzA1NTdhNDYy
+    ODY5NWJkYmNjODY5YTRkYzBjMGE0MWMwNDQ2NmYwMWYxMTE2NmU=

data/.ruby-version

@@ -1 +1 @@
-ruby-1.9.3-p194
+1.9.3

data/.travis.yml

@@ -1,5 +1,6 @@
 before_install: gem install bundler -v 1.2.3
 rvm: 
+  - 2.0.0
   - 1.9.3
   - 1.8.7
   - jruby

data/History.md

@@ -1,3 +1,8 @@
+## [2.12.0](https://github.com/cucumber/gherkin/compare/v2.11.8...v2.12.0)
+* [Java, Ruby] TagExpression.eval() removed (Oleg Sukhodolsky)
+* [Java, Ruby] Filter.eval() renamed to evaluate()  (Oleg Sukhodolsky)
+* [Java, JRuby] JSONFormatter's java version changed to connect embedding to the recent step the same way as Ruby's one does. (Oleg Sukhodolsky)
+
 ## [2.11.8](https://github.com/cucumber/gherkin/compare/v2.11.7...v2.11.8)
 
 * [Core] Added Galician (gl) ([#249](https://github.com/cucumber/gherkin/pull/249) son-cativo)

data/README.md

@@ -54,7 +54,7 @@ The jar file is in the central Maven repo.
     <dependency>
         <groupId>info.cukes</groupId>
         <artifactId>gherkin</artifactId>
-        <version>2.11.8</version>
+        <version>2.12.0</version>
     </dependency>
 
 You can get it manually from [Maven Central](http://search.maven.org/#browse%7C-2073395818)

data/gherkin.gemspec

@@ -4,7 +4,7 @@ require 'gherkin/platform'
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  # If the major version is bumped, verify that the change is ok:
+  # If the MINOR version is bumped (MAJOR.MINOR.PATCH), verify that the change is ok:
   #
   # * Comment out the cucumber dependency below
   # * Uncomment the cucumber location in Gemfile
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency('multi_json', '~> 1.3')
 
-  s.add_development_dependency('cucumber', '>= 1.2.5')
+  s.add_development_dependency('cucumber', '>= 1.2.0')
   s.add_development_dependency('rake', '>= 10.0.3')
   s.add_development_dependency('bundler', '>= 1.2.3') # Make sure it's in sync with /.travis.yml
   s.add_development_dependency('rspec', '~> 2.13.0')

data/lib/gherkin/formatter/filter_formatter.rb

@@ -68,7 +68,7 @@ module Gherkin
         end
 
         @examples_range = examples.line_range.first..table_body_range.last
-        if(@filter.eval([], [], [table_body_range]))
+        if(@filter.evaluate([], [], [table_body_range]))
           examples.rows = @filter.filter_table_body_rows(examples.rows)
         end
         @examples_events = [examples]
@@ -108,12 +108,12 @@ module Gherkin
       end
 
       def replay!
-        feature_element_ok = @filter.eval(
+        feature_element_ok = @filter.evaluate(
           (@feature_tags + @feature_element_tags), 
           [@feature_name, @feature_element_name].compact, 
           [@feature_element_range].compact
         )
-        examples_ok = @filter.eval(
+        examples_ok = @filter.evaluate(
           (@feature_tags + @feature_element_tags + @examples_tags), 
           [@feature_name, @feature_element_name, @examples_name].compact, 
           [@feature_element_range, @examples_range].compact

data/lib/gherkin/formatter/line_filter.rb

@@ -5,7 +5,7 @@ module Gherkin
         @lines = lines
       end
 
-      def eval(tags, names, ranges)
+      def evaluate(tags, names, ranges)
         ranges.detect do |range|
           @lines.detect do |line|
             range.include?(line)
@@ -23,4 +23,4 @@ module Gherkin
       end
     end
   end
-end
+end

data/lib/gherkin/formatter/pretty_formatter.rb

@@ -198,7 +198,7 @@ module Gherkin
         end
       end
 
-      if(RUBY_VERSION =~ /^1\.9/)
+      if(RUBY_VERSION =~ /^1\.9|2\.0/)
         START = /#{'^'.encode('UTF-8')}/
         TRIPLE_QUOTES = /#{'"""'.encode('UTF-8')}/
       else

data/lib/gherkin/formatter/regexp_filter.rb

@@ -5,7 +5,7 @@ module Gherkin
         @regexen = regexen
       end
 
-      def eval(tags, names, ranges)
+      def evaluate(tags, names, ranges)
         @regexen.detect do |regexp| 
           names.detect do |name|
             name =~ regexp
@@ -18,4 +18,4 @@ module Gherkin
       end
     end
   end
-end
+end

data/lib/gherkin/formatter/tag_filter.rb

@@ -7,7 +7,7 @@ module Gherkin
         @tag_expression = TagExpression.new(tags)
       end
 
-      def eval(tags, names, ranges)
+      def evaluate(tags, names, ranges)
         @tag_expression.evaluate(tags.uniq)
       end
 

data/lib/gherkin/platform.rb

@@ -2,7 +2,8 @@
 
 module Gherkin
 unless defined?(Gherkin::VERSION)
-  VERSION       = '2.11.8'
+  # See the comment in gherkin.gemspec if you bump the MINOR version (MAJOR.MINOR.PATCH).
+  VERSION       = '2.12.0'
   JRUBY         = defined?(JRUBY_VERSION)
 
   if !JRUBY && !(RUBY_VERSION =~ /^(1\.8\.7|1\.9\.3|2\.0)/)

data/lib/gherkin/tag_expression.rb

@@ -18,12 +18,6 @@ module Gherkin
       @ands.empty?
     end
 
-    # <b>DEPRECATED:</b> Please use <tt>evaluate</tt> instead
-    def eval(tags)
-      warn '[DEPRECATION] "eval" is deprecated. Please use "evaluate" instead'
-      evaluate(tags)
-    end
-
     def evaluate(tags)
       return true if @ands.flatten.empty?
       vars = Hash[*tags.map{|tag| [tag.name, true]}.flatten]

data/ragel/lexer.rb.rl.erb

@@ -162,7 +162,7 @@ module Gherkin
         utf8_pack(rest[0..rest.index(10)||-1]).strip # 10 is \n
       end
 
-      if (RUBY_VERSION =~ /^1\.9/)
+      if (RUBY_VERSION =~ /^1\.9|2\.0/)
         def utf8_pack(array)
           array.pack("c*").force_encoding("UTF-8")
         end

data/spec/gherkin/formatter/json_formatter_spec.rb

@@ -16,6 +16,12 @@ module Gherkin
 
         f.step(Model::Step.new([], "Given ", "g", 3, nil, nil))
         f.match(Model::Match.new([], "def.rb:33"))
+        data = "abc"
+        if defined?(JRUBY_VERSION)
+          data = data.to_java_bytes
+        end
+        f.embedding("mime-type", data)
+
         f.result(Model::Result.new(:passed, 1, nil))
 
         f.step(Model::Step.new([], "When ", "w", 4, nil, nil))
@@ -52,6 +58,12 @@ module Gherkin
                       "match": {
                         "location": "def.rb:33"
                       },
+                      "embeddings": [
+                        {
+                          "mime_type": "mime-type",
+                          "data": "YWJj"
+                        }
+                      ],
                       "result": {
                         "status": "passed",
                         "duration": 1
@@ -86,7 +98,7 @@ module Gherkin
             }
           ]
         }
-        MultiJson.load(expected).should == MultiJson.load(io.string)
+        MultiJson.load(io.string).should == MultiJson.load(expected)
       end
 
       it "renders results as pretty json" do
@@ -156,7 +168,7 @@ module Gherkin
             }
           ]
         }
-        MultiJson.load(expected).should == MultiJson.load(io.string)
+        MultiJson.load(io.string).should == MultiJson.load(expected)
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-if RUBY_VERSION =~ /1.9/
+if RUBY_VERSION =~ /1\.9|2\.0/
   Encoding.default_external = Encoding::UTF_8
   Encoding.default_internal = Encoding::UTF_8
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gherkin
 version: !ruby/object:Gem::Version
-  version: 2.11.8
-  prerelease: 
+  version: 2.12.0
 platform: java
 authors:
 - Mike Sassak
@@ -11,12 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-09 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -24,7 +22,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -32,23 +29,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,7 +50,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -64,7 +57,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,7 +64,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -80,7 +71,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -88,7 +78,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -96,7 +85,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,7 +92,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -112,7 +99,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: therubyracer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -120,7 +106,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -128,7 +113,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -136,7 +120,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -144,7 +127,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -152,7 +134,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -160,7 +141,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -168,7 +148,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -176,7 +155,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -184,7 +162,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -340,92 +317,27 @@ files:
 - lib/gherkin.jar
 homepage: http://github.com/cucumber/gherkin
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: gherkin-2.11.8
-test_files:
-- features/escaped_pipes.feature
-- features/feature_parser.feature
-- features/json_formatter.feature
-- features/json_parser.feature
-- features/native_lexer.feature
-- features/parser_with_native_lexer.feature
-- features/pretty_formatter.feature
-- features/step_definitions/eyeball_steps.rb
-- features/step_definitions/gherkin_steps.rb
-- features/step_definitions/json_formatter_steps.rb
-- features/step_definitions/json_parser_steps.rb
-- features/step_definitions/pretty_formatter_steps.rb
-- features/steps_parser.feature
-- features/support/env.rb
-- spec/gherkin/c_lexer_spec.rb
-- spec/gherkin/fixtures/1.feature
-- spec/gherkin/fixtures/comments_in_table.feature
-- spec/gherkin/fixtures/complex.feature
-- spec/gherkin/fixtures/complex.json
-- spec/gherkin/fixtures/complex_for_filtering.feature
-- spec/gherkin/fixtures/complex_with_tags.feature
-- spec/gherkin/fixtures/dos_line_endings.feature
-- spec/gherkin/fixtures/examples_with_only_header.feature
-- spec/gherkin/fixtures/hantu_pisang.feature
-- spec/gherkin/fixtures/i18n_fr.feature
-- spec/gherkin/fixtures/i18n_fr2.feature
-- spec/gherkin/fixtures/i18n_no.feature
-- spec/gherkin/fixtures/i18n_pt1.feature
-- spec/gherkin/fixtures/i18n_pt2.feature
-- spec/gherkin/fixtures/i18n_pt3.feature
-- spec/gherkin/fixtures/i18n_pt4.feature
-- spec/gherkin/fixtures/i18n_zh-CN.feature
-- spec/gherkin/fixtures/iso-8859-1.feature
-- spec/gherkin/fixtures/issue_145.feature
-- spec/gherkin/fixtures/scenario_outline_with_tags.feature
-- spec/gherkin/fixtures/scenario_without_steps.feature
-- spec/gherkin/fixtures/simple_with_comments.feature
-- spec/gherkin/fixtures/simple_with_tags.feature
-- spec/gherkin/fixtures/with_bom.feature
-- spec/gherkin/fixtures/with_bom_and_language_spec.feature
-- spec/gherkin/formatter/ansi_escapes_spec.rb
-- spec/gherkin/formatter/filter_formatter_spec.rb
-- spec/gherkin/formatter/json_formatter_spec.rb
-- spec/gherkin/formatter/model_spec.rb
-- spec/gherkin/formatter/pretty_formatter_spec.rb
-- spec/gherkin/formatter/spaces.feature
-- spec/gherkin/formatter/step_printer_spec.rb
-- spec/gherkin/formatter/tabs.feature
-- spec/gherkin/formatter/tag_count_formatter_spec.rb
-- spec/gherkin/i18n_spec.rb
-- spec/gherkin/java_lexer_spec.rb
-- spec/gherkin/json_parser_spec.rb
-- spec/gherkin/lexer/i18n_lexer_spec.rb
-- spec/gherkin/native_lexer_spec.rb
-- spec/gherkin/parser/parser_spec.rb
-- spec/gherkin/rubify_spec.rb
-- spec/gherkin/sexp_recorder.rb
-- spec/gherkin/shared/doc_string_group.rb
-- spec/gherkin/shared/encoding_group.rb
-- spec/gherkin/shared/lexer_group.rb
-- spec/gherkin/shared/row_group.rb
-- spec/gherkin/shared/tags_group.rb
-- spec/gherkin/tag_expression_spec.rb
-- spec/spec_helper.rb
+specification_version: 4
+summary: gherkin-2.12.0
+test_files: []
 has_rdoc: