X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ad6c0d3ebabdfe985ce91b10e3ae07b68ebd768f..HEAD:/config/initializers/oauth.rb

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index bad01dd3d..812e6610d 100644
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,4 +1,5 @@
 require "oauth/controllers/provider_controller"
+require "oauth/helper"
 require "oauth/rack/oauth_filter"
 
 Rails.configuration.middleware.use OAuth::Rack::OAuthFilter
@@ -7,8 +8,16 @@ module OAuth
   module Helper
     def escape(value)
       value.to_s.gsub(OAuth::RESERVED_CHARACTERS) do |c|
-        format("%%%02X", c.ord)
-      end
+        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
 
@@ -31,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
       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
       end
     end
   end