oj 2.12.9 → 2.12.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 9329b3314cabafb4851906568563da14cf57d738
+  data.tar.gz: b17b93f74fc2dc61a8e99d79c8d68ec5158aab50
+SHA512:
+  metadata.gz: 952f10cd94991fa3a5e37f7984b2c3ec721db85ddba7dd6e0755fc82f73cabce106c77dbce957da5bf248886435cd57c51f9cfa4ea641cbc68ed6936af69d09d
+  data.tar.gz: f5c83b5202de374776f799cec68f62cb182ba5128bb0c1b8e43e5f97126eeba5c3e181cc34db1d62c476c19028ab838d5493bb965e4fafa77402d85e2f2b0999

data/README.md

@@ -26,17 +26,10 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
-## Release 2.12.9
+## Future Release 2.12.10
 
- - Fixed failing test when using Rubinius.
-
- - Changed mimic_JSON to support the global/kernel function JSON even when the
-   json gem is loaded first.
-
-## Release 2.12.8
-
- - mimic_JSON now supports the global/kernel JSON function that will either
-   parse a string argument or dump an array or object argument.
+ - An exception is now raised if there are multiple JSON documents in a string
+   or file if there is no proc or block associated with the parse call.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 
@@ -103,8 +96,8 @@ gem 'oj_mimic_json'
 ## Proper Use
 
 Two settings in Oj are useful for parsing but do expose a vulnerability if used from an untrusted source. Symbolized
-keys can cause memory to be filled since Ruby does not garbage collect Symbols. The same is true for auto
-defining classes; memory will also be exhausted if too many classes are automatically defined. Auto defining is a useful
+keys can cause memory to be filled with previous versions of ruby. Ruby 2.1 and below does not garbage collect Symbols. The same is true for auto
+defining classes in all versions of ruby; memory will also be exhausted if too many classes are automatically defined. Auto defining is a useful
 feature during development and from trusted sources but it allows too many classes to be created in the object load
 mode and auto defined is used with an untrusted source. The `Oj.strict_load()` method sets and uses the most strict and safest options. It should be used by developers who find it difficult to understand the options available in Oj.
 

data/ext/oj/parse.c

@@ -587,10 +587,15 @@ colon(ParseInfo pi) {
 
 void
 oj_parse2(ParseInfo pi) {
+    int	first = 1;
+
     pi->cur = pi->json;
     err_init(&pi->err);
     while (1) {
 	next_non_white(pi);
+	if (!first && '\0' != *pi->cur) {
+	    rb_raise(rb_eSyntaxError, "Extra characters after the JSON document.");
+	}
 	switch (*pi->cur++) {
 	case '{':
 	    hash_start(pi);
@@ -657,18 +662,23 @@ oj_parse2(ParseInfo pi) {
 	if (err_has(&pi->err)) {
 	    return;
 	}
-	if (Qundef != pi->proc && stack_empty(&pi->stack)) {
-	    if (Qnil == pi->proc) {
-		rb_yield(stack_head_val(&pi->stack));
-	    } else {
+	if (stack_empty(&pi->stack)) {
+	    if (Qundef != pi->proc) {
+		if (Qnil == pi->proc) {
+		    rb_yield(stack_head_val(&pi->stack));
+		} else {
 #if HAS_PROC_WITH_BLOCK
-		VALUE	args[1];
+		    VALUE	args[1];
 
-		*args = stack_head_val(&pi->stack);
-		rb_proc_call_with_block(pi->proc, 1, args, Qnil);
+		    *args = stack_head_val(&pi->stack);
+		    rb_proc_call_with_block(pi->proc, 1, args, Qnil);
 #else
-		rb_raise(rb_eNotImpError, "Calling a Proc with a block not supported in this version. Use func() {|x| } syntax instead.");
+		    rb_raise(rb_eNotImpError,
+			     "Calling a Proc with a block not supported in this version. Use func() {|x| } syntax instead.");
 #endif
+		}
+	    } else {
+		first = 0;
 	    }
 	}
     }

data/ext/oj/sparse.c

@@ -602,11 +602,15 @@ colon(ParseInfo pi) {
 
 void
 oj_sparse2(ParseInfo pi) {
+    int		first = 1;
     char	c;
 
     err_init(&pi->err);
     while (1) {
 	c = reader_next_non_white(&pi->rd);
+	if (!first && '\0' != c) {
+	    rb_raise(rb_eSyntaxError, "Extra characters after the JSON document.");
+	}
 	switch (c) {
 	case '{':
 	    hash_start(pi);
@@ -701,20 +705,24 @@ oj_sparse2(ParseInfo pi) {
 	if (err_has(&pi->err)) {
 	    return;
 	}
-	if (Qundef != pi->proc && stack_empty(&pi->stack)) {
-	    if (Qnil == pi->proc) {
-		rb_yield(stack_head_val(&pi->stack));
-	    } else {
+	if (stack_empty(&pi->stack)) {
+	    if (Qundef != pi->proc) {
+		if (Qnil == pi->proc) {
+		    rb_yield(stack_head_val(&pi->stack));
+		} else {
 #if HAS_PROC_WITH_BLOCK
-		VALUE	args[1];
+		    VALUE	args[1];
 
-		*args = stack_head_val(&pi->stack);
-		rb_proc_call_with_block(pi->proc, 1, args, Qnil);
+		    *args = stack_head_val(&pi->stack);
+		    rb_proc_call_with_block(pi->proc, 1, args, Qnil);
 #else
-		oj_set_error_at(pi, rb_eNotImpError, __FILE__, __LINE__,
-				 "Calling a Proc with a block not supported in this version. Use func() {|x| } syntax instead.");
-		return;
+		    oj_set_error_at(pi, rb_eNotImpError, __FILE__, __LINE__,
+				    "Calling a Proc with a block not supported in this version. Use func() {|x| } syntax instead.");
+		    return;
 #endif
+		}
+	    } else {
+		first = 0;
 	    }
 	}
     }

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.12.9'
+  VERSION = '2.12.10'
 end

data/test/bug.rb

@@ -1,3 +1,5 @@
+#!/usr/bin/env ruby
+
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
@@ -5,60 +7,47 @@ $: << File.dirname(__FILE__)
 
 require 'helper'
 
-require 'oj'
-require 'securerandom'
-
 class Handler
-  def hash_start()      {} end
-  def hash_set(h,k,v)   h.store(k,v) end
-  def array_start()     [] end
-  def array_append(a,v) a << v end
-  def error(message, line, column)
-    raise Exception.new(message, line, column)
+  def initialize
+    @state = []
+  end
+
+  def hash_start
+    @state << {}
+    @state.last
+  end
+
+  def hash_end
+    @state.pop
+  end
+
+  def hash_set(h,k,v)
+    h.store(k,v)
   end
-end
 
-json = Oj.dump({"this"=>"object"})
-
-if true
-  name = "/tmp/#{SecureRandom.uuid}"
-  `mkfifo #{name}`
-  if fork
-    open(name, 'r+') do |read_io|
-      p "start reading #{read_io.stat.ftype}"
-      Oj.sc_parse(Handler.new, read_io) {|v| p v}
-      p "stop reading"
-    end
-  else
-    open(name, 'w+') do |write_io|
-      p "start writing #{write_io.stat.ftype}  autoclose: #{write_io.autoclose?}"
-      write_io.write json
-      write_io.write json
-      p "stop writing"
-    end
-    sleep(1) # make it obvious that there are two threads
-    open(name, 'w+') do |write_io|
-      p "start writing #{write_io.stat.ftype}"
-      write_io.write json
-      write_io.write json
-      p "stop writing"
-    end
+  def array_start
+    @state << []
+    @state.last
   end
-else
-  IO.pipe do |read_io, write_io|
-    if fork
-      write_io.close
-      p "start reading #{read_io.stat.ftype}"
-      Oj.sc_parse(Handler.new, read_io) {|v| p v}
-      p "stop reading"
-      read_io.close
-    else
-      read_io.close
-      p "start writing #{write_io.stat.ftype}"
-      write_io.write json
-      write_io.write json
-      p "stop writing"
-      write_io.close
-    end
+
+
+  def array_end
+    @state.pop
+  end
+
+  def array_append(a,v)
+    a << v
+  end
+
+  def add_value(v)
+    p v
   end
+
+  def error(message, line, column); p "ERROR: #{message}" end
 end
+
+$handler = Handler.new
+
+IO.popen("cat tst") { |p| puts Oj.sc_parse($handler, p) }
+
+#File.open('tst', 'r') { |file|  Oj.sc_parse($handler, file) }

data/test/bug2.rb

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+

data/test/bug3.rb

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+require 'stringio'
+
+class Parser < Oj::Saj
+
+  def parse(json)
+    Oj.saj_parse(self, StringIO.new(json))
+  end
+
+  def hash_start(key)
+    puts "START: #{key}"
+  end
+
+  def error(message, line, column)
+    puts "Error callback: #{message}"
+  end
+
+end
+
+parser = Parser.new
+
+begin
+  # truncated JSON, Oj.saj_parse raises, #error not called
+  parser.parse('{"foo{"bar":')
+rescue Exception => e
+  puts "*** #{e.class}: #{e.message}"
+end
+
+puts "\n\n"
+
+begin
+  # invalid JSON, doesn't raise an error
+  parser.parse('{"foo":{"bar":}')
+rescue Exception => e
+  puts "*** #{e.class}: #{e.message}"
+end

data/test/bug_fast.rb

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+
+def create_item(doc)
+  #puts "#{doc.fetch('/id')}: #{doc.fetch('/labels/it/value')} - #{doc.fetch('/descriptions/it/value')}"
+  doc.fetch('/id')
+  doc.fetch('/labels/it/value')
+  doc.fetch('/descriptions/it/value')
+end
+
+100.times { |i|
+  File.open('dump_10k.json') { |f|
+    f.each { |line|
+      #Oj::Doc.open(line) { |doc|
+      doc = Oj::Doc.open(line)
+        begin
+          create_item(doc) if doc.fetch('/type') == 'item'
+        rescue Exception => e
+          puts "*** #{e.class}: #{e.message}"
+        end
+      doc.close
+      #}
+    }
+  }
+  puts i
+}

data/test/bug_load.rb

@@ -0,0 +1,24 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'oj'
+
+def create_item(doc)
+  item_id = doc['source']
+  # ...
+  puts item_id
+end
+
+File.open('log.json') { |f|
+  Oj::load(f, mode: :compat) { |doc|
+    begin
+      create_item(doc) if doc['msgType'] == 1
+    rescue Exception => e
+      puts "*** #{e.class}: #{e.message}"
+    end
+  }
+}

data/test/example.rb

@@ -0,0 +1,11 @@
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+require 'oj'
+require 'json'
+ 
+Oj::Doc.open([{:name => "T-Shirt"}].to_json) do |doc|
+  doc.each_child do |child|
+    p child.fetch("name")
+  end
+end

data/test/io.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+class Handler
+  def initialize
+    @state = []
+  end
+
+  def hash_start
+    @state << {}
+    @state.last
+  end
+
+  def hash_end
+    @state.pop
+  end
+
+  def hash_set(h,k,v)
+    h.store(k,v)
+  end
+
+  def array_start
+    @state << []
+    @state.last
+  end
+
+
+  def array_end
+    @state.pop
+  end
+
+  def array_append(a,v)
+    a << v
+  end
+
+  def error(message, line, column); p "ERROR: #{message}" end
+end
+
+handler = Handler.new
+def handler.add_value(v)
+  p v
+end
+
+Oj.sc_parse(handler, StringIO.new('{"a":"b","c":[1,2,{"d":"e"}]}[4,5,6]'))

data/test/{test_range.rb → mod.rb}

@@ -1,19 +1,16 @@
 #!/usr/bin/env ruby
 # encoding: UTF-8
 
-$VERBOSE = true
-
 %w(lib ext test).each do |dir|
   $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
 end
 
-require 'rubygems' if RUBY_VERSION.start_with?('1.8.')
 require 'oj'
 
-Oj.mimic_JSON
-
-#puts Oj.default_options
-
-range = ("01".."12")
 
-puts Oj.dump(range)
+Thread.new do
+  string_io = StringIO.new('{"foo":"bar"}')
+  Oj.load(string_io)
+  string_io.rewind
+  puts string_io.read
+end.join

data/test/struct.rb

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
+# required. That can be set in the RUBYOPT environment variable.
+# export RUBYOPT=-w
+
+$VERBOSE = true
+
+$: << File.join(File.dirname(__FILE__), "../lib")
+$: << File.join(File.dirname(__FILE__), "../ext")
+
+require 'oj'
+
+A = Struct.new(:a,:b,:c,:d)
+B = Struct.new(:e,:f)
+
+obj = [A.new(55, B.new(1, 'X'), B.new(2, 'Y'), 3)]
+
+s = Oj.dump(obj, :mode => :object)
+
+100000.times do
+  Oj.load(s, :mode => :object)
+  # ds = Oj.dump(o, :mode => :object)
+  # if ds != s
+  #   puts ds
+  #   raise "holy crap"
+  # end
+end

data/test/test_scp.rb

@@ -259,7 +259,7 @@ class ScpTest < Minitest::Test
   def test_double
     handler = AllHandler.new()
     json = %{{"one":true,"two":false}{"three":true,"four":false}}
-    Oj.sc_parse(handler, json)
+    Oj.sc_parse(handler, json) { |j| j }
     assert_equal([[:hash_start],
                   [:hash_key, 'one'],
                   [:hash_set, 'one', true],
@@ -284,10 +284,8 @@ class ScpTest < Minitest::Test
   def test_fixnum_bad
     handler = AllHandler.new()
     json = %{12345xyz}
-    begin
+    assert_raises SyntaxError do
       Oj.sc_parse(handler, json)
-    rescue Exception => e
-      assert_match(%r{unexpected character at line 1, column 6 \[(?:[a-z\.]+/)*parse\.c:\d+\]}, e.message)
     end
   end
 

data/test/test_serializer.rb

@@ -0,0 +1,59 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+require 'oj'
+
+Oj.mimic_JSON
+
+require 'rails/all'
+require 'active_model'
+require 'active_model_serializers'
+require 'active_support/json'
+
+#Oj.mimic_JSON
+
+class Category
+  include ActiveModel::Model
+  include ActiveModel::SerializerSupport
+
+  attr_accessor :id, :name
+
+  def initialize(id, name)
+    @id   = id
+    @name = name
+  end
+end
+
+class CategorySerializer < ActiveModel::Serializer
+  attributes :id, :name
+end
+
+class MimicRails < Minitest::Test
+
+  def test_dump_object
+    Oj.default_options= {:indent => 0}
+    category = Category.new(1, 'test')
+    serializer = CategorySerializer.new(category)
+
+    json = serializer.to_json()
+    puts "*** serializer.to_json() #{serializer.to_json()}"
+    assert_equal(%|{"category":{"id":1,"name":"test"}}|, json)
+
+    json = serializer.as_json()
+    puts "*** serializer.as_json() #{serializer.as_json()}"
+    assert_equal({"category" => {:id => 1, :name => "test"}}, json)
+
+    json = JSON.dump(serializer)
+    puts "*** JSON.dump(serializer) #{JSON.dump(serializer)}"
+    assert_equal(%|{"category":{"id":1,"name":"test"}}|, json)
+  end
+
+end # MimicRails

data/test/test_various.rb

@@ -294,6 +294,20 @@ class Juice < Minitest::Test
     assert_equal([{"a"=>1}, [1,2], [3,4], {"b"=>2}], results)
   end
 
+  def test_multiple_json_no_callback
+    json = %{{"a":1}
+[1,2][3,4]
+{"b":2}
+}
+    begin
+      Oj.load(json)
+    rescue Exception
+      assert(true)
+      return
+    end
+    assert(false, "*** expected an exception")
+  end
+
   # encoding tests
   def test_does_not_escape_entities_by_default
     Oj.default_options = { :escape_mode => :ascii } # set in mimic mode

data/test/write_timebars.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'stringio'
+require 'oj'
+
+
+filename = File.join(File.dirname(__FILE__), 'day.json')
+File.open(filename, "w") do |f|
+  w = Oj::StreamWriter.new(f, :indent => -1)
+  390.times do |i|
+    w.push_object()
+    w.push_value(12, 'msgType')
+    w.push_value(1, 'version')
+    w.push_value(1_400_074_200 + i * 60, 'bar')
+    w.push_value('TBC', 'source')
+    w.push_array('timebars')
+    w.push_object()
+    w.push_value('aapl_24', 'asset')
+    w.push_value(91.87, 'close')
+    w.pop()
+    w.pop()
+    w.pop()
+  end
+  f.write("\n")
+end
+

data/test/zip.rb

@@ -0,0 +1,34 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+require 'zlib'
+
+File.open('test.json.gz', 'r') do |file|
+  Zlib::GzipReader.wrap(file) do |f2|
+    puts "*** f2: #{f2}"
+    Oj.load(f2) do |val|
+      puts val
+    end
+  end
+end
+
+=begin
+And a json file with the following contents (then gzipped):
+
+{"a":2}
+{"b":2}
+The output is:
+
+{"a"=>2}
+{"b"=>2}
+bin/test:8:in `load': undefined method `new' for #<EOFError: end of file reached> (NoMethodError)
+    from bin/test:8:in `block (2 levels) in <main>'
+    from bin/test:7:in `wrap'
+    from bin/test:7:in `block in <main>'
+    from bin/test:6:in `open'
+    from bin/test:6:in `<main>'
+=end

metadata

@@ -1,65 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.12.9
-  prerelease: 
+  version: 2.12.10
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-30 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
-description: ! 'The fastest JSON parser and object serializer. '
+description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
 executables: []
 extensions:
@@ -67,52 +60,60 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- lib/oj/active_support_helper.rb
-- lib/oj/bag.rb
-- lib/oj/error.rb
-- lib/oj/mimic.rb
-- lib/oj/saj.rb
-- lib/oj/schandler.rb
-- lib/oj/version.rb
-- lib/oj.rb
-- ext/oj/extconf.rb
+- LICENSE
+- README.md
 - ext/oj/buf.h
-- ext/oj/cache8.h
-- ext/oj/circarray.h
-- ext/oj/encode.h
-- ext/oj/err.h
-- ext/oj/hash.h
-- ext/oj/odd.h
-- ext/oj/oj.h
-- ext/oj/parse.h
-- ext/oj/reader.h
-- ext/oj/resolve.h
-- ext/oj/val_stack.h
 - ext/oj/cache8.c
+- ext/oj/cache8.h
 - ext/oj/circarray.c
+- ext/oj/circarray.h
 - ext/oj/compat.c
 - ext/oj/dump.c
+- ext/oj/encode.h
 - ext/oj/err.c
+- ext/oj/err.h
+- ext/oj/extconf.rb
 - ext/oj/fast.c
 - ext/oj/hash.c
+- ext/oj/hash.h
 - ext/oj/hash_test.c
 - ext/oj/object.c
 - ext/oj/odd.c
+- ext/oj/odd.h
 - ext/oj/oj.c
+- ext/oj/oj.h
 - ext/oj/parse.c
+- ext/oj/parse.h
 - ext/oj/reader.c
+- ext/oj/reader.h
 - ext/oj/resolve.c
+- ext/oj/resolve.h
 - ext/oj/saj.c
 - ext/oj/scp.c
 - ext/oj/sparse.c
 - ext/oj/strict.c
 - ext/oj/val_stack.c
+- ext/oj/val_stack.h
+- lib/oj.rb
+- lib/oj/active_support_helper.rb
+- lib/oj/bag.rb
+- lib/oj/error.rb
+- lib/oj/mimic.rb
+- lib/oj/saj.rb
+- lib/oj/schandler.rb
+- lib/oj/version.rb
 - test/_test_active.rb
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
 - test/bug.rb
+- test/bug2.rb
+- test/bug3.rb
+- test/bug_fast.rb
+- test/bug_load.rb
+- test/example.rb
 - test/files.rb
 - test/helper.rb
+- test/io.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_alone.rb
@@ -120,18 +121,17 @@ files:
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
+- test/mod.rb
 - test/perf.rb
-- test/perf1.rb
-- test/perf2.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
 - test/perf_file.rb
-- test/perf_obj_old.rb
 - test/perf_object.rb
 - test/perf_saj.rb
 - test/perf_scp.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
+- test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -144,49 +144,47 @@ files:
 - test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
-- test/sample.rb
 - test/sample_json.rb
-- test/test_bigd.rb
+- test/struct.rb
 - test/test_compat.rb
 - test/test_debian.rb
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
 - test/test_object.rb
-- test/test_range.rb
 - test/test_saj.rb
 - test/test_scp.rb
+- test/test_serializer.rb
 - test/test_strict.rb
 - test/test_various.rb
 - test/test_writer.rb
-- LICENSE
-- README.md
+- test/write_timebars.rb
+- test/zip.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []

data/test/perf1.rb

@@ -1,64 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-#require 'test/unit'
-require 'optparse'
-require 'oj'
-require 'ox'
-
-$indent = 2
-
-opts = OptionParser.new
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-iter = 100000
-s = %{
-{ "class": "Foo::Bar",
-  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
-  "attr2": { "one": 1 }
-}
-}
-#s = File.read('sample.json')
-
-Oj.default_options = { :indent => 0 }
-
-obj = Oj.load(s)
-xml = Ox.dump(obj, :indent => 0)
-
-puts xml
-
-start = Time.now
-iter.times do
-  Oj.load(s)
-end
-dt = Time.now - start
-puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Ox.load(xml)
-end
-dt = Time.now - start
-puts "%d Ox.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
-
-puts
-
-start = Time.now
-iter.times do
-  Oj.dump(obj)
-end
-dt = Time.now - start
-puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Ox.dump(obj)
-end
-dt = Time.now - start
-puts "%d Ox.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
-
-puts

data/test/perf2.rb

@@ -1,76 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-#require 'test/unit'
-require 'optparse'
-require 'yajl'
-require 'oj'
-
-$indent = 2
-
-opts = OptionParser.new
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-class Foo
-  def initialize()
-    @x = true
-    @y = 58
-  end
-  def to_json()
-    %{{"x":#{@x},"y":#{@y}}}
-  end
-  def to_hash()
-    { 'x' => @x, 'y' => @y }
-  end
-end
-
-iter = 100000
-s = %{
-{ "class": "Foo::Bar",
-  "attr1": [ true, [false, [12345, null], 3.967, ["something", false], null]],
-  "attr2": { "one": 1 }
-}
-}
-
-obj = Oj.load(s)
-obj["foo"] = Foo.new()
-
-Oj.default_options = { :indent => 0, :effort => :internal }
-
-puts
-
-start = Time.now
-iter.times do
-  Oj.load(s)
-end
-dt = Time.now - start
-puts "%d Oj.load()s in %0.3f seconds or %0.1f loads/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Yajl::Parser.parse(s)
-end
-dt = Time.now - start
-puts "%d Yajl::Parser.parse()s in %0.3f seconds or %0.1f parses/msec" % [iter, dt, iter/dt/1000.0]
-
-puts
-
-start = Time.now
-iter.times do
-  Oj.dump(obj)
-end
-dt = Time.now - start
-puts "%d Oj.dump()s in %0.3f seconds or %0.1f dumps/msec" % [iter, dt, iter/dt/1000.0]
-
-start = Time.now
-iter.times do
-  Yajl::Encoder.encode(obj)
-end
-dt = Time.now - start
-puts "%d Yajl::Encoder.encode()s in %0.3f seconds or %0.1f encodes/msec" % [iter, dt, iter/dt/1000.0]
-
-puts

data/test/perf_obj_old.rb

@@ -1,213 +0,0 @@
-#!/usr/bin/env ruby -wW1
-
-$: << '.'
-$: << '..'
-$: << '../lib'
-$: << '../ext'
-
-if __FILE__ == $0
-  if (i = ARGV.index('-I'))
-    x,path = ARGV.slice!(i, 2)
-    $: << path
-  end
-end
-
-require 'optparse'
-require 'ox'
-require 'oj'
-require 'perf'
-require 'sample'
-require 'files'
-
-$verbose = 0
-$circular = false
-$indent = 0
-
-do_sample = false
-do_files = false
-
-do_load = false
-do_dump = false
-do_read = false
-do_write = false
-$iter = 1000
-
-opts = OptionParser.new
-opts.on("-v", "increase verbosity")                         { $verbose += 1 }
-
-opts.on("-c", "circular options")                           { $circular = true }
-
-opts.on("-s", "load and dump as sample Ruby object")        { do_sample = true }
-opts.on("-f", "load and dump as files Ruby object")         { do_files = true }
-
-opts.on("-l", "load")                                       { do_load = true }
-opts.on("-d", "dump")                                       { do_dump = true }
-opts.on("-r", "read")                                       { do_read = true }
-opts.on("-w", "write")                                      { do_write = true }
-opts.on("-a", "load, dump, read and write")                 { do_load = true; do_dump = true; do_read = true; do_write = true }
-
-opts.on("-i", "--iterations [Int]", Integer, "iterations")  { |i| $iter = i }
-
-opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
-files = opts.parse(ARGV)
-
-if files.empty?
-  data = []
-  obj = do_sample ? sample_doc(2) : files('..')
-  mars = Marshal.dump(obj)
-  xml = Ox.dump(obj, :indent => $indent, circular: $circular)
-  json = Oj.dump(obj, :indent => $indent, circular: $circular)
-  File.open('sample.xml', 'w') { |f| f.write(xml) }
-  File.open('sample.json', 'w') { |f| f.write(json) }
-  File.open('sample.marshal', 'w') { |f| f.write(mars) }
-  data << { :file => 'sample.xml', :obj => obj, :xml => xml, :marshal => mars, :json => json }
-else
-  puts "loading and parsing #{files}\n\n"
-  # TBD change to allow xml and json
-  data = files.map do |f|
-    xml = File.read(f)
-    obj = Ox.load(xml);
-    mars = Marshal.dump(obj)
-    json = Oj.dump(obj, :indent => $indent, circular: $circular)
-    { :file => f, :obj => obj, :xml => xml, :marshal => mars, :json => json }
-  end
-end
-
-$ox_load_time = 0
-$mars_load_time = 0
-$ox_dump_time = 0
-$oj_dump_time = 0
-$mars_dump_time = 0
-
-def perf_load(d)
-  filename = d[:file]
-  marshal_filename = 'sample.marshal'
-  xml = d[:xml]
-  mars = d[:marshal]
-  json = d[:json]
-
-  if 0 < $verbose
-    obj = Ox.load(xml, :mode => :object, :trace => $verbose)
-    return
-  end
-  start = Time.now
-  (1..$iter).each do
-    obj = Ox.load(xml, :mode => :object)
-  end
-  $ox_load_time = Time.now - start
-  puts "Parsing #{$iter} times with Ox took #{$ox_load_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    obj = Oj.load(json, :mode => :object)
-  end
-  $oj_load_time = Time.now - start
-  puts "Parsing #{$iter} times with Oj took #{$oj_load_time} seconds."
-  
-  start = Time.now
-  (1..$iter).each do
-    obj = Marshal.load(mars)
-  end
-  $mars_load_time = Time.now - start
-  puts "Marshalling #{$iter} times took #{$mars_load_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal loading.\n\n" % [$mars_load_time/$ox_load_time]
-end
-
-def perf_dump(d)
-  obj = d[:obj]
-
-  start = Time.now
-  (1..$iter).each do
-    xml = Ox.dump(obj, :indent => $indent, :circular => $circular)
-    #puts "*** ox:\n#{xml}"
-  end
-  $ox_dump_time = Time.now - start
-  puts "Ox dumping #{$iter} times with ox took #{$ox_dump_time} seconds."
-
-  Oj.default_options = {:indent => $indent}
-  start = Time.now
-  (1..$iter).each do
-    json = Oj.dump(obj)
-  end
-  $oj_dump_time = Time.now - start
-  puts "Oj dumping #{$iter} times with oj took #{$oj_dump_time} seconds."
-
-  obj = d[:obj]
-  start = Time.now
-  (1..$iter).each do
-    m = Marshal.dump(obj)
-  end
-  $mars_dump_time = Time.now - start
-  puts "Marshal dumping #{$iter} times took #{$mars_dump_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [$mars_dump_time/$ox_dump_time]
-end
-
-def perf_read(d)
-  ox_read_time = 0
-  mars_read_time = 0
-
-  filename = d[:file]
-  marshal_filename = 'sample.marshal'
-  xml = d[:xml]
-  mars = d[:marshal]
-
-  # now load from the file
-  start = Time.now
-  (1..$iter).each do
-    obj = Ox.load_file(filename, :mode => :object)
-  end
-  ox_read_time = Time.now - start
-  puts "Loading and parsing #{$iter} times with ox took #{ox_read_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    m = File.read(marshal_filename)
-    obj = Marshal.load(m)
-  end
-  mars_read_time = Time.now - start
-  puts "Reading and marshalling #{$iter} times took #{mars_read_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal loading and parsing.\n\n" % [mars_read_time/ox_read_time]
-
-end
-
-def perf_write(d)
-  ox_write_time = 0
-  mars_write_time = 0
-  
-  ox_filename = 'out.xml'
-  marshal_filename = 'out.marshal'
-  obj = d[:obj]
-
-  start = Time.now
-  (1..$iter).each do
-    xml = Ox.to_file(ox_filename, obj, :indent => $indent)
-  end
-  ox_write_time = Time.now - start
-  puts "Ox dumping #{$iter} times with ox took #{ox_write_time} seconds."
-
-  start = Time.now
-  (1..$iter).each do
-    m = Marshal.dump(obj, circular: $circular)
-    File.open(marshal_filename, "w") { |f| f.write(m) }
-  end
-  mars_write_time = Time.now - start
-  puts "Marshal dumping and writing #{$iter} times took #{mars_write_time} seconds."
-  puts ">>> Ox is %0.1f faster than Marshal dumping.\n\n" % [mars_write_time/ox_write_time]
-
-end
-
-#if do_sample or do_files
-  data.each do |d|
-    puts "Using file #{d[:file]}."
-    
-    perf_load(d) if do_load
-    perf_dump(d) if do_dump
-    if do_load and do_dump
-      puts ">>> Ox is %0.1f faster than Marshal dumping and loading.\n\n" % [($mars_load_time + $mars_dump_time)/($ox_load_time + $ox_dump_time)] unless 0 == $mars_load_time
-    end
-
-    perf_read(d) if do_read
-    perf_write(d) if do_write
-
-  end
-#end

data/test/test_bigd.rb

@@ -1,63 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$VERBOSE = true
-
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'rubygems' if RUBY_VERSION.start_with?('1.8.')
-
-#require "minitest/spec"
-require "minitest/autorun"
- 
-require "oj"
- 
-# Uncomment this line and test_big_decimal will fail
-require "active_support/json"
- 
-# With ActiveSupport 4.0, neither of these settings affect BigDecimal#to_json,
-# only BigDecimal#as_json
-#
-# ActiveSupport.encode_big_decimal_as_string = false
-# ActiveSupport::JSON::Encoding.encode_big_decimal_as_string = false
- 
-describe Oj do
- 
-  # Options set by default in Rails 4.0 / Rabl
-  def options
-    {
-      :bigdecimal_as_decimal=>true, # default = true
-      :use_to_json=>true, # default = false
-      :mode=>:compat, # default = object
-      :time_format=>:ruby, # default = unix
-    }
-  end
- 
-  def test_big_decimal
-    orig = BigDecimal.new("3.14159265359")
-    puts "*** to_s: #{orig.to_s}"
-    puts "*** to_json: #{orig.to_json}"
-    puts "*** JSON.dump: #{JSON.dump(orig)}"
-    json = Oj.dump(orig, options)
-    puts "*** json: #{json}"
- 
-    value = Oj.load(json)
-    puts "*** value: #{value.class}"
-    assert_equal(value, orig)
- 
-    # by default, without active support
-    # assert_equal("0.314159265359E1", json)
-    # in Rails 4.1, with active support
-    # assert_equal("3.14159265359", json)
-  end
- 
-  # Floats are unaffected
-  def test_float
-    orig = 3.14159265359
-    json = Oj.dump(orig, options)
-    assert_equal("3.14159265359", json)
-  end
- 
-end