multi_json 1.11.3 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da198b4f59c9d69641161993e95453c51ea9d4b2
-  data.tar.gz: 2ca02cd8fcfc8c1a6319c8cb335bb7c2e85ed178
+  metadata.gz: 26886d50e3fa311fe1b33a1d8ebaad6c89d372ec
+  data.tar.gz: 41b704e0b93ce7211fa41e22a547e80d89ff067c
 SHA512:
-  metadata.gz: 9bf429b82738b7bcfc3ed90ad64d46bf86531a09330de9a020fd058d23047f130b1b19450bff41baade22372de960c27fee6808688a1d2363bca5c27fbd9274c
-  data.tar.gz: b4b51d664ac7fc469003a01c0a54fad91654678f079cc71586b2481b72259988f971efa8954298f528af5cf65b60d01e23cd45985cc066b64df20061bcf3859e
+  metadata.gz: ed17f8464c34c9dd2feff7decdd12c7c3161434a124c82151c3c167fdcb9d8ff5df5b02eb348d6c06eafe1ef717831780c607432b7f33a192b0c18c329c88558
+  data.tar.gz: a0cf57eb1318c0d6fe9c790cc82616172be1f6e18d4e7cac8ac100c468455b0a2fa5f078caa44e7de11f605c7795358f443a4145dcee6070450d699ed9c0955e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+1.12.0
+------
+
+* [Introduce global options cache to improve peroformance](https://github.com/intridea/multi_json/commit/7aaef2a1bc2b83c95e4208b12dad5d1d87ff20a6)
+
 1.11.2
 ------
 

data/lib/multi_json.rb

@@ -2,6 +2,7 @@ require 'multi_json/options'
 require 'multi_json/version'
 require 'multi_json/adapter_error'
 require 'multi_json/parse_error'
+require 'multi_json/options_cache'
 
 module MultiJson
   include Options
@@ -88,6 +89,8 @@ module MultiJson
   # * <tt>:jr_jackson</tt> (JRuby only)
   def use(new_adapter)
     @adapter = load_adapter(new_adapter)
+  ensure
+    OptionsCache.reset
   end
   alias_method :adapter=, :use
   alias_method :engine=, :use

data/lib/multi_json/adapter.rb

@@ -5,6 +5,7 @@ module MultiJson
   class Adapter
     extend Options
     include Singleton
+
     class << self
       def defaults(action, value)
         metaclass = class << self; self; end
@@ -17,11 +18,11 @@ module MultiJson
       def load(string, options = {})
         fail self::ParseError if blank?(string)
         string = string.read if string.respond_to?(:read)
-        instance.load(string, load_options(options).merge(MultiJson.load_options(options)).merge!(options))
+        instance.load(string, cached_load_options(options))
       end
 
       def dump(object, options = {})
-        instance.dump(object, dump_options(options).merge(MultiJson.dump_options(options)).merge!(options))
+        instance.dump(object, cached_dump_options(options))
       end
 
     private
@@ -31,6 +32,18 @@ module MultiJson
       rescue ArgumentError # invalid byte sequence in UTF-8
         false
       end
+
+      def cached_dump_options(options)
+        OptionsCache.fetch(:dump, options) do
+          dump_options(options).merge(MultiJson.dump_options(options)).merge!(options)
+        end
+      end
+
+      def cached_load_options(options)
+        OptionsCache.fetch(:load, options) do
+          load_options(options).merge(MultiJson.load_options(options)).merge!(options)
+        end
+      end
     end
   end
 end

data/lib/multi_json/adapters/oj.rb

@@ -11,7 +11,7 @@ module MultiJson
       ParseError = defined?(::Oj::ParseError) ? ::Oj::ParseError : SyntaxError
 
       def load(string, options = {})
-        options[:symbol_keys] = options.delete(:symbolize_keys)
+        options[:symbol_keys] = options[:symbolize_keys]
         ::Oj.load(string, options)
       end
 

data/lib/multi_json/options.rb

@@ -1,10 +1,12 @@
 module MultiJson
   module Options
     def load_options=(options)
+      OptionsCache.reset
       @load_options = options
     end
 
     def dump_options=(options)
+      OptionsCache.reset
       @dump_options = options
     end
 

data/lib/multi_json/options_cache.rb

@@ -0,0 +1,15 @@
+module MultiJson
+  module OptionsCache
+    extend self
+
+    def reset
+      @dump_cache = {}
+      @load_cache = {}
+    end
+
+    def fetch(type, key)
+      cache = instance_variable_get("@#{type}_cache")
+      cache.key?(key) ? cache[key] : cache[key] = yield
+    end
+  end
+end

data/lib/multi_json/version.rb

@@ -1,8 +1,8 @@
 module MultiJson
   class Version
     MAJOR = 1 unless defined? MultiJson::Version::MAJOR
-    MINOR = 11 unless defined? MultiJson::Version::MINOR
-    PATCH = 3 unless defined? MultiJson::Version::PATCH
+    MINOR = 12 unless defined? MultiJson::Version::MINOR
+    PATCH = 0 unless defined? MultiJson::Version::PATCH
     PRE = nil unless defined? MultiJson::Version::PRE
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.12.0
 platform: ruby
 authors:
 - Michael Bleigh
@@ -33,7 +33,7 @@ cert_chain:
   De8xFEGqLG8vclcTv7gGjDJH5FJTXuwLg41wc8p4ONXEBgLiaC7+S/DVDXWpYxuB
   akI17ua4eRKTFNvBtzP1802SP1k=
   -----END CERTIFICATE-----
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,7 @@ files:
 - lib/multi_json/adapters/yajl.rb
 - lib/multi_json/convertible_hash_keys.rb
 - lib/multi_json/options.rb
+- lib/multi_json/options_cache.rb
 - lib/multi_json/parse_error.rb
 - lib/multi_json/vendor/okjson.rb
 - lib/multi_json/version.rb