oj 3.3.2 → 3.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5751bb765a26b86b9e23a6fbc2bb4a127cdd8b10
-  data.tar.gz: be164b60130dad88db2de417ecae84b542a47d68
+  metadata.gz: e210bbe1a4ca6481764cdbce1cf22a81cef57422
+  data.tar.gz: 498f055ca85353c634d9075ebfd4aa08b407ec9e
 SHA512:
-  metadata.gz: 36f67b79a17e3bb452a3d10cdddaecb825b1cce08a4407e9ade9cee19a724e2ff73d99855b8da4da6d7bb0bf6d9f71708b4308c2f40e38c7d71d3d85f103180e
-  data.tar.gz: 36681b67bcd1f6a62aff34b4b3e8121eceb9f14be749430405b07fe736bc4e2e6fc0a783e74ac1d25a77945790c478706fe1bf1ee8cd09c8e0a9210b6b75b72b
+  metadata.gz: 2ef63f7e0e438b91403adc11f8789ee0637a093e77f189713e2a1c8302eb4ba2b5a85c1a212a0773a9d51d6b53e799ef23f5a24bf1ef5ada26ef6c4cd1607eec
+  data.tar.gz: 22439e9541f4cee3f2524c4fecf114bb69f90693fddd4527f4ba56d632f060803ac021b745abeca80f45c7ab0171ac94159f98428e527e24e3eba3971c40e3af

data/README.md

@@ -1,6 +1,6 @@
 # [![{}j](http://www.ohler.com/dev/images/oj_comet_64.svg)](http://www.ohler.com/oj) gem
 
-[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg)](http://travis-ci.org/ohler55/oj?branch=master) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg)
+[![Build Status](https://img.shields.io/travis/ohler55/oj/master.svg)](http://travis-ci.org/ohler55/oj?branch=master) [![AppVeyor](https://img.shields.io/appveyor/ci/ohler55/oj/master.svg)](https://ci.appveyor.com/project/ohler55/oj) ![Gem](https://img.shields.io/gem/v/oj.svg) ![Gem](https://img.shields.io/gem/dt/oj.svg)
 
 A *fast* JSON parser and Object marshaller as a Ruby gem.
 

data/ext/oj/extconf.rb

@@ -63,6 +63,6 @@ end
 
 $CPPFLAGS += ' -Wall'
 #puts "*** $CPPFLAGS: #{$CPPFLAGS}"
-create_makefile("#{extension_name}/#{extension_name}")
+create_makefile(File.join(extension_name, extension_name))
 
-%x{make clean}
+#%x{make clean}

data/ext/oj/mimic_json.c

@@ -92,6 +92,8 @@ oj_parse_mimic_dump_options(VALUE ropts, Options copts) {
 	    ropts = rb_funcall(ropts, oj_to_hash_id, 0);
 	} else if (rb_respond_to(ropts, oj_to_h_id)) {
 	    ropts = rb_funcall(ropts, oj_to_h_id, 0);
+	} else if (Qnil == ropts) {
+	    return;
 	} else {
 	    rb_raise(rb_eArgError, "options must be a hash.");
 	}
@@ -505,7 +507,7 @@ mimic_parse_core(int argc, VALUE *argv, VALUE self, bool bang) {
     pi.options.mode = CompatMode;
     pi.max_depth = 100;
 
-    if (2 <= argc) {
+    if (2 <= argc && Qnil != argv[1]) {
 	VALUE	ropts = argv[1];
 	VALUE	v;
 

data/ext/oj/object.c

@@ -294,14 +294,20 @@ hat_num(ParseInfo pi, Val parent, Val kval, NumInfo ni) {
 		    struct tm	*st = gmtime(&t);
 		    VALUE	args[8];
 
-		    args[0] = LONG2NUM(1900 + st->tm_year);
-		    args[1] = LONG2NUM(1 + st->tm_mon);
-		    args[2] = LONG2NUM(st->tm_mday);
-		    args[3] = LONG2NUM(st->tm_hour);
-		    args[4] = LONG2NUM(st->tm_min);
-		    args[5] = rb_float_new((double)st->tm_sec + ((double)nsec + 0.5) / 1000000000.0);
-		    args[6] = LONG2NUM(ni->exp);
-		    parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
+		    // Windows does not support dates before 1970 so ignore
+		    // the zone and do the best we can.
+		    if (NULL == st) {
+			parent->val = rb_time_nano_new(ni->i, (long)nsec);
+		    } else {
+			args[0] = LONG2NUM((long)(1900 + st->tm_year));
+			args[1] = LONG2NUM(1 + st->tm_mon);
+			args[2] = LONG2NUM(st->tm_mday);
+			args[3] = LONG2NUM(st->tm_hour);
+			args[4] = LONG2NUM(st->tm_min);
+			args[5] = rb_float_new((double)st->tm_sec + ((double)nsec + 0.5) / 1000000000.0);
+			args[6] = LONG2NUM(ni->exp);
+			parent->val = rb_funcall2(rb_cTime, oj_new_id, 7, args);
+		    }
 		} else {
 		    parent->val = rb_time_nano_new(ni->i, (long)nsec);
 		}

data/ext/oj/oj.c

@@ -749,24 +749,26 @@ load(int argc, VALUE *argv, VALUE self) {
 	VALUE	ropts = argv[1];
 	VALUE	v;
 
-	Check_Type(ropts, T_HASH);
-	if (Qnil != (v = rb_hash_lookup(ropts, mode_sym))) {
-	    if (object_sym == v) {
-		mode = ObjectMode;
-	    } else if (strict_sym == v) {
-		mode = StrictMode;
-	    } else if (compat_sym == v || json_sym == v) {
-		mode = CompatMode;
-	    } else if (null_sym == v) {
-		mode = NullMode;
-	    } else if (custom_sym == v) {
-		mode = CustomMode;
-	    } else if (rails_sym == v) {
-		mode = RailsMode;
-	    } else if (wab_sym == v) {
-		mode = WabMode;
-	    } else {
-		rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
+	if (Qnil != ropts || CompatMode != mode) {
+	    Check_Type(ropts, T_HASH);
+	    if (Qnil != (v = rb_hash_lookup(ropts, mode_sym))) {
+		if (object_sym == v) {
+		    mode = ObjectMode;
+		} else if (strict_sym == v) {
+		    mode = StrictMode;
+		} else if (compat_sym == v || json_sym == v) {
+		    mode = CompatMode;
+		} else if (null_sym == v) {
+		    mode = NullMode;
+		} else if (custom_sym == v) {
+		    mode = CustomMode;
+		} else if (rails_sym == v) {
+		    mode = RailsMode;
+		} else if (wab_sym == v) {
+		    mode = WabMode;
+		} else {
+		    rb_raise(rb_eArgError, ":mode must be :object, :strict, :compat, :null, :custom, :rails, or :wab.");
+		}
 	    }
 	}
     }

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+#require 'rails'
+#require 'active_support/json'
+require 'oj'
+
+#Oj.optimize_rails
+
+#puts JSON.parse('{"a":1}', symbolize_names: true)
+
+#Oj.mimic_JSON()
+
+#puts Oj.dump({nan: Float::NAN}, mode: :compat, nan: :raise)
+
+#puts({nan: Float::NAN}.to_json)
+
+puts Oj.dump(NoMethodError.new, mode: :custom)

data/test/test_file.rb

@@ -130,6 +130,8 @@ class FileJuice < Minitest::Test
     dump_and_load(t, false)
   end
   def test_time_object_early
+    # Windows does not support dates before 1970.
+    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
     t = Time.xmlschema("1954-01-05T00:00:00.123456")
     Oj.default_options = { :mode => :object, :time_format => :unix_zone }
     dump_and_load(t, false)

data/test/test_object.rb

@@ -568,11 +568,10 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_time_early
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('1954-01-05T21:37:07.123456789-08:00')
-    else
-      t = Time.new(1954, 1, 5, 21, 37, 7.123456789, -8 * 3600)
-    end
+    # Windows does not support dates before 1970.
+    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+
+    t = Time.new(1954, 1, 5, 21, 37, 7.123456789, -8 * 3600)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.
@@ -590,11 +589,7 @@ class ObjectJuice < Minitest::Test
   end
 
   def test_time_unix_zone
-    if RUBY_VERSION.start_with?('1.8')
-      t = Time.parse('2015-01-05T21:37:07.123456789-08:00')
-    else
-      t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
-    end
+    t = Time.new(2015, 1, 5, 21, 37, 7.123456789, -8 * 3600)
     # The fractional seconds are not always recreated exactly which causes a
     # mismatch so instead the seconds, nsecs, and gmt_offset are checked
     # separately along with utc.

data/test/test_scp.rb

@@ -320,6 +320,9 @@ class ScpTest < Minitest::Test
   end
 
   def test_pipe
+    # Windows does not support fork
+    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+
     handler = AllHandler.new()
     json = %{{"one":true,"two":false}}
     IO.pipe do |read_io, write_io|
@@ -344,6 +347,9 @@ class ScpTest < Minitest::Test
   end
 
   def test_pipe_close
+    # Windows does not support fork
+    return if RbConfig::CONFIG['host_os'] =~ /(mingw|mswin)/
+
     json = %{{"one":true,"two":false}}
     IO.pipe do |read_io, write_io|
       if fork

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-11 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -60,15 +60,15 @@ extensions:
 extra_rdoc_files:
 - README.md
 - pages/Advanced.md
-- pages/WAB.md
-- pages/Encoding.md
-- pages/Modes.md
-- pages/Security.md
-- pages/JsonGem.md
-- pages/Rails.md
 - pages/Compatibility.md
 - pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
+- pages/Modes.md
 - pages/Options.md
+- pages/Rails.md
+- pages/Security.md
+- pages/WAB.md
 files:
 - LICENSE
 - README.md
@@ -152,6 +152,7 @@ files:
 - test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/test_helper.rb
 - test/activesupport5/time_zone_test_helpers.rb
+- test/bug.rb
 - test/files.rb
 - test/helper.rb
 - test/isolated/shared.rb
@@ -244,77 +245,78 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files:
-- test/activesupport5/test_helper.rb
-- test/activesupport5/time_zone_test_helpers.rb
+- test/_test_active.rb
+- test/_test_active_mimic.rb
+- test/_test_mimic_rails.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.rb
 - test/activesupport5/decoding_test.rb
-- test/activesupport5/encoding_test_cases.rb
 - test/activesupport5/encoding_test.rb
-- test/test_file.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/time_zone_test_helpers.rb
+- test/bug.rb
 - test/files.rb
+- test/helper.rb
+- test/isolated/shared.rb
+- test/isolated/test_mimic_after.rb
+- test/isolated/test_mimic_alone.rb
+- test/isolated/test_mimic_as_json.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/isolated/test_mimic_redefine.rb
+- test/json_gem/json_addition_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_generator_test.rb
+- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_parser_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/test_helper.rb
+- test/perf.rb
+- test/perf_compat.rb
+- test/perf_fast.rb
+- test/perf_file.rb
+- test/perf_object.rb
+- test/perf_saj.rb
 - test/perf_scp.rb
-- test/test_debian.rb
-- test/test_gc.rb
-- test/_test_mimic_rails.rb
-- test/test_writer.rb
-- test/test_hash.rb
+- test/perf_simple.rb
+- test/perf_strict.rb
+- test/perf_wab.rb
+- test/sample/change.rb
+- test/sample/dir.rb
+- test/sample/doc.rb
 - test/sample/file.rb
+- test/sample/group.rb
 - test/sample/hasprops.rb
 - test/sample/layer.rb
-- test/sample/change.rb
-- test/sample/doc.rb
+- test/sample/line.rb
 - test/sample/oval.rb
+- test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
-- test/sample/group.rb
-- test/sample/dir.rb
-- test/sample/line.rb
-- test/sample/rect.rb
-- test/tests.rb
-- test/test_object.rb
-- test/perf_wab.rb
-- test/tests_mimic.rb
-- test/perf_saj.rb
-- test/tests_mimic_addition.rb
-- test/test_saj.rb
 - test/sample.rb
-- test/test_scp.rb
-- test/perf_object.rb
-- test/perf_simple.rb
-- test/test_null.rb
-- test/_test_active_mimic.rb
-- test/_test_active.rb
-- test/test_compat.rb
 - test/sample_json.rb
-- test/json_gem/test_helper.rb
-- test/json_gem/json_generic_object_test.rb
-- test/json_gem/json_common_interface_test.rb
-- test/json_gem/json_string_matching_test.rb
-- test/json_gem/json_addition_test.rb
-- test/json_gem/json_fixtures_test.rb
-- test/json_gem/json_generator_test.rb
-- test/json_gem/json_ext_parser_test.rb
-- test/json_gem/json_parser_test.rb
-- test/json_gem/json_encoding_test.rb
-- test/helper.rb
-- test/activesupport4/test_helper.rb
-- test/activesupport4/decoding_test.rb
-- test/activesupport4/encoding_test.rb
-- test/test_wab.rb
-- test/perf_file.rb
-- test/perf_compat.rb
-- test/test_various.rb
-- test/test_strict.rb
+- test/test_compat.rb
 - test/test_custom.rb
-- test/perf_strict.rb
-- test/perf_fast.rb
-- test/isolated/test_mimic_alone.rb
-- test/isolated/test_mimic_after.rb
-- test/isolated/test_mimic_as_json.rb
-- test/isolated/test_mimic_rails_after.rb
-- test/isolated/test_mimic_before.rb
-- test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_define.rb
-- test/isolated/shared.rb
-- test/isolated/test_mimic_redefine.rb
-- test/perf.rb
+- test/test_debian.rb
 - test/test_fast.rb
+- test/test_file.rb
+- test/test_gc.rb
+- test/test_hash.rb
+- test/test_null.rb
+- test/test_object.rb
+- test/test_saj.rb
+- test/test_scp.rb
+- test/test_strict.rb
+- test/test_various.rb
+- test/test_wab.rb
+- test/test_writer.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb