jrjackson 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 53842b80863cf3aa8239c790f2c98fdad8b71031
-  data.tar.gz: a62f9967a20c1e039e9d791302de4cded88453a1
+  metadata.gz: 0f9e650b921f331f6c35671692b6ea5b37e79bd4
+  data.tar.gz: c2724492377c6d3edca12a2da84314c5ed250c14
 SHA512:
-  metadata.gz: 49f9bab08c76222bd499ff821b937027c7f72d5f5cd1a256597e37cbb1ec3d2fd98f09f61ab0e3fa5b28da3ab19a01239ee07e8a1e24819aa1f1e117fc091289
-  data.tar.gz: b85776403df1201994debe1982583a774a08d52d2762227c335a1e6303a3f96d2769e9d00ce0c078d02a2ab9db715f91082e4f477aa054184566dc39226cea69
+  metadata.gz: 18a45247d04538ddce6d35c9dd9a8462e9569b243132f443d2ab373362e7eaf4685966c48c79a435366f97024e49961acd8722cef2826a9acaf33ad6d1c9ac48
+  data.tar.gz: 6d71d6fce9f140dad56018c3025b48dca19d2c243b87845bc4b69f1e5eb44a0843bbacb8414e8758f6f39351b27ee9cd8d12c423ff7a3f29c2012df58eaaca50

data/Rakefile

@@ -1,4 +1,5 @@
 require 'rspec/core/rake_task'
+require 'bundler'
 
 Bundler::GemHelper.install_tasks
 

data/changelog.md

@@ -0,0 +1,66 @@
+v0.2.6
+  fix issue-20
+    allow jruby to convert Ruby StringIO into Java
+    by not type checking passed arg
+    this is because jruby 1.7.9 has changed the type of java object backing Ruby StingIO
+  jar compiled for jruby 1.7.8 (jruby 1.7.9 in the maven repo has an error in the pom.xml)
+  jruby 1.7.8, jruby 1.7.9 (tested)
+  jackson 2.3.0
+
+v0.2.5
+  fix issue-16
+    reduce the gem size by:
+      change pom.xml to only include relevant java jars
+      exclude benchmaking from the gemspec files
+  jruby 1.7.5
+  jackson 2.2.3
+
+v0.2.4
+  fix issue-15
+    return Ruby nil instead of Java null
+  fix issue-14
+    remove all usage of Ruby.getGlobalRuntime
+    pass the runtime from the calling Ruby ThreadContext into the deserializers and converters
+  jruby 1.7.5
+  jackson 2.2.3
+
+v0.2.3
+  fix issue-12
+    improve the serialization support for non Json Datatype Ruby objects
+    now has support for serializing via toJava, to_h, to_hash, to_a, to_json
+  fix for failing MultiJson unicode test
+  jruby 1.7.4
+  jackson 2.2.3
+
+v0.2.2
+  fix issue-13
+    compile Java for 1.6 compatibility
+  documentation tweaks
+  jruby 1.7.4
+  jackson 2.2.3
+
+v0.2.1
+  documentation tweaks
+  fix issue-7
+    add pluggable String and Symbol Converters for JSON values
+  jruby 1.7.4
+  jackson 2.2.3
+
+v0.2.0
+  extract all Java -> Ruby generation to reusable RubyUtils static class
+  support BigDecimal
+  remove JSON Api
+  fixes issues 5, 6, 8, 
+
+  jruby 1.7.3
+  jackson 2.2.2
+
+v0.1.1
+  fix Time regex
+v0.1.0
+  MutiJson compatibility
+  switch to using almost all Java, i.e. define most of the ruby modules in Java
+  jruby 1.7.3
+  jackson 2.1.4
+v0.0.7
+  first release - minimal jruby wrapper around jackson 1.9.5 jars

data/dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <name>jrjackson</name>
-  <version>1.2.7</version>
+  <version>1.2.8</version>
   <url>http://maven.apache.org</url>
   <build>
     <plugins>
@@ -67,7 +67,7 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.5</version>
+      <version>1.7.8</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

data/lib/jrjackson/build_info.rb

@@ -1,7 +1,7 @@
 module JrJackson
   module BuildInfo
     def self.version
-      '0.2.5'
+      '0.2.6'
     end
 
     def self.files

data/lib/jrjackson/jrjackson.rb

@@ -3,8 +3,8 @@ unless RUBY_PLATFORM =~ /java/
   exit 255
 end
 
-require_relative "jars/jrjackson-1.2.7.jar"
-# require_relative "linked/jrjackson-1.2.7.jar"
+require_relative "jars/jrjackson-1.2.8.jar"
+# require_relative "linked/jrjackson-1.2.8.jar"
 
 require 'com/jrjackson/jr_jackson'
 
@@ -14,7 +14,7 @@ module JrJackson
       TIME_REGEX = %r(\A(\d{4}-\d\d-\d\d|(\w{3}\s){2}\d\d)\s\d\d:\d\d:\d\d)
 
       def load(json_string, options = nil)
-        if json_string.is_a?(String) && json_string =~ TIME_REGEX
+        if json_string.is_a?(String) && is_time_string?(json_string)
           return JrJackson::Raw.parse_raw("\"#{json_string}\"")
         end
 
@@ -52,6 +52,14 @@ module JrJackson
 
       alias :parse :load
       alias :generate :dump
+
+      private
+
+      def is_time_string?(json_string)
+        json_string =~ TIME_REGEX
+      rescue => e
+        raise JrJackson::ParseError, e.message
+      end
     end
   end
 end

data/pom.xml

@@ -5,7 +5,7 @@
   <groupId>com.jrjackson.jruby</groupId>
   <artifactId>jrjackson</artifactId>
   <packaging>jar</packaging>
-  <version>1.2.7</version>
+  <version>1.2.8</version>
   <name>jrjackson</name>
   <url>http://maven.apache.org</url>
   
@@ -23,27 +23,27 @@
     <dependency>
       <groupId>org.jruby</groupId>
       <artifactId>jruby</artifactId>
-      <version>1.7.5</version>
+      <version>1.7.8</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.2.3</version>
+      <version>2.3.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.2.3</version>
+      <version>2.3.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
-      <version>2.2.3</version>
+      <version>2.3.0</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.module</groupId>
       <artifactId>jackson-module-afterburner</artifactId>
-      <version>2.2.3</version>
+      <version>2.3.0</version>
     </dependency>
   </dependencies>
   <build>

data/run_all_individual_bench.sh

@@ -1,23 +1,23 @@
 #!/bin/sh
 
-# ruby benchmarking/individual/json-mri-sourced.rb
-# ruby benchmarking/individual/oj-mri-sourced.rb
+ruby benchmarking/individual/json-mri-sourced.rb
+ruby benchmarking/individual/oj-mri-sourced.rb
 
-# jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
-# jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-jr-sourced.rb
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-jr-sourced.rb
 
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/string-jr-sourced.rb
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/str-bd-jr-sourced.rb
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/string-jr-sourced.rb
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/str-bd-jr-sourced.rb
 
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/symbol-jr-sourced.rb
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sym-bd-jr-sourced.rb
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/symbol-jr-sourced.rb
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/sym-bd-jr-sourced.rb
 
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-jr-sourced.rb
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-bd-jr-sourced.rb
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-jr-sourced.rb
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-bd-jr-sourced.rb
 
-# ruby benchmarking/individual/json-gen-mri-sourced.rb
-# ruby benchmarking/individual/oj-gen-mri-sourced.rb
+ruby benchmarking/individual/json-gen-mri-sourced.rb
+ruby benchmarking/individual/oj-gen-mri-sourced.rb
 
-# jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb 
-# jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb 
-jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-gen-jr-sourced.rb 
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/json-gen-jr-sourced.rb 
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/gson-gen-jr-sourced.rb 
+chruby-exec jruby -- jruby -J-Xmn512m -J-Xms2048m -J-Xmx2048m benchmarking/individual/raw-gen-jr-sourced.rb 

data/src/main/java/com/jrjackson/JrJacksonRaw.java

@@ -6,11 +6,8 @@ import org.jruby.RubyObject;
 import org.jruby.RubyString;
 import org.jruby.RubySymbol;
 import org.jruby.RubyHash;
-import org.jruby.RubyIO;
 import org.jruby.anno.JRubyMethod;
 import org.jruby.anno.JRubyModule;
-import org.jruby.exceptions.RaiseException;
-import org.jruby.ext.stringio.RubyStringIO;
 import org.jruby.java.addons.IOJavaAddons;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -105,11 +102,10 @@ public class JrJacksonRaw extends RubyObject {
         o = mapper.readValue(
           ((RubyString)arg).getBytes(), Object.class
         );
-      } else if ((arg instanceof RubyIO) || (arg instanceof RubyStringIO)) {
+      } else {
+        // must be an IO object then
         IRubyObject stream = IOJavaAddons.AnyIO.any_to_inputstream(context, arg);
         o = mapper.readValue((InputStream)stream.toJava(InputStream.class), Object.class);
-      } else {
-        throw ruby.newArgumentError("Unsupported source. This method accepts String or IO");
       }
       return RubyUtils.rubyObject(ruby, o);
     }

data/test/jrjackson_test.rb

@@ -8,6 +8,7 @@ require 'test/unit'
 require 'thread'
 require 'bigdecimal'
 require 'jrjackson'
+require 'stringio'
 
 class JrJacksonTest < Test::Unit::TestCase
 
@@ -98,6 +99,19 @@ class JrJacksonTest < Test::Unit::TestCase
     assert_equal expected, actual
   end
 
+  def test_stringio
+    expected = {"foo" => 5}
+    json = ::StringIO.new('{"foo":5}')
+    actual = JrJackson::Json.load(json)
+    assert_equal expected, actual
+  end
+
+  def test_bad_utf
+    assert_raise JrJackson::ParseError do
+      JrJackson::Json.load("\x82\xAC\xEF")
+    end
+  end
+
   def test_can_parse_big_decimals
     expected = BigDecimal.new '0.12345678901234567890123456789'
     json = '{"foo":0.12345678901234567890123456789}'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Guy Boertje
@@ -14,14 +14,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: A mostly native JRuby wrapper for the java jackson json processor jar
@@ -31,16 +31,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .jrubyrc
+- ".gitignore"
+- ".jrubyrc"
 - Gemfile
 - README.md
 - Rakefile
+- changelog.md
 - dependency-reduced-pom.xml
 - jrjackson.gemspec
 - lib/jrjackson.rb
 - lib/jrjackson/build_info.rb
-- lib/jrjackson/jars/jrjackson-1.2.7.jar
+- lib/jrjackson/jars/jrjackson-1.2.8.jar
 - lib/jrjackson/jrjackson.rb
 - lib/require_relative_patch.rb
 - pom.xml
@@ -68,19 +69,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A JRuby wrapper for the java jackson json processor jar
 test_files: []
-has_rdoc: