cloudflare 4.1.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f5bd083595954567afddacb3dccb6ad1dbe614d3d654d6ec5edfb7967d99e19
-  data.tar.gz: f1ac3f29decb6108455805f5a24d68cda0ab7a142cd781b0df991ed11014835f
+  metadata.gz: 9dcc42587b1325b8ec2935b4b2bc93024dbf217928050c0ff84ce7623f805722
+  data.tar.gz: e2c287268b345cd3f2e9edbd116180117b5ea7ea7d7156e7b53ac4f6c5f95e09
 SHA512:
-  metadata.gz: 6113d2ffeb66def38c41b35ed739a24f2d8b568596e0fc5623e55c8b49dd17954235e37c0288ccef0aaf0a370c54c8bec5a4321cb5b2bfdc5f461a438184300d
-  data.tar.gz: bc5c727f94c5078d0a506d9cf6006b7d46582802d24a3089dbc3a8000be48e28a14d072f7a7a6125f835a14d567cd51f1424f2142dea44e992dafcfaff7d0d29
+  metadata.gz: 9a82ec080141604eafce382d2bf3f7986974e4c80ba108c0aa900ffafbb79b90b32e604ae497baa842e667878e3bbcfbf452848f24d448ff1935eecdfccb59bc
+  data.tar.gz: e6137b9c6dbaf3dd81265a2e5b07c7e40b392a08abf49318ae4f3822c8edb14c71e1e7fa7650e24cd9b91009b27e9ded0fe53f4be235d26e4a57e5c64415cc84

data/lib/cloudflare.rb

@@ -25,13 +25,13 @@ 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, **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/accounts.rb

@@ -33,7 +33,7 @@ module Cloudflare
 		end
 
 		def kv_namespaces
-			KV::Namespaces.new(@resource.with(path: 'storage/kv/namespaces'))
+			self.with(KV::Namespaces, path: 'storage/kv/namespaces')
 		end
 	end
 

data/lib/cloudflare/connection.rb

@@ -28,29 +28,33 @@ 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.class.new(@resource.with(headers: headers))
+			self.with(headers: headers)
 		end
 		
 		def zones
-			Zones.new(@resource.with(path: 'zones'))
+			self.with(Zones, path: 'zones')
 		end
 		
 		def accounts
-			Accounts.new(@resource.with(path: 'accounts'))
+			self.with(Accounts, path: 'accounts')
 		end
 		
 		def user
-			User.new(@resource.with(path: 'user'))
+			self.with(User, path: 'user')
 		end
 	end
 end

data/lib/cloudflare/dns.rb

@@ -34,11 +34,12 @@ module Cloudflare
 				@record = record || get.result
 			end
 
-			def update_content(content)
+			def update_content(content, **options)
 				response = put(
 					type: @record[:type],
 					name: @record[:name],
-					content: content
+					content: content,
+					**options
 				)
 
 				@value = response.result
@@ -56,6 +57,10 @@ module Cloudflare
 				value[:content]
 			end
 
+			def proxied
+				value[:proxied]
+			end
+
 			def to_s
 				"#{@record[:name]} #{@record[:type]} #{@record[:content]}"
 			end

data/lib/cloudflare/kv/namespaces.rb

@@ -32,7 +32,7 @@ module Cloudflare
 			end
 
 			def keys
-				Keys.new(@resource.with(path: 'keys'))
+				self.with(Keys, path: 'keys')
 			end
 
 			def read_value(name)
@@ -55,7 +55,7 @@ module Cloudflare
 			private
 
 			def value_representation(name)
-				Representation.new(@resource.with(path: "values/#{name}"))
+				self.with(Representation, path: "values/#{name}")
 			end
 		end
 

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,13 +21,15 @@
 # THE SOFTWARE.
 
 require 'async/rspec'
+require 'async/http/proxy'
+
 require_relative '../../cloudflare'
 
 module Cloudflare
 	module RSpec
 		module Connection
 		end
-
+		
 		RSpec.shared_context Connection do
 			include_context Async::RSpec::Reactor
 			
@@ -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.0'
+	VERSION = '4.2.1'
 end

data/lib/cloudflare/zones.rb

@@ -33,19 +33,19 @@ require_relative 'logs'
 module Cloudflare
 	class Zone < Representation
 		def custom_hostnames
-			CustomHostnames.new(@resource.with(path: 'custom_hostnames'))
+			self.with(CustomHostnames, path: 'custom_hostnames')
 		end
 
 		def dns_records
-			DNS::Records.new(@resource.with(path: 'dns_records'))
+			self.with(DNS::Records, path: 'dns_records')
 		end
 		
 		def firewall_rules
-			Firewall::Rules.new(@resource.with(path: 'firewall/access_rules/rules'))
+			self.with(Firewall::Rules, path: 'firewall/access_rules/rules')
 		end
 		
 		def logs
-			Logs::Received.new(@resource.with(path: 'logs/received'))
+			self.with(Logs::Received, path: 'logs/received')
 		end
 		
 		DEFAULT_PURGE_CACHE_PARAMS = {
@@ -53,7 +53,7 @@ module Cloudflare
 		}.freeze
 		
 		def purge_cache(parameters = DEFAULT_PURGE_CACHE_PARAMS)
-			Zone.new(@resource.with(path: 'purge_cache')).post(parameters)
+			self.with(Zone, path: 'purge_cache').post(parameters)
 			
 			return self
 		end

metadata

@@ -1,30 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Marcin Prokop
 - Samuel Williams
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-03 00:00:00.000000000 Z
+date: 2020-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-rest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: async-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -39,20 +39,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: covered
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: covered
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,21 +81,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
-description: 
+description:
 email:
-- marcin@prokop.co
-- samuel.williams@oriontransfer.co.nz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- README.md
-- Rakefile
-- cloudflare.gemspec
 - lib/cloudflare.rb
 - lib/cloudflare/accounts.rb
 - lib/cloudflare/connection.rb
@@ -126,20 +103,11 @@ files:
 - lib/cloudflare/user.rb
 - lib/cloudflare/version.rb
 - lib/cloudflare/zones.rb
-- spec/cloudflare/accounts_spec.rb
-- spec/cloudflare/custom_hostname/ssl_attribute/settings_spec.rb
-- spec/cloudflare/custom_hostname/ssl_attribute_spec.rb
-- spec/cloudflare/custom_hostnames_spec.rb
-- spec/cloudflare/dns_spec.rb
-- spec/cloudflare/firewall_spec.rb
-- spec/cloudflare/kv/namespaces_spec.rb
-- spec/cloudflare/zone_spec.rb
-- spec/spec_helper.rb
-homepage: https://github.com/b4k3r/cloudflare
+homepage: https://github.com/socketry/cloudflare
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,24 +115,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: A Ruby wrapper for the Cloudflare API.
-test_files:
-- spec/cloudflare/accounts_spec.rb
-- spec/cloudflare/custom_hostname/ssl_attribute/settings_spec.rb
-- spec/cloudflare/custom_hostname/ssl_attribute_spec.rb
-- spec/cloudflare/custom_hostnames_spec.rb
-- spec/cloudflare/dns_spec.rb
-- spec/cloudflare/firewall_spec.rb
-- spec/cloudflare/kv/namespaces_spec.rb
-- spec/cloudflare/zone_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/.gitignore

@@ -1,6 +0,0 @@
-t/
-Gemfile*
-*.gem
-tags
-.byebug_history
-.rspec_status

data/.rspec

@@ -1,4 +0,0 @@
---format documentation
---backtrace
---warnings
---require spec_helper

data/.travis.yml

@@ -1,25 +0,0 @@
-language: ruby
-dist: xenial
-cache: bundler
-
-matrix:
-  include:
-    - rvm: 2.3
-    - rvm: 2.4
-    - rvm: 2.5
-    - rvm: 2.6
-    - rvm: 2.6
-      env: COVERAGE=BriefSummary,Coveralls
-    - rvm: jruby-head
-      env: JRUBY_OPTS="--debug -X+O"
-    - rvm: truffleruby
-    - rvm: ruby-head
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: truffleruby
-
-env:
-  global:
-    - CLOUDFLARE_TEST_ZONE_MANAGEMENT=true
-    - secure: c5yG7N1r9nYuw47Y90jGeoHNvkL59AAC55dtPAhKP+gjXWW8hKbntj3oj+lVkxEqzRpzEQgYZzUElrP+6mJnb20ldclZg03L56243tMtVEcpGOx/MFhnIBkx3kKu1H6ydKKMxieHxjsLQ3vnpcIZ3p0skTQjYbjdu607tjbyg7s=

data/README.md

@@ -1,106 +0,0 @@
-# Cloudflare
-
-It is a Ruby wrapper for the Cloudflare V4 API. It provides a light weight wrapper using `RestClient::Resource`. The wrapper functionality is limited to zones and DNS records at this time, *PRs welcome*.
-
-[![Build Status](https://secure.travis-ci.org/socketry/cloudflare.svg)](http://travis-ci.org/socketry/cloudflare)
-[![Coverage Status](https://coveralls.io/repos/socketry/cloudflare/badge.svg)](https://coveralls.io/r/socketry/cloudflare)
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'cloudflare'
-```
-
-And then execute:
-
-```
-$ bundle
-```
-
-Or install it yourself as:
-
-```
-$ gem install cloudflare
-```
-
-## Usage
-
-Here are some basic examples. For more details, refer to the code and specs.
-
-```ruby
-require 'cloudflare'
-
-# Grab some details from somewhere:
-email = ENV['CLOUDFLARE_EMAIL']
-key = ENV['CLOUDFLARE_KEY']
-
-Cloudflare.connect(key: key, email: email) do |connection|
-	# Get all available zones:
-	zones = connection.zones
-	
-	# Get a specific zone:
-	zone = connection.zones.find_by_id("...")
-	zone = connection.zones.find_by_name("example.com")
-	
-	# Get DNS records for a given zone:
-	dns_records = zone.dns_records
-	
-	# Show some details of the DNS record:
-	dns_record = dns_records.first
-	puts dns_record.name
-	
-	# Add a DNS record. Here we add an A record for `batman.example.com`:
-	zone = zones.find_by_name("example.com")
-	zone.dns_records.create('A', 'batman', '1.2.3.4', proxied: false)
-	
-	# Get firewall rules:
-	all_rules = zone.firewall_rules
-	
-	# Block an ip:
-	rule = zone.firewall_rules.set('block', '1.2.3.4', notes: "ssh dictionary attack")
-end
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
-
-## See Also
-
-- [Cloudflare::DNS::Update](https://github.com/ioquatix/cloudflare-dns-update) - A dynamic DNS updater based on this gem.
-- [Rubyflare](https://github.com/trev/rubyflare) - Another implementation.
-
-## License
-
-Released under the MIT license.
-
-Copyright, 2018, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).  
-Copyright, 2017, by [David Rosenbloom](http://artifactory.com).  
-Copyright, 2012, 2014, by [Marcin Prokop](https://github.com/b4k3r).  
-
-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.
-
-
-

data/Rakefile

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:test)
-
-task default: :test
-
-task :coverage do
-	ENV['COVERAGE'] = 'y'
-end
-
-task :console do
-	require_relative 'lib/cloudflare'
-	require 'pry'
-
-	email = ENV.fetch('CLOUDFLARE_EMAIL')
-	key = ENV.fetch('CLOUDFLARE_KEY')
-
-	Async.run do
-		connection = Cloudflare.connect(key: key, email: email)
-		
-		binding.pry
-	end
-end

data/cloudflare.gemspec

@@ -1,32 +0,0 @@
-
-# frozen_string_literal: true
-
-require_relative 'lib/cloudflare/version'
-
-Gem::Specification.new do |spec|
-	spec.name     = 'cloudflare'
-	spec.version  = Cloudflare::VERSION
-	spec.platform = Gem::Platform::RUBY
-
-	spec.summary     = 'A Ruby wrapper for the Cloudflare API.'
-	spec.authors     = ['Marcin Prokop', 'Samuel Williams']
-	spec.email       = ['marcin@prokop.co', 'samuel.williams@oriontransfer.co.nz']
-	spec.homepage    = 'https://github.com/b4k3r/cloudflare'
-	spec.licenses    = ['MIT']
-
-	spec.files         = `git ls-files`.split("\n")
-	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-	spec.require_paths = ['lib']
-
-	spec.required_ruby_version = '>= 2.0.0'
-
-	spec.add_dependency 'async-rest'
-
-	spec.add_development_dependency 'async-rspec'
-
-	spec.add_development_dependency 'covered'
-	spec.add_development_dependency 'bundler'
-	spec.add_development_dependency 'rake'
-	spec.add_development_dependency 'rspec', '~> 3.6'
-end

data/spec/cloudflare/accounts_spec.rb

@@ -1,24 +0,0 @@
-# frozen_string_literal: true
-
-RSpec.describe Cloudflare::Accounts, order: :defined, timeout: 30 do
-	include_context Cloudflare::Account
-
-	before do
-		account.id # Force a fetch if it hasn't happened yet
-	end
-
-	it 'can list existing accounts' do
-		accounts = connection.accounts.to_a
-		expect(accounts.any? {|a| a.id == account.id }).to be true
-	end
-
-	it 'can get a specific account' do
-		expect(connection.accounts.find_by_id(account.id).id).to eq account.id
-	end
-
-	it 'can generate a representation for the KV namespace endpoint' do
-		ns = connection.accounts.find_by_id(account.id).kv_namespaces
-		expect(ns).to be_kind_of(Cloudflare::KV::Namespaces)
-		expect(ns.resource.reference.path).to end_with("/#{account.id}/storage/kv/namespaces")
-	end
-end

data/spec/cloudflare/custom_hostname/ssl_attribute/settings_spec.rb

@@ -1,54 +0,0 @@
-RSpec.describe Cloudflare::CustomHostname::SSLAttribute::Settings do
-
-	subject { described_class.new({}) }
-
-	it 'has an accessor for ciphers' do
-		ciphers = double
-		expect(subject.ciphers).to be_nil
-		subject.ciphers = ciphers
-		expect(subject.ciphers).to be ciphers
-	end
-
-	it 'has a boolean accessor for http2' do
-		expect(subject.http2).to be_nil
-		expect(subject.http2?).to be false
-		subject.http2 = true
-		expect(subject.http2).to eq 'on'
-		expect(subject.http2?).to be true
-		subject.http2 = false
-		expect(subject.http2).to eq 'off'
-		expect(subject.http2?).to be false
-		subject.http2 = 'on'
-		expect(subject.http2).to eq 'on'
-		expect(subject.http2?).to be true
-		subject.http2 = 'off'
-		expect(subject.http2).to eq 'off'
-		expect(subject.http2?).to be false
-	end
-
-	it 'has an accessor for min_tls_version' do
-		tls_version = double
-		expect(subject.min_tls_version).to be_nil
-		subject.min_tls_version = tls_version
-		expect(subject.min_tls_version).to be tls_version
-	end
-
-	it 'has a boolean accessor for tls_1_3' do
-		expect(subject.tls_1_3).to be_nil
-		expect(subject.tls_1_3?).to be false
-		subject.tls_1_3 = true
-		expect(subject.tls_1_3).to eq 'on'
-		expect(subject.tls_1_3?).to be true
-		subject.tls_1_3 = false
-		expect(subject.tls_1_3).to eq 'off'
-		expect(subject.tls_1_3?).to be false
-		subject.tls_1_3 = 'on'
-		expect(subject.tls_1_3).to eq 'on'
-		expect(subject.tls_1_3?).to be true
-		subject.tls_1_3 = 'off'
-		expect(subject.tls_1_3).to eq 'off'
-		expect(subject.tls_1_3?).to be false
-	end
-
-
-end

data/spec/cloudflare/custom_hostname/ssl_attribute_spec.rb

@@ -1,73 +0,0 @@
-RSpec.describe Cloudflare::CustomHostname::SSLAttribute do
-
-	accessors = [:cname, :cname_target, :http_body, :http_url, :method, :status, :type, :validation_errors]
-
-	let(:original_hash) { {} }
-
-	subject { described_class.new(original_hash) }
-
-	accessors.each do |key|
-
-		it "has an accessor for the #{key} value" do
-			test_value = double
-			expect(subject.send(key)).to be_nil
-			original_hash[key] = test_value
-			expect(subject.send(key)).to be test_value
-		end
-
-	end
-
-	it '#active? returns true when the status is "active" and false otherwise' do
-		expect(subject.active?).to be false
-		original_hash[:status] = 'initializing'
-		expect(subject.active?).to be false
-		original_hash[:status] = 'pending_validation'
-		expect(subject.active?).to be false
-		original_hash[:status] = 'pending_deployment'
-		expect(subject.active?).to be false
-		original_hash[:status] = 'active'
-		expect(subject.active?).to be true
-	end
-
-	it '#pending_validation? returns true when the status is "pending_validation" and false otherwise' do
-		expect(subject.pending_validation?).to be false
-		original_hash[:status] = 'initializing'
-		expect(subject.pending_validation?).to be false
-		original_hash[:status] = 'active'
-		expect(subject.pending_validation?).to be false
-		original_hash[:status] = 'pending_deployment'
-		expect(subject.pending_validation?).to be false
-		original_hash[:status] = 'pending_validation'
-		expect(subject.pending_validation?).to be true
-	end
-
-	describe '#settings' do
-
-		it 'should return a Settings object' do
-			expect(subject.settings).to be_kind_of Cloudflare::CustomHostname::SSLAttribute::Settings
-		end
-
-		it 'initailizes the settings object with the value from the settings key' do
-			settings = { min_tls_version: double }
-			original_hash[:settings] = settings
-			expect(subject.settings.min_tls_version).to be settings[:min_tls_version]
-		end
-
-		it 'initializes the settings object with a new hash if the settings key does not exist' do
-			expected_value = double
-			expect(original_hash[:settings]).to be_nil
-			expect(subject.settings.min_tls_version).to be_nil
-			expect(original_hash[:settings]).not_to be_nil
-			original_hash[:settings][:min_tls_version] = expected_value
-			expect(subject.settings.min_tls_version).to be expected_value
-		end
-
-		it 'updates the stored hash with values set on the settings object' do
-			expected_value = double
-			expect(subject.settings.min_tls_version).to be_nil
-			subject.settings.min_tls_version = expected_value
-			expect(original_hash[:settings][:min_tls_version]).to be expected_value
-		end
-	end
-
-end

data/spec/cloudflare/custom_hostnames_spec.rb

@@ -1,213 +0,0 @@
-
-RSpec.describe Cloudflare::CustomHostnames, order: :defined, timeout: 30 do
-	include_context Cloudflare::Zone
-
-	let(:domain) { "www#{ENV['TRAVIS_JOB_ID'] || rand(1..5)}.ourtest.com" }
-
-	let(:record) { @record = zone.custom_hostnames.create(domain) }
-
-	let(:custom_origin) do
-		id = rand(1...100)
-		id += (job_id * 100) if job_id.positive?
-		subdomain = "origin-#{id}"
-		@dns_record = zone.dns_records.create("A", subdomain, "1.2.3.4") # This needs to exist or the calls will fail
-		"#{subdomain}.#{zone.name}"
-	end
-
-	after do
-		if defined? @record
-			expect(@record.delete).to be_success
-		end
-
-		if defined? @dns_record
-			expect(@dns_record.delete).to be_success
-		end
-	end
-
-	it 'can create a custom hostname record' do
-    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
-		expect(record.ssl.method).to eq 'http'
-		expect(record.ssl.type).to eq 'dv'
-	end
-
-	it 'can create a custom hostname record with a custom origin' do
-		begin
-			@record = zone.custom_hostnames.create(domain, origin: custom_origin)
-
-			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 eq custom_origin
-			expect(@record.ssl.method).to eq 'http'
-			expect(@record.ssl.type).to eq 'dv'
-		rescue Cloudflare::RequestError => e
-			if e.message.include?('custom origin server has not been granted')
-				skip(e.message) # This currently doesn't work but might start eventually: https://github.com/socketry/async-rspec/issues/7
-			else
-				raise
-			end
-		end
-	end
-
-	it 'can create a custom hostname record with different ssl options' do
-		@record = zone.custom_hostnames.create(domain, ssl: { method: 'cname' })
-
-		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
-		expect(@record.ssl.method).to eq 'cname'
-		expect(@record.ssl.type).to eq 'dv'
-	end
-
-	it 'can create a custom hostname record with additional metadata' do
-		metadata = { a: rand(1..10) }
-
-		begin
-			@record = zone.custom_hostnames.create(domain, metadata: metadata)
-
-			expect(@record).to be_kind_of Cloudflare::CustomHostname
-			expect(@record.custom_metadata).to eq metadata
-			expect(@record.hostname).to eq domain
-			expect(@record.custom_origin).to be_nil
-			expect(@record.ssl.method).to eq 'http'
-			expect(@record.ssl.type).to eq 'dv'
-		rescue Cloudflare::RequestError => e
-			if e.message.include?('No custom metadata access has been allocated for this zone')
-				skip(e.message) # This currently doesn't work but might start eventually: https://github.com/socketry/async-rspec/issues/7
-			else
-				raise
-			end
-		end
-	end
-
-	it 'can look up an existing custom hostname by the hostname or id' do
-		expect(zone.custom_hostnames.find_by_hostname(record.hostname).id).to eq record.id
-		expect(zone.custom_hostnames.find_by_id(record.id).id).to eq record.id
-	end
-
-	context 'with existing record' do
-
-		it 'returns the hostname when calling #to_s' do
-			expect(record.to_s).to eq domain
-		end
-
-		it 'can update metadata' do
-			metadata = { c: rand(1..10) }
-
-			expect(record.custom_metadata).to be_nil
-
-			begin
-				record.update_settings(metadata: metadata)
-
-				# Make sure the existing object is updated
-				expect(record.custom_metadata).to eq metadata
-
-				# Verify that the server has the changes
-				found_record = zone.custom_hostnames.find_by_id(record.id)
-
-				expect(found_record.custom_metadata).to eq metadata
-				expect(found_record.hostname).to eq domain
-				expect(found_record.custom_origin).to be_nil
-			rescue Cloudflare::RequestError => e
-				if e.message.include?('No custom metadata access has been allocated for this zone')
-					skip(e.message) # This currently doesn't work but might start eventually: https://github.com/socketry/async-rspec/issues/7
-				else
-					raise
-				end
-			end
-		end
-
-		it 'can update the custom origin' do
-			expect(record.custom_origin).to be_nil
-
-			begin
-				record.update_settings(origin: custom_origin)
-
-				# Make sure the existing object is updated
-				expect(record.custom_origin).to eq custom_origin
-
-				# Verify that the server has the changes
-				found_record = zone.custom_hostnames.find_by_id(record.id)
-
-				expect(found_record.custom_metadata).to be_nil
-				expect(found_record.hostname).to eq domain
-				expect(found_record.custom_origin).to eq custom_origin
-			rescue Cloudflare::RequestError => e
-				if e.message.include?('custom origin server has not been granted')
-					skip(e.message) # This currently doesn't work but might start eventually: https://github.com/socketry/async-rspec/issues/7
-				else
-					raise
-				end
-			end
-		end
-
-		it 'can update ssl information' do
-				expect(record.ssl.method).to eq 'http'
-
-				record.update_settings(ssl: { method: 'cname', type: 'dv' })
-
-				# Make sure the existing object is updated
-				expect(record.ssl.method).to eq 'cname'
-
-				# Verify that the server has the changes
-				found_record = zone.custom_hostnames.find_by_id(record.id)
-
-				expect(found_record.custom_metadata).to be_nil
-				expect(found_record.hostname).to eq domain
-				expect(found_record.custom_origin).to be_nil
-				expect(found_record.ssl.method).to eq 'cname'
-		end
-
-		context 'has an ssl section' do
-
-			it 'wraps it in an SSLAttributes object' do
-				expect(record.ssl).to be_kind_of Cloudflare::CustomHostname::SSLAttribute
-			end
-
-			it 'has some helpers for commonly used keys' do
-				# Make sure our values exist before we check to make sure that they are returned correctly
-				expect(record.value[:ssl].values_at(:method, :http_body, :http_url).compact).not_to be_empty
-				expect(record.ssl.method).to be record.value[:ssl][:method]
-				expect(record.ssl.http_body).to be record.value[:ssl][:http_body]
-				expect(record.ssl.http_url).to be record.value[:ssl][:http_url]
-			end
-
-		end
-
-		describe '#ssl_active?' do
-
-			it 'returns the result of calling ssl.active?' do
-				expected_value = double
-				expect(record.ssl).to receive(:active?).and_return(expected_value)
-				expect(record).not_to receive(:send_patch)
-				expect(record.ssl_active?).to be expected_value
-			end
-
-			it 'returns the result of calling ssl.active? without triggering an update if force_update is true and the ssl is not in the pending_validation state' do
-				expected_value = double
-				expect(record.ssl).to receive(:active?).and_return(expected_value)
-				expect(record.ssl.method).not_to be_nil
-				expect(record.ssl.type).not_to be_nil
-				expect(record.ssl.pending_validation?).to be false
-				expect(record).not_to receive(:send_patch).with(ssl: { method: record.ssl.method, type: record.ssl.type })
-				expect(record.ssl_active?(true)).to be expected_value
-			end
-
-			it 'returns the result of calling ssl.active? after triggering an update if force_update is true and the ssl is in the pending_validation state' do
-				expected_value = double
-				expect(record.ssl).to receive(:active?).and_return(expected_value)
-				expect(record.ssl.method).not_to be_nil
-				expect(record.ssl.type).not_to be_nil
-				record.value[:ssl][:status] = 'pending_validation'
-				expect(record).to receive(:send_patch).with(ssl: { method: record.ssl.method, type: record.ssl.type })
-				expect(record.ssl_active?(true)).to be expected_value
-			end
-
-		end
-
-	end
-end

data/spec/cloudflare/dns_spec.rb

@@ -1,32 +0,0 @@
-
-require 'cloudflare/rspec/connection'
-
-RSpec.describe Cloudflare::DNS, order: :defined, timeout: 30 do
-	include_context Cloudflare::Zone
-	
-	let(:subdomain) {"www#{ENV['TRAVIS_JOB_ID']}"}
-	
-	let(:record) {@record = zone.dns_records.create("A", subdomain, "1.2.3.4")}
-	
-	after do
-		if defined? @record
-			expect(@record.delete).to be_success
-		end
-	end
-	
-	it "can create dns record" do
-		expect(record.type).to be == "A"
-		expect(record.name).to be_start_with subdomain
-		expect(record.content).to be == "1.2.3.4"
-	end
-	
-	context "with existing record" do
-		it "can update dns content" do
-			record.update_content("4.3.2.1")
-			expect(record.content).to be == "4.3.2.1"
-			
-			fetched_record = zone.dns_records.find_by_name(record.name)
-			expect(fetched_record.content).to be == record.content
-		end
-	end
-end

data/spec/cloudflare/firewall_spec.rb

@@ -1,48 +0,0 @@
-
-require 'cloudflare/rspec/connection'
-
-RSpec.describe Cloudflare::Firewall, order: :defined, timeout: 30 do
-	include_context Cloudflare::Zone
-	
-	let(:notes) {'gemtest'}
-	
-	context "with several rules" do
-		let(:allow_ip) {'123.123.123.123'}
-		let(:block_ip) {'123.123.123.124'}
-		
-		before do
-			zone.firewall_rules.each do |rule|
-				rule.delete
-			end
-			
-			zone.firewall_rules.set('whitelist', allow_ip)
-			zone.firewall_rules.set('block', block_ip)
-		end
-
-		it 'should get all rules' do
-			rules = zone.firewall_rules.to_a
-			
-			expect(rules.size).to be >= 2
-		end
-		
-		it 'should get rules with specific value' do
-			rules = zone.firewall_rules.each_by_value(allow_ip).to_a
-			
-			expect(rules.size).to be == 1
-		end
-	end
-	
-	%w[block challenge whitelist].each_with_index do |mode, index|
-		it "should create a #{mode} rule" do
-			value = "123.123.123.#{index}"
-			rule = zone.firewall_rules.set(mode, value, notes: notes)
-			
-			expect(rule.mode).to be == mode
-			expect(rule.configuration[:value]).to be == value
-			expect(rule.configuration[:target]).to be == 'ip'
-			expect(rule.notes).to be == notes
-			
-			rule.delete
-		end
-	end
-end

data/spec/cloudflare/kv/namespaces_spec.rb

@@ -1,71 +0,0 @@
-
-RSpec.describe Cloudflare::KV::Namespaces, kv_spec: true, order: :defined, timeout: 30 do
-	include_context Cloudflare::Account
-
-	let(:namespace) { @namespace = account.kv_namespaces.create(namespace_title) }
-	let(:namespace_title) { "Test NS ##{rand(1..100)}" }
-
-	after do
-		if defined? @namespace
-			expect(@namespace.delete).to be_success
-		end
-	end
-
-	it 'can create a namespace' do
-    expect(namespace).to be_kind_of Cloudflare::KV::Namespace
-		expect(namespace.id).not_to be_nil
-		expect(namespace.title).to eq namespace_title
-	end
-
-	it 'can find a namespace by title' do
-		namespace # Call this so that the namespace gets created
-		expect(account.kv_namespaces.find_by_title(namespace_title).id).to eq namespace.id
-	end
-
-	it 'can rename the namespace' do
-		new_title = "#{namespace_title}-#{rand(1..100)}"
-		namespace.rename(new_title)
-		expect(namespace.title).to eq new_title
-		expect(account.kv_namespaces.find_by_title(new_title).id).to eq namespace.id
-		expect(account.kv_namespaces.find_by_title(namespace_title)).to be_nil
-	end
-
-	it 'can store a key/value, read it back' do
-		key = "key-#{rand(1..100)}"
-		value = rand(100..999)
-		namespace.write_value(key, value)
-		expect(account.kv_namespaces.find_by_id(namespace.id).read_value(key)).to eq value.to_s
-	end
-
-	it 'can read a previously stored key' do
-		key = "key-#{rand(1..100)}"
-		value = rand(100..999)
-		expect(account.kv_namespaces.find_by_id(namespace.id).write_value(key, value)).to be true
-		expect(namespace.read_value(key)).to eq value.to_s
-	end
-
-	it 'can delete keys' do
-		key = "key-#{rand(1..100)}"
-		value = rand(100..999)
-		expect(namespace.write_value(key, value)).to be true
-		expect(namespace.read_value(key)).to eq value.to_s
-		expect(namespace.delete_value(key)).to be true
-		expect do
-			account.kv_namespaces.find_by_id(namespace.id).read_value(key)
-		end.to raise_error(Cloudflare::RequestError)
-	end
-
-	it 'can get the keys that exist in the namespace' do
-		counter = 0
-		keys = Array.new(rand(1..9)) { "key-#{counter += 1}" } # Keep this single digits so ordering works
-		keys.each_with_index do |key, i|
-			namespace.write_value(key, i)
-		end
-
-		saved_keys = account.kv_namespaces.find_by_id(namespace.id).keys.to_a
-		expect(saved_keys.length).to eq keys.length
-		saved_keys.each_with_index do |key, i|
-			expect(key.name).to eq keys[i]
-		end
-	end
-end

data/spec/cloudflare/zone_spec.rb

@@ -1,27 +0,0 @@
-
-RSpec.describe Cloudflare::Zones, order: :defined, timeout: 30 do
-	include_context Cloudflare::Zone
-
-	if ENV['CLOUDFLARE_TEST_ZONE_MANAGEMENT'] == 'true'
-		it "can delete existing domain if exists" do
-			if zone = zones.find_by_name(name)
-				expect(zone.delete).to be_success
-			end
-		end
-
-		it "can create a zone" do
-			zone = zones.create(name, account)
-			expect(zone.value).to include(:id)
-		end
-	end
-
-	it "can list zones" do
-		matching_zones = zones.select{|zone| zone.name == name}
-		expect(matching_zones).to_not be_empty
-	end
-
-	it "can get zone by name" do
-		found_zone = zones.find_by_name(name)
-		expect(found_zone.name).to be == name
-	end
-end

data/spec/spec_helper.rb

@@ -1,85 +0,0 @@
-# frozen_string_literal: true
-
-AUTH_EMAIL = ENV['CLOUDFLARE_EMAIL']
-AUTH_KEY = ENV['CLOUDFLARE_KEY']
-
-if AUTH_EMAIL.nil? || AUTH_EMAIL.empty? || AUTH_KEY.nil? || AUTH_KEY.empty?
-	puts 'Please make sure you have defined CLOUDFLARE_EMAIL and CLOUDFLARE_KEY in your environment'
-	puts 'You can also specify CLOUDFLARE_ZONE_NAME to test with your own zone and'
-	puts 'CLOUDFLARE_ACCOUNT_ID to use a specific account'
-	exit(1)
-end
-
-ACCOUNT_ID = ENV['CLOUDFLARE_ACCOUNT_ID']
-NAMES = ['testing', 'horse', 'cat', 'dog', 'fish', 'dolphin', 'lion', 'tiger'].freeze
-JOB_ID = ENV.fetch('TRAVIS_JOB_ID', 0).to_i
-ZONE_NAME = ENV['CLOUDFLARE_ZONE_NAME'] || "#{NAMES[JOB_ID % NAMES.size]}.com"
-
-require 'covered/rspec'
-require 'async/rspec'
-
-require 'cloudflare/rspec/connection'
-require 'cloudflare/zones'
-
-RSpec.shared_context Cloudflare::Account do
-	include_context Cloudflare::RSpec::Connection
-
-	let(:account) do
-		if ACCOUNT_ID
-			connection.accounts.find_by_id(ACCOUNT_ID)
-		else
-			connection.accounts.first
-		end
-	end
-
-end
-
-RSpec.shared_context Cloudflare::Zone do
-	include_context Cloudflare::Account
-
-	let(:job_id) { JOB_ID }
-	let(:names) { NAMES.dup }
-	let(:name) { ZONE_NAME.dup }
-
-	let(:zones) {connection.zones}
-
-	let(:zone) {@zone = zones.find_by_name(name) || zones.create(name, account)}
-
-	# after do
-	# 	if defined? @zone
-	# 		@zone.delete
-	# 	end
-	# end
-end
-
-RSpec.configure do |config|
-	# Enable flags like --only-failures and --next-failure
-	config.example_status_persistence_file_path = '.rspec_status'
-
-	config.expect_with :rspec do |c|
-		c.syntax = :expect
-	end
-
-	disabled_specs = {}
-
-	# Check for features the current account has enabled
-	Cloudflare.connect(key: AUTH_KEY, email: AUTH_EMAIL) do |conn|
-		begin
-			account = if ACCOUNT_ID
-				conn.accounts.find_by_id(ACCOUNT_ID)
-			else
-				conn.accounts.first
-			end
-			account.kv_namespaces.to_a
-		rescue Cloudflare::RequestError => e
-			if e.message.include?('your account is not permitted')
-				puts 'Disabling KV specs due to no access'
-				disabled_specs[:kv_spec] = true
-			else
-				raise
-			end
-		end
-	end
-
-	config.filter_run_excluding disabled_specs unless disabled_specs.empty?
-end