Merge pull request #26092 from kerrizor/kerrizor/force-param-encoding

Allow specifying encoding of parameters by action

1 files changed, 29 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/metal/parameter_encoding.rb b/actionpack/lib/action_controller/metal/parameter_encoding.rb
new file mode 100644
index 0000000000..f5d3dabb45
--- /dev/null
+++ b/actionpack/lib/action_controller/metal/parameter_encoding.rb
@@ -0,0 +1,29 @@
+module ActionController
+  module ParameterEncoding
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def inherited(klass)
+        super
+        klass.setup_param_encode
+      end
+
+      def setup_param_encode
+        @_parameter_encodings = {}
+      end
+
+      def encoding_for_param(action, param)
+        if @_parameter_encodings[action.to_s] && @_parameter_encodings[action.to_s][param.to_s]
+          @_parameter_encodings[action.to_s][param.to_s]
+        else
+          ::Encoding::UTF_8
+        end
+      end
+
+      def parameter_encoding(action, param_name, encoding)
+        @_parameter_encodings[action.to_s] ||= {}
+        @_parameter_encodings[action.to_s][param_name.to_s] = encoding
+      end
+    end
+  end
+end