oj 2.17.2 → 2.17.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fda157680e8bdefb8ada5e768266c624ec23e190
-  data.tar.gz: 4b19f21033006a9e652be232bbcd7bce56b7f8cf
+  metadata.gz: e6db88500e6a8f5b5243b53140952b8956fdad9b
+  data.tar.gz: bd67bf4dd52102f84c728f9349a57a79f28cacd8
 SHA512:
-  metadata.gz: a61a6aa2f2f1a6c22dc20628fa19519c381eaffcde90e39c1fbb366861cfd7cc06e81ec972dd18d0e08d07805bbaf3c187332a64d28575b51f72eb3c835fd7af
-  data.tar.gz: ca4a307de685a1d122cfe579ed551627a6e5b78c3045888d0fc1e3d3941d326bf0ec2eb0afa43adbe2ea62afb871eb30b62e68dc44ace762c6ac10273d29c73d
+  metadata.gz: a85842674b8da8c33f9526c14a675535da412be6f52ad136f6ba48fad5cadf99ec5810ebc076fbf2e27dbda4758b5432dc697a11cdcbff5d7955482dfea92f9c
+  data.tar.gz: d5e3c117f7cea742867e06ca02fdcef961ff6b14c58d9b21979d4df556b780d052bb6de5695ecf9b11d2084091102e752553390bb31d666d6205f39708f52b0b

data/README.md

@@ -170,6 +170,11 @@ Oj.default_options = {:mode => :compat }
 
 ## Releases
 
+**Release 2.17.3**
+
+- Updated mimic_JSON to monkey patch OpenStruct, Range, Rational, Regexp, Struct, Symbol,
+  and Time like the JSON gem does. Also added the JSON.create_id accessor.
+
 **Release 2.17.2**
 
  - Worked around a problem with DateTime and ActiveSupport that causes a hang

data/ext/oj/oj.c

@@ -1860,7 +1860,7 @@ no_op1(VALUE self, VALUE obj) {
 }
 
 static VALUE
-mimic_create_id(VALUE self, VALUE id) {
+mimic_set_create_id(VALUE self, VALUE id) {
     Check_Type(id, T_STRING);
 
     if (0 != oj_default_options.create_id) {
@@ -1880,6 +1880,14 @@ mimic_create_id(VALUE self, VALUE id) {
     return id;
 }
 
+static VALUE
+mimic_create_id(VALUE self) {
+    if (0 != oj_default_options.create_id) {
+	return oj_encode(rb_str_new_cstr(oj_default_options.create_id));
+    }
+    return rb_str_new_cstr(json_class);
+}
+
 static struct _Options	mimic_object_to_json_options = {
     0,		// indent
     No,		// circular
@@ -2005,7 +2013,8 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     }
     rb_define_module_function(mimic, "parser=", no_op1, 1);
     rb_define_module_function(mimic, "generator=", no_op1, 1);
-    rb_define_module_function(mimic, "create_id=", mimic_create_id, 1);
+    rb_define_module_function(mimic, "create_id=", mimic_set_create_id, 1);
+    rb_define_module_function(mimic, "create_id", mimic_create_id, 0);
 
     rb_define_module_function(mimic, "dump", mimic_dump, -1);
     rb_define_module_function(mimic, "load", mimic_load, -1);

data/lib/oj/mimic.rb

@@ -1,4 +1,10 @@
 
+begin
+  require 'ostruct'
+rescue Exception
+  # ignore
+end
+
 module Oj
 
   def self.mimic_loaded(mimic_paths=[])
@@ -14,5 +20,107 @@ module Oj
     end
     mimic_paths.each { |p| $LOADED_FEATURES << p }
     $LOADED_FEATURES << 'json' unless $LOADED_FEATURES.include?('json')
+
+    if Object.const_defined?('OpenStruct')
+      OpenStruct.class_eval do
+        # Both the JSON gem and Rails monkey patch as_json. Let them battle it out.
+        unless defined?(self.as_json)
+          def as_json(*)
+            name = self.class.name.to_s
+            raise JSON::JSONError, "Only named structs are supported!" if 0 == name.length
+            { JSON.create_id => name, 't' => table }
+          end
+        end
+        def self.json_create(h)
+          new(h['t'])
+        end
+      end
+    end
+
+    Range.class_eval do
+      # Both the JSON gem and Rails monkey patch as_json. Let them battle it out.
+      unless defined?(self.as_json)
+        def as_json(*)
+          {JSON.create_id => 'Range', 'a' => [first, last, exclude_end?]}
+        end
+      end
+      def self.json_create(h)
+        new(h['a'])
+      end
+    end
+
+    Rational.class_eval do
+      # Both the JSON gem and Rails monkey patch as_json. Let them battle it out.
+      unless defined?(self.as_json)
+        def as_json(*)
+          {JSON.create_id => 'Rational', 'n' => numerator, 'd' => denominator }
+        end
+      end
+      def self.json_create(h)
+        Rational(h['n'], h['d'])
+      end
+    end
+
+    Regexp.class_eval do
+      # Both the JSON gem and Rails monkey patch as_json. Let them battle it out.
+      unless defined?(self.as_json)
+        def as_json(*)
+          {JSON.create_id => 'Regexp', 'o' => options, 's' => source }
+        end
+      end
+      def self.json_create(h)
+        new(h['s'], h['o'])
+      end
+    end
+
+    Struct.class_eval do
+      # Both the JSON gem and Rails monkey patch as_json. Let them battle it out.
+      unless defined?(self.as_json)
+        def as_json(*)
+          name = self.class.name.to_s
+          raise JSON::JSONError, "Only named structs are supported!" if 0 == name.length
+          { JSON.create_id => name, 'v' => values }
+        end
+      end
+      def self.json_create(h)
+        new(h['v'])
+      end
+    end
+
+    Symbol.class_eval do
+      # Both the JSON gem and Rails monkey patch as_json. Let them battle it out.
+      unless defined?(self.as_json)
+        def as_json(*)
+          {JSON.create_id => 'Symbol', 's' => to_s }
+        end
+      end
+      def self.json_create(h)
+        h['s'].to_sym
+      end
+    end
+
+    Time.class_eval do
+      # Both the JSON gem and Rails monkey patch as_json. Let them battle it out.
+      unless defined?(self.as_json)
+        def as_json(*)
+          {JSON.create_id => 'Symbol', 's' => to_s }
+          nsecs = [ tv_usec * 1000 ]
+          nsecs << tv_nsec if respond_to?(:tv_nsec)
+          nsecs = nsecs.max
+          { JSON.create_id => 'Time', 's' => tv_sec, 'n' => nsecs }
+        end
+      end
+      def self.json_create(h)
+        if usec = h.delete('u')
+          h['n'] = usec * 1000
+        end
+        if instance_methods.include?(:tv_nsec)
+          at(h['s'], Rational(h['n'], 1000))
+        else
+          at(h['s'], h['n'] / 1000)
+        end
+      end
+    end
+
   end
 end

data/lib/oj/version.rb

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

data/test/isolated/shared.rb

@@ -1,5 +1,11 @@
 # encoding: UTF-8
 
+# The rails tests set this to true. Both Rails and the JSON gem monkey patch the
+# as_json methods on several base classes. Depending on which one replaces the
+# method last the behavior will be different. Oj.mimic_JSON abides by the same
+# conflicting behavior and the tests reflect that.
+$rails_monkey = false unless defined?($rails_monkey)
+
 class SharedMimicTest < Minitest::Test
   class Jam
     attr_accessor :x, :y
@@ -56,37 +62,66 @@ class SharedMimicTest < Minitest::Test
 # dump
   def test_dump_string
     json = JSON.dump([1, true, nil, @time])
-    assert_equal(%{[1,true,null,#{@expected_time_string}]}, json)
+    if $rails_monkey
+      assert_equal(%{[1,true,null,#{@expected_time_string}]}, json)
+    else
+      assert_equal(%{[1,true,null,{"json_class":"Time","s":1400000000,"n":0}]}, json)
+    end
   end
 
   def test_dump_with_options
     Oj.default_options= {:indent => 2} # JSON this will not change anything
     json = JSON.dump([1, true, nil, @time])
-    assert_equal(%{[
+    if $rails_monkey
+      assert_equal(%{[
   1,
   true,
   null,
   #{@expected_time_string}
 ]
 }, json)
+    else
+      assert_equal(%{[
+  1,
+  true,
+  null,
+  {
+    "json_class":"Time",
+    "s":1400000000,
+    "n\":0
+  }
+]
+}, json)
+    end
   end
 
   def test_dump_io
     s = StringIO.new()
     json = JSON.dump([1, true, nil, @time], s)
     assert_equal(s, json)
-    assert_equal(%{[1,true,null,#{@expected_time_string}]}, s.string)
+    if $rails_monkey
+      assert_equal(%{[1,true,null,#{@expected_time_string}]}, s.string)
+    else
+      assert_equal(%{[1,true,null,{"json_class":"Time","s":1400000000,"n":0}]}, s.string)
+    end
   end
   # TBD options
 
   def test_dump_struct
-    # anonymous Struct
-    s = Struct.new(:a, :b, :c)
+    # anonymous Struct not supported by json so name it
+    if Object.const_defined?("Struct::Abc")
+      s = Struct::Abc
+    else
+      s = Struct.new("Abc", :a, :b, :c)
+    end
     o = s.new(1, 'two', [true, false])
     json = JSON.dump(o)
-    # Rails add the as_json method and changes the behavior.
     if o.respond_to?(:as_json)
-      assert_equal(%|{"a":1,"b":"two","c":[true,false]}|, json)
+      if $rails_monkey
+        assert_equal(%|{"a":1,"b":"two","c":[true,false]}|, json)
+      else
+        assert_equal(%|{"json_class":"Struct::Abc","v":[1,"two",[true,false]]}|, json)
+      end
     else
       j = '"' + o.to_s.gsub('"', '\\"') + '"'
       assert_equal(j, json)

data/test/isolated/test_mimic_rails_after.rb

@@ -16,5 +16,7 @@ Oj.mimic_JSON
 
 require 'isolated/shared'
 
+$rails_monkey = true
+
 class MimicRailsAfter < SharedMimicRailsTest
 end # MimicRailsAfter

data/test/isolated/test_mimic_rails_before.rb

@@ -15,6 +15,7 @@ end
 
 require 'isolated/shared'
 
+$rails_monkey = true
+
 class MimicRailsBefore < SharedMimicRailsTest
 end # MimicRailsBefore
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.17.2
+  version: 2.17.3
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-13 00:00:00.000000000 Z
+date: 2016-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler