Merge pull request #126 from oauth-xx/silence_circular_dependency_warning

ch1ago · ch1ago · commit 601f2517ca20 · 2016-05-27T15:06:08.000-03:00
Silencing 'loading in progress, circular require considered harmful'
diff --git a/lib/oauth/client/action_controller_request.rb b/lib/oauth/client/action_controller_request.rb
@@ -1,4 +1,3 @@
-require 'oauth/client/helper'
 if defined? ActionDispatch
   require 'oauth/request_proxy/rack_request'
   require 'action_dispatch/testing/test_process'
diff --git a/lib/oauth/client/em_http.rb b/lib/oauth/client/em_http.rb
@@ -1,6 +1,5 @@
 require 'em-http'
 require 'oauth/helper'
-require 'oauth/client/helper'
 require 'oauth/request_proxy/em_http_request'
 
 # Extensions for em-http so that we can use consumer.sign! with an EventMachine::HttpClient
diff --git a/lib/oauth/client/net_http.rb b/lib/oauth/client/net_http.rb
@@ -1,5 +1,4 @@
 require 'oauth/helper'
-require 'oauth/client/helper'
 require 'oauth/request_proxy/net_http'
 
 class Net::HTTPGenericRequest

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-require 'oauth/client/helper'`
`2`	`1`	`if defined? ActionDispatch`
`3`	`2`	`require 'oauth/request_proxy/rack_request'`
`4`	`3`	`require 'action_dispatch/testing/test_process'`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`require 'oauth/helper'`
`2`		`-require 'oauth/client/helper'`
`3`	`2`	`require 'oauth/request_proxy/net_http'`
`4`	`3`
`5`	`4`	`class Net::HTTPGenericRequest`