cloudflare 4.1.2 → 4.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb422d698395ca2c0909d60f756ab939428b1c42807d6b447f83ef10597b12c
-  data.tar.gz: 2dd664743a06dba67c963b4b8d1d937403a2cb1df74052a268ca02fde52b4f5b
+  metadata.gz: 626ea2f798763660de19bc89189844304761b3db0c7db35f7bf8db5910844df6
+  data.tar.gz: 206a3f3f19a7b0db41371f63a151b3e626fd2686f02b9f4bd7118d612bc48c06
 SHA512:
-  metadata.gz: 29088d9573a60166b3ca8ac37dd68d80d4e73bf3f522f6f2b704da059088ea84e370d6a7cb063ae393c23dd0ce25f5f4401653b32be07862cb8634fdbaea19db
-  data.tar.gz: c60e436e2ae972df5f81a3123d1bef4289cb51023fd7fab90acb0278739db924a9b0b778950bb8c24c8c30ebaa50fbea4d21037ceaff70478219e36e38a71352
+  metadata.gz: 67914afda228ba0a5a1d3ce5e51ef38e7c7ccf38a69015d8b82408f620f48a32874ba008f5172915300826c2c461c115d029bf8ac8862547c486952d623f918e
+  data.tar.gz: 8ec079ac0dd5de6bfa9d74db9a0ff987579bb37b2a93b52ef2ba3265dfa543b1898c1b898045065ab561645082f360f6d5471d38f81707d51f8c465f5cde3370

data/.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

data/Gemfile

@@ -5,6 +5,8 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cloudflare.gemspec
 gemspec
 
+gem 'async-http', '~> 0.48', '>= 0.48.2'
+
 group :development do
 	gem 'pry'
 	gem 'pry-coolline'

data/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'
 

data/lib/cloudflare.rb

@@ -25,10 +25,10 @@ require 'async'
 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)

data/lib/cloudflare/paginate.rb

@@ -37,7 +37,7 @@ module Cloudflare
 				page += 1
 
 				# Was this the last page?
-				break if zones.value.count < per_page
+				break if zones.value.size < per_page
 			end
 		end
 

data/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 Cloudflare
 			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)
+					@client = Async::HTTP::Client.new(proxy_endpoint)
+					@connection = Cloudflare.connect(@client.proxied_endpoint(DEFAULT_ENDPOINT), key: key, email: email)
+				else
+					@client = nil
+					@connection = Cloudflare.connect(key: key, email: email)
+				end
+			end
 			
 			after do
 				@connection&.close
+				@client&.close
 			end
 		end
 	end

data/lib/cloudflare/version.rb

@@ -22,5 +22,5 @@
 # THE SOFTWARE.
 
 module Cloudflare
-	VERSION = '4.1.2'
+	VERSION = '4.1.3'
 end

data/spec/spec_helper.rb

@@ -72,7 +72,7 @@ RSpec.configure do |config|
 			end
 			account.kv_namespaces.to_a
 		rescue Cloudflare::RequestError => e
-			if e.message.include?('your account is not permitted')
+			if e.message.include?('your account is not entitled')
 				puts 'Disabling KV specs due to no access'
 				disabled_specs[:kv_spec] = true
 			else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare
 version: !ruby/object:Gem::Version
-  version: 4.1.2
+  version: 4.1.3
 platform: ruby
 authors:
 - Marcin Prokop
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement