oj 2.17.1 → 2.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 442b44efad229257aca6e661d9007d3fdc6ff06c
-  data.tar.gz: 66e9485846bccc6c5059e22417d1af5c091b20cc
+  metadata.gz: fda157680e8bdefb8ada5e768266c624ec23e190
+  data.tar.gz: 4b19f21033006a9e652be232bbcd7bce56b7f8cf
 SHA512:
-  metadata.gz: 1f8f5fcbe94843dc1e8cd1a8868afd2d4cb0ad29c701869deaab1a56353d087f64cc460f2e9ecd46482ec46d9ab918eccd6cd66b30950eb380c32b58ca214681
-  data.tar.gz: d3fda284959163b69fae190c7ee0e92a52d93a7160bf363caf5fa17e5e848b50d8f2bd7675e7bb8091cf625fc64faab33fb039bc00311cd4a8e8c969a687d6cf
+  metadata.gz: a61a6aa2f2f1a6c22dc20628fa19519c381eaffcde90e39c1fbb366861cfd7cc06e81ec972dd18d0e08d07805bbaf3c187332a64d28575b51f72eb3c835fd7af
+  data.tar.gz: ca4a307de685a1d122cfe579ed551627a6e5b78c3045888d0fc1e3d3941d326bf0ec2eb0afa43adbe2ea62afb871eb30b62e68dc44ace762c6ac10273d29c73d

data/README.md

@@ -170,21 +170,10 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
-**Release 2.17.1**
+**Release 2.17.2**
 
- - Added an option provide an alternative Hash class for loading.
-
- - Added the Oj::EasyHash class.
-
- - Fixed test failures on 32 bit machines.
-
- - Sped up mimic_JSON.
-
- - Added an option to omit Hash and Object attributes with nil values.
-
-**Release 2.16.1**
-
- - Thanks to hsbt for fixing a compile issue with Ruby 2.4.0-preview1.
+ - Worked around a problem with DateTime and ActiveSupport that causes a hang
+   when hour, minute, second, and some other methods are called from C.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/dump.c

@@ -1981,7 +1981,7 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 		char	*n2 = nbuf;
 		char	*n;
 		char	*end;
-		ID		i;
+		ID	i;
 	    
 		if (sizeof(nbuf) <= nlen) {
 		    n2 = strdup(name);

data/lib/oj/active_support_helper.rb

@@ -3,7 +3,7 @@ require 'active_support/time'
 
 module Oj
 
-  # 
+  # Exists only to handle the ActiveSupport::TimeWithZone.
   class ActiveSupportHelper
 
     def self.createTimeWithZone(utc, zone)
@@ -15,3 +15,27 @@ end
 
 Oj.register_odd(ActiveSupport::TimeWithZone, Oj::ActiveSupportHelper, :createTimeWithZone, :utc, 'time_zone.name')
 
+# This is a hack to work around an oddness with DateTime and the ActiveSupport
+# that causes a hang when some methods are called from C. Hour, min(ute),
+# sec(ond) and other methods are special but they can be called from C until
+# activesupport/time is required. After that they can not be even though
+# resond_to? returns true. By defining methods to call super the problem goes
+# away. There is obviously some magic going on under the covers that I don't
+# understand.
+class DateTime
+  def hour()
+    super
+  end
+  def min()
+    super
+  end
+  def sec()
+    super
+  end
+  def sec_fraction()
+    super
+  end
+  def offset()
+    super
+  end
+end

data/lib/oj/version.rb

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

data/test/activesupport_datetime_test.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+require "active_support" # v5.0.0
+require "oj" #v2.17.1
+
+puts "ActiveSupport + OJ.dump(DateTime.now)"
+puts
+puts Oj.dump(DateTime.now)
+puts
+
+require "oj/active_support_helper"
+#require 'active_support/time'
+
+puts "ActiveSupport + OJ + active_support_helper dump(DateTime.now)"
+puts
+puts Oj.dump(DateTime.now)
+puts
+

data/test/test_various.rb

@@ -175,7 +175,6 @@ class Juice < Minitest::Test
 
   def test_float_parse
     Oj.default_options = { :float_precision => 16, :bigdecimal_load => :auto }
-=begin
     n = Oj.load('0.00001234567890123456')
     assert_equal(Float, n.class)
     assert_equal('1.234567890123456e-05', "%0.15e" % [n])
@@ -183,15 +182,15 @@ class Juice < Minitest::Test
     n = Oj.load('-0.00001234567890123456')
     assert_equal(Float, n.class)
     assert_equal('-1.234567890123456e-05', "%0.15e" % [n])
-=end
+
     n = Oj.load('1000.0000123456789')
     assert_equal(BigDecimal, n.class)
     assert_equal('0.10000000123456789E4', n.to_s)
-=begin
+
     n = Oj.load('-0.000012345678901234567')
     assert_equal(BigDecimal, n.class)
     assert_equal('-0.12345678901234567E-4', n.to_s)
-=end
+
   end
 
   def test_float_dump

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.17.1
+  version: 2.17.2
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -106,6 +106,7 @@ files:
 - test/_test_active.rb
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
+- test/activesupport_datetime_test.rb
 - test/bug.rb
 - test/bug2.rb
 - test/bug3.rb
@@ -195,6 +196,7 @@ test_files:
 - test/_test_active.rb
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
+- test/activesupport_datetime_test.rb
 - test/bug.rb
 - test/bug2.rb
 - test/bug3.rb