gherkin 2.2.1-java → 2.2.2-java

data/.gitignore

@@ -7,4 +7,5 @@ pkg
 ext
 tmp
 release
-.bundle
+.bundle
+Gemfile.lock

data/History.txt

@@ -1,4 +1,10 @@
-== 2.2.1
+== 2.2.2 (2010-09-21)
+
+=== New Features
+* Use json instead of json_pure (Aslak Hellesøy)
+* JSON formatter and parser can now omit JSON serialization (for speed) and work directly on objects (Aslak Hellesøy)
+
+== 2.2.1 (2010-09-12)
 
 === New Features
 * Windows gems are now built against 1.8.6-p287 and 1.9.1-p243, on both mswin32 and mingw32, and should work on 1.8.6, 1.8.7, 1.9.1 and 1.9.2 versions of rubyinstaller.org as well as older windows rubies. (Aslak Hellesøy)

data/README.rdoc

@@ -28,14 +28,13 @@ E.g. in Bash, export RL_LANG="en,fr,no". This can be quite helpful when modifyin
 
 == Release process
 
-* Bump version in the VERSION.yml file and:
+* Bump version in the VERSION file and:
 ** java/pom.xml
 ** ikvm/Gherkin/Gherkin.csproj
-* Make sure both JRuby and MRI has the latest Cucumber installed (from source) otherwise the jruby gem might not get the jar inside it.
-** Install cucumber without gherkin dep: gem install --ignore-dependencies pkg/cucumber
 * rake gems:prepare && ./build_native_gems.sh && rake release:ALL
 * Announce on Cucumber list, IRC and Twitter.
 
+
 == Configuring Rake-Compiler for cross compilation
 In order to build Windows binaries (so we can release Windows gems from OS X/Linux) we need to set up rake-compiler.
 

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/gherkin.gemspec

@@ -50,8 +50,11 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency('trollop', '~> 1.16.2')
+  s.add_dependency('json', '~> 1.4.6')
+  s.add_dependency('term-ansicolor','~> 1.0.5')
+
   s.add_development_dependency('rake', '~> 0.8.7')
   s.add_development_dependency('awesome_print', '~> 0.2.1')
-  s.add_development_dependency('rspec', '~> 2.0.0.beta.20')
+  s.add_development_dependency('rspec', '~> 2.0.0.beta.22')
   s.add_development_dependency('cucumber', '~> 0.9.0') unless File.directory?(File.join(gherkin_dir, '../cucumber'))
 end

data/lib/gherkin/formatter/json_formatter.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'json/pure' # Needed to make JSON.generate work.
 require 'gherkin/formatter/model'
 require 'gherkin/native'
 
@@ -8,15 +7,22 @@ module Gherkin
     class JSONFormatter
       native_impl('gherkin')
       
+      attr_reader :gherkin_object
+      
+      # Creates a new instance that writes the resulting JSON to +io+.
+      # If +io+ is nil, the JSON will not be written, but instead a Ruby
+      # object can be retrieved with #gherkin_object
       def initialize(io)
         @io = io
       end
 
       def uri(uri)
+        # We're ignoring the uri - we don't want it as part of the JSON
+        # (The pretty formatter uses it just for visual niceness - comments)
       end
 
       def feature(feature)
-        @feature_hash = feature.to_hash
+        @gherkin_object = feature.to_hash
       end
 
       def background(background)
@@ -40,13 +46,13 @@ module Gherkin
       end
 
       def eof
-        @io.write(@feature_hash.to_json)
+        @io.write(@gherkin_object.to_json) if @io
       end
 
     private
 
       def feature_elements
-        @feature_hash['elements'] ||= []
+        @gherkin_object['elements'] ||= []
       end
 
       def feature_element

data/lib/gherkin/json_parser.rb

@@ -10,9 +10,11 @@ module Gherkin
       @formatter = formatter
     end
 
-    def parse(src, feature_uri='unknown.json', line_offset=0)
+    # Parse a gherkin object +o+, which can either be a JSON String,
+    # or a Hash (from a parser JSON String).
+    def parse(o, feature_uri='unknown.json', line_offset=0)
+      o = JSON.parse(o) if String === o
       @formatter.uri(feature_uri)
-      o = JSON.parse(src)
 
       Formatter::Model::Feature.new(comments(o), tags(o), keyword(o), name(o), description(o), line(o)).replay(@formatter)
       (o["elements"] || []).each do |feature_element|

data/spec/gherkin/parser/parser_spec.rb

@@ -3,11 +3,13 @@ require 'spec_helper'
 module Gherkin
   module Parser
     describe Parser do
-      it "should raise when feature doesn't parse" do
-        p = Parser.new(mock('formatter').as_null_object)
-        lambda do
-          p.parse("Feature: f\nFeature: f", __FILE__, __LINE__-1)
-        end.should raise_error(/Parse error at/)
+      unless defined?(JRUBY_VERSION)
+        it "should raise when feature doesn't parse" do
+          p = Parser.new(mock('formatter').as_null_object)
+          lambda do
+            p.parse("Feature: f\nFeature: f", __FILE__, __LINE__-1)
+          end.should raise_error(/Parse error at/)
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'rspec/autorun'
 require 'gherkin'
 require 'stringio'
 require 'gherkin/sexp_recorder'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gherkin
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: java
 authors: 
 - Mike Sassak
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-13 00:00:00 +02:00
+date: 2010-09-21 00:00:00 +02:00
 default_executable: gherkin
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,9 +37,41 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: term-ansicolor
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 0
+        - 5
+        version: 1.0.5
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -51,11 +83,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: awesome_print
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -67,25 +99,25 @@ dependencies:
         - 1
         version: 0.2.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196427
+        hash: 62196431
         segments: 
         - 2
         - 0
         - 0
         - beta
-        - 20
-        version: 2.0.0.beta.20
+        - 22
+        version: 2.0.0.beta.22
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 description: A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: 
@@ -103,7 +135,6 @@ files:
 - .rspec
 - .rvmrc
 - Gemfile
-- Gemfile.lock
 - History.txt
 - LICENSE
 - README.rdoc
@@ -263,7 +294,7 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: gherkin-2.2.1
+summary: gherkin-2.2.2
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature

data/Gemfile.lock

@@ -1,49 +0,0 @@
-PATH
-  remote: /Users/aslakhellesoy/scm/cucumber
-  specs:
-    cucumber (0.9.0)
-      builder (~> 2.1.2)
-      diff-lcs (~> 1.1.2)
-      json_pure (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-
-PATH
-  remote: .
-  specs:
-    gherkin (2.2.1)
-      trollop (~> 1.16.2)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    awesome_print (0.2.1)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
-    json_pure (1.4.6)
-    rake (0.8.7)
-    rake-compiler (0.7.1)
-      rake (>= 0.8.3, < 0.9)
-    rspec (2.0.0.beta.20)
-      rspec-core (= 2.0.0.beta.20)
-      rspec-expectations (= 2.0.0.beta.20)
-      rspec-mocks (= 2.0.0.beta.20)
-    rspec-core (2.0.0.beta.20)
-    rspec-expectations (2.0.0.beta.20)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.20)
-    term-ansicolor (1.0.5)
-    trollop (1.16.2)
-
-PLATFORMS
-  java
-  ruby
-  x86-mingw32
-
-DEPENDENCIES
-  awesome_print (~> 0.2.1)
-  cucumber!
-  gherkin!
-  rake (~> 0.8.7)
-  rake-compiler (~> 0.7.1)
-  rspec (~> 2.0.0.beta.20)
-  trollop (~> 1.16.2)