oj 2.11.5 → 2.12.0

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

@@ -386,26 +386,26 @@ class Juice < Minitest::Test
   def test_unix_time_compat
     t = Time.xmlschema("2012-01-05T23:58:07.123456000+09:00")
     #t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
-    json = Oj.dump(t, :mode => :compat)
+    json = Oj.dump(t, :mode => :compat, :time_format => :unix)
     assert_equal(%{1325775487.123456000}, json)
   end
   def test_unix_time_compat_precision
     t = Time.xmlschema("2012-01-05T23:58:07.123456789+09:00")
     #t = Time.local(2012, 1, 5, 23, 58, 7, 123456)
-    json = Oj.dump(t, :mode => :compat, :second_precision => 5)
+    json = Oj.dump(t, :mode => :compat, :second_precision => 5, :time_format => :unix)
     assert_equal(%{1325775487.12346}, json)
     t = Time.xmlschema("2012-01-05T23:58:07.999600+09:00")
-    json = Oj.dump(t, :mode => :compat, :second_precision => 3)
+    json = Oj.dump(t, :mode => :compat, :second_precision => 3, :time_format => :unix)
     assert_equal(%{1325775488.000}, json)
   end
   def test_unix_time_compat_early
     t = Time.xmlschema("1954-01-05T00:00:00.123456789+00:00")
-    json = Oj.dump(t, :mode => :compat, :second_precision => 5)
+    json = Oj.dump(t, :mode => :compat, :second_precision => 5, :time_format => :unix)
     assert_equal(%{-504575999.87654}, json)
   end
   def test_unix_time_compat_1970
     t = Time.xmlschema("1970-01-01T00:00:00.123456789+00:00")
-    json = Oj.dump(t, :mode => :compat, :second_precision => 5)
+    json = Oj.dump(t, :mode => :compat, :second_precision => 5, :time_format => :unix)
     assert_equal(%{0.12346}, json)
   end
   def test_ruby_time_compat
@@ -503,16 +503,6 @@ class Juice < Minitest::Test
       assert_equal(%{"2012-01-05T23:58:07Z"}, json)
     end
   end
-  def test_time_object
-    t = Time.now()
-    Oj.default_options = { :mode => :object }
-    dump_and_load(t, false)
-  end
-  def test_time_object_early
-    t = Time.xmlschema("1954-01-05T00:00:00.123456")
-    Oj.default_options = { :mode => :object }
-    dump_and_load(t, false)
-  end
 
   # Class
   def test_class_strict

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.11.5
+  version: 2.12.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -106,8 +106,10 @@ files:
 - test/_test_active_mimic.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
@@ -115,13 +117,11 @@ 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
@@ -141,19 +141,21 @@ files:
 - test/sample/shape.rb
 - test/sample/text.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
+- test/write_timebars.rb
+- test/zip.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
@@ -182,3 +184,4 @@ signing_key:
 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

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