multi_json 1.3.3 → 1.3.4

data/lib/multi_json.rb

@@ -8,8 +8,6 @@ module MultiJson
     end
   end
 
-  module_function
-
   @adapter = nil
 
   REQUIREMENT_MAP = [
@@ -19,98 +17,102 @@ module MultiJson
     ["json/pure", :json_pure]
   ]
 
-  # The default adapter based on what you currently
-  # have loaded and installed. First checks to see
-  # if any adapters are already loaded, then checks
-  # to see which are installed if none are loaded.
-  def default_adapter
-    return :oj if defined?(::Oj)
-    return :yajl if defined?(::Yajl)
-    return :json_gem if defined?(::JSON)
+  class << self
+
+    # The default adapter based on what you currently
+    # have loaded and installed. First checks to see
+    # if any adapters are already loaded, then checks
+    # to see which are installed if none are loaded.
+    def default_adapter
+      return :oj if defined?(::Oj)
+      return :yajl if defined?(::Yajl)
+      return :json_gem if defined?(::JSON)
 
-    REQUIREMENT_MAP.each do |(library, adapter)|
-      begin
-        require library
-        return adapter
-      rescue LoadError
-        next
+      REQUIREMENT_MAP.each do |(library, adapter)|
+        begin
+          require library
+          return adapter
+        rescue LoadError
+          next
+        end
       end
+
+      Kernel.warn "[WARNING] MultiJson is using the default adapter (ok_json). We recommend loading a different JSON library to improve performance."
+      :ok_json
     end
+    # :nodoc:
+    alias :default_engine :default_adapter
 
-    Kernel.warn "[WARNING] MultiJson is using the default adapter (ok_json). We recommend loading a different JSON library to improve performance."
-    :ok_json
-  end
-  # :nodoc:
-  alias :default_engine :default_adapter
+    # Get the current adapter class.
+    def adapter
+      return @adapter if @adapter
+      self.use self.default_adapter
+      @adapter
+    end
+    # :nodoc:
+    alias :engine :adapter
 
-  # Get the current adapter class.
-  def adapter
-    return @adapter if @adapter
-    self.use self.default_adapter
-    @adapter
-  end
-  # :nodoc:
-  alias :engine :adapter
+    # Set the JSON parser utilizing a symbol, string, or class.
+    # Supported by default are:
+    #
+    # * <tt>:oj</tt>
+    # * <tt>:json_gem</tt>
+    # * <tt>:json_pure</tt>
+    # * <tt>:ok_json</tt>
+    # * <tt>:yajl</tt>
+    # * <tt>:nsjsonserialization</tt> (MacRuby only)
+    def use(new_adapter)
+      @adapter = load_adapter(new_adapter)
+    end
+    alias :adapter= :use
+    # :nodoc:
+    alias :engine= :use
 
-  # Set the JSON parser utilizing a symbol, string, or class.
-  # Supported by default are:
-  #
-  # * <tt>:oj</tt>
-  # * <tt>:json_gem</tt>
-  # * <tt>:json_pure</tt>
-  # * <tt>:ok_json</tt>
-  # * <tt>:yajl</tt>
-  # * <tt>:nsjsonserialization</tt> (MacRuby only)
-  def use(new_adapter)
-    @adapter = load_adapter(new_adapter)
-  end
-  alias :adapter= :use
-  # :nodoc:
-  alias :engine= :use
+    def load_adapter(new_adapter)
+      case new_adapter
+      when String, Symbol
+        require "multi_json/adapters/#{new_adapter}"
+        MultiJson::Adapters.const_get("#{new_adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
+      when NilClass
+        nil
+      when Class
+        new_adapter
+      else
+        raise "Did not recognize your adapter specification. Please specify either a symbol or a class."
+      end
+    end
 
-  def load_adapter(new_adapter)
-    case new_adapter
-    when String, Symbol
-      require "multi_json/adapters/#{new_adapter}"
-      MultiJson::Adapters.const_get("#{new_adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
-    when NilClass
-      nil
-    when Class
-      new_adapter
-    else
-      raise "Did not recognize your adapter specification. Please specify either a symbol or a class."
+    # Decode a JSON string into Ruby.
+    #
+    # <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
-  end
+    # :nodoc:
+    alias :decode :load
 
-  # Decode a JSON string into Ruby.
-  #
-  # <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
-  # :nodoc:
-  alias :decode :load
+    def current_adapter(options)
+      if new_adapter = (options || {}).delete(:adapter)
+        load_adapter(new_adapter)
+      else
+        adapter
+      end
+    end
 
-  def current_adapter(options)
-    if new_adapter = (options || {}).delete(:adapter)
-      load_adapter(new_adapter)
-    else
-      adapter
+    # Encodes a Ruby object as JSON.
+    def dump(object, options={})
+      adapter = current_adapter(options)
+      adapter.dump(object, options)
     end
-  end
+    # :nodoc:
+    alias :encode :dump
 
-  # Encodes a Ruby object as JSON.
-  def dump(object, options={})
-    adapter = current_adapter(options)
-    adapter.dump(object, options)
   end
-  # :nodoc:
-  alias :encode :dump
 
 end

data/lib/multi_json/version.rb

@@ -1,3 +1,3 @@
 module MultiJson
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

data/spec/multi_json_spec.rb

@@ -68,10 +68,10 @@ describe 'MultiJson' do
       end
 
       it "should use the defined parser just for the call" do
-        MultiJson.use :yajl
+        MultiJson.use :json_gem
         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")
+        MultiJson.adapter.to_s.should eql("MultiJson::Adapters::JsonGem")
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: multi_json
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-28 00:00:00.000000000 Z
+date: 2012-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -123,6 +123,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3342711038323069490
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,4 +142,3 @@ test_files:
 - spec/adapter_shared_example.rb
 - spec/helper.rb
 - spec/multi_json_spec.rb
-has_rdoc: