cloudflare 3.2.1 → 4.0.0

data/spec/cloudflare/firewall_spec.rb

@@ -0,0 +1,48 @@
+
+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/zone_spec.rb

@@ -1,126 +1,25 @@
-# frozen_string_literal: true
 
-# rubocop:disable Metrics/BlockLength
-RSpec.describe 'Cloudflare DNS Zones' do
-  include_context Cloudflare::RSpec::Connection
-
-  before(:each) { stub_get_zones }
-  it 'should list zones' do
-    zones = connection.zones.all
-    expect(zones).to be_any
-  end
-
-  describe Cloudflare::Zone, order: :defined do
-    before(:each) do
-      stub_get_zones
-      stub_purge_cache
-    end
-
-    let(:zone) { connection.zones.all.first }
-
-    describe '#purge_cache' do
-      it 'should purge cache' do
-        expect(zone.purge_cache).to eq(true)
-      end
-    end
-  end
-
-  describe Cloudflare::DNSRecords, order: :defined do
-    before(:each) do
-      stub_get_zones
-      stub_get_dns_records
-      stub_create_dns_record
-      stub_delete_dns_record '123123123'
-      stub_find_dns_record_by_id '123123123'
-    end
-    let(:zone) { connection.zones.all.first }
-
-    let(:name) { 'test' }
-    let(:ip) { '123.123.123.123' }
-
-    it 'should get all records' do
-      result = zone.dns_records.all
-      expect(result.size).to be > 0
-    end
-
-    it 'should create dns record' do
-      response = zone.dns_records.post({
-        type: 'A',
-        name: name,
-        content: ip,
-        ttl: 240,
-        proxied: false
-      }.to_json, content_type: 'application/json')
-
-      expect(response).to be_successful
-
-      result = response.result
-      expect(result).to include(:id, :type, :name, :content, :ttl)
-    end
-
-    before do
-      stub_get_dns_record '1231231234'
-      stub_delete_dns_record '1231231234'
-    end
-    it 'should delete dns record' do
-      dns_record = zone.dns_records.find_by_id('1231231234')
-      response = dns_record.delete
-      expect(response).to be_successful
-    end
-  end
-
-  describe Cloudflare::FirewallRules, order: :defined do
-    let(:zone) { connection.zones.all.first }
-    let(:name) { 'test' }
-    let(:ip) { '123.123.123.123' }
-    let(:ip2) { '123.123.123.124' }
-    let(:notes) { 'gemtest' }
-    before do
-      stub_get_zones
-      stub_create_rule 'block', ip2, notes
-      stub_list_access_rules 1, [cf_access_rule('whitelist', ip, notes)]
-      stub_list_access_rules 2, [cf_access_rule('block', ip2, notes)]
-    end
-
-    it 'should get all rules' do
-      result = zone.firewall_rules.all
-
-      puts "===> #{result.size} records returned"
-      expect(result.size).to be > 0
-    end
-
-    %i[block challenge whitelist].each do |mode|
-      it "should create a #{mode} rule" do
-        stub_create_rule mode, ip, notes
-        response = zone.firewall_rules.set(mode, ip, notes)
-
-        expect(response).to be_successful
-
-        result = response.result
-        expect(result).to include(:id, :mode, :notes, :configuration)
-        expect(result[:mode]).to eq mode.to_s
-      end
-    end
-    before do
-      stub_get_access_rule('123123123')
-      stub_delete_access_rule(id: '123123123')
-    end
-    it 'should delete firewall rule by record' do
-      response = zone.firewall_rules.unset('id', '123123123')
-      assert_requested stub_get_access_rule('123123123')
-      assert_requested stub_delete_access_rule(id: '123123123')
-      expect(response).to be_successful
-    end
-
-    before do
-      stub_find_rule_by_value ip: ip2
-      stub_get_access_rule '123123124'
-      stub_delete_access_rule id: '123123124'
-    end
-    it 'should delete firewall rule by ip' do
-      response = zone.firewall_rules.unset('ip', ip2)
-      expect(response).to be_successful
-    end
-  end
+RSpec.describe Cloudflare::Zones, order: :defined, timeout: 30 do
+	include_context Cloudflare::Zone
+	
+	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 zone" do
+		zone = zones.create(name, account)
+		expect(zone.value).to include(:id)
+	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
-# rubocop:enable Metrics/BlockLength

data/spec/spec_helper.rb

@@ -1,177 +1,33 @@
-# frozen_string_literal: true
 
-if ENV['COVERAGE'] || ENV['TRAVIS']
-  begin
-    require 'simplecov'
+require 'async/rspec'
 
-    SimpleCov.start do
-      add_filter '/spec/'
-    end
-  rescue LoadError
-    warn "Could not load simplecov: #{$ERROR_INFO}"
-  end
-end
-
-require 'webmock/rspec'
-WebMock.disable_net_connect!(allow_localhost: true)
-
-require 'bundler/setup'
-require 'cloudflare'
 require 'cloudflare/rspec/connection'
-
-def base_url
-  %(https://api.cloudflare.com/client/v4)
-end
-
-def zone_id
-  '1337z0n31d3n71f13r'
-end
-
-def stub_get_zones
-  stub_request(:get, "#{base_url}/zones/?page=1&per_page=50&scope_type=organization")
-      .with(cf_headers)
-      .to_return(status: 200, body: cf_results([{
-                                                    name: 'example.com',
-                                                    ip: '123.123.123.123',
-                                                    id: zone_id
-                                                }]),
-                 headers: {})
-end
-
-def stub_get_dns_records
-  dns_record = {
-      "id": 'b12a037696862c2fc1d45a0e288c82a5',
-      "type": 'A',
-      "name": 'www.example.com',
-      "content": '123.123.123.123',
-      "ttl": 1,
-      "zone_id": zone_id,
-      "zone_name": 'example.com'
-  }
-  stub_request(:get, "#{base_url}/zones/#{zone_id}/dns_records/?page=1&per_page=50&scope_type=organization")
-      .with(cf_headers)
-      .to_return(status: 200,
-                 body: cf_results([dns_record]),
-                 headers: {})
-end
-
-def stub_create_dns_record
-  stub_request(:post, "#{base_url}/zones/#{zone_id}/dns_records")
-      .with(cf_headers('Content-Type': 'application/json'))
-      .with(
-          body: hash_including(:type, :name, :content, :ttl, :proxied)
-      )
-      .to_return(status: 200,
-                 body: cf_results(id: '123231123', type: 'A', name: 'test', content: '123.123.123.123', ttl: 240),
-                 headers: {})
-end
-
-def stub_find_dns_record_by_id(id)
-  stub_request(:get, "#{base_url}/zones/#{zone_id}/dns_records")
-      .with(query: {id: id})
-      .with(cf_headers)
-      .to_return(status: 200,
-                 body: cf_results(
-                     id: '123231123',
-                     type: 'A',
-                     name: 'test',
-                     content: '123.123.123.123',
-                     ttl: 240
-                 ),
-                 headers: {})
-end
-
-def stub_get_dns_record(id)
-  stub_request(:get, "#{base_url}/zones/#{zone_id}/dns_records/#{id}")
-      .with(cf_headers)
-      .to_return(status: 200,
-                 body: cf_results(
-                     id: '123231123',
-                     type: 'A',
-                     name: 'test',
-                     content: '123.123.123.123',
-                     ttl: 240
-                 ),
-                 headers: {})
-end
-
-def stub_delete_dns_record(id)
-  stub_request(:delete, "#{base_url}/zones/#{zone_id}/dns_records/#{id}")
-      .with(cf_headers)
-      .to_return(status: 200, body: cf_results(id: id), headers: {})
-end
-
-def stub_find_rule_by_value(ip:)
-  stub_request(:get, "#{base_url}/zones/#{zone_id}/firewall/access_rules/rules/?configuration_value=#{ip}")
-      .with(cf_headers)
-      .to_return(status: 200,
-                 body: cf_results([cf_access_rule('block', '123.123.123.124', 'gemtest')]),
-                 headers: {})
-end
-
-def stub_list_access_rules(page, rules)
-  query = URI.encode_www_form(page: page, per_page: 50, scope_type: :organization)
-  stub_request(:get, "#{base_url}/zones/#{zone_id}/firewall/access_rules/rules/?#{query}")
-      .with(cf_headers)
-      .to_return(status: 200, body: cf_results(rules), headers: {})
-end
-
-def stub_get_access_rule(id)
-  stub_request(:get, "#{base_url}/zones/#{zone_id}/firewall/access_rules/rules/#{id}")
-      .with(cf_headers)
-      .to_return(status: 200,
-                 body: cf_results(cf_access_rule('whitelist', '123.123.123.124', 'gemtest', id)),
-                 headers: {})
-end
-
-def stub_delete_access_rule(id: nil)
-  stub_request(:delete, "#{base_url}/zones/#{zone_id}/firewall/access_rules/rules/#{id}")
-      .with(cf_headers)
-      .to_return(status: 200, body: cf_results(id: id), headers: {})
-end
-
-def stub_create_rule(mode, ip, note)
-  notes = "cloudflare gem firewall_rules [#{mode}] #{note} #{Time.now.strftime('%m/%d/%y')}"
-  body = "{\"mode\":\"#{mode}\",\"configuration\":{\"target\":\"ip\",\"value\":\"#{ip}\",\"notes\":\"#{notes}\"}}"
-  stub_request(:post, "https://api.cloudflare.com/client/v4/zones/#{zone_id}/firewall/access_rules/rules")
-      .with(cf_headers(
-                'Content-Length' => body.bytesize,
-                'Content-Type' => 'application/json'
-            ))
-      .with(body: body)
-      .to_return(status: 200, body: cf_results(cf_access_rule(mode, ip, notes)), headers: {})
-end
-
-def stub_purge_cache
-  stub_request(:post, "#{base_url}/zones/#{zone_id}/purge_cache")
-      .with(cf_headers)
-      .to_return(status: 200, body: cf_results(id: zone_id), headers: {})
+require 'cloudflare/zones'
+
+RSpec.shared_context Cloudflare::Zone do
+	include_context Cloudflare::RSpec::Connection
+	
+	let(:job_id) {ENV.fetch('TRAVIS_JOB_ID', 0).to_i}
+	let(:names) {['testing', 'horse', 'cat', 'dog', 'fish', 'dolphin', 'lion', 'tiger']}
+	let(:name) {"#{names[job_id % names.size]}.com"}
+	
+	let(:account) {connection.accounts.first}
+	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
-end
-
-def cf_results(result, messages = [], errors = [])
-  {result: result, success: true, messages: messages, errors: errors}.to_json
-end
-
-def cf_headers(extra = {})
-  {headers: {
-      'Accept' => '*/*',
-      'Accept-Encoding' => 'gzip, deflate',
-      'Host' => 'api.cloudflare.com',
-      'X-Auth-Email' => 'jake@example.net',
-      'X-Auth-Key' => '5up3rS3cr3tAuthK3y',
-      'X-Auth-User-Service-Key' => ''
-  }.merge(extra)}
-end
+	# Enable flags like --only-failures and --next-failure
+	config.example_status_persistence_file_path = '.rspec_status'
 
-def cf_access_rule(mode, ip, note, id = '12312312' + ip.slice(-1))
-  {id: id, mode: mode, notes: note, configuration: {}}
+	config.expect_with :rspec do |c|
+		c.syntax = :expect
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Marcin Prokop
@@ -9,36 +9,50 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2019-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: async-rest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: async-rspec
+  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
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -77,22 +91,26 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
 - cloudflare.gemspec
 - lib/cloudflare.rb
+- lib/cloudflare/accounts.rb
 - lib/cloudflare/connection.rb
-- lib/cloudflare/response.rb
+- lib/cloudflare/dns.rb
+- lib/cloudflare/firewall.rb
+- lib/cloudflare/logs.rb
+- lib/cloudflare/paginate.rb
+- lib/cloudflare/representation.rb
 - lib/cloudflare/rspec/connection.rb
 - lib/cloudflare/user.rb
 - lib/cloudflare/version.rb
-- lib/cloudflare/zone.rb
+- lib/cloudflare/zones.rb
+- spec/cloudflare/dns_spec.rb
+- spec/cloudflare/firewall_spec.rb
 - spec/cloudflare/zone_spec.rb
-- spec/fake_cloudflare/cloudflare.rb
 - spec/spec_helper.rb
 homepage: https://github.com/b4k3r/cloudflare
 licenses:
@@ -113,12 +131,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: A Ruby wrapper for the Cloudflare API.
 test_files:
+- spec/cloudflare/dns_spec.rb
+- spec/cloudflare/firewall_spec.rb
 - spec/cloudflare/zone_spec.rb
-- spec/fake_cloudflare/cloudflare.rb
 - spec/spec_helper.rb