jrjackson 0.0.7 → 0.1.0

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

@@ -0,0 +1,80 @@
+package com.jrjackson;
+
+import java.io.IOException;
+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;
+
+
+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;
+  }
+}
+

metadata

@@ -1,28 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: jrjackson
 version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease:
-  version: 0.0.7
 platform: ruby
 authors:
 - Guy Boertje
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-14 00:00:00.000000000Z
+date: 2013-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: awesome_print
-  version_requirements: &2056 !ruby/object:Gem::Requirement
+  name: bundler
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '1.0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     none: false
-  requirement: *2056
   prerelease: false
   type: :development
-description: ''
+description: A mostly native JRuby wrapper for the java jackson json processor jar
 email:
 - guyboertje@gmail.com
 executables: []
@@ -30,21 +35,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
-- README
+- README.md
 - Rakefile
+- benchmarking/.jrubyrc
 - benchmarking/benchmark.rb
 - jrjackson.gemspec
 - lib/jrjackson.rb
-- lib/jrjackson/jackson-core-asl-1.9.5.jar
-- lib/jrjackson/jackson-mapper-asl-1.9.5.jar
-- lib/jrjackson/jackson-smile-1.9.5.jar
+- lib/jrjackson/jars/jrjackson-1.0.jar
 - lib/jrjackson/jrjackson.rb
-- lib/jrjackson/rubify.rb
-- lib/jrjackson/rubify_with_symbol_keys.rb
 - lib/jrjackson/version.rb
-- lib/jrjackson_r.rb
-- lib/jrjackson_r_sym.rb
+- lib/require_relative_patch.rb
+- pom.xml
 - 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/RubyObjectDeserializer.java
+- src/main/java/com/jrjackson/RubyObjectSymDeserializer.java
 homepage: http://github.com/guyboertje/jrjackson
 licenses: []
 post_install_message:
@@ -53,21 +62,23 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
   none: false
 requirements: []
 rubyforge_project:
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key:
 specification_version: 3
 summary: A JRuby wrapper for the java jackson json processor jar
 test_files: []
-...
+has_rdoc:

data/README

@@ -1,44 +0,0 @@
-jrjackson
-
-a jruby library wrapping the JAVA jackson jars
-
-provides:
-
-JrJackson::Json.generate(obj) -> json string
-JrJackson::Json.parse(str) -> hash like object
-
-JrJackson::Smile.generate obj -> smile string
-JrJackson::Smile.parse smile_str -> hash like object
-
-
-Credit to Chuck Remes for the benchmark and initial
-investigation when the jruby, json gem and the jackson
-libraries were young.
-
-I compared json-jruby 1.5.1 and jackson/smile 1.9.5 on jruby 1.6.7 and Java 7
-
-                                        user     system      total        real
-jackson generate:                   0.756000   0.000000   0.756000 (  0.756000)
-smile generate:                     0.530000   0.000000   0.530000 (  0.530000)
-ruby generate:                      2.754000   0.000000   2.754000 (  2.754000)
-jackson parse:                      0.630000   0.000000   0.630000 (  0.630000)
-smile parse:                        0.368000   0.000000   0.368000 (  0.368000)
-ruby parse:                         2.102000   0.000000   2.102000 (  2.102000)
-
-Variants:
-
-jrjackson.rb
-  this variant is the fastest but the parse function will
-  return Java ArrayList instead of Ruby Array and
-  Java LinkedHashMap instead of Ruby Hash.
-  In Jruby 1.6.0+, these java classes have most if not all
-  of the behaviour of the corresponding Ruby classes
-
-jrjackson_r.rb
-  If you absolutely need Ruby Objects then use this variant
-  It parses a little bit slower than the above but
-  returns Ruby Array and Hash objects
-
-jrjackson_r_sym.rb
-  Will give you symbols for hash keys instead of strings
-

data/lib/jrjackson/rubify.rb

@@ -1,35 +0,0 @@
-module JrJackson
-  include_package "org.codehaus.jackson.map.module"
-  java_import org.codehaus.jackson.map.deser.UntypedObjectDeserializer
-  java_import org.codehaus.jackson.Version
-  java_import org.codehaus.jackson.JsonToken
-
-  class RubyObjectDeserializer < UntypedObjectDeserializer
-    def mapArray(jp,ctxt)
-      arr = super(jp,ctxt)
-      arr.entries
-    end
-
-    def mapObject(jp,ctxt)
-      t = jp.getCurrentToken
-      t = jp.nextToken if t == JsonToken::START_OBJECT
-
-      return {} if t != JsonToken::FIELD_NAME
-      tmp = []
-      begin
-        k = jp.getText
-        jp.nextToken
-        v = deserialize(jp, ctxt)
-        tmp.push(k)
-        tmp.push(v)
-      end while jp.nextToken != JsonToken::END_OBJECT
-      Hash[*tmp]
-    end
-  end
-
-  _module = SimpleModule.new("JrJacksonModule", Version.new(1, 0, 0, nil))
-  _module.addDeserializer(Jclass, RubyObjectDeserializer.new)
-  Mapper.registerModule(_module)
-
-end
-

data/lib/jrjackson/rubify_with_symbol_keys.rb

@@ -1,34 +0,0 @@
-module JrJackson
-  include_package "org.codehaus.jackson.map.module"
-  java_import org.codehaus.jackson.map.deser.UntypedObjectDeserializer
-  java_import org.codehaus.jackson.Version
-  java_import org.codehaus.jackson.JsonToken
-
-  class RubyObjectDeserializer < UntypedObjectDeserializer
-    def mapArray(jp,ctxt)
-      arr = super(jp,ctxt)
-      arr.entries
-    end
-
-    def mapObject(jp,ctxt)
-      t = jp.getCurrentToken
-      t = jp.nextToken if t == JsonToken::START_OBJECT
-
-      return {} if t != JsonToken::FIELD_NAME
-      tmp = []
-      begin
-        k = jp.getText
-        jp.nextToken
-        v = deserialize(jp, ctxt)
-        tmp.push(k.to_sym)
-        tmp.push(v)
-      end while jp.nextToken != JsonToken::END_OBJECT
-      Hash[*tmp]
-    end
-  end
-
-  _module = SimpleModule.new("JrJacksonModule", Version.new(1, 0, 0, nil))
-  _module.addDeserializer(Jclass, RubyObjectDeserializer.new)
-  Mapper.registerModule(_module)
-
-end

data/lib/jrjackson_r.rb

@@ -1,11 +0,0 @@
-unless RUBY_PLATFORM =~ /java/
-  error "This library is only compatible with a java-based ruby environment like JRuby."
-  exit 255
-end
-
-require 'java'
-
-$CLASSPATH << 'jrjackson'
-
-require File.join("jrjackson","jrjackson")
-require File.join("jrjackson","rubify")

data/lib/jrjackson_r_sym.rb

@@ -1,11 +0,0 @@
-unless RUBY_PLATFORM =~ /java/
-  error "This library is only compatible with a java-based ruby environment like JRuby."
-  exit 255
-end
-
-require 'java'
-
-$CLASSPATH << 'jrjackson'
-
-require File.join("jrjackson","jrjackson")
-require File.join("jrjackson","rubify_with_symbol_keys")