jrjackson 0.1.1 → 0.2.0

data/benchmarking/.jrubyrc

@@ -132,11 +132,11 @@ invokedynamic.class.values=false
 
 # # Set the JIT threshold to the specified method invocation count.
 # # Options: [Integer], Default: 50.
-# jit.threshold=50
+jit.threshold=1
 
 # # Set the max count of active methods eligible for JIT-compilation.
 # # Options: [Integer], Default: 4096.
-# jit.max=4096
+jit.max=16384
 
 # # Set the maximum full-class byte size allowed for jitted methods.
 # # Options: [Integer], Default: 30000.

data/benchmarking/benchmark.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'rubygems'
+require 'bigdecimal'
 require 'benchmark'
 require 'thread'
 require 'digest'
@@ -62,82 +63,33 @@ end
 
 generated_array = []
 generated_smile = []
-q = Queue.new
 
 org_array.each do |hsh|
   generated_array << JrJackson::Raw.generate(hsh)
 end
 
+q = Queue.new
+
 Benchmark.bmbm("jackson parse symbol keys:  ".size) do |x|
 
   x.report("json java parse:") do
-    th1 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| ::JSON.parse("[#{string}]").first }}
-      q << true
-    end
-    th2 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| ::JSON.parse("[#{string}]").first }}
-      q << true
-    end
-    q.pop
-    q.pop
-    # 50.times {generated_array.each {|string| ::JSON.parse("[#{string}]").first }}
+    50.times {generated_array.each {|string| ::JSON.parse(string) }}
   end
 
   x.report("gson parse:") do
-    th1 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| ::Gson::Decoder.new({}).decode(string) }}
-      q << true
-    end
-    th2 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| ::Gson::Decoder.new({}).decode(string) }}
-      q << true
-    end
-    q.pop
-    q.pop
-    # 50.times {generated_array.each {|string| ::Gson::Decoder.new({}).decode(string) }}
+    50.times {generated_array.each {|string| ::Gson::Decoder.new({}).decode(string) }}
   end
 
-  x.report("jackson parse raw:") do
-    th1 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| JrJackson::Raw.parse(string) }}
-      q << true
-    end
-    th2 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| JrJackson::Raw.parse(string) }}
-      q << true
-    end
-    q.pop
-    q.pop
-    # 50.times {generated_array.each {|string| JrJackson::Raw.parse(string) }}
+  x.report("jackson parse string keys:") do
+    50.times {generated_array.each {|string| JrJackson::Raw.parse_str(string) }}
   end
 
   x.report("jackson parse symbol keys:") do
-    th1 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| JrJackson::Sym.parse(string) }}
-      q << true
-    end
-    th2 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| JrJackson::Sym.parse(string) }}
-      q << true
-    end
-    q.pop
-    q.pop
-    # 50.times {generated_array.each {|string| JrJackson::Sym.parse(string) }}
+    50.times {generated_array.each {|string| JrJackson::Raw.parse_sym(string) }}
   end
 
-  x.report("jackson parse string keys:") do
-    th1 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| JrJackson::Str.parse(string) }}
-      q << true
-    end
-    th2 = Thread.new(generated_array) do |arry|
-      50.times {arry.each {|string| JrJackson::Str.parse(string) }}
-      q << true
-    end
-    q.pop
-    q.pop
-    # 50.times {generated_array.each {|string| JrJackson::Str.parse(string) }}
+  x.report("jackson parse raw:") do
+    50.times {generated_array.each {|string| JrJackson::Raw.parse_raw(string) }}
   end
 
   x.report("json java generate:") do

data/benchmarking/benchmark_threaded.rb

@@ -0,0 +1,153 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bigdecimal'
+require 'benchmark'
+require 'thread'
+require 'digest'
+require 'json/ext'
+require 'gson'
+
+require File.expand_path('lib/jrjackson')
+
+HASH = {:one => nil, :two => nil, :three => nil, :four => {:a => nil, :b => nil, :c =>nil},
+:five => {:d => nil, :e => nil},
+:six => {:f => nil, :g => nil, :h =>nil, :i => nil, :j => nil, :k => nil, :l => nil},
+:seven => nil, :eight => [],
+:nine => {:m => {:A => nil, :B => nil}}}
+
+def random_string
+  Digest::MD5.hexdigest "#{Time.now + rand(999)}"
+end
+
+def random_number
+  rand 999_999_999
+end
+
+def random_float
+  random_number + rand
+end
+
+def fill_array
+  value = []
+  5.times do
+    value.push send(METHODS[rand(3)])
+  end
+  value
+end
+
+def randomize_entries hsh
+  new_hsh = {}
+  hsh.each_pair do |key, value|
+    case value
+    when NilClass
+      new_hsh[key] = send METHODS[rand(3)]
+    when Hash
+      new_hsh[key] = randomize_entries value
+    when Array
+      new_hsh[key] = fill_array
+    end
+  end
+  new_hsh
+end
+
+METHODS = [:random_string, :random_number, :random_float]
+
+org_array = []
+one = []
+
+0.upto(5000) do |i|
+  hsh = HASH.dup
+  org_array << randomize_entries(hsh)
+end
+
+generated_array = []
+generated_smile = []
+
+org_array.each do |hsh|
+  generated_array << JrJackson::Raw.generate(hsh)
+end
+
+q = Queue.new
+
+Benchmark.bmbm("jackson parse symbol keys:  ".size) do |x|
+
+  x.report("json java parse:") do
+    th1 = Thread.new(generated_array) do |arry|
+      # 50.times {arry.each {|string| ::JSON.parse("[#{string}]").first }}
+      50.times {arry.each {|string| ::JSON.parse(string).first }}
+      q << true
+    end
+    th2 = Thread.new(generated_array) do |arry|
+      # 50.times {arry.each {|string| ::JSON.parse("[#{string}]").first }}
+      50.times {arry.each {|string| ::JSON.parse(string).first }}
+      q << true
+    end
+    q.pop
+    q.pop
+  end
+
+  x.report("gson parse:") do
+    th1 = Thread.new(generated_array) do |arry|
+      50.times {arry.each {|string| ::Gson::Decoder.new.decode(string) }}
+      q << true
+    end
+    th2 = Thread.new(generated_array) do |arry|
+      50.times {arry.each {|string| ::Gson::Decoder.new.decode(string) }}
+      q << true
+    end
+    q.pop
+    q.pop
+  end
+
+  x.report("jackson parse raw:") do
+    th1 = Thread.new(generated_array) do |arry|
+      50.times {arry.each {|string| JrJackson::Raw.parse_raw(string) }}
+      q << true
+    end
+    th2 = Thread.new(generated_array) do |arry|
+      50.times {arry.each {|string| JrJackson::Raw.parse_raw(string) }}
+      q << true
+    end
+    q.pop
+    q.pop
+  end
+
+  x.report("jackson parse symbol keys:") do
+    th1 = Thread.new(generated_array) do |arry|
+      50.times {arry.each {|string| JrJackson::Raw.parse_sym(string) }}
+      q << true
+    end
+    th2 = Thread.new(generated_array) do |arry|
+      50.times {arry.each {|string| JrJackson::Raw.parse_sym(string) }}
+      q << true
+    end
+    q.pop
+    q.pop
+  end
+
+  x.report("jackson parse string keys:") do
+    th1 = Thread.new(generated_array) do |arry|
+      50.times {arry.each {|string| JrJackson::Raw.parse_str(string) }}
+      q << true
+    end
+    th2 = Thread.new(generated_array) do |arry|
+      50.times {arry.each {|string| JrJackson::Raw.parse_str(string) }}
+      q << true
+    end
+    q.pop
+    q.pop
+  end
+
+  x.report("json java generate:") do
+    50.times {org_array.each {|hsh|  hsh.to_json }}
+  end
+
+  x.report("gson generate:") do
+    50.times {org_array.each {|hsh|  ::Gson::Encoder.new({}).encode(hsh) }}
+  end
+
+  x.report("jackson generate:") do
+    50.times {org_array.each {|hsh| JrJackson::Raw.generate(hsh)  }}
+  end
+end

data/dependency-reduced-pom.xml

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.jrjackson.jruby</groupId>
+  <artifactId>jrjackson</artifactId>
+  <name>jrjackson</name>
+  <version>1.2.2</version>
+  <url>http://maven.apache.org</url>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.1</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>2.16</version>
+        <configuration>
+          <parallel>methods</parallel>
+          <threadCount>10</threadCount>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <artifactSet>
+                <excludes>
+                  <exclude>org.jruby:jruby</exclude>
+                </excludes>
+              </artifactSet>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.11</version>
+      <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>hamcrest-core</artifactId>
+          <groupId>org.hamcrest</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>org.jruby</groupId>
+      <artifactId>jruby</artifactId>
+      <version>1.7.3</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+</project>
+

data/jrjackson.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name        = 'jrjackson'
-  s.version     = '0.1.1'
-  s.date        = '2013-04-03'
+  s.version     = '0.2.0'
+  s.date        = '2013-09-30'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Guy Boertje']
   s.email       = ['guyboertje@gmail.com']
@@ -15,14 +15,17 @@ Gem::Specification.new do |s|
 
   # = MANIFEST =
   s.files = %w[
+    .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
@@ -30,11 +33,14 @@ Gem::Specification.new do |s|
     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
   ]
   # = MANIFEST =
 

data/lib/jrjackson/jrjackson.rb

@@ -3,36 +3,42 @@ unless RUBY_PLATFORM =~ /java/
   exit 255
 end
 
-require_relative "jars/jrjackson-1.0.jar"
+# require_relative "jars/jrjackson-1.2.1.jar"
+require_relative "jars/jrjackson-1.2.2.jar"
 require 'com/jrjackson/jr_jackson'
 
 module JrJackson
   module Json
       class << self
       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 = {})
-        mod = if options[:raw]
-          JrJackson::Raw
-        elsif options[:symbolize_keys]
-          JrJackson::Sym
-        else
-          JrJackson::Str
-        end
+
+      def load(json_string, options = nil)
+
         if json_string.is_a?(String) && json_string =~ TIME_REGEX
-          mod.parse("\"#{json_string}\"")
+          return JrJackson::Raw.parse_raw("\"#{json_string}\"")
+        end
+
+        if options && !options.empty?
+          if options.size == 1 && !!options[:raw]
+            return JrJackson::Raw.parse_raw(json_string)
+          end
+          if options.size == 1 && !!options[:symbolize_keys]
+            return JrJackson::Raw.parse_sym(json_string)
+          end
+          JrJackson::Raw.parse(json_string, options)
         else
-          mod.parse(json_string)
+          JrJackson::Raw.parse_str(json_string)
         end
       end
 
       def dump(object)
         case object
-        when Array, Hash
+        when Array, Hash, String
           JrJackson::Raw.generate(object)
-        when String
-          "\"#{object}\""
-        when nil, true, false
-          object
+        when true, false
+          object.to_s
+        when nil
+          'null'
         else
           if object.respond_to?(:to_json)
             object.to_json
@@ -49,5 +55,3 @@ module JrJackson
     end
   end
 end
-
-JSON = JrJackson::Json unless defined?(JSON)