cloudflare 4.3.0 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df158b1fb45428a5bd2f3a2147700e691ed6a4bdadbc26f7a6cf0229d77ff98
-  data.tar.gz: 909cd8848e8368d670592c2108ffe1231147226d56d98e23e499807f48d80e8c
+  metadata.gz: 2ba2d239f123bdb4e182b88d91784524799c70c90bd5c807667f95901892263f
+  data.tar.gz: bf5e63e363ec5da14af177bb87849c9e00b883c964c18b7ebcb227cae994758a
 SHA512:
-  metadata.gz: df08439266659d4232501e8cd22dc1013b5d7d764c9c0d09c3a2768704cb460031ef69139c72de03b5c84b3e8618e1714c1b00624652e3dd557e9206a0fedd3b
-  data.tar.gz: 7c006538e659c65ff3059f6bbbac4feaeed6ac36763f683498be20b2cc8b0ff7d42e0bc43faeda1a8786967a829b152d7575f52c8904502302c7a2a0aa818b95
+  metadata.gz: ad9c07a221587403f1d997273b05c121c9fe658113cd3d460f8b1394c17285518cdbbf98cc31865315189bb9402901a23d775003b75760d0c5e7f13b1342d5e5
+  data.tar.gz: 4f72ebb38c78fd734b235be37a5088c1f632877f592370924dfb89461bd3f4a4f0fe5f8ac85d071c9395467f928b62a530f165cded2718b7c50eb339b5065025

data/lib/cloudflare/accounts.rb

@@ -1,39 +1,21 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Marcin Prokop.
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2017, by David Rosenbloom. <http://artifactory.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# 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.
+# Released under the MIT License.
+# Copyright, 2018-2024, by Samuel Williams.
+# Copyright, 2019, by Rob Widmer.
 
-require_relative 'representation'
-require_relative 'paginate'
-require_relative 'kv/namespaces'
+require_relative "representation"
+require_relative "paginate"
+require_relative "kv/namespaces"
 
 module Cloudflare
 	class Account < Representation
 		def id
-			value[:id]
+			result[:id]
 		end
 
 		def kv_namespaces
-			self.with(KV::Namespaces, path: 'storage/kv/namespaces')
+			self.with(KV::Namespaces, path: "storage/kv/namespaces")
 		end
 	end
 

data/lib/cloudflare/connection.rb

@@ -1,44 +1,36 @@
 # frozen_string_literal: true
 
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# 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.
+# Released under the MIT License.
+# Copyright, 2014-2016, by Marcin Prokop.
+# Copyright, 2014-2024, by Samuel Williams.
+# Copyright, 2015, by Kyle Corbitt.
+# Copyright, 2015, by Guillaume Leseur.
+# Copyright, 2018, by Leonhardt Wille.
+# Copyright, 2018, by Michael Kalygin.
+# Copyright, 2018, by Sherman Koa.
+# Copyright, 2019, by Akinori Musha.
 
-require_relative 'representation'
+require "async/rest/resource"
 
-require_relative 'zones'
-require_relative 'accounts'
-require_relative 'user'
+require_relative "zones"
+require_relative "accounts"
+require_relative "user"
 
 module Cloudflare
-	class Connection < Representation
+	class Connection < Async::REST::Resource
+		ENDPOINT = Async::HTTP::Endpoint.parse("https://api.cloudflare.com/client/v4/")
+		
 		def authenticated(token: nil, key: nil, email: nil)
 			headers = {}
 			
 			if token
-				headers['Authorization'] = "Bearer #{token}"
+				headers["authorization"] = "bearer #{token}"
 			elsif key
 				if email
-					headers['X-Auth-Key'] = key
-					headers['X-Auth-Email'] = email
+					headers["x-auth-key"] = key
+					headers["x-auth-email"] = email
 				else
-					headers['X-Auth-User-Service-Key'] = key
+					headers["x-auth-user-service-key"] = key
 				end
 			end
 			
@@ -46,15 +38,15 @@ module Cloudflare
 		end
 		
 		def zones
-			self.with(Zones, path: 'zones')
+			Zones.new(self.with(path: "zones/"))
 		end
 		
 		def accounts
-			self.with(Accounts, path: 'accounts')
+			Accounts.new(self.with(path: "accounts"))
 		end
 		
 		def user
-			self.with(User, path: 'user')
+			User.new(self.with(path: "user"))
 		end
 	end
 end

data/lib/cloudflare/custom_hostname/ssl_attribute/settings.rb

@@ -1,10 +1,16 @@
 # frozen_string_literal: true
 
+# Released under the MIT License.
+# Copyright, 2019, by Rob Widmer.
+# Copyright, 2019-2024, by Samuel Williams.
+
+require_relative "../../representation"
+
 module Cloudflare
 	class CustomHostname < Representation
 		class SSLAttribute
 			class Settings
-				def initialize(settings)
+				def initialize(settings = {})
 					@settings = settings
 				end
 
@@ -25,7 +31,7 @@ module Cloudflare
 				# Always coerce into a boolean, if the key is not
 				# provided, this value may not be accurate
 				def http2?
-					http2 == 'on'
+					http2 == "on"
 				end
 
 				def http2=(value)
@@ -49,7 +55,7 @@ module Cloudflare
 				# Always coerce into a boolean, if the key is not
 				# provided, this value may not be accurate
 				def tls_1_3?
-					tls_1_3 == 'on'
+					tls_1_3 == "on"
 				end
 
 				def tls_1_3=(value)
@@ -62,7 +68,7 @@ module Cloudflare
 					if value.nil?
 						@settings.delete(key)
 					else
-						@settings[key] = !value || value == 'off' ? 'off' : 'on'
+						@settings[key] = !value || value == "off" ? "off" : "on"
 					end
 				end
 			end

data/lib/cloudflare/custom_hostname/ssl_attribute.rb

@@ -1,6 +1,11 @@
 # frozen_string_literal: true
 
-require_relative './ssl_attribute/settings'
+# Released under the MIT License.
+# Copyright, 2019, by Rob Widmer.
+# Copyright, 2019-2024, by Samuel Williams.
+
+require_relative "ssl_attribute/settings"
+require_relative "../representation"
 
 module Cloudflare
 	class CustomHostname < Representation
@@ -10,7 +15,7 @@ module Cloudflare
 			end
 
 			def active?
-				status == 'active'
+				status == "active"
 			end
 
 			def cname
@@ -34,7 +39,7 @@ module Cloudflare
 			end
 
 			def pending_validation?
-				status == 'pending_validation'
+				status == "pending_validation"
 			end
 
 			# Wraps the settings hash if it exists or initializes the settings hash and then wraps it

data/lib/cloudflare/custom_hostnames.rb

@@ -1,78 +1,101 @@
 # frozen_string_literal: true
 
-# This implements the Custom Hostname API
-# https://api.cloudflare.com/#custom-hostname-for-a-zone-properties
+# Released under the MIT License.
+# Copyright, 2019, by Rob Widmer.
+# Copyright, 2019-2024, by Samuel Williams.
 
-require_relative 'custom_hostname/ssl_attribute'
-require_relative 'paginate'
-require_relative 'representation'
+require_relative "custom_hostname/ssl_attribute"
+require_relative "paginate"
+require_relative "representation"
 
 module Cloudflare
 	class CustomHostname < Representation
+		include Async::REST::Representation::Mutable
+		
 		# Only available if enabled for your zone
 		def custom_origin
-			value[:custom_origin_server]
+			result[:custom_origin_server]
 		end
-
+		
 		# Only available if enabled for your zone
 		def custom_metadata
-			value[:custom_metadata]
+			result[:custom_metadata]
 		end
-
+		
 		def hostname
-			value[:hostname]
+			result[:hostname]
 		end
-
+		
 		def id
-			value[:id]
+			result[:id]
 		end
-
+		
 		def ssl
-			@ssl ||= SSLAttribute.new(value[:ssl])
+			@ssl ||= SSLAttribute.new(result[:ssl])
 		end
-
+		
 		# Check if the cert has been validated
 		# passing true will send a request to Cloudflare to try to validate the cert
 		def ssl_active?(force_update = false)
-			send_patch(ssl: { method: ssl.method, type: ssl.type }) if force_update && ssl.pending_validation?
-			ssl.active?
+			if force_update && ssl.pending_validation?
+				self.patch(ssl: {method: ssl.method, type: ssl.type})
+			end
+			
+			return ssl.active?
 		end
-
+		
 		def update_settings(metadata: nil, origin: nil, ssl: nil)
-			attrs = {}
-			attrs[:custom_metadata] = metadata if metadata
-			attrs[:custom_origin_server] = origin if origin
-			attrs[:ssl] = ssl if ssl
-
-			send_patch(attrs)
+			payload = {}
+			
+			payload[:custom_metadata] = metadata if metadata
+			payload[:custom_origin_server] = origin if origin
+			payload[:ssl] = ssl if ssl
+			
+			self.patch(payload)
 		end
-
+		
 		alias :to_s :hostname
-
+		
 		private
-
-		def send_patch(data)
-			response = patch(data)
-
-			@ssl = nil # Kill off our cached version of the ssl object so it will be regenerated from the response
-			@value = response.result
+		
+		def patch(payload)
+			self.class.patch(@resource, payload) do |resource, response|
+				value = response.read
+				
+				if value[:sucess]
+					@ssl = nil
+					@value = value
+				else
+					raise RequestError.new(@resource, value)
+				end
+			end
 		end
 	end
 
 	class CustomHostnames < Representation
 		include Paginate
-
+		
 		def representation
 			CustomHostname
 		end
-
-		# initializes a custom hostname object and yields it for customization before saving
-		def create(hostname, metadata: nil, origin: nil, ssl: {}, &block)
-			attrs = { hostname: hostname, ssl: { method: 'http', type: 'dv' }.merge(ssl) }
-			attrs[:custom_metadata] = metadata if metadata
-			attrs[:custom_origin_server] = origin if origin
-
-			represent_message(self.post(attrs))
+		
+		def create(hostname, metadata: nil, origin: nil, ssl: {}, **options)
+			payload = {hostname: hostname, ssl: {method: "http", type: "dv"}.merge(ssl), **options}
+			
+			payload[:custom_metadata] = metadata if metadata
+			payload[:custom_origin_server] = origin if origin
+			
+			CustomHostname.post(@resource, payload) do |resource, response|
+				value = response.read
+				result = value[:result]
+				metadata = response.headers
+				
+				if id = result[:id]
+					resource = resource.with(path: id)
+				end
+				
+				CustomHostname.new(resource, value: value, metadata: metadata)
+			end
 		end
 
 		def find_by_hostname(hostname)

data/lib/cloudflare/dns.rb

@@ -1,86 +1,84 @@
 # frozen_string_literal: true
 
-# Copyright, 2012, by Marcin Prokop.
-# Copyright, 2017, by Samuel G. D. Williams. <http://www.codeotaku.com>
-# Copyright, 2017, by David Rosenbloom. <http://artifactory.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# 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.
+# Released under the MIT License.
+# Copyright, 2019-2024, by Samuel Williams.
+# Copyright, 2019, by Rob Widmer.
+# Copyright, 2019, by David Wegman.
 
-require_relative 'representation'
-require_relative 'paginate'
+require_relative "representation"
+require_relative "paginate"
 
 module Cloudflare
 	module DNS
 		class Record < Representation
-			def initialize(url, record = nil, **options)
-				super(url, **options)
-
-				@record = record || get.result
-			end
-
+			include Async::REST::Representation::Mutable
+			
 			def update_content(content, **options)
-				response = put(
-					type: @record[:type],
-					name: @record[:name],
+				self.class.put(@resource, {
+					type: self.type,
+					name: self.name,
 					content: content,
 					**options
-				)
-
-				@value = response.result
+				}) do |resource, response|
+					if response.success?
+						@value = response.read
+						@metadata = response.headers
+					else
+						raise RequestError.new(resource, response.read)
+					end
+					
+					self
+				end
 			end
-
+			
 			def type
-				value[:type]
+				result[:type]
 			end
-
+			
 			def name
-				value[:name]
+				result[:name]
 			end
-
+			
 			def content
-				value[:content]
+				result[:content]
 			end
-
-			def proxied
-				value[:proxied]
+			
+			def proxied?
+				result[:proxied]
 			end
-
+			
+			alias proxied proxied?
+			
 			def to_s
-				"#{@record[:name]} #{@record[:type]} #{@record[:content]}"
+				"#{self.name} #{self.type} #{self.content}"
 			end
 		end
-
+		
 		class Records < Representation
 			include Paginate
-
+			
 			def representation
 				Record
 			end
-
-			TTL_AUTO = 1
 			
 			def create(type, name, content, **options)
-				represent_message(self.post(type: type, name: name, content: content, **options))
+				payload = {type: type, name: name, content: content, **options}
+				
+				Record.post(@resource, payload) do |resource, response|
+					value = response.read
+					result = value[:result]
+					metadata = response.headers
+					
+					if id = result[:id]
+						resource = resource.with(path: id)
+					end
+					
+					Record.new(resource, value: value, metadata: metadata)
+				end
 			end
 
 			def find_by_name(name)
-				each(name: name).first
+				each(name: name).find{|record| record.name == name}
 			end
 		end
 	end

data/lib/cloudflare/firewall.rb

@@ -1,43 +1,29 @@
 # frozen_string_literal: true
 
-# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# 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.
+# Released under the MIT License.
+# Copyright, 2019-2024, by Samuel Williams.
+# Copyright, 2019, by Rob Widmer.
 
-require_relative 'representation'
-require_relative 'paginate'
+require_relative "representation"
+require_relative "paginate"
 
 module Cloudflare
 	module Firewall
 		class Rule < Representation
+			include Async::REST::Representation::Mutable
+			
 			def mode
-				value[:mode]
+				result[:mode]
 			end
-
+			
 			def notes
-				value[:notes]
+				result[:notes]
 			end
-
+			
 			def configuration
-				value[:configuration]
+				result[:configuration]
 			end
-
+			
 			def to_s
 				"#{configuration[:value]} - #{mode} - #{notes}"
 			end
@@ -45,26 +31,29 @@ module Cloudflare
 
 		class Rules < Representation
 			include Paginate
-
+			
 			def representation
 				Rule
 			end
-
-			def set(mode, value, notes: nil, target: 'ip')
+			
+			def set(mode, value, notes: nil, target: "ip")
 				notes ||= "cloudflare gem [#{mode}] #{Time.now.strftime('%m/%d/%y')}"
-
-				message = self.post({
-					mode: mode.to_s,
-					notes: notes,
-					configuration: {
-						target: target,
-						value: value.to_s,
-					}
-				})
-
-				represent_message(message)
+				
+				payload = {mode: mode.to_s, notes: notes, configuration: {target: target, value: value.to_s}}
+				
+				Rule.post(@resource, payload) do |resource, response|
+					value = response.read
+					result = value[:result]
+					metadata = response.headers
+					
+					if id = result[:id]
+						resource = resource.with(path: id)
+					end
+					
+					Rule.new(resource, value: value, metadata: metadata)
+				end
 			end
-
+			
 			def each_by_value(value, &block)
 				each(configuration_value: value, &block)
 			end