cloudflare 4.1.3 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 626ea2f798763660de19bc89189844304761b3db0c7db35f7bf8db5910844df6
-  data.tar.gz: 206a3f3f19a7b0db41371f63a151b3e626fd2686f02b9f4bd7118d612bc48c06
+  metadata.gz: 9da58bc3e8cf7394296aafbe26d50731d145f1587df2ecd940057c01de31585c
+  data.tar.gz: 0b8523d30369c61c1fa5aaf1d749daa9a05c03f36c1a9aa898bb5782e662fa6c
 SHA512:
-  metadata.gz: 67914afda228ba0a5a1d3ce5e51ef38e7c7ccf38a69015d8b82408f620f48a32874ba008f5172915300826c2c461c115d029bf8ac8862547c486952d623f918e
-  data.tar.gz: 8ec079ac0dd5de6bfa9d74db9a0ff987579bb37b2a93b52ef2ba3265dfa543b1898c1b898045065ab561645082f360f6d5471d38f81707d51f8c465f5cde3370
+  metadata.gz: 8079f41055721191fd999e1b4e948d0061bf5e710503940c07d4125a315c812cda8e5603cc891e50671f5992dbc75ab1e65d6a297c9f6656db0317e85784cc35
+  data.tar.gz: 9f6ac470ada76aea32143026ac1b7923b76b0b50775a362759817dd7fc3118b792d6ad36f4dcd2829e3b3faba097f3c1072e01db3d1a9d21ab5c653285421683

data/.travis.yml

@@ -21,6 +21,9 @@ matrix:
     - rvm: 2.6
       env: CLOUDFLARE_PROXY=http://localhost:3128
       before_script: sudo service squid start
+    - rvm: jruby-head
+      env: JRUBY_OPTS="--debug -X+O" CLOUDFLARE_PROXY=http://localhost:3128
+      before_script: sudo service squid start
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head

data/README.md

@@ -63,6 +63,20 @@ Cloudflare.connect(key: key, email: email) do |connection|
 end
 ```
 
+### Using a Bearer Token
+
+You can read more about [bearer tokens here](https://blog.cloudflare.com/api-tokens-general-availability/). This allows you to limit priviledges.
+
+```ruby
+require 'cloudflare'
+
+token = 'a_generated_api_token'
+
+Cloudflare.connect(token: token) do |connection|
+	# ...
+end
+```
+
 ## Contributing
 
 1. Fork it
@@ -101,6 +115,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
-
-
-

data/lib/cloudflare.rb

@@ -27,11 +27,11 @@ require_relative 'cloudflare/connection'
 module Cloudflare
 	DEFAULT_ENDPOINT = Async::HTTP::Endpoint.parse('https://api.cloudflare.com/client/v4')
 	
-	def self.connect(endpoint = DEFAULT_ENDPOINT, key: nil, email: nil)
+	def self.connect(endpoint = DEFAULT_ENDPOINT, **auth_info)
 		representation = Connection.for(endpoint)
 		
-		if key
-			representation = representation.authenticated(key, email)
+		if !auth_info.empty?
+			representation = representation.authenticated(**auth_info)
 		end
 		
 		return representation unless block_given?

data/lib/cloudflare/connection.rb

@@ -28,14 +28,18 @@ require_relative 'user'
 
 module Cloudflare
 	class Connection < Representation
-		def authenticated(key, email = nil)
+		def authenticated(token: nil, key: nil, email: nil)
 			headers = {}
 			
-			if email.nil?
-				headers['X-Auth-User-Service-Key'] = key
-			else
-				headers['X-Auth-Key'] = key
-				headers['X-Auth-Email'] = email
+			if token
+				headers['Authorization'] = "Bearer #{token}"
+			elsif key
+				if email
+					headers['X-Auth-Key'] = key
+					headers['X-Auth-Email'] = email
+				else
+					headers['X-Auth-User-Service-Key'] = key
+				end
 			end
 			
 			self.with(headers: headers)

data/lib/cloudflare/dns.rb

@@ -39,7 +39,7 @@ module Cloudflare
 					type: @record[:type],
 					name: @record[:name],
 					content: content,
-                                        **options
+					**options
 				)
 
 				@value = response.result

data/lib/cloudflare/version.rb

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

data/spec/cloudflare/custom_hostnames_spec.rb

@@ -25,7 +25,7 @@ RSpec.xdescribe Cloudflare::CustomHostnames, order: :defined, timeout: 30 do
 	end
 
 	it 'can create a custom hostname record' do
-    expect(record).to be_kind_of Cloudflare::CustomHostname
+		expect(record).to be_kind_of Cloudflare::CustomHostname
 		expect(record.custom_metadata).to be_nil
 		expect(record.hostname).to eq domain
 		expect(record.custom_origin).to be_nil

data/spec/cloudflare/dns_spec.rb

@@ -19,7 +19,7 @@ RSpec.describe Cloudflare::DNS, order: :defined, timeout: 30 do
 			expect(@record.name).to be_start_with subdomain
 			expect(@record.content).to be == "1.2.3.4"
 		end
-                
+		
 		it "can create dns record with proxied option" do
 			@record = zone.dns_records.create("A", subdomain, "1.2.3.4", proxied: true)
 			expect(@record.type).to be == "A"
@@ -38,7 +38,7 @@ RSpec.describe Cloudflare::DNS, order: :defined, timeout: 30 do
 			fetched_record = zone.dns_records.find_by_name(record.name)
 			expect(fetched_record.content).to be == record.content
 		end
-                
+		
 		it "can update dns content with proxied option" do
 			record.update_content("4.3.2.1", proxied: true)
 			expect(record.proxied).to be_truthy

data/spec/cloudflare/kv/namespaces_spec.rb

@@ -12,7 +12,7 @@ RSpec.describe Cloudflare::KV::Namespaces, kv_spec: true, order: :defined, timeo
 	end
 
 	it 'can create a namespace' do
-    expect(namespace).to be_kind_of Cloudflare::KV::Namespace
+		expect(namespace).to be_kind_of Cloudflare::KV::Namespace
 		expect(namespace.id).not_to be_nil
 		expect(namespace.title).to eq namespace_title
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.2.0
 platform: ruby
 authors:
 - Marcin Prokop
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the Cloudflare API.