Merge a43a6a3 into 9436d73

rails-api · Jan 27, 2014 · 0273c44 · 0273c44
2 parents 9436d73 + a43a6a3
commit 0273c44
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/active_model/serializable.rb b/lib/active_model/serializable.rb
@@ -1,6 +1,7 @@
 module ActiveModel
   module Serializable
     def as_json(options={})
+      options = options.to_hash if options.respond_to?(:to_hash)
       if root = options.fetch(:root, json_key)
         hash = { root => serializable_object }
         hash.merge!(serializable_data)