cloudflare_client_rb 4.2.5 → 4.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ee79e1c4cf490ebd1c76ac063d78b33fcbb599
-  data.tar.gz: 4959f3b3ba24fea4815c16ea1f5079c36f5b73f6
+  metadata.gz: 6b750c4cf1d2406e217504fe9cbf195faf7dbc87
+  data.tar.gz: 97a75d61e8d7f758425e3fb0c01d00bcf978f372
 SHA512:
-  metadata.gz: 3deaa8ca8298f6b76df9353e68aedef1f4a8f568c62a3c8d6147829e6927a1366bb5bc803389843a42eb107d1505a3f19c138761bc4266791f69a81237cf6c91
-  data.tar.gz: b3d80e5762604b3063465ed75e14f9a9c0638229fe4fdc8ca9fcf78be0329032b83251dd9970d4e2379a6bcac6399721ae7287a88ce19219986a096b10847659
+  metadata.gz: b10b81567bd45527a8826e441cfb429158eaca341532d3cff5d1d02c895dea0334ea3e91c7040707cd714cedccc9b71fdae3236f8fefffedf618c538b5966e8b
+  data.tar.gz: 05c0e5b3880770e0291107b7608a4d9bdb18be396404cdd5f720c9ea06fa1c6d94a0b16c9b2ba95dd70271d64fcec649de91c5ce38de09cfef97f248ac5b64cf

data/lib/cloudflare_client/middleware/response/raise_error.rb

@@ -4,7 +4,7 @@ class CloudflareClient
     attr_reader :response, :method, :uri, :url
 
     def initialize(message = nil, response = nil, method = nil, uri = nil, url = nil)
-      super("#{message}, #{method.upcase} #{url} #{response.body}")
+      super("#{message}, #{method&.upcase} #{url} #{response&.body}")
       @response = response
       @method = method
       @uri = uri

data/lib/cloudflare_client/namespace/value.rb

@@ -0,0 +1,26 @@
+class CloudflareClient::Value < CloudflareClient::Namespace
+  attr_reader :namespace_id
+
+  def initialize(args)
+    @namespace_id = args.delete(:namespace_id)
+    id_check(:namespace_id, namespace_id)
+    super
+  end
+
+  def write(key:, value:, expiration_ttl: nil, metadata: nil)
+    if expiration_ttl
+      raise RuntimeError, 'expiration_ttl must be an integer' unless expiration_ttl.kind_of?(Integer)
+    end
+
+    data = metadata ? { value: value, metadata: metadata} : value
+    cf_put(path: "/accounts/#{account_id}/storage/kv/namespaces/#{namespace_id}/values/#{key}", data: data, params: {expiration_ttl: expiration_ttl})
+  end
+
+  def read(key:)
+    cf_get(path: "/accounts/#{account_id}/storage/kv/namespaces/#{namespace_id}/values/#{key}", raw: true)
+  end
+
+  def delete(key:)
+    cf_delete(path: "/accounts/#{account_id}/storage/kv/namespaces/#{namespace_id}/values/#{key}")
+  end
+end

data/lib/cloudflare_client/namespace.rb

@@ -0,0 +1,12 @@
+class CloudflareClient::Namespace < CloudflareClient
+  Dir[File.expand_path('../namespace/*.rb', __FILE__)].each {|f| require f}
+
+  attr_reader :account_id
+
+  def initialize(args)
+    @account_id = args.delete(:account_id)
+    id_check(:account_id, account_id)
+    super
+  end
+
+end

data/lib/cloudflare_client/version.rb

@@ -1,3 +1,3 @@
 class CloudflareClient
-  VERSION = "4.2.5"
+  VERSION = "4.5.0"
 end

data/lib/cloudflare_client/zone/custom_hostname_v2.rb

@@ -0,0 +1,24 @@
+require_relative 'custom_hostname'
+# https://api.cloudflare.com/#custom-hostname-for-a-zone-list-custom-hostnames
+class CloudflareClient::Zone::CustomHostnameV2 < CloudflareClient::Zone::CustomHostname
+
+  def create(hostname:, ssl: DEFAULT_SSL_PROPERTIES, custom_metadata: {}, custom_origin_server: nil)
+    super
+  end
+
+  def list(hostname: nil, id: nil, page: 1, per_page: 50, order: 'ssl', direction: 'desc', ssl: 0)
+    super
+  end
+
+  def show(id:)
+    super
+  end
+
+  def update(id:, ssl: {}, custom_metadata: nil, custom_origin_server: nil)
+    super
+  end
+
+  def delete(id:)
+    super
+  end
+end

data/lib/cloudflare_client/zone/custom_ssl.rb

@@ -26,7 +26,7 @@ class CloudflareClient::Zone::CustomSSL < CloudflareClient::Zone::Base
     params = {page: page, per_page: per_page}
     params[:match] = match
     params[:direction] = direction
-    cf_get(path: "/zones/#{zone_id}/custom_certficates", params: params)
+    cf_get(path: "/zones/#{zone_id}/custom_certificates", params: params)
   end
 
   ##

data/lib/cloudflare_client.rb

@@ -51,10 +51,10 @@ class CloudflareClient
     websockets
   ].freeze
 
-  def initialize(auth_key: nil, email: nil)
-    raise('Missing auth_key') if auth_key.nil?
-    raise('missing email') if email.nil?
-    @cf_client ||= build_client(auth_key: auth_key, email: email)
+  def initialize(auth_key: nil, email: nil, auth_token: nil, &block)
+    raise('Missing auth_key or auth_token') if auth_key.nil? && auth_token.nil?
+    raise('missing email') if email.nil? && !auth_key.nil?
+    @cf_client ||= build_client(auth_key: auth_key, email: email, auth_token: auth_token, &block)
   end
 
   #TODO: add the time based stuff
@@ -131,19 +131,24 @@ class CloudflareClient
   end
 
   def build_client(params)
-    raise('Missing auth_key') if params[:auth_key].nil?
-    raise('Missing auth email') if params[:email].nil?
     # we need multipart form encoding for some of these operations
     client                                      = Faraday.new(url: API_BASE) do |conn|
       conn.request :multipart
       conn.request :url_encoded
       conn.use Middleware::Response::RaiseError
-      conn.adapter :net_http
     end
-    client.headers['X-Auth-Key']                = params[:auth_key]
-    client.headers['X-Auth-User-Service-Key	'] = params[:auth_key] #FIXME, is this always the same?
-    client.headers['X-Auth-Email']              = params[:email]
+
     client.headers['Content-Type']              = 'application/json'
+    if params[:auth_token]
+      client.headers['Authorization'] = "Bearer #{params[:auth_token]}"
+    else
+      client.headers['X-Auth-Key']                = params[:auth_key]
+      client.headers['X-Auth-User-Service-Key	']  = params[:auth_key] #FIXME, is this always the same?
+      client.headers['X-Auth-Email']              = params[:email]
+    end
+
+    yield client if block_given?
+    client.adapter :net_http
     client
   end
 
@@ -175,10 +180,13 @@ class CloudflareClient
     JSON.parse(result.body, symbolize_names: true)
   end
 
-  def cf_put(path: nil, data: nil)
+  def cf_put(path: nil, data: nil, params: nil)
     result = @cf_client.put do |request|
       request.url(API_BASE + path) unless path.nil?
       request.body = data.to_json unless data.nil?
+      unless params.nil?
+        request.params = params if params.values.any? { |i| !i.nil? }
+      end
     end
     JSON.parse(result.body, symbolize_names: true)
   end
@@ -204,4 +212,4 @@ class CloudflareClient
     return false unless POSSIBLE_API_SETTINGS.include?(name)
     true
   end
-end
+end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare_client_rb
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 4.5.0
 platform: ruby
 authors:
 - ian waters
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email: iwaters@zendesk.com
 executables: []
 extensions: []
@@ -19,6 +19,8 @@ files:
 - lib/cloudflare_client.rb
 - lib/cloudflare_client/certificate.rb
 - lib/cloudflare_client/middleware/response/raise_error.rb
+- lib/cloudflare_client/namespace.rb
+- lib/cloudflare_client/namespace/value.rb
 - lib/cloudflare_client/organization.rb
 - lib/cloudflare_client/organization/access_rule.rb
 - lib/cloudflare_client/organization/invite.rb
@@ -33,6 +35,7 @@ files:
 - lib/cloudflare_client/zone/analytics.rb
 - lib/cloudflare_client/zone/base.rb
 - lib/cloudflare_client/zone/custom_hostname.rb
+- lib/cloudflare_client/zone/custom_hostname_v2.rb
 - lib/cloudflare_client/zone/custom_page.rb
 - lib/cloudflare_client/zone/custom_ssl.rb
 - lib/cloudflare_client/zone/dns.rb
@@ -52,9 +55,9 @@ files:
 - lib/cloudflare_client/zone/subscription.rb
 homepage: https://github.com/zendesk/cloudflare_client_rb
 licenses:
-- Apache License Version 2.0
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,9 +72,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.6.11
-signing_key: 
+signing_key:
 specification_version: 4
 summary: lightweight cloudflare api client
 test_files: []