fast_multi_json 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 01f64ab00bbaff16abaa9085080e24f47e4ecf7f
-  data.tar.gz: 66db9ef54f902fa65b9f26988542af4d8ac81c00
+SHA256:
+  metadata.gz: 529b67b9c69012bf49a7d98f885f1249cd513465beb91f41a7b39d588f4e806e
+  data.tar.gz: d38a9989290dfd0b111e686f27caf1d34eb7267e7777e95372a251b2d279d8df
 SHA512:
-  metadata.gz: 6376b403fc5b10b0ec779a3e4b898d20c4b66aa3ec243d1e06adc229e93b5579a544752feb83bceb0dea1163c29d19e2d1235d1a54e2de9bd7785427d0451016
-  data.tar.gz: c249c9c72032ff1b9f02bb032ef695b93033b7ab8e1d6c0376559ca5113bc01431e2d13bb97c9c82db8d3c6321ff93d456b6ce7f7b004f827f9d2b7db63c433a
+  metadata.gz: 1ec9d5a43c50703ef7e801b9284340de4c5bbe55e99def2ae5c4ed9db6ba68acce7c7c7e43f76a1530d0ca4fd5da3dfa7067a0ca22b8106eac90d2f838435c07
+  data.tar.gz: 30a34ad18ffbb3eb7aca55eaa790633ce740d7e0cc2db485c3ca36c1994df90baf710403bfaaa75524fd50ac85bd3cd6cbe932e4fa3037cbd5dd9ee070925fd8

data/fast_multi_json.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

data/lib/fast_multi_json/version.rb

@@ -1,3 +1,3 @@
 module FastMultiJson
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/fast_multi_json.rb

@@ -1,45 +1,43 @@
-require "fast_multi_json/version"
+# frozen_string_literal: true
+
+require 'fast_multi_json/version'
 require 'logger'
 
 # Usage:
 #   class Movie
 #     def to_json(payload)
-#       FastMultiJson.to_json(payload)
+#       ::FastMultiJson.to_json(payload)
+#     end
+#
+#     def from_json(string)
+#       ::FastMultiJson.from_json(string)
 #     end
 #   end
 module FastMultiJson
-  # Result object pattern is from https://johnnunemaker.com/resilience-in-ruby/
-  # e.g. https://github.com/github/github-ds/blob/fbda5389711edfb4c10b6c6bad19311dfcb1bac1/lib/github/result.rb
-  class Result
-    def initialize
-      @value = yield
-      @error = nil
-    rescue LoadError => e
-      @error = e
-    end
-
-    def ok?
-      @error.nil?
-    end
+  def self.logger(logger=nil)
+    return @logger = logger if logger
+    @logger ||= Logger.new(IO::NULL)
+  end
 
-    def value!
-      if ok?
-        @value
-      else
-        raise @error
-      end
-    end
+  def self.to_json(object)
+    _fast_to_json(object)
+  rescue NameError
+    define_to_json(::FastMultiJson)
+    _fast_to_json(object)
+  end
 
-    def rescue
-      return self if ok?
-      Result.new { yield(@error) }
-    end
+  def self.from_json(string)
+    _fast_from_json(string)
+  rescue NameError
+    define_from_json(::FastMultiJson)
+    _fast_from_json(string)
   end
-  private_constant :Result
 
-  def self.logger(logger=nil)
-    return @logger = logger if logger
-    @logger ||= Logger.new(IO::NULL)
+  def self.define_to_json(receiver)
+    cl = caller_locations[0]
+    method_body = to_json_method
+    logger.debug { "Defining #{receiver}._fast_to_json as #{method_body.inspect}" }
+    receiver.instance_eval method_body, cl.absolute_path, cl.lineno
   end
 
   # Encoder-compatible with default MultiJSON adapters and defaults
@@ -47,45 +45,106 @@ module FastMultiJson
     encode_method = String.new(%(def _fast_to_json(object)\n ))
     encode_method << Result.new {
       require 'oj'
-      %(::Oj.dump(object, mode: :compat, time_format: :ruby, use_to_json: true))
+      %(::Oj.dump(object, mode: :compat, time_format: :ruby, use_to_json: true, indent: 0))
     }.rescue {
       require 'yajl'
       %(::Yajl::Encoder.encode(object))
     }.rescue {
       require 'jrjackson' unless defined?(::JrJackson)
-      %(::JrJackson::Json.dump(object))
+      if ::JrJackson::Json.method(:dump).arity == 1
+        %(::JrJackson::Json.dump(object))
+      else
+        %(::JrJackson::Json.dump(object, ::FastMultiJson::EMPTY_OPTIONS.dup))
+      end
     }.rescue {
       require 'json'
-      %(::JSON.fast_generate(object, create_additions: false, quirks_mode: true))
+      %(::JSON.fast_generate(object, create_additions: false, quirks_mode: false))
     }.rescue {
       require 'gson'
-      %(::Gson::Encoder.new({}).encode(object))
+      %(::Gson::Encoder.new(::FastMultiJson::EMPTY_OPTIONS.dup).encode(object))
     }.rescue {
       require 'active_support/json/encoding'
       %(::ActiveSupport::JSON.encode(object))
     }.rescue {
       warn "No JSON encoder found. Falling back to `object.to_json`"
-      %(object.to_json)
+      %(object.to_json(::JSON::FAST_STATE_PROTOTYPE.to_h))
     }.value!
     encode_method << "\nend"
   end
 
-  def self.to_json(object)
-    _fast_to_json(object)
-  rescue NameError
-    define_to_json(FastMultiJson)
-    _fast_to_json(object)
+  def self.reset_to_json!
+    undef :_fast_to_json if method_defined?(:_fast_to_json)
+    logger.debug { "Undefining #{receiver}._fast_to_json" }
   end
 
-  def self.define_to_json(receiver)
+  def self.define_from_json(receiver)
     cl = caller_locations[0]
-    method_body = to_json_method
-    logger.debug { "Defining #{receiver}._fast_to_json as #{method_body.inspect}" }
+    method_body = from_json_method
+    logger.debug { "Defining #{receiver}._fast_from_json as #{method_body.inspect}" }
     receiver.instance_eval method_body, cl.absolute_path, cl.lineno
   end
 
-  def self.reset_to_json!
-    undef :_fast_to_json if method_defined?(:_fast_to_json)
-    logger.debug { "Undefining #{receiver}._fast_to_json" }
+  # Decoder-compatible with default MultiJSON adapters and defaults
+  def self.from_json_method
+    decode_method = String.new(%(def _fast_from_json(string)\n ))
+    decode_method << Result.new {
+      require 'oj'
+      %(::Oj.load(string, mode: :strict, symbol_keys: false))
+    }.rescue {
+      require 'yajl'
+      %(::Yajl::Parser.new(symbolize_keys: false).parse(string))
+    }.rescue {
+      require 'jrjackson' unless defined?(::JrJackson)
+      %(::JrJackson::Json.load(string))
+    }.rescue {
+      require 'json'
+      %(::JSON.parse(string, quirks_mode: false, symbolize_names: false))
+    }.rescue {
+      require 'gson'
+      %(::Gson::Decoder.new(::FastMultiJson::EMPTY_OPTIONS.dup).decode(string))
+    }.rescue {
+      require 'active_support/json/decoding'
+      %(::ActiveSupport::JSON.decode(string))
+    }.rescue {
+      fail "No JSON decoder found."
+    }.value!
+    decode_method << "\nend"
+  end
+
+  def self.reset_from_json!
+    undef :_fast_from_json if method_defined?(:_fast_from_json)
+    logger.debug { "Undefining #{receiver}._fast_from_json" }
+  end
+
+  # Result object pattern is from https://johnnunemaker.com/resilience-in-ruby/
+  # e.g. https://github.com/github/github-ds/blob/fbda5389711edfb4c10b6c6bad19311dfcb1bac1/lib/github/result.rb
+  class Result
+    def initialize
+      @value = yield
+      @error = nil
+    rescue LoadError => e
+      @error = e
+    end
+
+    def ok?
+      @error.nil?
+    end
+
+    def value!
+      if ok?
+        @value
+      else
+        raise @error
+      end
+    end
+
+    def rescue
+      return self if ok?
+      Result.new { yield(@error) }
+    end
   end
+  private_constant :Result
+
+  EMPTY_OPTIONS = {}.freeze
+  private_constant :EMPTY_OPTIONS
 end

data/scripts/perf_compat

@@ -0,0 +1,271 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+require 'bundler/inline'
+
+gemfile do
+  source 'https://rubygems.org'
+  gem 'multi_json', require: false
+  gem 'oj', require: false
+  gem 'fast_multi_json', path: '.'
+end
+
+# Adapted from https://raw.githubusercontent.com/ohler55/oj/39c975a048d89f42062bb542fae98109520b10eb/test/perf.rb
+class Perf
+
+  def initialize()
+    @items = []
+  end
+
+  def add(title, op, &blk)
+    @items << Item.new(title, op, &blk)
+  end
+
+  def before(title, &blk)
+    @items.each do |i|
+      if title == i.title
+        i.set_before(&blk)
+        break
+      end
+    end
+  end
+
+  def run(iter)
+    base = Item.new(nil, nil) { }
+    base.run(iter, 0.0)
+    @items.each do |i|
+      i.run(iter, base.duration)
+      if i.error.nil?
+        puts "#{i.title}.#{i.op} #{iter} times in %0.3f seconds or %0.3f #{i.op}/sec." % [i.duration, iter / i.duration]
+      else
+        puts "***** #{i.title}.#{i.op} failed! #{i.error}"
+      end
+    end
+    summary()
+  end
+
+  def summary()
+    fastest = nil
+    slowest = nil
+    width = 6
+    @items.each do |i|
+      next if i.duration.nil?
+      width = i.title.size if width < i.title.size
+    end
+    iva = @items.clone
+    iva.delete_if { |i| i.duration.nil? }
+    iva = iva.sort_by { |i| i.duration }
+    puts
+    puts "Summary:"
+    puts "%*s  time (secs)  rate (ops/sec)" % [width, 'System']
+    puts "#{'-' * width}  -----------  --------------"
+    iva.each do |i|
+      if i.duration.nil?
+      else
+        puts "%*s %11.3f  %14.3f" % [width, i.title, i.duration, i.rate ]
+      end
+    end
+    puts
+    puts "Comparison Matrix\n(performance factor, 2.0 means row is twice as fast as column)"
+    puts ([' ' * width] + iva.map { |i| "%*s" % [width, i.title] }).join('  ')
+    puts (['-' * width] + iva.map { |i| '-' * width }).join('  ')
+    iva.each do |i|
+      line = ["%*s" % [width, i.title]]
+      iva.each do |o|
+        line << "%*.2f" % [width, o.duration / i.duration]
+      end
+      puts line.join('  ')
+    end
+    puts
+  end
+
+  class Item
+    attr_accessor :title
+    attr_accessor :op
+    attr_accessor :blk
+    attr_accessor :duration
+    attr_accessor :rate
+    attr_accessor :error
+
+    def initialize(title, op, &blk)
+      @title = title
+      @blk = blk
+      @op = op
+      @duration = nil
+      @rate = nil
+      @error = nil
+      @before = nil
+    end
+
+    def set_before(&blk)
+      @before = blk
+    end
+
+    def run(iter, base)
+      begin
+        GC.start
+        @before.call unless @before.nil?
+        start = Time.now
+        iter.times { @blk.call }
+        @duration = Time.now - start - base
+        @duration = 0.0 if @duration < 0.0
+        @rate = iter / @duration
+      rescue Exception => e
+        @error = "#{e.class}: #{e.message}"
+      end
+    end
+
+  end # Item
+end # Perf
+
+
+# Adapted from https://github.com/ohler55/oj/blob/39c975a048d89f42062bb542fae98109520b10eb/test/perf_compat.rb
+require 'optparse'
+require 'oj'
+require 'fast_multi_json'
+require 'multi_json'
+
+$verbose = false
+$indent = 0
+$iter = 20000
+$size = 0
+
+opts = OptionParser.new
+opts.on("-v", "verbose")                                    { $verbose = true }
+opts.on("-c", "--count [Int]", Integer, "iterations")       { |i| $iter = i }
+opts.on("-i", "--indent [Int]", Integer, "indentation")     { |i| $indent = i }
+opts.on("-s", "--size [Int]", Integer, "size (~Kbytes)")    { |i| $size = i }
+opts.on("-h", "--help", "Show this display")                { puts opts; Process.exit!(0) }
+files = opts.parse(ARGV)
+
+def capture_error(tag, orig, load_key, dump_key, &blk)
+  begin
+    obj = blk.call(orig)
+    puts obj unless orig == obj
+    raise "#{tag} #{dump_key} and #{load_key} did not return the same object as the original." unless orig == obj
+  rescue Exception => e
+    $failed[tag] = "#{e.class}: #{e.message}"
+  end
+end
+
+$failed = {} # key is same as String used in tests later
+
+# Verify that all packages dump and load correctly and return the same Object as the original.
+capture_error('Oj:compat', $obj, 'load', 'dump') { |o| Oj.compat_load(Oj.dump(o, :mode => :compat)) }
+capture_error('MultiJson', $obj, 'load', 'dump') { |o| MultiJson.load(MultiJson.dump(o)) }
+capture_error('FastMultiJson', $obj, 'oj_load', 'dump') { |o| FastMultiJson.from_json(FastMultiJson.to_json(o)) }
+capture_error('JSON::Ext', $obj, 'generate', 'parse') { |o|
+  require 'json'
+  require 'json/ext'
+  JSON.generator = JSON::Ext::Generator
+  JSON.parser = JSON::Ext::Parser
+  JSON.load(JSON.generate(o))
+}
+
+module One
+  module Two
+    module Three
+      class Empty
+
+        def initialize()
+          @a = 1
+          @b = 2
+          @c = 3
+        end
+
+        def eql?(o)
+          self.class == o.class && @a == o.a && @b = o.b && @c = o.c
+        end
+        alias == eql?
+
+        def as_json(*a)
+          {JSON.create_id => self.class.name, 'a' => @a, 'b' => @b, 'c' => @c }
+        end
+
+        def to_json(*a)
+          JSON.generate(as_json())
+        end
+
+        def self.json_create(h)
+          self.new()
+        end
+      end # Empty
+    end # Three
+  end # Two
+end # One
+
+$obj = {
+  'a' => 'Alpha', # string
+  'b' => true,    # boolean
+  'c' => 12345,   # number
+  'd' => [ true, [false, [-123456789, nil], 3.9676, ['Something else.', false], nil]], # mix it up array
+  'e' => { 'zero' => nil, 'one' => 1, 'two' => 2, 'three' => [3], 'four' => [0, 1, 2, 3, 4] }, # hash
+  'f' => nil,     # nil
+  'g' => One::Two::Three::Empty.new(),
+  'h' => { 'a' => { 'b' => { 'c' => { 'd' => {'e' => { 'f' => { 'g' => nil }}}}}}}, # deep hash, not that deep
+  'i' => [[[[[[[nil]]]]]]]  # deep array, again, not that deep
+}
+
+
+Oj.default_options = { :indent => $indent, :mode => :compat, :use_to_json => true, :create_additions => true, :create_id => '^o' }
+
+if 0 < $size
+  s = Oj.dump($obj).size + 1
+  cnt = $size * 1024 / s
+  o = $obj
+  $obj = []
+  cnt.times do
+    $obj << o
+  end
+end
+
+puts '-' * 80
+puts "  ## Compat dump Performance"
+perf = Perf.new()
+unless $failed.has_key?('JSON::Ext')
+  perf.add('JSON::Ext', 'dump') { JSON.dump($obj) }
+  perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
+end
+unless $failed.has_key?('MultiJson')
+  perf.add('MultiJson', 'dump') { MultiJson.dump($oj) }
+end
+unless $failed.has_key?('FastMultiJson')
+  perf.add('FastMultiJson', 'to_json') { FastMultiJson.to_json($oj) }
+end
+unless $failed.has_key?('Oj:compat')
+  perf.add('Oj:compat', 'dump_compat') { Oj.dump($oj, mode: :compat) }
+end
+perf.run($iter)
+
+puts
+puts '-' * 80
+puts
+
+$json = JSON.dump($obj)
+
+puts '-' * 80
+puts "  ## Compat load Performance"
+perf = Perf.new()
+unless $failed.has_key?('JSON::Ext')
+  perf.add('JSON::Ext', 'load') { JSON.load($json) }
+  perf.before('JSON::Ext') { JSON.parser = JSON::Ext::Parser }
+end
+unless $failed.has_key?('MultiJson')
+  perf.add('MultiJson', 'load') { MultiJson.load($json) }
+end
+unless $failed.has_key?('FastMultiJson')
+  perf.add('FastMultiJson', 'from_json') { FastMultiJson.from_json($json) }
+end
+unless $failed.has_key?('Oj:compat')
+  perf.add('Oj:compat', 'load_compat') { Oj.load($json, mode: :compat) }
+end
+perf.run($iter)
+
+puts
+puts '-' * 80
+puts
+
+unless $failed.empty?
+  puts "The following packages were not included for the reason listed"
+  $failed.each { |tag,msg| puts "***** #{tag}: #{msg}" }
+end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: fast_multi_json
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Benjamin Fleischer
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2023-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,12 +76,13 @@ files:
 - fast_multi_json.gemspec
 - lib/fast_multi_json.rb
 - lib/fast_multi_json/version.rb
+- scripts/perf_compat
 homepage: https://github.com/bf4/fast_multi_json
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,9 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Adapterless multi-JSON encoder/decoder
 test_files: []