multi_json 1.3.1 → 1.3.2

data/lib/multi_json.rb

@@ -19,6 +19,12 @@ module MultiJson
     ["json/pure", :json_pure]
   ]
 
+  # TODO: Remove for 2.0 release (but no sooner)
+  def default_engine
+    deprecate("MultiJson.default_engine is deprecated and will be removed in the next major version. Use MultiJson.default_adapter instead.")
+    self.default_adapter
+  end
+
   # The default adapter based on what you currently
   # have loaded and installed. First checks to see
   # if any adapters are already loaded, then checks
@@ -70,19 +76,23 @@ module MultiJson
   # * <tt>:yajl</tt>
   # * <tt>:nsjsonserialization</tt> (MacRuby only)
   def use(new_adapter)
+    @adapter = load_adapter(new_adapter)
+  end
+  alias :adapter= :use
+
+  def load_adapter(new_adapter)
     case new_adapter
     when String, Symbol
       require "multi_json/adapters/#{new_adapter}"
-      @adapter = MultiJson::Adapters.const_get("#{new_adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
+      MultiJson::Adapters.const_get("#{new_adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
     when NilClass
-      @adapter = nil
+      nil
     when Class
-      @adapter = new_adapter
+      new_adapter
     else
       raise "Did not recognize your adapter specification. Please specify either a symbol or a class."
     end
   end
-  alias :adapter= :use
 
   # TODO: Remove for 2.0 release (but no sooner)
   def decode(string, options={})
@@ -95,12 +105,22 @@ module MultiJson
   # <b>Options</b>
   #
   # <tt>:symbolize_keys</tt> :: If true, will use symbols instead of strings for the keys.
+  # <tt>:adapter</tt> :: If set, the selected engine will be used just for the call.
   def load(string, options={})
+    adapter = current_adapter(options)
     adapter.load(string, options)
   rescue adapter::ParseError => exception
     raise DecodeError.new(exception.message, exception.backtrace, string)
   end
 
+  def current_adapter(options)
+    if new_adapter = (options || {}).delete(:adapter)
+      load_adapter(new_adapter)
+    else
+      adapter
+    end
+  end
+
   # TODO: Remove for 2.0 release (but no sooner)
   def encode(object, options={})
     deprecate("MultiJson.encode is deprecated and will be removed in the next major version. Use MultiJson.dump instead.")
@@ -109,6 +129,7 @@ module MultiJson
 
   # Encodes a Ruby object as JSON.
   def dump(object, options={})
+    adapter = current_adapter(options)
     adapter.dump(object, options)
   end
 

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/multi_json.gemspec

@@ -25,8 +25,11 @@ Gem::Specification.new do |gem|
   MultiJson.engine is deprecated and will be removed in the next major version.
   Use MultiJson.adapter instead.
 
-  MultiJson.engine= is deprecated and will be removed in the next major version.
-  Use MultiJson.use instead.
+  MultiJson.engine= is deprecated and will be removed in the next major
+  version. Use MultiJson.use instead.
+
+  MultiJson.default_engine is deprecated and will be removed in the next major
+  version. Use MultiJson.default_adapter instead.
 
 ********************************************************************************
 eos

data/spec/multi_json_spec.rb

@@ -59,6 +59,21 @@ describe 'MultiJson' do
       MultiJson.use MockDecoder
       MultiJson.adapter.name.should == 'MockDecoder'
     end
+
+    context "using one-shot parser" do
+      before(:each) do
+        require 'multi_json/adapters/json_pure'
+        MultiJson::Adapters::JsonPure.should_receive(:dump).exactly(1).times.and_return('dump_something')
+        MultiJson::Adapters::JsonPure.should_receive(:load).exactly(1).times.and_return('load_something')
+      end
+
+      it "should use the defined parser just for the call" do
+        MultiJson.use :yajl
+        MultiJson.dump('', :adapter => :json_pure).should eql('dump_something')
+        MultiJson.load('', :adapter => :json_pure).should eql('load_something')
+        MultiJson.adapter.to_s.should eql("MultiJson::Adapters::Yajl")
+      end
+    end
   end
 
   %w(json_gem json_pure nsjsonserialization oj ok_json yajl).each do |adapter|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-16 00:00:00.000000000 Z
+date: 2012-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -117,8 +117,10 @@ post_install_message: ! "*******************************************************
   \ Use MultiJson.dump instead.\n\n  MultiJson.decode is deprecated and will be removed
   in the next major version.\n  Use MultiJson.load instead.\n\n  MultiJson.engine
   is deprecated and will be removed in the next major version.\n  Use MultiJson.adapter
-  instead.\n\n  MultiJson.engine= is deprecated and will be removed in the next major
-  version.\n  Use MultiJson.use instead.\n\n********************************************************************************\n"
+  instead.\n\n  MultiJson.engine= is deprecated and will be removed in the next major\n
+  \ version. Use MultiJson.use instead.\n\n  MultiJson.default_engine is deprecated
+  and will be removed in the next major\n  version. Use MultiJson.default_adapter
+  instead.\n\n********************************************************************************\n"
 rdoc_options:
 - --charset=UTF-8
 require_paths: