cloudflare_client_rb 4.2.3 → 4.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d76a257765222f6d04e48abc22acc641fd7f280d
-  data.tar.gz: 308f8b469c516bbc02e07b6b83145395212291c5
+  metadata.gz: 125802fef0c3221bb92cde156cafd90ded68d591
+  data.tar.gz: 627757654b8419bab16194820c5bbc5e4b8d7ba9
 SHA512:
-  metadata.gz: 4fdabeeaf4c72e1b47ad952fa7f6949387abe2cf5ff84dd4236659c10dc000e86e9e8e3e72a5c3864ab8d25bb21b9891e8e950a24bc5128301a6df11c6a31556
-  data.tar.gz: dd441a1a1f5cc47a36327602bb31e672da5b5d409ae3dc1e2f92ac9eebd3dd317c910e085ab1ca31f8debb0d86692cf6831c7ca7a29104e2e28ff72fe55baafa
+  metadata.gz: 60eeece7b3ecd4d5b975415017aac7035c587422bae15fd1cef05a2e217885737dec81645bd221c3c0c4bdeb26f66c0b49798f7ac8a5f4a29a6e1e71800b2178
+  data.tar.gz: 1578ee65e475099591342d754ff59f1abb7ea2bb00b56c96b2383fc28aaf3a51fa6957644933e2b770d8f3836ba0b414976a9309a1a07af91adc4c8ed46fb15d

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
 
@@ -204,4 +209,4 @@ class CloudflareClient
     return false unless POSSIBLE_API_SETTINGS.include?(name)
     true
   end
-end
+end

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.inspect}")
+      super("#{message}, #{method&.upcase} #{url} #{response&.body}")
       @response = response
       @method = method
       @uri = uri

data/lib/cloudflare_client/version.rb

@@ -1,3 +1,3 @@
 class CloudflareClient
-  VERSION = "4.2.3"
+  VERSION = "4.2.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudflare_client_rb
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.2.10
 platform: ruby
 authors:
 - ian waters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-31 00:00:00.000000000 Z
+date: 2021-01-18 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: iwaters@zendesk.com
@@ -52,7 +52,7 @@ 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: 
 rdoc_options: []