Initial migration of code.

socketry · Sep 11, 2024 · 8400a5b · 8400a5b
1 parent 1c7da35
commit 8400a5b
Show file tree

Hide file tree

Showing 30 changed files with 124 additions and 127 deletions.
diff --git a/.mailmap b/.mailmap
@@ -1,2 +1,6 @@
+Eric McKay <[email protected]>
 Denis Sadomowski <[email protected]>
 莫粒 <[email protected]>
+Sherman Koa <[email protected]>
+Fedishin Nazar <[email protected]>
+Akinori Musha <[email protected]>
diff --git a/cloudflare.gemspec b/cloudflare.gemspec
@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
 	spec.version = Cloudflare::VERSION
 
 	spec.summary = "A Ruby wrapper for the Cloudflare API."
-	spec.authors = ["Samuel Williams", "Marcin Prokop", "Leonhardt Wille", "Rob Widmer", "Akinori MUSHA", "Sherman K", "Michael Kalygin", "Denis Sadomowski", "Nazar", "emckay", "Casey Lopez", "David Wegman", "Greg Retkowski", "Guillaume Leseur", "Jason Green", "Kugayama Nana", "Kyle Corbitt", "Mike Perham", "Olle Jonsson", "Terry Kerr", "莫粒"]
+	spec.authors = ["Samuel Williams", "Marcin Prokop", "Leonhardt Wille", "Rob Widmer", "Akinori Musha", "Sherman Koa", "Michael Kalygin", "Denis Sadomowski", "Eric McKay", "Fedishin Nazar", "Casey Lopez", "David Wegman", "Greg Retkowski", "Guillaume Leseur", "Jason Green", "Kugayama Nana", "Kyle Corbitt", "Mike Perham", "Olle Jonsson", "Terry Kerr", "莫粒"]
 	spec.license = "MIT"
 
 	spec.cert_chain  = ["release.cert"]

diff --git a/gems.rb b/gems.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2014-2020, by Samuel Williams.
+# Copyright, 2014-2024, by Samuel Williams.
 # Copyright, 2014, by Marcin Prokop.
 # Copyright, 2018, by Leonhardt Wille.
 
@@ -19,13 +19,15 @@
 
 group :test do
 	gem "rspec"
+	gem "covered"
 	gem "decode"
 	gem "rubocop"
 
 	gem "async-rspec"
 
-	gem "coveralls", require: false
-	gem "simplecov"
 	gem "sinatra"
 	gem "webmock"
+
+	gem "bake-test"
+	gem "bake-test-external"
 end
diff --git a/lib/cloudflare.rb b/lib/cloudflare.rb
@@ -2,33 +2,31 @@
 
 # Released under the MIT License.
 # Copyright, 2012-2016, by Marcin Prokop.
-# Copyright, 2013, by emckay.
+# Copyright, 2013, by Eric McKay.
 # Copyright, 2014, by Jason Green.
-# Copyright, 2014-2019, by Samuel Williams.
+# Copyright, 2014-2024, by Samuel Williams.
 # Copyright, 2014, by Greg Retkowski.
 # Copyright, 2018, by Leonhardt Wille.
-# Copyright, 2019, by Akinori MUSHA.
+# Copyright, 2019, by Akinori Musha.
 
 require "async"
 require_relative "cloudflare/connection"
 
 module Cloudflare
-	DEFAULT_ENDPOINT = Async::HTTP::Endpoint.parse("https://api.cloudflare.com/client/v4/")
-
-	def self.connect(endpoint = DEFAULT_ENDPOINT, **auth_info)
-		representation = Connection.for(endpoint)
-
-		if !auth_info.empty?
-			representation = representation.authenticated(**auth_info)
-		end
-
-		return representation unless block_given?
-
-		Async do
+	def self.connect(*arguments, **auth_info)
+		Sync do
+			connection = Connection.open(*arguments)
+
+			if !auth_info.empty?
+				connection = connection.authenticated(**auth_info)
+			end
+
+			return connection unless block_given?
+
 			begin
-				yield representation
+				yield connection
 			ensure
-				representation.close
+				connection.close
 			end
 		end
 	end

diff --git a/lib/cloudflare/accounts.rb b/lib/cloudflare/accounts.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2019, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2019, by Rob Widmer.
 
 require_relative "representation"

diff --git a/lib/cloudflare/connection.rb b/lib/cloudflare/connection.rb
@@ -2,22 +2,24 @@
 
 # Released under the MIT License.
 # Copyright, 2014-2016, by Marcin Prokop.
-# Copyright, 2014-2019, by Samuel Williams.
+# 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 K.
-# Copyright, 2019, by Akinori MUSHA.
+# 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"
 
 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 = {}
 
@@ -36,15 +38,15 @@ def authenticated(token: nil, key: nil, email: nil)
 		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
diff --git a/lib/cloudflare/custom_hostname/ssl_attribute.rb b/lib/cloudflare/custom_hostname/ssl_attribute.rb
@@ -2,7 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2019, by Rob Widmer.
-# Copyright, 2019, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative "./ssl_attribute/settings"
 

diff --git a/lib/cloudflare/custom_hostname/ssl_attribute/settings.rb b/lib/cloudflare/custom_hostname/ssl_attribute/settings.rb
@@ -2,7 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2019, by Rob Widmer.
-# Copyright, 2019, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 module Cloudflare
 	class CustomHostname < Representation

diff --git a/lib/cloudflare/custom_hostnames.rb b/lib/cloudflare/custom_hostnames.rb
@@ -2,7 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2019, by Rob Widmer.
-# Copyright, 2019, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative "custom_hostname/ssl_attribute"
 require_relative "paginate"

diff --git a/lib/cloudflare/dns.rb b/lib/cloudflare/dns.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2019, by Rob Widmer.
 # Copyright, 2019, by David Wegman.
 

diff --git a/lib/cloudflare/firewall.rb b/lib/cloudflare/firewall.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2019, by Rob Widmer.
 
 require_relative "representation"

diff --git a/lib/cloudflare/kv/namespaces.rb b/lib/cloudflare/kv/namespaces.rb
@@ -2,7 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2019, by Rob Widmer.
-# Copyright, 2019, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 # Copyright, 2021, by Terry Kerr.
 
 require_relative "../paginate"

diff --git a/lib/cloudflare/kv/rest_wrapper.rb b/lib/cloudflare/kv/rest_wrapper.rb
@@ -2,6 +2,7 @@
 
 # Released under the MIT License.
 # Copyright, 2021, by Terry Kerr.
+# Copyright, 2024, by Samuel Williams.
 
 require "json"
 

diff --git a/lib/cloudflare/logs.rb b/lib/cloudflare/logs.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2019, by Samuel Williams.
+# Copyright, 2019-2024, by Samuel Williams.
 
 require_relative "representation"
 require_relative "paginate"

diff --git a/lib/cloudflare/paginate.rb b/lib/cloudflare/paginate.rb
@@ -1,36 +1,36 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2018-2019, by Samuel Williams.
+# Copyright, 2018-2024, by Samuel Williams.
 # Copyright, 2019, by Rob Widmer.
 
 module Cloudflare
 	module Paginate
 		include Enumerable
-
+		
 		def each(page: 1, per_page: 50, **parameters)
 			return to_enum(:each, page: page, per_page: per_page, **parameters) unless block_given?
-
+			
 			while true
-				zones = @resource.get(self.class, page: page, per_page: per_page, **parameters)
-
-				break if zones.empty?
-
-				Array(zones.value).each do |attributes|
-					yield represent(zones.metadata, attributes)
+				response = self.class.get(@resource, {page: page, per_page: per_page, **parameters})
+				
+				break if response.empty?
+				
+				response.results.each do |attributes|
+					yield represent(response.metadata, attributes)
 				end
-
+				
 				page += 1
-
+				
 				# Was this the last page?
-				break if zones.value.size < per_page
+				break if response.results.size < per_page
 			end
 		end
-
+		
 		def empty?
 			self.value.empty?
 		end
-
+		
 		def find_by_id(id)
 			representation.new(@resource.with(path: "#{id}/"))
 		end