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

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

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index fa9685d7068ec7f5d65432af0fddf02ce10dd83d..b0b993e90da722048e1856962386b86bdfe56a6f 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,13 +1,19 @@
-require 'oauth/rack/oauth_filter'
-
-Rails.configuration.middleware.use OAuth::Rack::OAuthFilter
+require "oauth/helper"
 
 module OAuth
-  module RequestProxy
-    class RackRequest
-      def method
-        request.request_method
-      end
+  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
 end