Merge branch 'pull/3146'

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

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 122c2e6513838eb90b609c15701592193a65c049..9179e431f9558d7483e9980311a150c0451e8855 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,9 +1,26 @@
 require "oauth/controllers/provider_controller"
 require "oauth/controllers/provider_controller"

+require "oauth/helper"

 require "oauth/rack/oauth_filter"
 
 Rails.configuration.middleware.use OAuth::Rack::OAuthFilter
 
 module OAuth
 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..-1].to_i(16).chr
+      end.force_encoding(Encoding::UTF_8)
+    end
+  end
+

   module RequestProxy
     class RackRequest
       def method
   module RequestProxy
     class RackRequest
       def method


@@ -16,6 +33,7 @@ end
 module OpenStreetMap
   module ProviderController
     def self.prepended(mod)
 module OpenStreetMap
   module ProviderController
     def self.prepended(mod)

+      super

       mod.singleton_class.prepend(OpenStreetMap::ProviderController::ClassMethods)
     end
 
       mod.singleton_class.prepend(OpenStreetMap::ProviderController::ClassMethods)
     end