From df3b65081012f7e24fb44320d4febd9008dbb20c Mon Sep 17 00:00:00 2001 From: Aaron Patterson Date: Tue, 13 Nov 2012 13:39:42 -0800 Subject: wrap up hash conversion in the constructor --- actionpack/lib/action_controller/metal/params_wrapper.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'actionpack/lib/action_controller/metal/params_wrapper.rb') diff --git a/actionpack/lib/action_controller/metal/params_wrapper.rb b/actionpack/lib/action_controller/metal/params_wrapper.rb index 3230c6d1b7..0234f138e8 100644 --- a/actionpack/lib/action_controller/metal/params_wrapper.rb +++ b/actionpack/lib/action_controller/metal/params_wrapper.rb @@ -75,7 +75,11 @@ module ActionController Options = Struct.new(:name, :format, :include, :exclude) do # :nodoc: def self.from_hash(hash) - new(*hash.values_at(:name, :format, :include, :exclude)) + name = hash[:name] + format = Array(hash[:format]) + include = hash[:include] && Array(hash[:include]).collect(&:to_s) + exclude = hash[:exclude] && Array(hash[:exclude]).collect(&:to_s) + new name, format, include, exclude end end @@ -187,10 +191,6 @@ module ActionController controller_name.singularize end - opts.format = Array(opts.format) - opts.include &&= Array(opts.include).collect(&:to_s) - opts.exclude &&= Array(opts.exclude).collect(&:to_s) - self._wrapper_options = opts end end -- cgit v1.2.3