Merge branch 'multi_json' of https://github.com/joshk/rails into josh…

…k-multi_json

activesupport/activesupport.gemspec

@@ -16,4 +16,6 @@ Gem::Specification.new do |s|
 
   s.files        = Dir['CHANGELOG', 'README.rdoc', 'lib/**/*']
   s.require_path = 'lib'
+
+  s.add_dependency('multi_json', '~> 1.0.0.rc3')
 end

activesupport/lib/active_support/json/decoding.rb

@@ -1,32 +1,31 @@
 require 'active_support/core_ext/module/attribute_accessors'
 require 'active_support/core_ext/module/delegation'
+require 'multi_json'
 
 module ActiveSupport
   # Look for and parse json strings that look like ISO 8601 times.
   mattr_accessor :parse_json_times
 
   module JSON
-    # Listed in order of preference.
-    DECODERS = %w(Yajl Yaml)
-
     class << self
-      attr_reader :parse_error
-      delegate :decode, :to => :backend
+      def decode(json, options ={})
+        data = MultiJson.decode(json, options)
+        if ActiveSupport.parse_json_times
+          convert_dates_from(data)
+        else
+          data
+        end
+      end
 
-      def backend
-        set_default_backend unless defined?(@backend)
-        @backend
+      def engine
+        MultiJson.engine
       end
+      alias :backend :engine
 
-      def backend=(name)
-        if name.is_a?(Module)
-          @backend = name
-        else
-          require "active_support/json/backends/#{name.to_s.downcase}"
-          @backend = ActiveSupport::JSON::Backends::const_get(name)
-        end
-        @parse_error = @backend::ParseError
+      def engine=(name)
+        MultiJson.engine = name
       end
+      alias :backend= :engine=
 
       def with_backend(name)
         old_backend, self.backend = backend, name
@@ -35,15 +34,30 @@ def with_backend(name)
         self.backend = old_backend
       end
 
-      def set_default_backend
-        DECODERS.find do |name|
+      def parse_error
+        MultiJson::DecodeError
+      end
+
+      private
+
+      def convert_dates_from(data)
+        case data
+        when nil
+          nil
+        when DATE_REGEX
           begin
-            self.backend = name
-            true
-          rescue LoadError
-            # Try next decoder.
-            false
+            DateTime.parse(data)
+          rescue ArgumentError
+            data
           end
+        when Array
+          data.map! { |d| convert_dates_from(d) }
+        when Hash
+          data.each do |key, value|
+            data[key] = convert_dates_from(value)
+          end
+        else
+          data
         end
       end
     end

activesupport/test/json/decoding_test.rb

@@ -56,12 +56,9 @@ class TestJSONDecoding < ActiveSupport::TestCase
     %q({"a":"Line1\u000aLine2"}) => {"a"=>"Line1\nLine2"}
   }
 
-  # load the default JSON backend
-  ActiveSupport::JSON.backend = 'Yaml'
-
-  backends = %w(Yaml)
-  backends << "JSONGem" if defined?(::JSON)
-  backends << "Yajl" if defined?(::Yajl)
+  backends = [:ok_json]
+  backends << :json_gem if defined?(::JSON)
+  backends << :yajl if defined?(::Yajl)
 
   backends.each do |backend|
     TESTS.each do |json, expected|