oj 3.11.3 → 3.11.5

data/lib/oj/bag.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module Oj
 

data/lib/oj/mimic.rb

@@ -133,18 +133,6 @@ module Oj
       end
     end
 
-    Date.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 => 'Date', 'y' => year, 'm' => month, 'd' => day, 'sg' => start }
-        end
-      end
-      def self.json_create(h)
-        civil(h['y'], h['m'], h['d'], h['sg'])
-      end
-    end
-
     DateTime.class_eval do
       # Both the JSON gem and Rails monkey patch as_json. Let them battle it out.
       unless defined?(self.as_json)

data/lib/oj/version.rb

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

data/test/activerecord/result_test.rb

@@ -21,7 +21,12 @@ class ActiveRecordResultTest < Minitest::Test
 					["row 3 col 1", "row 3 col 2"],
 				      ])
     #puts "*** result: #{Oj.dump(result, indent: 2)}"
-   
-    assert_equal Oj.dump(result, mode: :rails), Oj.dump(result.to_hash)
+    json_result = if ActiveRecord.version >= Gem::Version.new("6")
+                    result.to_a
+                  else
+                    result.to_hash
+                  end
+
+    assert_equal Oj.dump(result, mode: :rails), Oj.dump(json_result)
   end
 end

data/test/foo.rb

@@ -6,47 +6,50 @@ $oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
   $: << File.join($oj_dir, dir)
 end
 
-require 'json'
-
-t = [Time.now.utc]
-
-puts "t.to_json - #{t.to_json}"
-
-puts "--- active support"
-
-require 'active_support'
-require "active_support/json"
-
-ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
-
-puts "t.as_json - #{t.as_json}"
-puts "t.to_json - #{t.to_json}"
-
 require 'oj'
 
-t = [Time.now.utc]
+class Foo
+  def initialize
+    @x = 123
+  end
+
+  def xto_json(opt=nil, options=nil)
+    "---to_json---"
+  end
+end
 
-puts "-----------------------"
+class Bar < Foo
+  def initialize
+    @x = 321
+  end
+end
 
-#puts "t.as_json - #{t.as_json}"
-puts "t.to_json - #{t.to_json}"
+foo = Foo.new
+bar = Bar.new
 
-#Oj.mimic_JSON
+require 'json'
 
-#puts "Oj - t.as_json - #{t.as_json}"
+puts "JSON: #{JSON.generate(foo)}"
+puts "to_json: #{foo.to_json}"
+puts "bar JSON: #{JSON.generate(bar)}"
+puts "bar to_json: #{bar.to_json}"
 
-puts "--- active support"
+m = bar.method('to_json')
+puts "*** method: #{m} owner: #{m.owner.name}"
 
-require 'active_support'
-require "active_support/json"
+puts "---- rails"
+require 'rails'
 
-ActiveSupport::JSON::Encoding.use_standard_json_time_format = false
+m = bar.method('to_json')
+puts "*** method: #{m} owner: #{m.owner} params: #{m.parameters}"
 
-puts "t.as_json - #{t.as_json}"
-puts "t.to_json - #{t.to_json}"
+puts "JSON: #{JSON.generate(foo)}"
+puts "to_json: #{foo.to_json}"
 
-puts "--- optimize"
-Oj.optimize_rails
+puts "---- Oj.mimic_JSON"
+Oj.mimic_JSON()
+puts "Oj JSON: #{JSON.generate(foo)}"
+puts "Oj to_json: #{foo.to_json}"
 
-puts "t.as_json - #{t.as_json}"
-puts "t.to_json - #{t.to_json}"
+m = bar.method('to_json')
+puts "*** method: #{m} owner: #{m.owner} params: #{m.parameters}"

data/test/test_generate.rb

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+require 'oj'
+
+class Generator < Minitest::Test
+
+  def test_before
+    json = Oj.generate({})
+    assert_equal("{}", json)
+  end
+
+end

data/test/test_scp.rb

@@ -328,7 +328,7 @@ class ScpTest < Minitest::Test
     IO.pipe do |read_io, write_io|
       if fork
         write_io.close
-        Oj.sc_parse(handler, read_io) {|v| p v}
+        Oj.sc_parse(handler, read_io)
         read_io.close
         assert_equal([[:hash_start],
                       [:hash_key, 'one'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.11.3
+  version: 3.11.5
 platform: ruby
 authors:
 - Peter Ohler
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -240,6 +240,7 @@ files:
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
+- test/test_generate.rb
 - test/test_hash.rb
 - test/test_integer_range.rb
 - test/test_null.rb
@@ -364,6 +365,7 @@ test_files:
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
+- test/test_generate.rb
 - test/test_hash.rb
 - test/test_integer_range.rb
 - test/test_null.rb