glare 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2600364f5b04c36ab6d05324f6876f4a36ea654c0dd85a6f77be1c21a65f141e
-  data.tar.gz: 5aa32304bb23e6cca6ab6c25343d346b7a3800cb02a14ba39db48c4d16765dc3
+  metadata.gz: de9b063e4c69c21566a74862a623247fd9385cf31d7e24742e5970c9ab50cfed
+  data.tar.gz: 121de9045bf2d3d05bad31ae5ffee1501e4e6c7b7f65726bba34ae7ab22e7add
 SHA512:
-  metadata.gz: 4c75b4376b091ddbfd72eb3d43284be26c6d1ec4a999f06d138b40c0a686211f6a6e4efb97047a90851d211442dc14f93a01ce0431d2ab1c1d2c8b90b2aefa10
-  data.tar.gz: 0351277a39c10948b2b52210f7a221509d286c07b5c4176acf6be29e2249f9f439efbacd1a2e3a44b1663890b627448bc9f675b3a1dc1355f2ac1e19b06ab25e
+  metadata.gz: 2ec90aa14e010e2a7c1a131e163438458127bee37774bca20d515773b19cc4d4f1e1a528907e2fbdaf77861838d25e7af7bb971b68a8dc6e8fa41e001bb9a961
+  data.tar.gz: c88b3aff8e5572ab0f463b4a541aabb0610a5ddd100bd9349f338638b207913e4c56a199e9f8ec4966d96745b78be67bccfd81256db6e40494eb11c0d6923eb0

data/glare.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.7'
 
   spec.add_dependency 'public_suffix', '>= 3.0.2', '< 5.0'
-  spec.add_dependency 'httpclient', '>= 2.8.3', '< 3.0'
+  spec.add_dependency 'faraday', '>= 0.16.0'
+  spec.add_dependency 'faraday_middleware', '>= 0.13.0'
 end

data/lib/glare/api_response.rb

@@ -22,7 +22,7 @@ module Glare
     end
 
     def content
-      @response.content
+      @response.body
     end
 
     def errors

data/lib/glare/client.rb

@@ -1,13 +1,21 @@
-require 'jsonclient'
+require 'faraday'
+require 'faraday_middleware'
+require 'logger'
 require 'glare/api_response'
 
 module Glare
   class Client
-    BASE_URL = 'https://api.cloudflare.com/client/v4'.freeze
+    BASE_HOST = 'https://api.cloudflare.com'
+    BASE_PATH = '/client/v4'.freeze
 
     def initialize
-      @http = JSONClient.new
-      @http.debug_dev = STDERR if ENV['CF_DEBUG']
+      @http = Faraday::Connection.new(BASE_HOST) do |builder|
+        builder.request  :json
+        builder.response :logger, Logger.new(STDERR) if ENV['CF_DEBUG']
+        builder.response :json, :content_type => /\bjson$/
+
+        builder.adapter  :net_http
+      end
     end
 
     def from_global_api_key(email, auth_key)
@@ -26,19 +34,19 @@ module Glare
     end
 
     def get(query, params)
-      ApiResponse.new(@http.get(BASE_URL + query, params, @headers)).valid!
+      ApiResponse.new(@http.get(BASE_HOST + BASE_PATH + query, params, @headers)).valid!
     end
 
     def post(query, data)
-      ApiResponse.new(@http.post(BASE_URL + query, data, @headers)).valid!
+      ApiResponse.new(@http.post(BASE_HOST + BASE_PATH + query, data, @headers)).valid!
     end
 
     def put(query, data)
-      ApiResponse.new(@http.put(BASE_URL + query, data, @headers)).valid!
+      ApiResponse.new(@http.put(BASE_HOST + BASE_PATH + query, data, @headers)).valid!
     end
 
     def delete(query, params=nil)
-      ApiResponse.new(@http.delete(BASE_URL + query, params, @headers)).valid!
+      ApiResponse.new(@http.delete(BASE_HOST + BASE_PATH + query, params, @headers)).valid!
     end
   end
 end

data/lib/glare/version.rb

@@ -1,3 +1,3 @@
 module Glare
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/spec/spec_helper.rb

@@ -99,5 +99,5 @@ end
 def load_fixture(fixture)
   fixture_dir = File.expand_path(File.join(File.dirname(__FILE__), 'fixtures'))
   json = IO.read(File.join(fixture_dir, "#{fixture}.json"))
-  ::HTTP::Message.new_response(JSON.parse(json))
+  Faraday::Response.new(body: JSON.parse(json))
 end

data/spec/units/api_response_spec.rb

@@ -1,5 +1,4 @@
 require 'glare/api_response'
-require 'httpclient/http'
 
 RSpec.describe Glare::ApiResponse do
   let(:error_response) { load_fixture('error_response') }

data/spec/units/glare_spec.rb

@@ -8,13 +8,17 @@ RSpec.describe Glare do
   around do |example|
     previous_cf_email = ENV['CF_EMAIL']
     previous_cf_auth_key = ENV['CF_AUTH_KEY']
+    previous_cf_api_token = ENV['CF_API_TOKEN']
+
     ENV['CF_EMAIL'] = 'an_email'
     ENV['CF_AUTH_KEY'] = 'an_auth_key'
+    ENV.delete('CF_API_TOKEN')
 
     example.run
 
     ENV['CF_EMAIL'] = previous_cf_email
     ENV['CF_AUTH_KEY'] = previous_cf_auth_key
+    ENV['CF_API_TOKEN'] = previous_cf_api_token
   end
 
   let(:client) { spy(Glare::Client) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glare
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Jose Luis Salas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2020-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -74,25 +74,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.8.3
-    - - "<"
+        version: 0.16.0
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 0.13.0
 description: 
 email:
 - josacar@users.noreply.github.com
@@ -153,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: API client for CloudFlare v4 API