cloudflare_client_rb 4.2.7 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 781fa68d768317105d936c42203e717c9fa760f2
-  data.tar.gz: 4b04969de67f023b90a7054c6638e5f1bd3801f7
+SHA256:
+  metadata.gz: 867624e2f37d6cf2f1709c151e9bd51cba5526863486debbaa7dfc99430950e1
+  data.tar.gz: 40ee55b856e35a064872391bbe4ec105b5cc149546ca6d9592e5ef0c67820c90
 SHA512:
-  metadata.gz: a5adf49cd33d6fc7a8370a7627ffd9f9e9d9d972dd5f5e736c7e9de507b9ff39b6de88adfade73a4f7fd6ab1ab92861676d4d9447bed2d28e953cc23f6c13e59
-  data.tar.gz: c6ff857e320a7708eebdc9b15e7bfa9f0fa261d1ffa51311eed8adb7a2d31220ea15f9199b6e9d2a77472ec1fb01c4fc246aaa4fc301949b23cc3cb48aa9a2bf
+  metadata.gz: 715cdb2ae1c2c8a4f37ae47665ffd1d146e1e31147984e57431aae7bc2afab9da6f1e155229db3aacba9ad45ae245dbfe46d6464d7ada0d72208dfc8c6adcdfb
+  data.tar.gz: 7ad6cf31ed7bfd150c99392d9213a50bf6a3fe1b949db77f3470a60b014c604b30ac99451ac35173d522582cc9834ae9de099b6c987bcfced9bbff275c5fabae

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(**args)
+  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(**args)
+  end
+
+end

data/lib/cloudflare_client/organization.rb

@@ -8,7 +8,7 @@ class CloudflareClient::Organization < CloudflareClient
   def initialize(args)
     @org_id = args.delete(:org_id)
     id_check(:org_id, org_id)
-    super
+    super(**args)
   end
 
   ##

data/lib/cloudflare_client/railgun.rb

@@ -1,9 +1,4 @@
 class CloudflareClient::Railgun < CloudflareClient
-  ##
-  # Railgun methods
-  def initialize(*args)
-    super
-  end
 
   ##
   # create(name: 'name of railgun')

data/lib/cloudflare_client/version.rb

@@ -1,3 +1,3 @@
 class CloudflareClient
-  VERSION = "4.2.7"
+  VERSION = "5.0.0"
 end

data/lib/cloudflare_client/virtual_dns_cluster/analytic.rb

@@ -7,7 +7,7 @@ class CloudflareClient::VirtualDnsCluster::Analytic < CloudflareClient::VirtualD
   def initialize(args)
     @virtual_dns_id = args.delete(:virtual_dns_id)
     id_check(:virtual_dns_id, virtual_dns_id)
-    super
+    super(**args)
   end
 
   def report(dimensions:, metrics:, since_ts:, until_ts:, filters: nil, sort: nil, limit: nil)

data/lib/cloudflare_client/virtual_dns_cluster.rb

@@ -22,7 +22,7 @@ class CloudflareClient::VirtualDnsCluster < CloudflareClient
       @uri_prefix = "/organizations/#{org_id}"
     end
 
-    super
+    super(**args)
   end
 
   ##

data/lib/cloudflare_client/zone/base.rb

@@ -4,6 +4,6 @@ class CloudflareClient::Zone::Base < CloudflareClient::Zone
   def initialize(args)
     @zone_id = args.delete(:zone_id)
     id_check('zone_id', zone_id)
-    super
+    super(**args)
   end
 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/zone/firewall/waf_package/base.rb

@@ -4,6 +4,6 @@ class CloudflareClient::Zone::Firewall::WAFPackage::Base < CloudflareClient::Zon
   def initialize(args)
     @package_id = args.delete(:package_id)
     id_check('package_id', package_id)
-    super
+    super(**args)
   end
 end

data/lib/cloudflare_client/zone/log.rb

@@ -10,10 +10,10 @@ class CloudflareClient::Zone::Log < CloudflareClient::Zone::Base
     timestamp_check(:end_time, end_time) unless end_time.nil?
 
     params = Hash.new
-
+    minute = 60
 
     if start_time.nil?
-      params[:start] = (Time.now - 20.minute).to_i
+      params[:start] = (Time.now - (20 * minute)).to_i
     else
       timestamp_check(:start_time, start_time)
       params[:start] = start_time
@@ -21,7 +21,7 @@ class CloudflareClient::Zone::Log < CloudflareClient::Zone::Base
 
 
     if end_time.nil?
-      params[:end] = (Time.now - 5.minute).to_i
+      params[:end] = (Time.now - (5 * minute)).to_i
     else
       timestamp_check(:end_time, end_time)
       params[:end] = end_time

data/lib/cloudflare_client/zone.rb

@@ -5,12 +5,6 @@ class CloudflareClient
 
     VALID_ZONE_STATUSES = %w[active pending initializing moved deleted deactivated].freeze
 
-    ##
-    # Zone based operations
-    def initialize(*args)
-      super
-    end
-
     ##
     # list_zones will either list all zones or search for zones based on params
     # results are paginated!

data/lib/cloudflare_client.rb

@@ -51,10 +51,10 @@ class CloudflareClient
     websockets
   ].freeze
 
-  def initialize(auth_key: nil, email: nil, &block)
-    raise('Missing auth_key') if auth_key.nil?
-    raise('missing email') if email.nil?
-    @cf_client ||= build_client(auth_key: auth_key, email: email, &block)
+  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
@@ -133,14 +133,20 @@ class CloudflareClient
   def build_client(params)
     # we need multipart form encoding for some of these operations
     client                                      = Faraday.new(url: API_BASE) do |conn|
-      conn.request :multipart
+      # conn.request :multipart
       conn.request :url_encoded
       conn.use Middleware::Response::RaiseError
     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
@@ -174,16 +180,21 @@ 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 data.nil?
+        request.body = data.kind_of?(String) ? data : data.to_json
+      end
+      unless params.nil?
+        request.params = params if params.values.any? { |i| !i.nil? }
+      end
     end
     JSON.parse(result.body, symbolize_names: true)
   end
 
   def cf_patch(path: nil, data: {})
-    result               = @cf_client.patch do |request|
+    result = @cf_client.patch do |request|
       request.url(API_BASE + path) unless path.nil?
       request.body = data.to_json unless data.empty?
     end
@@ -203,4 +214,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.7
+  version: 5.0.0
 platform: ruby
 authors:
 - ian waters
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-16 00:00:00.000000000 Z
+date: 2022-08-03 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
@@ -62,16 +65,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: lightweight cloudflare api client
 test_files: []