jrjackson 0.1.1 → 0.2.0

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

@@ -0,0 +1,23 @@
+package com.jrjackson;
+
+import java.io.IOException;
+import java.util.*;
+
+import com.fasterxml.jackson.core.*;
+
+import org.jruby.Ruby;
+
+import org.jruby.RubyObject;
+
+public class RubyObjectStrDeserializer
+    extends RubyObjectDeserializer
+{
+  
+  public final static RubyObjectStrDeserializer instance = new RubyObjectStrDeserializer();
+  
+  public RubyObjectStrDeserializer() { super(); }
+
+  protected RubyObject convertKey(JsonParser jp) throws IOException {
+    return RubyUtils.rubyString(Ruby.getGlobalRuntime(), jp.getText());
+  }
+}

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

@@ -5,76 +5,19 @@ import java.util.*;
 
 import com.fasterxml.jackson.core.*;
 
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
-import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;
-import com.fasterxml.jackson.databind.util.ObjectBuffer;
-import com.fasterxml.jackson.databind.deser.std.StdDeserializer;
-
 import org.jruby.Ruby;
-import org.jruby.RubyObject;
-import org.jruby.RubyArray;
-import org.jruby.RubyHash;
-import org.jruby.RubyString;
-import org.jruby.RubySymbol;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.javasupport.JavaUtil;
-import org.jruby.javasupport.util.RuntimeHelpers;
 
+import org.jruby.RubyObject;
 
 public class RubyObjectSymDeserializer
-    // extends RubyObjectDeserializer<RubyObject>
     extends RubyObjectDeserializer
 {
   
-  protected final static Ruby __ruby__ = Ruby.getGlobalRuntime();
-
   public final static RubyObjectSymDeserializer instance = new RubyObjectSymDeserializer();
   
   public RubyObjectSymDeserializer() { super(); }
 
-  /*
-  /**********************************************************
-  /* Internal methods
-  /**********************************************************
-   */
-  
-  protected RubySymbol rubySymbol(JsonParser jp) throws IOException {
-    return __ruby__.newSymbol(jp.getText());
-  }
-
-  protected RubyObject mapObject(JsonParser jp, DeserializationContext ctxt)
-      throws IOException, JsonProcessingException
-  {
-    JsonToken t = jp.getCurrentToken();
-    if (t == JsonToken.START_OBJECT) {
-        t = jp.nextToken();
-    }
-    // 1.6: minor optimization; let's handle 1 and 2 entry cases separately
-    if (t != JsonToken.FIELD_NAME) { // and empty one too
-        // empty map might work; but caller may want to modify... so better just give small modifiable
-        return RubyHash.newHash(__ruby__);
-    }
-    RubySymbol field1 = rubySymbol(jp);
-    jp.nextToken();
-    RubyObject value1 = deserialize(jp, ctxt);
-    if (jp.nextToken() != JsonToken.FIELD_NAME) { // single entry; but we want modifiable
-        return RuntimeHelpers.constructHash(__ruby__, field1, value1);
-    }
-    RubySymbol field2 = rubySymbol(jp);
-    jp.nextToken();
-    RubyObject value2 = deserialize(jp, ctxt);
-    if (jp.nextToken() != JsonToken.FIELD_NAME) {
-        return RuntimeHelpers.constructHash(__ruby__, field1, value1, field2, value2);
-    }
-    RubyHash result = RuntimeHelpers.constructHash(__ruby__, field1, value1, field2, value2);
-    do {
-        RubySymbol fieldName = rubySymbol(jp);
-        jp.nextToken();
-        result.fastASet(fieldName, deserialize(jp, ctxt));
-    } while (jp.nextToken() != JsonToken.END_OBJECT);
-    return result;
+  protected RubyObject convertKey(JsonParser jp) throws IOException {
+    return RubyUtils.rubySymbol(Ruby.getGlobalRuntime(), jp.getText());
   }
 }
-

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

@@ -0,0 +1,77 @@
+package com.jrjackson;
+
+import java.io.IOException;
+import java.util.*;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+
+import org.jruby.*;
+import org.jruby.javasupport.JavaUtil;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.ext.bigdecimal.RubyBigDecimal;
+import org.jruby.runtime.Block;
+
+public class RubyUtils
+{
+  
+  public static RubyObject rubyObject(Ruby ruby, Object node)
+  {
+    return (RubyObject)JavaUtil.convertJavaToRuby(ruby, node);
+  }
+
+  public static RubyString rubyString(Ruby ruby, String node)
+  {
+    return ruby.newString(node);
+  }
+
+  public static RubySymbol rubySymbol(Ruby ruby, String node)
+  {
+    return RubySymbol.newSymbol(ruby, node);
+  }
+
+  public static RubyArray rubyArray(Ruby ruby, Object[] arg)
+  {
+    return (RubyArray)JavaUtil.convertJavaToRuby(ruby, arg);
+  }
+
+  public static RubyArray rubyArray(Ruby ruby, List arg)
+  {
+    return (RubyArray)JavaUtil.convertJavaToRuby(ruby, arg);
+  }
+  
+  public static RubyHash rubyHash(Ruby ruby, Map arg)
+  {
+    return (RubyHash)JavaUtil.convertJavaToRuby(ruby, arg);
+  }
+
+  public static RubyFixnum rubyFixnum(Ruby ruby, int arg)
+  {
+    return ruby.newFixnum(arg);
+  }
+
+  public static RubyFixnum rubyFixnum(Ruby ruby, long arg)
+  {
+    return ruby.newFixnum(arg);
+  }
+
+  public static RubyBignum rubyBignum(Ruby ruby, BigInteger arg)
+  {
+    return RubyBignum.newBignum(ruby, arg);
+  }
+
+  public static RubyFloat rubyFloat(Ruby ruby, double arg)
+  {
+    return ruby.newFloat(arg);
+  }
+
+  public static RubyBigDecimal rubyBigDecimal(Ruby ruby, BigDecimal arg)
+  {
+    return new RubyBigDecimal(ruby, arg);
+  }
+
+  public static RubyBoolean rubyBoolean(Ruby ruby, Boolean arg)
+  {
+    return ruby.newBoolean(arg);
+  }
+}

data/src/test/java/com/jrjackson/jruby/AppTest.java

@@ -0,0 +1,38 @@
+package com.jrjackson.jruby;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest 
+    extends TestCase
+{
+    /**
+     * Create the test case
+     *
+     * @param testName name of the test case
+     */
+    public AppTest( String testName )
+    {
+        super( testName );
+    }
+
+    /**
+     * @return the suite of tests being tested
+     */
+    public static Test suite()
+    {
+        return new TestSuite( AppTest.class );
+    }
+
+    /**
+     * Rigourous Test :-)
+     */
+    public void testApp()
+    {
+        assertTrue( true );
+    }
+}

data/test/jrjackson_test.rb

@@ -0,0 +1,63 @@
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+
+require 'test/unit'
+require 'thread'
+require 'bigdecimal'
+require 'jrjackson'
+
+class JrJacksonTest < Test::Unit::TestCase
+
+  def test_threading
+    q1, q2, q3 = Queue.new, Queue.new, Queue.new
+
+    s1 = %Q|{"a":2.5, "b":0.214, "c":3.4567}|
+    th1 = Thread.new(s1) do |string|
+      q1 << JrJackson::Json.load(string, {use_bigdecimal: true, raw: true})
+    end
+    th2 = Thread.new(s1) do |string|
+      q2 << JrJackson::Json.load(string, {use_bigdecimal: true, symbolize_keys: true})
+    end
+    th3 = Thread.new(s1) do |string|
+      q3 << JrJackson::Json.load(string, {use_bigdecimal: false, symbolize_keys: true})
+    end
+    a1, a2, a3 = q1.pop, q2.pop, q3.pop
+    assert_equal ["a", "b", "c"], a1.keys
+    assert a1.values.all? {|v| v.is_a?(Java::JavaMath::BigDecimal)}, "Expected all values to be Java::JavaMath::BigDecimal"
+    assert_equal [:a, :b, :c], a2.keys
+    assert a2.values.all? {|v| v.is_a?(BigDecimal)}, "Expected all values to be BigDecimal"
+    assert a3.values.all? {|v| v.is_a?(Float)}, "Expected all values to be Float"
+  end
+
+  def test_serialize_symbols_as_values
+    source = {"first" => :first_symbol, "second" => {"inner" => :inner_symbol}}
+    expected = {:first => "first_symbol", :second => {:inner => "inner_symbol"}}
+    actual = JrJackson::Json.load(JrJackson::Json.dump(source), :symbolize_keys => true)
+    assert_equal expected, actual
+  end
+
+  def test_can_parse_big_decimals
+    expected = BigDecimal.new '0.12345678901234567890123456789'
+    json = '{"foo":0.12345678901234567890123456789}'
+
+    actual = JrJackson::Json.parse(json, :use_bigdecimal => true)['foo']
+    assert_bigdecimal_equal expected, actual
+
+    actual = JrJackson::Json.parse(json, :use_bigdecimal => true, :symbolize_keys => true)[:foo]
+    assert_bigdecimal_equal expected, actual
+
+    actual = JrJackson::Json.parse(json, :use_bigdecimal => true, :raw => true)['foo']
+    assert_bigdecimal_similar expected, actual
+  end
+
+  def assert_bigdecimal_equal(expected, actual)
+    assert_equal expected, actual
+    assert_equal expected.class, actual.class
+    assert_equal BigDecimal, actual.class
+  end
+
+  def assert_bigdecimal_similar(expected, actual)
+    assert_equal BigDecimal.new(expected.to_s), BigDecimal.new(actual.to_s)
+    assert_equal Java::JavaMath::BigDecimal, actual.class
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease:
 platform: ruby
 authors:
@@ -9,19 +9,19 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
     none: false
@@ -34,14 +34,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .jrubyrc
 - Gemfile
 - README.md
 - Rakefile
 - benchmarking/.jrubyrc
 - benchmarking/benchmark.rb
+- benchmarking/benchmark_threaded.rb
+- dependency-reduced-pom.xml
 - jrjackson.gemspec
 - lib/jrjackson.rb
-- lib/jrjackson/jars/jrjackson-1.0.jar
+- lib/jrjackson/jars/jrjackson-1.2.2.jar
 - lib/jrjackson/jrjackson.rb
 - lib/jrjackson/version.rb
 - lib/require_relative_patch.rb
@@ -49,11 +52,14 @@ files:
 - profiling/profiled.rb
 - src/main/java/com/jrjackson/JrJacksonRaw.java
 - src/main/java/com/jrjackson/JrJacksonService.java
-- src/main/java/com/jrjackson/JrJacksonStr.java
-- src/main/java/com/jrjackson/JrJacksonSym.java
 - src/main/java/com/jrjackson/ParseError.java
+- src/main/java/com/jrjackson/RubyJacksonModule.java
 - src/main/java/com/jrjackson/RubyObjectDeserializer.java
+- src/main/java/com/jrjackson/RubyObjectStrDeserializer.java
 - src/main/java/com/jrjackson/RubyObjectSymDeserializer.java
+- src/main/java/com/jrjackson/RubyUtils.java
+- src/test/java/com/jrjackson/jruby/AppTest.java
+- test/jrjackson_test.rb
 homepage: http://github.com/guyboertje/jrjackson
 licenses: []
 post_install_message:
@@ -62,17 +68,15 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
+      version: '0'
   none: false
 requirements: []
 rubyforge_project:

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

@@ -1,80 +0,0 @@
-package com.jrjackson;
-
-import org.jruby.Ruby;
-import org.jruby.RubyClass;
-import org.jruby.RubyObject;
-import org.jruby.RubyString;
-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.javasupport.JavaUtil;
-import org.jruby.runtime.ThreadContext;
-import org.jruby.runtime.builtin.IRubyObject;
-import org.jruby.util.RubyDateFormat;
-
-import java.io.InputStream;
-import java.io.IOException;
-import java.text.DateFormat;
-import java.util.*;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.core.JsonProcessingException;
-
-@JRubyModule(name = "JrJacksonStr")
-public class JrJacksonStr extends RubyObject {
-  private static final ObjectMapper mapper = new ObjectMapper();
-  private static final SimpleModule module = new SimpleModule("JrJacksonStrModule");
-
-  static {
-    mapper.registerModule(module.addDeserializer(Object.class, RubyObjectDeserializer.instance));
-    mapper.setDateFormat(new RubyDateFormat("yyyy-MM-dd HH:mm:ss z", Locale.US, true));
-  }
-  
-  public JrJacksonStr(Ruby ruby, RubyClass metaclass) {
-    super(ruby, metaclass);
-  }
-
-  @JRubyMethod(module = true, name = {"parse", "load"}, required = 1)
-  public static IRubyObject parse(ThreadContext context, IRubyObject self, IRubyObject arg) {
-    Ruby ruby = context.getRuntime();
-    try {
-      Object o;
-      if (arg instanceof RubyString) {
-        o = mapper.readValue(arg.toString(), Object.class);
-      } else if ((arg instanceof RubyIO) || (arg instanceof RubyStringIO)) {
-        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 (RubyObject)JavaUtil.convertJavaToRuby(ruby, o);
-    }
-    catch (JsonProcessingException e) {
-      throw ParseError.newParseError(ruby, e.getLocalizedMessage());
-    }
-    catch (IOException e) {
-      throw ruby.newIOError(e.getLocalizedMessage());
-    }
-  }
-
-  @JRubyMethod(module = true, name = {"generate", "dump"}, required = 1)
-  public static IRubyObject generate(ThreadContext context, IRubyObject self, IRubyObject arg) {
-    Ruby ruby = context.getRuntime();
-    Object obj = arg.toJava(Object.class);
-    try {
-      String s = mapper.writeValueAsString(obj);
-      return ruby.newString(s);
-    }
-    catch (JsonProcessingException e) {
-      throw ParseError.newParseError(ruby, e.getLocalizedMessage());
-    }
-    catch (IOException e) {
-      throw ruby.newIOError(e.getLocalizedMessage());
-    }
-  }
-}