oj 2.14.6 → 2.15.0

data/test/test_bigd.rb

@@ -0,0 +1,63 @@
+#!/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

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

@@ -1,16 +1,19 @@
 #!/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")
 
-Thread.new do
-  string_io = StringIO.new('{"foo":"bar"}')
-  Oj.load(string_io)
-  string_io.rewind
-  puts string_io.read
-end.join
+puts Oj.dump(range)

data/test/test_various.rb

@@ -138,6 +138,7 @@ class Juice < Minitest::Test
       :array_nl=>'a',
       :object_nl=>'o',
       :space_before=>'b',
+      :nan=>:huge,
     }
     Oj.default_options = alt
     opts = Oj.default_options()
@@ -214,6 +215,24 @@ class Juice < Minitest::Test
     assert_equal('-95.640172', Oj.dump(-95.640172))
   end
 
+  def test_nan_dump
+    assert_equal('null', Oj.dump(0/0.0, :mode => :strict, :nan => :null))
+    assert_equal('NaN', Oj.dump(0/0.0, :mode => :strict, :nan => :word))
+    assert_equal('3.3e14159265358979323846', Oj.dump(0/0.0, :mode => :strict, :nan => :huge))
+  end
+
+  def test_infinity_dump
+    assert_equal('null', Oj.dump(1/0.0, :mode => :strict, :nan => :null))
+    assert_equal('Infinity', Oj.dump(1/0.0, :mode => :strict, :nan => :word))
+    assert_equal('3.0e14159265358979323846', Oj.dump(1/0.0, :mode => :strict, :nan => :huge))
+  end
+
+  def test_neg_infinity_dump
+    assert_equal('null', Oj.dump(-1/0.0, :mode => :strict, :nan => :null))
+    assert_equal('-Infinity', Oj.dump(-1/0.0, :mode => :strict, :nan => :word))
+    assert_equal('-3.0e14159265358979323846', Oj.dump(-1/0.0, :mode => :strict, :nan => :huge))
+  end
+
   def test_float
     mode = Oj.default_options()[:mode]
     Oj.default_options = {:mode => :object}
@@ -229,7 +248,7 @@ class Juice < Minitest::Test
     dump_and_load(1/0.0, false)
     # NaN does not always == NaN
     json = Oj.dump(0/0.0)
-    assert_equal('NaN', json)
+    assert_equal('3.3e14159265358979323846', json)
     loaded = Oj.load(json);
     assert_equal(true, loaded.nan?)
     Oj.default_options = {:mode => mode}
@@ -1213,7 +1232,8 @@ class Juice < Minitest::Test
   end
 
   def test_comment_c
-    json = %{{
+    json = %{/*before*/
+{
   "x"/*one*/:/*two*/true,
   "y":58,
   "z": [1,2,3]}

metadata

@@ -1,58 +1,65 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.14.6
+  version: 2.15.0
+  prerelease: 
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-28 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:
@@ -60,60 +67,52 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
-- LICENSE
-- README.md
+- 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
 - ext/oj/buf.h
-- ext/oj/cache8.c
 - ext/oj/cache8.h
-- ext/oj/circarray.c
 - 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/circarray.c
 - 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
@@ -122,18 +121,18 @@ 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/russian.rb
-- test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -146,60 +145,57 @@ 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_bigd.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
+- LICENSE
+- README.md
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options:
-- "--main"
+- --main
 - README.md
 require_paths:
 - lib
 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: 2.4.5
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A fast JSON parser and serializer.
 test_files:
 - 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
@@ -208,17 +204,18 @@ test_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/russian.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -233,18 +230,16 @@ test_files:
 - test/sample/text.rb
 - test/sample.rb
 - test/sample_json.rb
-- test/struct.rb
+- test/test_bigd.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
-has_rdoc: true

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a4eeac461218d534327dc278a6dfe132de7227bb
-  data.tar.gz: 9197b3baa13fe3077519d6156a9d9dbbd1176066
-SHA512:
-  metadata.gz: 1a89867a9e4e684a3d0f268e18179d54f63471a0b8f3fed3ed174a11b5dc3f0cd582bce893955de582e57872985196c6dd671078624b1de4bbfb17805508e9ef
-  data.tar.gz: 9eb8668bbc77cc0a3057321706f08bbded75ab0bca623964554796bdc9835ede42e34b36a596f64637a81461b9bc9a67d94cd5d46ee8fca5fce04c8a9ab5f6cb

data/test/bug2.rb

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