Merge pull request #150 from xprazak2/action-dispatch

Fixes UnknownRequestType on Rails 5.1 for ActionDispatch::Request

Author: galois17

.travis.yml

@@ -5,8 +5,6 @@ rvm:
 - "2.4.0"
 - "2.3"
 - "2.2"
-- "2.1"
-- "2.0"
 
 addons:
   code_climate:

lib/oauth/client/action_controller_request.rb

@@ -1,5 +1,6 @@
 if defined? ActionDispatch
   require 'oauth/request_proxy/rack_request'
+  require 'oauth/request_proxy/action_dispatch_request'
   require 'action_dispatch/testing/test_process'
 else
   require 'oauth/request_proxy/action_controller_request'

lib/oauth/request_proxy/action_controller_request.rb

@@ -23,7 +23,7 @@
     ActionDispatch::Request::HTTP_METHOD_LOOKUP["patch"] = :patch
   end
 
-else # rails 4.x - already has patch
+else # rails 4.x and later - already has patch
   require 'action_dispatch/http/request'
 end
 

lib/oauth/request_proxy/action_dispatch_request.rb

@@ -0,0 +1,7 @@
+require 'oauth/request_proxy/rack_request'
+
+module OAuth::RequestProxy
+  class ActionDispatchRequest < OAuth::RequestProxy::RackRequest
+    proxies ActionDispatch::Request
+  end
+end

oauth.gemspec

@@ -28,9 +28,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency("rake")
   spec.add_development_dependency("minitest")
   spec.add_development_dependency("byebug")
-  spec.add_development_dependency("actionpack", "~> 4.0")
+  spec.add_development_dependency("actionpack", ">= 5.0")
   spec.add_development_dependency("iconv")
-  spec.add_development_dependency("rack", "~> 1.0")
+  spec.add_development_dependency("rack", "~> 2.0")
   spec.add_development_dependency("rack-test")
   spec.add_development_dependency("mocha", ">= 0.9.12")
   spec.add_development_dependency("typhoeus", ">= 0.1.13")

test/units/test_action_controller_request_proxy.rb

@@ -5,7 +5,7 @@
 class ActionControllerRequestProxyTest < Minitest::Test
 
   def request_proxy(request_method = :get, uri_params = {}, body_params = {})
-    request = ActionDispatch::TestRequest.new
+    request = ActionDispatch::TestRequest.create
     request.request_uri = '/'
 
     case request_method

test/units/test_action_dispatch_request_proxy.rb

@@ -0,0 +1,39 @@
+require File.expand_path('../../test_helper', __FILE__)
+
+require 'oauth/request_proxy/action_dispatch_request'
+
+class ActionRequestProxyTest < Minitest::Test
+
+  def test_that_proxy_simple_get_request_works
+    request = ActionDispatch::Request.new(Rack::MockRequest.env_for('http://example.com/test?key=value'))
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value'})
+
+    expected_parameters = {'key' => 'value'}
+    assert_equal expected_parameters, request_proxy.parameters
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'GET', request_proxy.method
+  end
+
+  def test_that_proxy_simple_post_request_works
+    request = ActionDispatch::Request.new(Rack::MockRequest.env_for('http://example.com/test', :method => 'POST'))
+    params = {'key' => 'value'}
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test', :parameters => params})
+
+    expected_parameters = {'key' => 'value'}
+    assert_equal expected_parameters, request_proxy.parameters
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'POST', request_proxy.method
+  end
+
+  def test_that_proxy_post_and_get_request_works
+    request = ActionDispatch::Request.new(Rack::MockRequest.env_for('http://example.com/test?key=value', :method => 'POST', :input => 'key2=value2'))
+    params = {'key2' => 'value2'}
+    request_proxy = OAuth::RequestProxy.proxy(request, {:uri => 'http://example.com/test?key=value', :parameters => params})
+
+    expected_parameters = {'key' => 'value', 'key2' => 'value2'}
+    assert_equal expected_parameters, request_proxy.parameters
+    assert_equal 'http://example.com/test', request_proxy.normalized_uri
+    assert_equal 'POST', request_proxy.method
+  end
+
+end