cloudflare 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a37a8b92266e030c82969316e7c5cade2081069
-  data.tar.gz: bb4db11a47c0777ac96a6dd77fa7aec01c9b8a00
+  metadata.gz: 9a110e823c75c13f404a65302681c7dfa94259b7
+  data.tar.gz: 9124f505ca1db512e237515ffb5936921a2981b6
 SHA512:
-  metadata.gz: 1e5fb4101c0451643b585b005246c2f1803888d0def6278bf350ed23f2750f69311a491a78d33b281f97ee648ab618a0c195f916467d62be1d81e71d68613291
-  data.tar.gz: c6754b19bf2e6c32536113e3dc0747e4513ffaf0304bf268f833cda3ff5b119184b816fd8a3cef519806460b9761443aad2d46179c12f301004eb7b81b5e1aec
+  metadata.gz: 45ece12909dddffe400565bad14412a58d33d1e062a4744676a4b1a6cc3e33a959aa56ee8a6d5f022c34fa31909edc46a3a9b3f7e56e84a2b4d6fb0d4fe22da2
+  data.tar.gz: 7190a218eeb9dd39b2dc43c1ce4c8ed7b9a5bd20aefdfbd3be583886f16d601360d53eb58d4fd5e4d0f1f92910cbefc9c1372785c4799ecbaac83603502f76e5

data/.rspec

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

data/.travis.yml

@@ -0,0 +1,19 @@
+language: ruby
+sudo: false
+dist: trusty
+cache: bundler
+rvm:
+- 2.0
+- 2.1
+- 2.2
+- 2.3
+- 2.4
+- jruby-head
+- ruby-head
+matrix:
+  allow_failures:
+  - rvm: ruby-head
+  - rvm: jruby-head
+env:
+  global:
+    secure: c5yG7N1r9nYuw47Y90jGeoHNvkL59AAC55dtPAhKP+gjXWW8hKbntj3oj+lVkxEqzRpzEQgYZzUElrP+6mJnb20ldclZg03L56243tMtVEcpGOx/MFhnIBkx3kKu1H6ydKKMxieHxjsLQ3vnpcIZ3p0skTQjYbjdu607tjbyg7s=

data/Gemfile

@@ -1,4 +1,16 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in build.gemspec
+# Specify your gem's dependencies in utopia.gemspec
 gemspec
+
+group :development do
+	gem 'pry'
+	gem 'pry-coolline'
+	
+	gem 'tty-prompt'
+end
+
+group :test do
+	gem 'simplecov'
+	gem 'coveralls', require: false
+end

data/README.md

@@ -1,60 +1,70 @@
-# CloudFlare
+# Cloudflare
 
-It is a Ruby wrapper for the CloudFlare API.
+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://travis-ci.org/b4k3r/cloudflare.png?branch=master)](https://travis-ci.org/b4k3r/cloudflare)
-
-Official home page is [here](https://github.com/b4k3r/cloudflare). The complete [RDoc](http://rdoc.info/github/b4k3r/cloudflare/) is online.
-
-Visit also a CloudFlare API documentation:
-
--    [Client](http://www.cloudflare.com/docs/client-api.html)
--    [Host](http://www.cloudflare.com/docs/host-api.html)
+[![Build Status](https://secure.travis-ci.org/ioquatix/cloudflare.svg)](http://travis-ci.org/ioquatix/cloudflare)
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'cloudflare'
+```ruby
+gem 'cloudflare'
+```
 
 And then execute:
 
-    $ bundle
+```
+$ bundle
+```
 
 Or install it yourself as:
 
-    $ gem install cloudflare
+```
+$ gem install cloudflare
+```
 
 ## Usage
 
-**Example for Client API:**
+Prepare a connection to the remote API:
+
+```ruby
+require 'cloudflare'
+
+# Grab some details from somewhere:
+email = ENV['CLOUDFLARE_EMAIL']
+key = ENV['CLOUDFLARE_KEY']
 
-	require 'cloudflare'
+# Set up the connection:
+connection = Cloudflare.connect(key: key, email: email)
+```
 
-	cf = CloudFlare::connection('user_api_key', 'user_email')
+Get all available zones:
 
-	begin
-		cf.rec_new('domain.com', 'A', 'subdomain', '212.11.6.211', 1)
-	rescue => e
-		puts e.message # error message
-	else
-	  puts 'Successfuly added DNS record'
-	end
+```ruby
+zones = connection.zones.all
+```
 
-**Example for Host API:**
+Get a specific zone:
 
-	require 'cloudflare'
+```ruby
+zone = connection.zones.find_by_id("...")
+zone = connection.zones.find_by_name("example.com")
+```
 
-	cf = CloudFlare::connection('host_api_key')
+Get DNS records for a given zone:
 
-	begin
-		output = cf.create_user('john@example.com', 'secret', 'john')
-	rescue => e
-		puts e.message # error message
-	else
-		puts output['msg']
-		puts "Your login is #{output['response']['cloudflare_username']}" # => john
-	end
+```ruby
+dns_records = zones.first.dns_records.all
+```
+
+Show some details of the DNS record:
+
+```ruby
+dns_record = records.first
+puts records.first.record[:name]
+puts records
+```
 
 ## Contributing
 
@@ -64,12 +74,17 @@ Or install it yourself as:
 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, 2012, 2014, by [Marcin Prokop](https://github.com/b4k3r).  
-Copyright, 2014, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
+Copyright, 2017, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/Rakefile

@@ -1,8 +1,22 @@
-require 'rake/testtask'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new do |t|
-  t.libs << 'test'
-end
+RSpec::Core::RakeTask.new(:test)
 
-desc "Run tests"
 task :default => :test
+
+task :coverage do
+	ENV['COVERAGE'] = 'y'
+end
+
+task :console do
+	require 'cloudflare'
+	require 'pry'
+	
+	email = ENV['CLOUDFLARE_EMAIL']
+	key = ENV['CLOUDFLARE_KEY']
+	
+	connection = Cloudflare::Connection.new(key: key, email: email)
+	
+	binding.pry
+end

data/cloudflare.gemspec

@@ -1,25 +1,27 @@
 # -*- encoding: utf-8 -*-
-$LOAD_PATH.push File.expand_path("../lib", __FILE__)
-require 'cloudflare/version'
+require_relative 'lib/cloudflare/version'
 
-Gem::Specification.new do |s|
-  s.name     = 'cloudflare'
-  s.version  = CloudFlare::VERSION
-  s.platform = Gem::Platform::RUBY
+Gem::Specification.new do |spec|
+  spec.name     = 'cloudflare'
+  spec.version  = Cloudflare::VERSION
+  spec.platform = Gem::Platform::RUBY
 
-  s.description = 'A Ruby wrapper for the CloudFlare API.'
-  s.summary     = 'A Ruby wrapper for the CloudFlare API.'
-  s.authors     = ['Marcin Prokop']
-  s.email       = 'marcin@prokop.co'
-  s.homepage    = 'https://github.com/b4k3r/cloudflare'
-  s.licenses    = ['MIT']
+  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']
 
-  s.files            = `git ls-files`.split("\n")
-  s.test_files       = ['test/test_cloudflare.rb']
-  s.rdoc_options     = ['--main', 'README.md', '--charset=UTF-8']
-  s.extra_rdoc_files = ['README.md', 'LICENSE']
-
-  s.required_ruby_version = '>= 1.9.0'
-  s.add_runtime_dependency 'json', '~> 1'
-  s.add_development_dependency 'rake'
+  spec.files         = `git ls-files`.split($/)
+  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 'rest-client'
+  
+  spec.add_development_dependency "rspec", "~> 3.6"
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
 end

data/lib/cloudflare.rb

@@ -1,4 +1,5 @@
 # Copyright, 2012, by Marcin Prokop.
+# Copyright, 2017, 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
@@ -18,10 +19,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'cloudflare/connection'
+require_relative 'cloudflare/connection'
+require_relative 'cloudflare/zone'
+require_relative 'cloudflare/user'
 
-module CloudFlare
-  def self.connection(api_key, email = nil)
-    Connection.new(api_key, email)
-  end
+module Cloudflare
+	def self.connect(**options)
+		Connection.new(**options)
+	end
 end

data/lib/cloudflare/connection.rb

@@ -1,4 +1,5 @@
 # Copyright, 2012, by Marcin Prokop.
+# Copyright, 2017, 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
@@ -21,524 +22,34 @@
 require 'net/http'
 require 'json'
 
-# For more information please visit:
-# - http://www.cloudflare.com/docs/client-api.html
-# - http://www.cloudflare.com/docs/host-api.html
-#
-module CloudFlare
-  class RequestError < StandardError
-    def initialize(what, response)
-      super(what)
-
-      @response = response
-    end
-
-    attr :response
-  end
-
-  class Connection
-    # URL for Client and Host API
-    URL_API = {
-      client: 'https://www.cloudflare.com/api_json.html',
-      host: 'https://api.cloudflare.com/host-gw.html'
-    }
-
-    TIMEOUT = 5 # Default is 5 seconds
-
-    # @param api_key [String] user or Host API key.
-    # @param email [String] it is for a Client API.
-    def initialize(api_key, email = nil)
-      @params = Hash.new
-
-      if email.nil?
-        @params[:api_key] = api_key
-      else
-        @params[:api_key] = api_key
-        @params[:email] = email
-      end
-    end
-
-    # CLIENT
-
-    # This function can be used to get currently settings of values such as the security level.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s3.1
-    #
-    # @param zone [String]
-    # @param interval [Integer]
-
-    def stats(zone, interval = 20)
-      send_req({a: :stats, z: zone, interval: interval})
-    end
-
-    # This function lists all domains in a CloudFlare account along with other data.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s3.2
-
-    def zone_load_multi
-      send_req(a: :zone_load_multi)
-    end
-
-    # This function lists all of the DNS records from a particular domain in a CloudFlare account.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s3.3
-    #
-    # @param zone [String]
-
-    def rec_load_all(zone, offset = 0)
-      send_req({a: :rec_load_all, z: zone, o: offset})
-    end
-
-    # This function checks whether one or more websites/domains are active under an account and return the zone ids (zids) for these.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s3.4
-    #
-    # @param zones [String or Array]
-
-    def zone_check(*zones)
-      send_req({a: :zone_check, zones: zones.kind_of?(Array) ? zones.join(',') : zones})
-    end
-
-    # DEPRECATED!
-    # This function pulls recent IPs hitting your site.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s3.5
-    #
-    # @param zone [String]
-    # @param hours [Integer] max 48
-    # @param classification [String] (optional) values: r|c|t
-    # @param geo [Fixnum] (optional)
-
-    def zone_ips(zone, classification = nil, hours = 24, geo = 1)
-      puts 'Warning! This method is deprecated.'
-      send_req({a: :zone_ips, z: zone, hours: hours, "class" => classification, geo: geo})
-    end
-
-    # This function checks the threat score for a given IP.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s3.6
-    #
-    # @param ip [String]
-
-    def ip_lkup(ip)
-      send_req({a: :ip_lkup, ip: ip})
-    end
-
-    # This function retrieves all current settings for a given domain.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s3.7
-    #
-    # @param zone [String]
-
-    def zone_settings(zone)
-      send_req({a: :zone_settings, z: zone})
-    end
-
-    # This function sets the Basic Security Level to HELP I'M UNDER ATTACK / HIGH / MEDIUM / LOW / ESSENTIALLY OFF.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.1
-    #
-    # @param zone [String]
-    # @param value [String] values: low|med|high|help|eoff
-
-    def sec_lvl(zone, value)
-      send_req({a: :sec_lvl, z: zone, v: value})
-    end
-
-    # This function sets the Caching Level to Aggressive or Basic.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.2
-    #
-    # @param zone [String]
-    # @param value [String] values: agg|basic
-
-    def cache_lvl(zone, value)
-      send_req({a: :cache_lvl, z: zone, v: value})
-    end
-
-    # This function allows you to toggle Development Mode on or off for a particular domain.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.3
-    #
-    # @param zone [String]
-    # @param value [Boolean]
-
-    def devmode(zone, value)
-      send_req({a: :devmode, z: zone, v: value ? 1 : 0})
-    end
-
-    # This function will purge CloudFlare of any cached files.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.4
-    #
-    # @param zone [String]
-
-    def fpurge_ts(zone)
-      send_req({a: :fpurge_ts, z: zone, v: 1})
-    end
-
-    # This function will purge a single file from CloudFlare's cache.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.5
-    #
-    # @param zone [String]
-    # @param url [String]
-
-    def zone_file_purge(zone, url)
-      send_req({a: :zone_file_purge, z: zone, url: url})
-    end
-
-    # This function adds an IP address to your white lists.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.6
-    #
-    # @param ip [String]
-
-    def whitelist(ip)
-      send_req({a: :wl, key: ip})
-    end
-
-
-    # This function adds an IP address to your black lists.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.6
-    #
-    # @param ip [String]
-
-    def blacklist(ip)
-      send_req({a: :ban, key: ip})
-    end
-
-    # This function removes the IP from whitelist or blacklist.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.6
-    #
-    # @param ip [String]
-
-    def remove_ip(ip)
-      send_req({a: :nul, key: ip})
-    end
-
-    # This function toggles IPv6 support.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.7
-    #
-    # @param zone [String]
-    # @param value [Boolean]
-
-    def ipv46(zone, value)
-      send_req({a: :ipv46, z: zone, v: value ? 1 : 0})
-    end
-
-    # This function changes Rocket Loader setting.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.8
-    #
-    # @param zone [String]
-    # @param value [Integer or String] values: 0|a|m
-
-    def async(zone, value)
-      send_req({a: :async, z: zone, v: value})
-    end
-
-    # This function changes minification settings.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.9
-    #
-    # @param zone [String]
-    # @param value [Integer] values: 0|2|3|4|5|6|7
-
-    def minify(zone, value)
-      send_req({a: :minify, z: zone, v: value})
-    end
-
-
-    # This function changes mirage2 settings.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s4.10
-    #
-    # @param zone [String]
-    # @param value [Integer] values: 0|1
-
-    def mirage2(zone, value)
-      send_req({a: :mirage2, z: zone, v: value})
-    end
-
-    # This function creates a new DNS record for your site. This can be either a CNAME or A record.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s5.1
-    #
-    # @param zone [String]
-    # @param type [String] values: A|CNAME|MX|TXT|SPF|AAAA|NS|SRV|LOC
-    # @param name [String]
-    # @param content [String]
-    # @param ttl [Integer] values: 1|120...4294967295
-    # @param prio [Integer] (applies to MX/SRV)
-    # @param service [String] (applies to SRV)
-    # @param srvname [String] (applies to SRV)
-    # @param protocol [Integer] (applies to SRV) values: _tcp|_udp|_tls
-    # @param weight [Intger] (applies to SRV)
-    # @param port [Integer] (applies to SRV)
-    # @param target [String] (applies to SRV)
-    # @param service_mode [Boolean] (applies to A/AAAA/CNAME)
-
-    def rec_new(zone, type, name, content, ttl, prio = nil, service = nil, srvname = nil, protocol = nil, weight = nil, port = nil, target = nil, service_mode = true)
-      send_req({
-        a: :rec_new,
-        z: zone,
-        type: type,
-        name: name,
-        content: content,
-        ttl: ttl,
-        prio: prio,
-        service: service,
-        srvname: srvname,
-        protocol: protocol,
-        weight: weight,
-        port: port,
-        target: target,
-        service_mode: service_mode ? 1 : 0,
-      })
-    end
-
-    # This function edits a DNS record for a zone.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s5.2
-    #
-    # @param zone [String]
-    # @param type [String] values: A|CNAME|MX|TXT|SPF|AAAA|NS|SRV|LOC
-    # @param record_id [Integer]
-    # @param name [String]
-    # @param content [String]
-    # @param ttl [Integer] values: 1|120...4294967295
-    # @param prio [Integer] (applies to MX/SRV)
-    # @param service [String] (applies to SRV)
-    # @param srvname [String] (applies to SRV)
-    # @param protocol [Integer] (applies to SRV) values: _tcp/_udp/_tls
-    # @param weight [Intger] (applies to SRV)
-    # @param port [Integer] (applies to SRV)
-    # @param target [String] (applies to SRV)
-    # @param service_mode [Boolean] (applies to A/AAAA/CNAME)
-
-    def rec_edit(zone, type, record_id, name, content, ttl, prio = nil, service = nil, srvname = nil, protocol = nil, weight = nil, port = nil, target = nil, service_mode = true)
-      send_req({
-        a: :rec_edit,
-        z: zone,
-        type: type,
-        id: record_id,
-        name: name,
-        content: content,
-        ttl: ttl,
-        prio: prio,
-        service: service,
-        srvname: srvname,
-        protocol: protocol,
-        weight: weight,
-        port: port,
-        target: target,
-        service_mode: service_mode ? 1 : 0,
-      })
-    end
-
-    # This functon deletes a record for a domain.
-    #
-    # @see http://www.cloudflare.com/docs/client-api.html#s5.3
-    #
-    # @param zone [String]
-    # @param zoneid [Integer]
-
-    def rec_delete(zone, zoneid)
-      send_req({a: :rec_delete, z: zone, id: zoneid})
-    end
-
-    # HOST
-
-    # This function creates a CloudFlare account mapped to your user.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.1
-    #
-    # @param email [String]
-    # @param pass [String]
-    # @param login [String] (optional) cloudflare_username
-    # @param id [Integer] (optional) unique_id
-    # @param cui [Integer] (optional) clobber_unique_id
-
-    def create_user(email, pass, login = nil, id = nil, cui = nil)
-      send_req({
-        act: :user_create,
-        cloudflare_email: email,
-        cloudflare_pass: pass,
-        cloudflare_username: login,
-        unique_id: id,
-        clobber_unique_id: cui
-      })
-    end
-
-    # This function setups a User's zone for CNAME hosting.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.2
-    #
-    # @param user_key [String]
-    # @param zone [String]
-    # @param resolve_to [String]
-    # @param subdomains [String or Array]
-
-    def add_zone(user_key, zone, resolve_to, subdomains)
-      send_req({
-        act: :zone_set,
-        user_key: user_key,
-        zone_name: zone,
-        resolve_to: resolve_to,
-        subdomains: subdomains.kind_of?(Array) ? zones.join(',') : subdomains
-      })
-    end
-
-    # This function adds a zone using the full setup.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.3
-    #
-    # @param user_key [String]
-    # @param zone [String]
-
-    def add_full_zone(user_key, zone)
-      send_req({
-        act: :full_zone_set,
-        user_key: user_key,
-        zone_name: zone
-      })
-    end
-
-    # This function lookups a user's CloudFlare account information.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.4
-    #
-    # *Example:*
-    #
-    #   cf = CloudFlare('your_host_key')
-    #   cf.user_lookup('unique_id', true)
-    #
-    # If +id+ is set to true, email is a unique_id.
-    #
-    # @param email [String or Integer]
-    # @param id [Boolean]
-
-    def user_lookup(email, id = false)
-      if id
-        send_req({act: :user_lookup, unique_id: email})
-      else
-        send_req({act: :user_lookup, cloudflare_email: email})
-      end
-    end
-
-    # This function authorizes access to a user's existing CloudFlare account.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.5
-    #
-    # @param email [String]
-    # @param pass [String]
-    # @param unique_id [Integer] (optional)
-    # @param cui [Integer] (optional) clobber_unique_id
-
-    def user_auth(email, pass, id = nil, cui = nil)
-      send_req({
-        act: :user_auth,
-        cloudflare_email: email,
-        cloudflare_pass: pass,
-        unique_id: id,
-        clobber_unique_id: cui
-      })
-    end
-
-    # This function lookups a specific user's zone.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.6
-    #
-    # @param user_key [String]
-    # @param zone [String]
-
-    def zone_lookup(user_key, zone)
-      send_req({act: :zone_lookup, user_key: user_key, zone_name: zone})
-    end
-
-    # This function deletes a specific zone on behalf of a user.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.7
-    #
-    # @param user_key [String]
-    # @param zone [String]
-
-    def del_zone(user_key, zone)
-      send_req({act: :zone_delete, user_key: user_key, zone_name: zone})
-    end
-
-    # This function regenerates your host key.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.8
-
-    def host_key_regen
-      send_req(act: :host_key_regen)
-    end
-
-    # This function stops a child host provider account.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.9
-    #
-    # @param id [Integer] child_id
-
-    def host_child_stop(id)
-      send_req({act: :host_child_stop, child_id: id})
-    end
-
-    # This function lists the domains currently active on CloudFlare for the given host.
-    #
-    # @see http://www.cloudflare.com/docs/host-api.html#s3.2.10
-    #
-    # @param limit [Integer] (optional)
-    # @param offset [Integer] (optional)
-    # @param name [String] (optional) zone_name
-    # @param sub_id [Integer] (optional) sub_id
-    # @param status [String] (optional) values: V|D|ALL
-    # @param sub_status [String] (optional) values: V|CNL|ALL
-
-    def zone_list(limit = 100, offset = 0, name = nil, sub_id = nil, status = nil, sub_status = nil)
-      send_req({
-        act: :zone_list,
-        offset: offset,
-        zone_name: name,
-        sub_id: sub_id,
-        zone_status: status,
-        sub_status: sub_status
-      })
-    end
-
-    private
-
-    def send_req(params)
-      if @params[:email]
-        params[:tkn] = @params[:api_key]
-        params[:u] = @params[:email]
-        uri = URI(URL_API[:client])
-      else
-        params[:host_key] = @params[:api_key]
-        uri = URI(URL_API[:host])
-      end
-
-      req = Net::HTTP::Post.new(uri.path)
-      req.set_form_data(params.reject{|k, v| v.nil?})
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = true
-      http.read_timeout = TIMEOUT
-
-      res = http.request(req)
-      out = JSON.parse(res.body)
-
-      # If there is an error, raise an exception:
-      if out['result'] == 'error'
-        raise RequestError.new(out['msg'], out)
-      else
-        return out
-      end
-    end
-  end
+require 'rest-client'
+
+require_relative 'response'
+
+module Cloudflare
+	DEFAULT_URL = "https://api.cloudflare.com/client/v4/"
+	TIMEOUT = 10 # Default is 5 seconds
+	
+	class Resource < RestClient::Resource
+		# @param api_key [String] `X-Auth-Key` or `X-Auth-User-Service-Key` if no email provided.
+		# @param email [String] `X-Auth-Email`, your email address for the account.
+		def initialize(url = DEFAULT_URL, key: nil, email: nil, **options)
+			headers = options[:headers] || {}
+			
+			if email.nil?
+				headers['X-Auth-User-Service-Key'] = key
+			else
+				headers['X-Auth-Key'] = key
+				headers['X-Auth-Email'] = email
+			end
+			
+			# Convert HTTP API responses to our own internal response class:
+			super(url, headers: headers, accept: 'application/json', **options) do |response|
+				Response.new(response.request.url, response.body)
+			end
+		end
+	end
+	
+	class Connection < Resource
+	end
 end