🐛 Fix request proxy Class constant reference scopes

- Some classes are reproduced within this gem as nested proxies of the same name, so class lookups could get confused

Signed-off-by: Peter Boling <peter.boling@gmail.com>

Author: pboling

lib/oauth/request_proxy/action_controller_request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_support"
 require "active_support/version"
 require "action_controller"
@@ -25,61 +27,63 @@
   require "action_dispatch/http/request"
 end
 
-module OAuth::RequestProxy
-  class ActionControllerRequest < OAuth::RequestProxy::Base
-    proxies(defined?(ActionDispatch::AbstractRequest) ? ActionDispatch::AbstractRequest : ActionDispatch::Request)
+module OAuth
+  module RequestProxy
+    class ActionControllerRequest < OAuth::RequestProxy::Base
+      proxies(defined?(::ActionDispatch::AbstractRequest) ? ::ActionDispatch::AbstractRequest : ::ActionDispatch::Request)
 
-    def method
-      request.method.to_s.upcase
-    end
+      def method
+        request.method.to_s.upcase
+      end
 
-    def uri
-      request.url
-    end
+      def uri
+        request.url
+      end
 
-    def parameters
-      if options[:clobber_request]
-        options[:parameters] || {}
-      else
-        params = request_params.merge(query_params).merge(header_params)
-        params.stringify_keys! if params.respond_to?(:stringify_keys!)
-        params.merge(options[:parameters] || {})
+      def parameters
+        if options[:clobber_request]
+          options[:parameters] || {}
+        else
+          params = request_params.merge(query_params).merge(header_params)
+          params.stringify_keys! if params.respond_to?(:stringify_keys!)
+          params.merge(options[:parameters] || {})
+        end
       end
-    end
 
-    # Override from OAuth::RequestProxy::Base to avoid roundtrip
-    # conversion to Hash or Array and thus preserve the original
-    # parameter names
-    def parameters_for_signature
-      params = []
-      params << options[:parameters].to_query if options[:parameters]
+      # Override from OAuth::RequestProxy::Base to avoid roundtrip
+      # conversion to Hash or Array and thus preserve the original
+      # parameter names
+      def parameters_for_signature
+        params = []
+        params << options[:parameters].to_query if options[:parameters]
 
-      unless options[:clobber_request]
-        params << header_params.to_query
-        params << request.query_string unless query_string_blank?
+        unless options[:clobber_request]
+          params << header_params.to_query
+          params << request.query_string unless query_string_blank?
 
-        params << request.raw_post if raw_post_signature?
-      end
+          params << request.raw_post if raw_post_signature?
+        end
 
-      params.
-        join("&").split("&").
-        reject { |s| s.match(/\A\s*\z/) }.
-        map { |p| p.split("=").map { |esc| CGI.unescape(esc) } }.
-        reject { |kv| kv[0] == "oauth_signature" }
-    end
+        params.
+          join("&").split("&").
+          reject { |s| s.match(/\A\s*\z/) }.
+          map { |p| p.split("=").map { |esc| CGI.unescape(esc) } }.
+          reject { |kv| kv[0] == "oauth_signature" }
+      end
 
-    def raw_post_signature?
-      (request.post? || request.put?) && request.content_type.to_s.downcase.start_with?("application/x-www-form-urlencoded")
-    end
+      def raw_post_signature?
+        (request.post? || request.put?) && request.content_type.to_s.downcase.start_with?("application/x-www-form-urlencoded")
+      end
 
-    protected
+      protected
 
-    def query_params
-      request.query_parameters
-    end
+      def query_params
+        request.query_parameters
+      end
 
-    def request_params
-      request.request_parameters
+      def request_params
+        request.request_parameters
+      end
     end
   end
 end

lib/oauth/request_proxy/action_dispatch_request.rb

@@ -1,7 +1,11 @@
+# frozen_string_literal: true
+
 require "oauth/request_proxy/rack_request"
 
-module OAuth::RequestProxy
-  class ActionDispatchRequest < OAuth::RequestProxy::RackRequest
-    proxies ActionDispatch::Request
+module OAuth
+  module RequestProxy
+    class ActionDispatchRequest < OAuth::RequestProxy::RackRequest
+      proxies ::ActionDispatch::Request
+    end
   end
 end