multi_json 1.7.6 → 1.7.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1526efc5eb9f327a9e7d99b8334583259f52ec51
+  data.tar.gz: 665a9bc1822afd536e0564d0e2743934652aa068
+SHA512:
+  metadata.gz: 205f05da917cb2cc834962ac06189ef06e11b6ee47ef0f2162e6afa0849a6002610ecdd3e8524daf6c7835e500e1dd46ba888e4a5e84c2951653475d2c36e4b3
+  data.tar.gz: cdaf1b1d9f0ab8242c93576c63d1b80b96752043cfe6c511fdcf7bf3757fb74816486a667c37c803e0fdb23493736bc50baa840423192e48ef0ac6f8dbffce4b

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+nH�:%b>��R$��u�=z��Y�J?^Q����pȩ4|{�|f@��&��JYK&�ʯ#+N�"h\3�+R5�S''����xF=��K!�dfNi��S�˵w�T���=4�Էˑ�o�3�]X
���`��B�hE�

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+1.7.7
+-----
+* [Fix options caching issues](https://github.com/intridea/multi_json/commit/a3f14c3661688c5927638fa6088c7b46a67e875e)
+
 1.7.6
 -----
 * [Bring back MultiJson::VERSION constant](https://github.com/intridea/multi_json/commit/31b990c2725e6673bf8ce57540fe66b57a751a72)

data/lib/multi_json.rb

@@ -5,6 +5,16 @@ module MultiJson
   include Options
   extend self
 
+  class << self
+    def cached_options
+      @cached_options || reset_cached_options!
+    end
+
+    def reset_cached_options!
+      @cached_options = {}
+    end
+  end
+
   class LoadError < StandardError
     attr_reader :data
     def initialize(message='', backtrace=[], data='')
@@ -27,17 +37,7 @@ module MultiJson
     self.load_options = self.dump_options = value
   end
 
-  # cache busting
-  %w(load_options= dump_options=).each do |method|
-    define_method method do |*args|
-      use current_adapter
-      super(*args)
-    end
-  end
-
-  ALIASES = {
-    'jrjackson' => :jr_jackson
-  }
+  ALIASES = { 'jrjackson' => :jr_jackson }
 
   REQUIREMENT_MAP = [
     ['oj',           :oj],
@@ -95,9 +95,7 @@ module MultiJson
   # * <tt>:gson</tt> (JRuby only)
   # * <tt>:jr_jackson</tt> (JRuby only)
   def use(new_adapter)
-    adapter = load_adapter(new_adapter)
-    adapter.activate! if adapter.respond_to?(:activate!)
-    @adapter = adapter
+    @adapter = load_adapter(new_adapter)
   end
   alias adapter= use
   alias engine= use

data/lib/multi_json/adapter.rb

@@ -15,28 +15,22 @@ module MultiJson
         end
       end
 
-      def activate!
-        @load_options_cache = {}
-        @dump_options_cache = {}
-        instance.activate if instance.respond_to?(:activate)
-      end
-
       def load(string, options={})
-        instance.load(string, collect_load_options(string, options).clone)
+        instance.load(string, collect_load_options(options).clone)
       end
 
       def dump(object, options={})
-        instance.dump(object, collect_dump_options(object, options).clone)
+        instance.dump(object, collect_dump_options(options).clone)
       end
 
     protected
 
-      def collect_load_options(string, options)
-        @load_options_cache[options] ||= collect_options(:load_options, options).merge(options)
+      def collect_load_options(options)
+        cache('load', options){ collect_options(:load_options, options).merge(options) }
       end
 
-      def collect_dump_options(object, options)
-        @dump_options_cache[options] ||= collect_options(:dump_options, options).merge(options)
+      def collect_dump_options(options)
+        cache('dump', options){ collect_options(:dump_options, options).merge(options) }
       end
 
       def collect_options(method, *args)
@@ -44,6 +38,11 @@ module MultiJson
         local.merge(global)
       end
 
+      def cache(method, options)
+        cache_key = [self, options].map(&:hash).join + method
+        MultiJson.cached_options[cache_key] ||= yield
+      end
+
     end
   end
 end

data/lib/multi_json/options.rb

@@ -1,6 +1,15 @@
 module MultiJson
   module Options
-    attr_writer :load_options, :dump_options
+
+    def load_options=(options)
+      MultiJson.reset_cached_options!
+      @load_options = options
+    end
+
+    def dump_options=(options)
+      MultiJson.reset_cached_options!
+      @dump_options = options
+    end
 
     def load_options(*args)
       get_options :load_options, *args

data/lib/multi_json/version.rb

@@ -2,7 +2,7 @@ module MultiJson
   class Version
     MAJOR = 1 unless defined? MultiJson::Version::MAJOR
     MINOR = 7 unless defined? MultiJson::Version::MINOR
-    PATCH = 6 unless defined? MultiJson::Version::PATCH
+    PATCH = 7 unless defined? MultiJson::Version::PATCH
     PRE = nil unless defined? MultiJson::Version::PRE
 
     class << self

data/spec/multi_json_spec.rb

@@ -51,15 +51,24 @@ describe 'MultiJson' do
     end
 
     context 'caching' do
-      before{ MultiJson.use :json_gem }
+      before{ MultiJson.use adapter }
+      let(:adapter){ MultiJson::Adapters::JsonGem }
       let(:json_string){ '{"abc":"def"}' }
 
-      it 'busts options caches on change' do
+      it 'busts caches on global options change' do
         MultiJson.load_options = { :symbolize_keys => true }
         expect(MultiJson.load(json_string)).to eq(:abc => 'def')
         MultiJson.load_options = nil
         expect(MultiJson.load(json_string)).to eq('abc' => 'def')
       end
+
+      it 'busts caches on per-adapter options change' do
+        adapter.load_options = { :symbolize_keys => true }
+        expect(MultiJson.load(json_string)).to eq(:abc => 'def')
+        adapter.load_options = nil
+        expect(MultiJson.load(json_string)).to eq('abc' => 'def')
+      end
+
     end
 
     it 'defaults to the best available gem' do

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.7.6
-  prerelease: 
+  version: 1.7.7
 platform: ruby
 authors:
 - Michael Bleigh
@@ -12,39 +11,32 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain:
-- !binary |-
-  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURMakNDQWhhZ0F3SUJB
-  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREE5TVE4d0RRWURWUVFEREFaelpt
-  VnkKYVdzeEZUQVRCZ29Ka2lhSmsvSXNaQUVaRmdWbmJXRnBiREVUTUJFR0Nn
-  bVNKb21UOGl4a0FSa1dBMk52YlRBZQpGdzB4TXpBeU1ETXhNREF5TWpkYUZ3
-  MHhOREF5TURNeE1EQXlNamRhTUQweER6QU5CZ05WQkFNTUJuTm1aWEpwCmF6
-  RVZNQk1HQ2dtU0pvbVQ4aXhrQVJrV0JXZHRZV2xzTVJNd0VRWUtDWkltaVpQ
-  eUxHUUJHUllEWTI5dE1JSUIKSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4
-  QU1JSUJDZ0tDQVFFQWwweDVkeDh1S3hpN1Rrckl1eUJVVEpWQgp2MW85M25V
-  QjlqL3k0TTk2Z1Yycll3QWNpMUpQQnNlTmQ2RnliempvM1lHdUhsN0VRSHVT
-  SE5hZjFwMmx4ZXcvCnk2MEpYSUpCQmdQY0RLL0tDUDROVUhvZm0wamZvWUQr
-  SDV1TkpmSENOcTcvWnNUeE90RTNSYTkyczBCQ01UcG0Kd0JNTWxXUjVNdGRF
-  aElZdUJPNFhobmVqWWdIMEwvN0JMMmx5bW50Vm5zci9hZ2RRb29qUUNOMUlR
-  bXNSSnZyUgpkdVpSTzN0WnZvSW8xcEJjNEpFZWhEdXFDZXlCZ1BMT3FNb0t0
-  UWxvbGQxVFFzMWtXVUJLN0tXTUZFaEtDL0tnCnp5ektSSFFvOXlEWXdPdllu
-  Z29CTFkrVC9sd0NUNGR5c3NkaHpSYmZueEFoYUt1NFNBc3NJd2FDMDF5Vm93
-  SUQKQVFBQm96a3dOekFKQmdOVkhSTUVBakFBTUIwR0ExVWREZ1FXQkJTMHJ1
-  RGZSYWs1Y2kxT3BETlgvWmRERWtJcwppVEFMQmdOVkhROEVCQU1DQkxBd0RR
-  WUpLb1pJaHZjTkFRRUZCUUFEZ2dFQkFISFNNcy9NUDBzT2FMa0V2NEpvCnp2
-  a20zcW41QTZ0MHZhSHg3NzRjbWVqeU1VKzV3eVN4UmV6c3BMN1VMaDlOZXVL
-  Mk9oVStPZTNUcHFyQWc1VEsKUjhHUUlMblZ1MkZlbUdBNnNBa1BEbGNQdGdB
-  NmllSTE5UFpPRjZIVkxtYy9JRC9kUC9OZ1pXV3pFZXFRS21jSwoyK0hNK1NF
-  RURoWmtTY1lla3c0Wk9lMTY0WnRaRzgxNm9BdjV4MHBHaXRTSWt1bVVwN1Y4
-  aUVaLzZlaHI3WTllClhPZzRlZXVuNUwvSmptakFSb1cya05kdmtSRDNjMkVl
-  U0xxV3ZRUnNCbHlwSGZoczZKSnVMbHlaUEdoVTNSL3YKU2YzbFZLcEJDV2dS
-  cEdUdnk0NVhWcEIrNTl5MzNQSm1FdVExUFRFT1l2UXlhbzlVS01BQWFBTi83
-  cVdRdGpsMApobHc9Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-date: 2013-06-04 00:00:00.000000000 Z
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLjCCAhagAwIBAgIBADANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZzZmVy
+  aWsxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2NvbTAe
+  Fw0xMzAyMDMxMDAyMjdaFw0xNDAyMDMxMDAyMjdaMD0xDzANBgNVBAMMBnNmZXJp
+  azEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAl0x5dx8uKxi7TkrIuyBUTJVB
+  v1o93nUB9j/y4M96gV2rYwAci1JPBseNd6Fybzjo3YGuHl7EQHuSHNaf1p2lxew/
+  y60JXIJBBgPcDK/KCP4NUHofm0jfoYD+H5uNJfHCNq7/ZsTxOtE3Ra92s0BCMTpm
+  wBMMlWR5MtdEhIYuBO4XhnejYgH0L/7BL2lymntVnsr/agdQoojQCN1IQmsRJvrR
+  duZRO3tZvoIo1pBc4JEehDuqCeyBgPLOqMoKtQlold1TQs1kWUBK7KWMFEhKC/Kg
+  zyzKRHQo9yDYwOvYngoBLY+T/lwCT4dyssdhzRbfnxAhaKu4SAssIwaC01yVowID
+  AQABozkwNzAJBgNVHRMEAjAAMB0GA1UdDgQWBBS0ruDfRak5ci1OpDNX/ZdDEkIs
+  iTALBgNVHQ8EBAMCBLAwDQYJKoZIhvcNAQEFBQADggEBAHHSMs/MP0sOaLkEv4Jo
+  zvkm3qn5A6t0vaHx774cmejyMU+5wySxRezspL7ULh9NeuK2OhU+Oe3TpqrAg5TK
+  R8GQILnVu2FemGA6sAkPDlcPtgA6ieI19PZOF6HVLmc/ID/dP/NgZWWzEeqQKmcK
+  2+HM+SEEDhZkScYekw4ZOe164ZtZG816oAv5x0pGitSIkumUp7V8iEZ/6ehr7Y9e
+  XOg4eeun5L/JjmjARoW2kNdvkRD3c2EeSLqWvQRsBlypHfhs6JJuLlyZPGhU3R/v
+  Sf3lVKpBCWgRpGTvy45XVpB+59y33PJmEuQ1PTEOYvQyao9UKMAAaAN/7qWQtjl0
+  hlw=
+  -----END CERTIFICATE-----
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -52,7 +44,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,27 +93,26 @@ files:
 homepage: http://github.com/intridea/multi_json
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A common interface to multiple JSON libraries.
 test_files:
 - spec/adapter_shared_example.rb

metadata.gz.sig

@@ -1,2 +1,3 @@
-,�j�S7�Y2WBxO����]���)�l����-����WP�����/�#��5QQ�G;�e
-���;�u@���������;��<�9�J����t�S��W�v- �Fb���hž��R^�Jh�<n�,�BDo���HyA�r�d2_[S�Z/���Kx��*�M�A��*�b�j9��N9��G4��
+���iLg^�� �1E4x���%)H>@�
+���+�U��7Պ�?*���
+#��Q�S�=�1		c4֠,-4��J����l.r���.�~����w-(�L-��Gyt�o��9ʑ��U�k�#0�@j�[+�F��:�