Add support for proxy client/endpoint.

ioquatix · ioquatix · commit 60fc0b5abc34 · 2019-08-12T10:52:53.000+12:00
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,11 @@ language: ruby
 dist: xenial
 cache: bundler
 
+addons:
+  apt:
+    packages:
+    - squid
+
 matrix:
   include:
     - rvm: 2.4
@@ -13,6 +18,9 @@ matrix:
       env: JRUBY_OPTS="--debug -X+O"
     - rvm: truffleruby
     - rvm: ruby-head
+    - rvm: 2.6
+      env: CLOUDFLARE_PROXY=http://localhost:3128
+      before_script: sudo service squid start
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
diff --git a/cloudflare.gemspec b/cloudflare.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
 	spec.required_ruby_version = '>= 2.0.0'
 
-	spec.add_dependency 'async-rest', '~> 0.9.0'
+	spec.add_dependency 'async-rest', '~> 0.10.0'
 
 	spec.add_development_dependency 'async-rspec'
 
diff --git a/lib/cloudflare.rb b/lib/cloudflare.rb
@@ -25,10 +25,10 @@
 require_relative 'cloudflare/connection'
 
 module Cloudflare
-	DEFAULT_URL = 'https://api.cloudflare.com/client/v4'
+	DEFAULT_ENDPOINT = Async::HTTP::Endpoint.parse('https://api.cloudflare.com/client/v4')
 	
-	def self.connect(key: nil, email: nil)
-		representation = Connection.for(DEFAULT_URL)
+	def self.connect(endpoint = DEFAULT_ENDPOINT, key: nil, email: nil)
+		representation = Connection.for(endpoint)
 		
 		if key
 			representation = representation.authenticated(key, email)
diff --git a/lib/cloudflare/rspec/connection.rb b/lib/cloudflare/rspec/connection.rb
@@ -21,6 +21,8 @@
 # THE SOFTWARE.
 
 require 'async/rspec'
+require 'async/http/proxy'
+
 require_relative '../../cloudflare'
 
 module Cloudflare
@@ -35,10 +37,20 @@ module Connection
 			let(:email) {ENV['CLOUDFLARE_EMAIL']}
 			let(:key) {ENV['CLOUDFLARE_KEY']}
 			
-			let(:connection) {@connection = Cloudflare.connect(key: key, email: email)}
+			let(:connection) do
+				if proxy_url = ENV['CLOUDFLARE_PROXY']
+					proxy_endpoint = Async::HTTP::Endpoint.parse(proxy_url)
+					@proxy = Async::HTTP::Proxy.new(proxy_endpoint)
+					@connection = Cloudflare.connect(proxy.endpoint(DEFAULT_ENDPOINT.url), key: key, email: email)
+				else
+					@proxy = nil
+					@connection = Cloudflare.connect(key: key, email: email)
+				end
+			end
 			
 			after do
 				@connection&.close
+				@proxy&.close
 			end
 		end
 	end
