diff options
| -rw-r--r-- | actionmailer/README.rdoc | 2 | ||||
| -rw-r--r-- | actionpack/README.rdoc | 2 | ||||
| -rw-r--r-- | activemodel/README.rdoc | 2 | ||||
| -rw-r--r-- | activerecord/README.rdoc | 2 | ||||
| -rw-r--r-- | activeresource/README.rdoc | 2 | ||||
| -rw-r--r-- | activesupport/README.rdoc | 2 | ||||
| -rw-r--r-- | activesupport/activesupport.gemspec | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/json/decoding.rb | 20 | ||||
| -rw-r--r-- | railties/README.rdoc | 2 |
9 files changed, 25 insertions, 11 deletions
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc index dc74b590f7..7667549608 100644 --- a/actionmailer/README.rdoc +++ b/actionmailer/README.rdoc @@ -143,7 +143,7 @@ The latest version of Action Mailer can be installed with RubyGems: Source code can be downloaded as part of the Rails project on GitHub -* https://github.com/rails/rails/tree/master/actionmailer +* https://github.com/rails/rails/tree/3-2-stable/actionmailer == License diff --git a/actionpack/README.rdoc b/actionpack/README.rdoc index 185439f363..3539ce2d8f 100644 --- a/actionpack/README.rdoc +++ b/actionpack/README.rdoc @@ -322,7 +322,7 @@ The latest version of Action Pack can be installed with RubyGems: Source code can be downloaded as part of the Rails project on GitHub -* https://github.com/rails/rails/tree/master/actionpack +* https://github.com/rails/rails/tree/3-2-stable/actionpack == License diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc index 6937c64ee3..3ff1279aff 100644 --- a/activemodel/README.rdoc +++ b/activemodel/README.rdoc @@ -192,7 +192,7 @@ The latest version of Active Model can be installed with RubyGems: Source code can be downloaded as part of the Rails project on GitHub -* https://github.com/rails/rails/tree/master/activemodel +* https://github.com/rails/rails/tree/3-2-stable/activemodel == License diff --git a/activerecord/README.rdoc b/activerecord/README.rdoc index 70922ef864..aa8bf724b1 100644 --- a/activerecord/README.rdoc +++ b/activerecord/README.rdoc @@ -203,7 +203,7 @@ The latest version of Active Record can be installed with RubyGems: Source code can be downloaded as part of the Rails project on GitHub -* https://github.com/rails/rails/tree/master/activerecord +* https://github.com/rails/rails/tree/3-2-stable/activerecord == License diff --git a/activeresource/README.rdoc b/activeresource/README.rdoc index 93ec74bbc3..9ab9990bcf 100644 --- a/activeresource/README.rdoc +++ b/activeresource/README.rdoc @@ -28,7 +28,7 @@ The latest version of Active Resource can be installed with RubyGems: Source code can be downloaded as part of the Rails project on GitHub -* https://github.com/rails/rails/tree/master/activeresource +* https://github.com/rails/rails/tree/3-2-stable/activeresource === Configuration and Usage diff --git a/activesupport/README.rdoc b/activesupport/README.rdoc index 1ab8e00608..ab1926303c 100644 --- a/activesupport/README.rdoc +++ b/activesupport/README.rdoc @@ -14,7 +14,7 @@ The latest version of Active Support can be installed with RubyGems: Source code can be downloaded as part of the Rails project on GitHub -* https://github.com/rails/rails/tree/master/activesupport +* https://github.com/rails/rails/tree/3-2-stable/activesupport == License diff --git a/activesupport/activesupport.gemspec b/activesupport/activesupport.gemspec index 696f2ca803..e6fc7bf571 100644 --- a/activesupport/activesupport.gemspec +++ b/activesupport/activesupport.gemspec @@ -19,5 +19,5 @@ Gem::Specification.new do |s| s.rdoc_options.concat ['--encoding', 'UTF-8'] s.add_dependency('i18n', '~> 0.6') - s.add_dependency('multi_json', '>= 1.0', '< 1.3') + s.add_dependency('multi_json', '~> 1.0') end diff --git a/activesupport/lib/active_support/json/decoding.rb b/activesupport/lib/active_support/json/decoding.rb index cbeb6c0a28..f95eb7a289 100644 --- a/activesupport/lib/active_support/json/decoding.rb +++ b/activesupport/lib/active_support/json/decoding.rb @@ -9,7 +9,13 @@ module ActiveSupport module JSON class << self def decode(json, options ={}) - data = MultiJson.decode(json, options) + # Can't reliably detect whether MultiJson responds to load, since it's + # a reserved word. Use adapter as a proxy for new features. + data = if MultiJson.respond_to?(:adapter) + MultiJson.load(json, options) + else + MultiJson.decode(json, options) + end if ActiveSupport.parse_json_times convert_dates_from(data) else @@ -18,12 +24,20 @@ module ActiveSupport end def engine - MultiJson.engine + if MultiJson.respond_to?(:adapter) + MultiJson.adapter + else + MultiJson.engine + end end alias :backend :engine def engine=(name) - MultiJson.engine = name + if MultiJson.respond_to?(:use) + MultiJson.use name + else + MultiJson.engine = name + end end alias :backend= :engine= diff --git a/railties/README.rdoc b/railties/README.rdoc index ae40600401..eed8745870 100644 --- a/railties/README.rdoc +++ b/railties/README.rdoc @@ -17,7 +17,7 @@ The latest version of Railties can be installed with RubyGems: Source code can be downloaded as part of the Rails project on GitHub -* https://github.com/rails/rails/tree/master/railties +* https://github.com/rails/rails/tree/3-2-stable/railties == License |