gherkin 2.4.3-java → 2.4.4-java

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gherkin (2.4.3)
+    gherkin (2.4.4)
       json (>= 1.4.6)
 
 GEM

data/History.md

@@ -1,3 +1,9 @@
+## [2.4.4](https://github.com/cucumber/gherkin/compare/v2.4.3...v2.4.4)
+
+### Bugfixes
+* JRuby fixes. Symbols and streams are now properly converted before passing from ruby to java. (Aslak Hellesøy)
+* json-simple and base64 jar files (used by some of the java classes) are now embedded in the jruby gem (Aslak Hellesøy)
+
 ## [2.4.3](https://github.com/cucumber/gherkin/compare/v2.4.2...v2.4.3)
 
 ### Changed Features

data/README.md

@@ -161,6 +161,7 @@ Make sure you have openssl installed first.
   * java/pom.xml
   * ikvm/Gherkin/Gherkin.csproj (2 places)
   * js/package.json
+* Run bundle update, so Gemfile.lock gets updated with the changes.
 * Commit changes, otherwise you will get an error at the end when a tag is made.
 * bundle exec rake gems:prepare && ./build_native_gems.sh && bundle exec rake release:ALL
   * The specs intermittently fail with a segfault from therubyracer. Running specs can be disabled with SKIP_JS_SPECS=true

data/gherkin.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = "gherkin"
-  s.version     = "2.4.3"
+  s.version     = "2.4.4"
   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}"
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.platform = ENV['GEM_PLATFORM'] if ENV['GEM_PLATFORM'] 
   case s.platform.to_s
   when /java/
-    s.files += ['lib/gherkin.jar']
+    s.files += Dir['lib/*.jar']
   when /mswin|mingw32/
     s.files += Dir['lib/*/*.so']
   when /dotnet/

data/lib/gherkin.rb

@@ -1,2 +1,6 @@
 require 'gherkin/lexer/i18n_lexer'
 require 'gherkin/parser/parser'
+if defined?(JRUBY_VERSION)
+  require 'json-simple-1.1.jar'
+  require 'base64-2.3.8.jar'
+end

data/lib/gherkin/native/java.rb

@@ -1,4 +1,21 @@
 class Class
+  class IOWriter < Java.java.io.Writer
+    def initialize(io)
+      @io = io
+    end
+    
+    def write(cbuf, off, len)
+      @io.write(cbuf.unpack("U*")[off..len].pack("U*"))
+    end
+
+    def flush
+      @io.flush
+    end
+
+    def close
+      @io.close
+    end
+  end
 
   def implements(java_class_name)
     # no-op
@@ -19,6 +36,10 @@ class Class
           case(arg)
           when Regexp
             java.util.regex.Pattern.compile(arg.source)
+          when Symbol
+            arg.to_s
+          when IO
+            IOWriter.new(arg)
           else
             arg
           end

metadata

@@ -2,7 +2,7 @@
 name: gherkin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 2.4.3
+  version: 2.4.4
 platform: java
 authors: 
 - Mike Sassak
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-09 00:00:00 Z
+date: 2011-07-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -80,61 +80,50 @@ dependencies:
         version: 0.4.0
   type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: therubyracer
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.2
-  type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: yard
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 0.7.2
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rdiscount
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.6.8
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: term-ansicolor
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 1.0.5
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         version: 2.1.2
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 description: A fast Gherkin lexer/parser for based on the Ragel State Machine Compiler.
 email: cukes@googlegroups.com
 executables: []
@@ -286,7 +275,9 @@ files:
 - tasks/yard/default/layout/html/layout.erb
 - tasks/yard/default/layout/html/logo.erb
 - tasks/yard/default/layout/html/setup.rb
+- lib/base64-2.3.8.jar
 - lib/gherkin.jar
+- lib/json-simple-1.1.jar
 homepage: http://github.com/cucumber/gherkin
 licenses: []
 
@@ -313,7 +304,7 @@ rubyforge_project:
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: gherkin-2.4.3
+summary: gherkin-2.4.4
 test_files: 
 - features/escaped_pipes.feature
 - features/feature_parser.feature