Merge remote-tracking branch 'upstream/pull/4717'

[rails.git] / config / initializers / oauth.rb

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 2e2f45ab88e1c46667b09719f07ca7880d238936..fbe4ad219161a6c87d58c872a98aced64b1acdfd 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,9 +1,26 @@
 require "oauth/controllers/provider_controller"
+require "oauth/helper"
 require "oauth/rack/oauth_filter"
 
 Rails.configuration.middleware.use OAuth::Rack::OAuthFilter
 
 module OAuth
+  module Helper
+    def escape(value)
+      value.to_s.gsub(OAuth::RESERVED_CHARACTERS) do |c|
+        c.bytes.map do |b|
+          format("%%%02X", b)
+        end.join
+      end.force_encoding(Encoding::US_ASCII)
+    end
+
+    def unescape(value)
+      value.to_s.gsub(/%\h{2}/) do |c|
+        c[1..].to_i(16).chr
+      end.force_encoding(Encoding::UTF_8)
+    end
+  end
+
   module RequestProxy
     class RackRequest
       def method
@@ -23,28 +40,28 @@ module OpenStreetMap
     def render(options = {})
       text = options.delete(:text)
       if text
-        super options.merge(:plain => text)
+        super(options.merge(:plain => text))
       elsif options.delete(:nothing)
         status = options.delete(:status) || :ok
         head status, options
       else
-        super options
+        super(options)
       end
     end
 
     module ClassMethods
       def included(controller)
         controller.class_eval do
-          def self.before_filter(*names, &blk)
-            before_action(*names, &blk)
+          def self.before_filter(...)
+            before_action(...)
           end
 
-          def self.skip_before_filter(*names, &blk)
-            skip_before_action(*names, &blk)
+          def self.skip_before_filter(...)
+            skip_before_action(...)
           end
         end
 
-        super controller
+        super(controller)
       end
     end
   end