Merge pull request #674 from tricknotes/support-rails4.2-for-ams0.9

Support Rails 4.2.0 with AMS 0.9

Author: steveklabnik

lib/action_controller/serialization.rb

@@ -45,13 +45,15 @@ def serialization_scope(scope)
       end
     end
 
-    def _render_option_json(resource, options)
-      serializer = build_json_serializer(resource, options)
-
-      if serializer
-        super(serializer, options)
-      else
-        super
+    [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
+      define_method renderer_method do |resource, options|
+        serializer = build_json_serializer(resource, options)
+
+        if serializer
+          super(serializer, options)
+        else
+          super(resource, options)
+        end
       end
     end