oj 2.9.9 → 2.10.0

data/test/test_strict.rb

@@ -39,6 +39,8 @@ class StrictJuice < Minitest::Test
     dump_and_load(12345.6789, false)
     dump_and_load(70.35, false)
     dump_and_load(-54321.012, false)
+    dump_and_load(1.7775, false)
+    dump_and_load(2.5024, false)
     dump_and_load(2.48e16, false)
     dump_and_load(2.48e100 * 1.0e10, false)
     dump_and_load(-2.48e100 * 1.0e10, false)

data/test/test_various.rb

@@ -173,6 +173,8 @@ class Juice < Minitest::Test
     dump_and_load(12345.6789, false)
     dump_and_load(70.35, false)
     dump_and_load(-54321.012, false)
+    dump_and_load(1.7775, false)
+    dump_and_load(2.5024, false)
     dump_and_load(2.48e16, false)
     dump_and_load(2.48e100 * 1.0e10, false)
     dump_and_load(-2.48e100 * 1.0e10, false)

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,117 +1,112 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oj
-version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
-  segments: 
-  - 2
-  - 9
-  - 9
-  version: 2.9.9
+version: !ruby/object:Gem::Version
+  version: 2.10.0
 platform: ruby
-authors: 
+authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-07-07 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-08-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 5
-        version: "5"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        version: "3"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
-  version_requirements: *id003
-description: "The fastest JSON parser and object serializer. "
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4'
+description: 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
 executables: []
-
-extensions: 
+extensions:
 - ext/oj/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
+- README.md
+files:
+- LICENSE
 - README.md
-files: 
-- 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
 - 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/bag.rb
+- lib/oj/error.rb
+- lib/oj/mimic.rb
+- lib/oj/saj.rb
+- lib/oj/schandler.rb
+- lib/oj/version.rb
 - test/_test_mimic_rails.rb
 - test/bug.rb
+- test/bug2.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,17 +115,15 @@ files:
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.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
@@ -143,8 +136,8 @@ files:
 - test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
-- test/sample.rb
 - test/sample_json.rb
+- test/struct.rb
 - test/test_compat.rb
 - test/test_debian.rb
 - test/test_fast.rb
@@ -156,43 +149,35 @@ files:
 - 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: 
+licenses:
 - MIT
 - GPL-3.0
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --main
+rdoc_options:
+- "--main"
 - README.md
-require_paths: 
+require_paths:
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: oj
-rubygems_version: 1.8.15
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
-
+has_rdoc: true

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