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

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

diff --git a/config/initializers/oauth.rb b/config/initializers/oauth.rb
index 437a00c97d12d88dd90162c5d70146917997fc51..3b4f06a2e66277c2856ca87650fea36b0b264d59 100644 (file)
--- a/config/initializers/oauth.rb
+++ b/config/initializers/oauth.rb
@@ -1,3 +1,4 @@
+require "oauth/controllers/provider_controller"

 require "oauth/rack/oauth_filter"
 
 Rails.configuration.middleware.use OAuth::Rack::OAuthFilter
 require "oauth/rack/oauth_filter"
 
 Rails.configuration.middleware.use OAuth::Rack::OAuthFilter


@@ -11,3 +12,41 @@ module OAuth
     end
   end
 end
     end
   end
 end

+
+module OpenStreetMap
+  module ProviderController
+    def self.prepended(mod)
+      mod.singleton_class.prepend(OpenStreetMap::ProviderController::ClassMethods)
+    end
+
+    def render(options = {})
+      text = options.delete(:text)
+      if text
+        super options.merge(:plain => text)
+      elsif options.delete(:nothing)
+        status = options.delete(:status) || :ok
+        head status, options
+      else
+        super options
+      end
+    end
+
+    module ClassMethods
+      def included(controller)
+        controller.class_eval do
+          def self.before_filter(*names, &blk)
+            before_action(*names, &blk)
+          end
+
+          def self.skip_before_filter(*names, &blk)
+            skip_before_action(*names, &blk)
+          end
+        end
+
+        super controller
+      end
+    end
+  end
+end
+
+OAuth::Controllers::ProviderController.prepend(OpenStreetMap::ProviderController)