gherkin 2.4.1-x86-mingw32 → 2.4.2-x86-mingw32

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gherkin (2.4.1)
+    gherkin (2.4.2)
       json (>= 1.4.6)
 
 GEM
@@ -9,15 +9,15 @@ GEM
   specs:
     awesome_print (0.4.0)
     builder (3.0.0)
-    cucumber (0.10.7)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.0)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    json (1.5.2)
-    json (1.5.2-java)
+    json (1.5.3)
+    json (1.5.3-java)
     rake (0.9.2)
     rake-compiler (0.7.9)
       rake
@@ -39,7 +39,7 @@ DEPENDENCIES
   awesome_print (>= 0.4.0)
   builder (>= 2.1.2)
   bundler (>= 1.0.15)
-  cucumber (>= 0.10.7)
+  cucumber (>= 1.0.0)
   gherkin!
   rake (>= 0.9.2)
   rake-compiler (>= 0.7.8)

data/History.md

@@ -1,3 +1,8 @@
+## [2.4.2](https://github.com/cucumber/gherkin/compare/v2.4.1...v2.4.2)
+
+### Changed Features
+* Formatter and Reporter are now two distinct interfaces. JSONParser takes one of each in ctor. (Aslak Hellesøy)
+
 ## [2.4.1](https://github.com/cucumber/gherkin/compare/v2.4.0...v2.4.1)
 
 ### New Features

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009-2010 Mike Sassak, Gregory Hnatiuk, Aslak Hellesøy
+Copyright (c) 2009-2011 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/features/step_definitions/json_formatter_steps.rb

@@ -18,7 +18,7 @@ end
 
 Then /^the outputted JSON should be:$/ do |expected_json|
   require 'json'
-  announce JSON.pretty_generate(JSON.parse(@io.string))
+  puts JSON.pretty_generate(JSON.parse(@io.string))
   expected = JSON.parse(expected_json).ai
   actual   = JSON.parse(@io.string).ai
   actual.should == expected

data/features/step_definitions/json_parser_steps.rb

@@ -8,7 +8,7 @@ Given /^a PrettyFormatter$/ do
 end
 
 Given /^a JSON lexer$/ do
-  @json_parser = Gherkin::JSONParser.new(@formatter)
+  @json_parser = Gherkin::JSONParser.new(@formatter, @formatter)
 end
 
 Given /^the following JSON is parsed:$/ do |text|

data/features/step_definitions/pretty_formatter_steps.rb

@@ -23,7 +23,7 @@ module PrettyPlease
 
     io                  = StringIO.new
     pretty_formatter    = Gherkin::Formatter::PrettyFormatter.new(io, true, false)
-    json_parser         = Gherkin::JSONParser.new(pretty_formatter)
+    json_parser         = Gherkin::JSONParser.new(pretty_formatter, pretty_formatter)
     json_parser.parse(json.string, "#{feature_path}.json", 0)
     
     io.string

data/gherkin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  s.version     = "2.4.1"
+  s.version     = "2.4.2"
   s.authors     = ["Mike Sassak", "Gregory Hnatiuk", "Aslak Hellesøy"]
   s.description = "A fast Gherkin lexer/parser for based on the Ragel State Machine Compiler."
   s.summary     = "#{s.name}-#{s.version}"
@@ -44,14 +44,14 @@ Gem::Specification.new do |s|
 
   s.add_dependency('json', '>= 1.4.6')
 
-  s.add_development_dependency('cucumber', '>= 0.10.7')
+  s.add_development_dependency('cucumber', '>= 1.0.0')
   s.add_development_dependency('rake', '>= 0.9.2')
   s.add_development_dependency('bundler', '>= 1.0.15')
   s.add_development_dependency('rspec', '>= 2.6.0')
   s.add_development_dependency('awesome_print', '>= 0.4.0')
 
   unless ENV['RUBY_CC_VERSION'] || defined?(JRUBY_VERSION)
-    s.add_development_dependency('therubyracer', '>= 0.9.1') if ENV['GHERKIN_JS']
+    s.add_development_dependency('therubyracer', '>= 0.9.2') if ENV['GHERKIN_JS']
     # For Documentation:
     s.add_development_dependency('yard', '>= 0.7.2')
     s.add_development_dependency('rdiscount', '>= 1.6.8')

data/lib/gherkin/json_parser.rb

@@ -10,8 +10,8 @@ module Gherkin
 
     include Base64
 
-    def initialize(formatter)
-      @formatter = formatter
+    def initialize(reporter, formatter)
+      @reporter, @formatter = reporter, formatter
     end
 
     # Parse a gherkin object +o+, which can either be a JSON String,
@@ -66,19 +66,19 @@ module Gherkin
 
     def match(o)
       if(m = o['match'])
-        Formatter::Model::Match.new(arguments(m), location(m)).replay(@formatter)
+        Formatter::Model::Match.new(arguments(m), location(m)).replay(@reporter)
       end
     end
 
     def result(o)
       if(r = o['result'])
-        Formatter::Model::Result.new(status(r), duration(r), error_message(r)).replay(@formatter)
+        Formatter::Model::Result.new(status(r), duration(r), error_message(r)).replay(@reporter)
       end
     end
 
     def embeddings(o)
       (o['embeddings'] || []).each do |embedding|
-        @formatter.embedding(embedding['mime_type'], Base64::decode64(embedding['data']))
+        @reporter.embedding(embedding['mime_type'], Base64::decode64(embedding['data']))
       end
     end
 

data/spec/gherkin/json_parser_spec.rb

@@ -10,7 +10,7 @@ module Gherkin
     def check_json(json)
       io = StringIO.new
       f = Formatter::JSONFormatter.new(io)
-      p = JSONParser.new(f)
+      p = JSONParser.new(f, f)
       p.parse(json, 'unknown.json', 0)
       expected = JSON.parse(json)
       actual   = JSON.parse(io.string)

data/tasks/gems.rake

@@ -5,8 +5,8 @@ namespace :gems do
       exit(1)
     end
     # rvm and mingw ruby versions have to match to avoid errors
-    sh "rvm 1.8.6-p399@cucumber rake cross compile RUBY_CC_VERSION=1.8.6"
-    sh "rvm 1.9.1-p243@cucumber rake cross compile RUBY_CC_VERSION=1.9.1"
+    sh "rvm 1.8.6-p399@cucumber rake -t cross compile RUBY_CC_VERSION=1.8.6"
+    sh "rvm 1.9.1-p243@cucumber rake -t cross compile RUBY_CC_VERSION=1.9.1"
     # This will copy the .so files to the proper place
     sh "rake -t cross compile RUBY_CC_VERSION=1.8.6:1.9.1"
   end

metadata

@@ -2,7 +2,7 @@
 name: gherkin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.4.1
+  version: 2.4.2
 platform: x86-mingw32
 authors: 
 - Mike Sassak
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-19 00:00:00 Z
+date: 2011-07-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.7
+        version: 1.0.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -88,7 +88,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.1
+        version: 0.9.2
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -176,6 +176,7 @@ files:
 - gherkin.gemspec
 - ikvm/.gitignore
 - java/.gitignore
+- java/Gherkin.iml
 - java/src/main/java/gherkin/lexer/i18n/.gitignore
 - java/src/main/resources/gherkin/.gitignore
 - js/.gitignore
@@ -399,7 +400,7 @@ rubyforge_project:
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: gherkin-2.4.1
+summary: gherkin-2.4.2
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature