multi_json 0.0.2 → 0.0.3

data/README.rdoc

@@ -1,4 +1,4 @@
-= Use X to JSON
+= MultiJSON
 
 Lots of Ruby libraries utilize JSON parsing in some form, and everyone has their favorite JSON library. In order to best support multiple JSON parsers and libraries, <tt>multi_json</tt> is a general-purpose swappable JSON backend library. You use it like so:
 
@@ -13,6 +13,8 @@ Lots of Ruby libraries utilize JSON parsing in some form, and everyone has their
     
 The <tt>engine</tt> setter takes either a symbol or a class (to allow for custom JSON parsers) that responds to both <tt>.decode</tt> and <tt>.encode</tt> at the class level.
 
+MultiJSON tries to have intelligent defaulting. That is, if you have any of the supported engines already loaded, it will utilize them before attempting to load any. When loading, libraries are ordered by speed. First Yajl-Ruby, then the JSON gem, then ActiveSupport, then JSON pure.
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/multi_json.rb

@@ -9,13 +9,22 @@ module MultiJson
   end
   
   # The default engine based on what you currently
-  # have loaded. Tries Yajl first, then JSON gem,
-  # then ActiveSupport and JSON pure.
+  # have loaded and installed. First checks to see
+  # if any engines are already loaded, then checks
+  # to see which are installed if none are loaded.
   def default_engine
     return :yajl if defined?(::Yajl)
     return :json_gem if defined?(::JSON)
     return :active_support if defined?(::ActiveSupport::JSON)
-    :json_pure
+    
+    %w(yajl json active_support json/pure).each do |req|
+      begin
+        require req
+        return req.sub('/','_').to_sym
+      rescue LoadError
+        next
+      end
+    end
   end
   
   # Set the JSON parser utilizing a symbol, string, or class.

data/lib/multi_json/engines/active_support.rb

@@ -2,17 +2,18 @@ require 'active_support' unless defined?(::ActiveSupport::JSON)
 
 module MultiJson
   module Engines
-    class ActiveSupport
-      def self.decode(string, options = {})
+    # Use ActiveSupport to encode/decode JSON.
+    class ActiveSupport 
+      def self.decode(string, options = {}) #:nodoc:
         hash = ::ActiveSupport::JSON.decode(string)
         options[:symbolize_keys] ? symbolize_keys(hash) : hash
       end
       
-      def self.encode(object)
+      def self.encode(object) #:nodoc:
         ::ActiveSupport::JSON.encode(object)
       end
       
-      def self.symbolize_keys(hash)
+      def self.symbolize_keys(hash) #:nodoc:
         hash.inject({}){|result, (key, value)|
           new_key = case key
                     when String then key.to_sym

data/lib/multi_json/engines/json_gem.rb

@@ -2,14 +2,15 @@ require 'json' unless defined?(::JSON)
 
 module MultiJson
   module Engines
+    # Use the JSON gem to encode/decode.
     class JsonGem
-      def self.decode(string, options = {})
+      def self.decode(string, options = {}) #:nodoc:
         opts = {}
         opts[:symbolize_names] = options[:symbolize_keys]
         ::JSON.parse(string, opts)
       end
       
-      def self.encode(object)
+      def self.encode(object) #:nodoc:
         object.to_json
       end
     end

data/lib/multi_json/engines/json_pure.rb

@@ -2,14 +2,15 @@ require 'json/pure' unless defined?(::JSON)
 
 module MultiJson
   module Engines
+    # Use JSON pure to encode/decode.
     class JsonPure
-      def self.decode(string, options = {})
+      def self.decode(string, options = {}) #:nodoc:
         opts = {}
         opts[:symbolize_names] = options[:symbolize_keys]
         ::JSON.parse(string, opts)
       end
       
-      def self.encode(object)
+      def self.encode(object) #:nodoc:
         object.to_json
       end
     end

data/lib/multi_json/engines/yajl.rb

@@ -2,12 +2,13 @@ require 'yajl' unless defined?(Yajl)
 
 module MultiJson
   module Engines
+    # Use the Yajl-Ruby library to encode/decode.
     class Yajl
-      def self.decode(string, options = {})
+      def self.decode(string, options = {}) #:nodoc:
         ::Yajl::Parser.new(:symbolize_keys => options[:symbolize_keys]).parse(string)
       end
       
-      def self.encode(object)
+      def self.encode(object) #:nodoc:
         ::Yajl::Encoder.new.encode(object)
       end
     end

data/multi_json.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{multi_json}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Bleigh"]
-  s.date = %q{2010-06-13}
+  s.date = %q{2010-06-14}
   s.description = %q{A gem to provide swappable JSON backends utilizing Yajl::Ruby, the JSON gem, ActiveSupport, or JSON pure.}
   s.email = %q{michael@intridea.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-13 00:00:00 -04:00
+date: 2010-06-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency