Merge pull request #236 from tpitale/preserve-location

Rails actionpack responder preserves :location => nil, AM::S should too

lib/active_model/serializer/responder.rb

@@ -32,7 +32,7 @@ module ActiveModel
             serialization_scope = controller.send(:serialization_scope)
             options[:scope] = serialization_scope unless options.has_key?(:scope)
             options[:url_options] = controller.send(:url_options)
-            render(given_options.merge(:json => serializer.new(resource, options)))
+            render(given_options.merge(self.options).merge(:json => serializer.new(resource, options)))
           else
             super
           end

test/responder_test.rb

@@ -143,6 +143,10 @@ class ResponderTest < ActionController::TestCase
       respond_with JsonSerializable.new, :options => true
     end
 
+    def render_json_with_serializer_but_without_location
+      respond_with JsonSerializable.new, :location => nil
+    end
+
     def render_json_with_serializer_and_scope_option
       @current_user = Struct.new(:as_json).new(:current_user => true)
       scope = Struct.new(:as_json).new(:current_user => false)
@@ -301,6 +305,11 @@ class ResponderTest < ActionController::TestCase
     assert_match '"options":true', @response.body
   end
 
+  def test_render_json_with_serializer_but_without_location
+    post :render_json_with_serializer_but_without_location
+    assert_equal nil, @response.location
+  end
+
   def test_render_json_with_serializer_and_scope_option
     get :render_json_with_serializer_and_scope_option
     assert_match '"scope":{"current_user":false}', @response.body