github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:rails/rails

Browse Source
This commit is contained in:
Xavier Noria
2011-08-16 11:19:20 -07:00
parent 0245792c83 8e23615245
commit 98fac9902b
3 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/lib/action_controller/metal/params_wrapper.rb
View File

@@ -121,8 +121,6 @@ module ActionController
_set_wrapper_defaults(_wrapper_options.slice(:format).merge(options), model)
end
alias :wrap_parameters= :wrap_parameters
# Sets the default wrapper key or model which will be used to determine
# wrapper key and attribute names. Will be called automatically when the
# module is inherited.

7
actionpack/test/controller/params_wrapper_test.rb
View File

@@ -180,13 +180,6 @@ class ParamsWrapperTest < ActionController::TestCase
assert_parameters({ 'username' => 'sikachu', 'title' => 'Developer', 'user' => { 'username' => 'sikachu', 'title' => 'Developer' }})
end
end
def test_assignment_alias
with_default_wrapper_options do
UsersController.wrap_parameters = { :format => [:foo] }
assert_equal({ :format => [:foo], :name => "user" }, UsersController._wrapper_options)
end
end
end
class NamespacedParamsWrapperTest < ActionController::TestCase

18
railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
View File

@@ -3,12 +3,14 @@
# This file contains settings for ActionController::ParamsWrapper which
# is enabled by default.
<%= app_const %>.configure do
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
config.action_controller.wrap_parameters = { <%= key_value :format, "[:json]" %> }
<%- unless options.skip_active_record? -%>
# Disable root element in JSON by default.
config.active_record.include_root_in_json = false
<%- end -%>
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do
wrap_parameters <%= key_value :format, "[:json]" %>
end
<%- unless options.skip_active_record? -%>
# Disable root element in JSON by default.
ActiveSupport.on_load(:active_record) do
self.include_root_in_json = false
end
<%- end -%>