oj 2.9.4 → 2.9.5

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,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.9.4
+  version: 2.9.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-28 00:00:00.000000000 Z
-dependencies: []
+date: 2014-06-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  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
+  prerelease: false
+  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
+  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: []
@@ -59,14 +101,16 @@ files:
 - lib/oj/saj.rb
 - lib/oj/schandler.rb
 - lib/oj/version.rb
-- test/a.rb
-- test/bug.rb
-- test/debian_test.rb
-- test/e.rb
+- test/_test_mimic_rails.rb
 - test/files.rb
-- test/foo.rb
-- test/lots.rb
-- test/mj.rb
+- test/helper.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_before.rb
+- test/isolated/test_mimic_define.rb
+- test/isolated/test_mimic_rails_after.rb
+- test/isolated/test_mimic_rails_before.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -75,9 +119,7 @@ files:
 - test/perf_saj.rb
 - test/perf_scp.rb
 - test/perf_simple.rb
-- test/perf_str.rb
 - test/perf_strict.rb
-- test/perf_strictx.rb
 - test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -94,20 +136,17 @@ files:
 - test/sample_json.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_mimic.rb
-- test/test_mimic_after.rb
 - test/test_object.rb
 - test/test_saj.rb
 - test/test_scp.rb
 - test/test_strict.rb
-- test/test_strictx.rb
+- test/test_various.rb
 - test/test_writer.rb
-- test/tests.rb
-- test/write_fake_log.rb
-- test/x.rb
+- test/zip.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT

data/test/a.rb

@@ -1,38 +0,0 @@
-#!/usr/bin/env ruby -wW1
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'pp'
-require 'oj'
-require 'perf'
-
-obj = [[1],[2],[3],[4],[5],[6],[7],[8],[9]]
-obj = [[],[],[],[],[],[],[],[],[]]
-obj = {
-  'a' => 'Alpha', # string
-  'b' => true,    # boolean
-  'c' => 12345,   # number
-  'd' => [ true, [false, [12345, nil], 3.967, ['something', false], nil]], # mix it up array
-  'e' => { 'one' => 1, 'two' => 2 }, # hash
-  'f' => nil,     # nil
-  'g' => 12345678901234567890123456789, # big number
-  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
-  'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
-}
-
-json = Oj.dump(obj, mode: :compat)
-
-puts json
-#pp Oj.saj_parse(nil, json)
-pp Oj.t_parse(json)
-
-if true
-  perf = Perf.new()
-  perf.add('SAJ', 'oj') { Oj.saj_parse(nil, json) }
-  perf.add('T', 'oj') { Oj.t_parse(json) }
-  perf.add('load', 'oj') { Oj.load(json) }
-  perf.run(10000)
-end

data/test/bug.rb

@@ -1,17 +0,0 @@
-#!/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'
-
-obj = Oj.load_file('bug.json', :mode => :object)
-
-puts Oj.dump(obj, :mode => :object, :indent => 0)

data/test/debian_test.rb

@@ -1,90 +0,0 @@
-#!/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 'test/unit'
-require 'stringio'
-require 'date'
-require 'bigdecimal'
-require 'oj'
-
-$ruby = RUBY_DESCRIPTION.split(' ')[0]
-$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
-
-def hash_eql(h1, h2)
-  return false if h1.size != h2.size
-  h1.keys.each do |k|
-    return false unless h1[k] == h2[k]
-  end
-  true
-end
-
-class Jam
-  attr_accessor :x, :y
-
-  def initialize(x, y)
-    @x = x
-    @y = y
-  end
-
-  def eql?(o)
-    self.class == o.class && @x == o.x && @y == o.y
-  end
-  alias == eql?
-
-end# Jam
-
-# contributed by sauliusg to fix as_json
-class Orange < Jam
-  def initialize(x, y)
-    super
-  end
-
-  def as_json()
-    puts "Orange.as_json called"
-    { :json_class => self.class,
-      :x => @x,
-      :y => @y }
-  end
-
-  def self.json_create(h)
-    puts "Orange.json_create"
-    self.new(h['x'], h['y'])
-  end
-end
-
-class DebJuice < ::Test::Unit::TestCase
-
-  def test_class_hash
-    Oj.hash_test()
-  end
-
-  def test_as_json_object_compat_hash_cached
-    Oj.default_options = { :mode => :compat, :class_cache => true }
-    obj = Orange.new(true, 58)
-    puts "dumping compat with cache"
-    json = Oj.dump(obj, :indent => 2)
-    assert(!json.nil?)
-    dump_and_load(obj, true)
-  end
-
-  def dump_and_load(obj, trace=false)
-    puts "dumping"
-    json = Oj.dump(obj, :indent => 2)
-    puts json if trace
-    puts "loading"
-    loaded = Oj.load(json);
-    puts "done"
-    assert_equal(obj, loaded)
-    loaded
-  end
-
-end

data/test/e.rb

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'oj'
-
-json = %{"\xc2\xa9\xc3\x98"}
-puts "original:\n#{json}"
-
-str = Oj.load(json)
-puts "out: #{str}"

data/test/foo.rb

@@ -1,24 +0,0 @@
-#!/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'
-
-class Foo < String
-  def initialize(str, safe)
-    super(str)
-    @safe = safe
-  end
-end
-
-f = Foo.new("z")
-
-puts f

data/test/lots.rb

@@ -1,68 +0,0 @@
-#!/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'
-
-module One
-  module Two
-    module Three
-      class Empty
-
-        def initialize()
-        end
-
-        def eql?(o)
-          self.class == o.class
-        end
-        alias == eql?
-
-        def to_hash()
-          {'json_class' => "#{self.class.name}"}
-        end
-
-        def to_json(*a)
-          %{{"json_class":"#{self.class.name}"}}
-        end
-
-        def self.json_create(h)
-          self.new()
-        end
-      end # Empty
-    end # Three
-  end # Two
-end # One
-
-$obj = {
-  'a' => 'Alpha', # string
-  'b' => true,    # boolean
-  'c' => 12345,   # number
-  'd' => [ true, [false, [-123456789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
-  'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
-  'f' => nil,     # nil
-  'g' => One::Two::Three::Empty.new(),
-  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
-  'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
-}
-
-$obj = [$obj]*10000
-
-Oj.default_options = { :indent => 2, :mode => :compat }
-
-$json = Oj.dump($obj, :mode => :compat)
-
-$result = nil
-100.times { |i|
-  print(".") if (0 == i % 10)
-  $result = Oj.compat_load($json)
-}
-
-

data/test/mj.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-# $: << File.join(File.dirname(__FILE__), "../../multi_json/lib")
-
-require 'multi_json'
-require 'benchmark'
-require 'yajl'
-require 'json'
-require 'oj'
-
-iter = 1_000_000
-iter = 100_000
-
-json = %({"k1":"val1","k2":"val2","k3":"val3"})
-obj = { k1: "val1", k2: "val2", k3: "val3" }
-
-puts "Benchmarks for different JSON handlers with MultiJson."
-puts "  Ruby #{RUBY_VERSION}"
-puts "  #{iter} iterations"
-
-MultiJson.engine = :oj
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "    Oj decode: #{dt}  encode: #{et}"
-
-MultiJson.engine = :yajl
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "  Yajl decode: #{dt}  encode: #{et}"
-
-MultiJson.engine = :json_gem
-dt = Benchmark.realtime { iter.times { MultiJson.decode(json) }}
-et = Benchmark.realtime { iter.times { MultiJson.encode(obj) }}
-puts "  Json decode: #{dt}  encode: #{et}"
-
-Oj.default_options = { :mode => :compat, :time_format => :ruby }
-dt = Benchmark.realtime { iter.times { Oj.load(json) }}
-et = Benchmark.realtime { iter.times { Oj.dump(obj) }}
-puts "Raw Oj decode: #{dt}  encode: #{et}"
-
-ye = Yajl::Encoder.new
-dt = Benchmark.realtime { iter.times { Yajl::Parser.parse(json) }}
-et = Benchmark.realtime { iter.times { Yajl::Encoder.encode(obj) }}
-e2 = Benchmark.realtime { iter.times { ye.encode(obj) }}
-puts "Raw Yajl decode: #{dt} encode: #{et}, encoder: #{e2}"