2 files changed, 8 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/json/backends/jsongem.rb b/activesupport/lib/active_support/json/backends/jsongem.rb
index de847e30a3..d1a1cdd7d7 100644
--- a/activesupport/lib/active_support/json/backends/jsongem.rb
+++ b/activesupport/lib/active_support/json/backends/jsongem.rb
@@ -6,8 +6,11 @@ module ActiveSupport
       module JSONGem
         extend self
 
-        # Converts a JSON string into a Ruby object.
+        # Parses a JSON string or IO and convert it into an object
         def decode(json)
+          if json.respond_to?(:read)
+            json = json.read
+          end
           data = ::JSON.parse(json)
           if ActiveSupport.parse_json_times
             convert_dates_from(data)
diff --git a/activesupport/lib/active_support/json/backends/yaml.rb b/activesupport/lib/active_support/json/backends/yaml.rb
index c7db508c23..1c18fc4801 100644
--- a/activesupport/lib/active_support/json/backends/yaml.rb
+++ b/activesupport/lib/active_support/json/backends/yaml.rb
@@ -9,8 +9,11 @@ module ActiveSupport
       module Yaml
         extend self
 
-        # Converts a JSON string into a Ruby object.
+        # Parses a JSON string or IO and converts it into an object
         def decode(json)
+          if json.respond_to?(:read)
+            json = json.read
+          end
           YAML.load(convert_json_to_yaml(json))
         rescue ArgumentError => e
           raise ParseError, "Invalid JSON string"