glare 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9b063e4c69c21566a74862a623247fd9385cf31d7e24742e5970c9ab50cfed
-  data.tar.gz: 121de9045bf2d3d05bad31ae5ffee1501e4e6c7b7f65726bba34ae7ab22e7add
+  metadata.gz: e226cb39d95b10c480df7d010890467f8f65af0d2640f80dc05bb9fe0cc38dd6
+  data.tar.gz: 80ffd27027901623f5ff3b79989d5f89bb8bd6c354889bc48fc037d41dfc9484
 SHA512:
-  metadata.gz: 2ec90aa14e010e2a7c1a131e163438458127bee37774bca20d515773b19cc4d4f1e1a528907e2fbdaf77861838d25e7af7bb971b68a8dc6e8fa41e001bb9a961
-  data.tar.gz: c88b3aff8e5572ab0f463b4a541aabb0610a5ddd100bd9349f338638b207913e4c56a199e9f8ec4966d96745b78be67bccfd81256db6e40494eb11c0d6923eb0
+  metadata.gz: a5610704ad3c8db6f575a98e491b94b5333c98113153fbd1ff54b0c1e6280bbc931330b8795c7a3297beda1793ee31c8de08e0092dd1a5adce5a81e65f13046c
+  data.tar.gz: 05bd9c85b68b445d88dba8610ae3b14c8587f2db31bf9f3453e334da50b2717f769d88f3cd6d27cb2c4abd1025607c737570b0a58e4decf1c235a37558deee49

data/.gitignore

@@ -10,3 +10,4 @@
 .envrc
 /spec/examples.txt
 /.ruby-version
+/vendor

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec

data/glare.gemspec

@@ -1,5 +1,7 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'glare/version'
 
@@ -25,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 12.3'
   spec.add_development_dependency 'rspec', '~> 3.7'
 
+  spec.add_dependency 'faraday', '~> 1.0'
+  spec.add_dependency 'faraday_middleware', '>= 1.0.0.rc1'
   spec.add_dependency 'public_suffix', '>= 3.0.2', '< 5.0'
-  spec.add_dependency 'faraday', '>= 0.16.0'
-  spec.add_dependency 'faraday_middleware', '>= 0.13.0'
 end

data/lib/glare.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'public_suffix'
 require 'glare/version'
 require 'glare/credentials'
@@ -7,39 +9,49 @@ require 'glare/api_response'
 require 'glare/dns_record'
 require 'glare/cf_dns_records'
 require 'glare/errors'
+require 'forwardable'
 
 module Glare
   class << self
+    extend Forwardable
+
+    def_delegators :new, :register, :resolve, :deregister, :proxied?, :records
+
+    def new
+      Instance.new
+    end
+  end
+
+  class Instance
+    def initialize
+      @client = Domain.new(build_client)
+    end
+
     def register(fqdn, destination, type, proxied: false, ttl: 1)
-      client = build_client
-      Domain.new(client).register(fqdn, destination, type, proxied: proxied, ttl: ttl)
+      @client.register(fqdn, destination, type, proxied: proxied, ttl: ttl)
     end
 
     def resolve(fqdn, type)
-      client = build_client
-      Domain.new(client).resolve(fqdn, type)
+      @client.resolve(fqdn, type)
     end
 
     def deregister(fqdn, type)
-      client = build_client
-      Domain.new(client).deregister(fqdn, type)
+      @client.deregister(fqdn, type)
     end
 
     def proxied?(fqdn, type)
-      client = build_client
-      Domain.new(client).proxied?(fqdn, type)
+      @client.proxied?(fqdn, type)
     end
 
     def records(fqdn, type)
-      client = build_client
-      Domain.new(client).records(fqdn, type)
+      @client.records(fqdn, type)
     end
 
     private
 
-    CF_EMAIL = 'CF_EMAIL'.freeze
-    CF_AUTH_KEY = 'CF_AUTH_KEY'.freeze
-    CF_API_TOKEN = 'CF_API_TOKEN'.freeze
+    CF_EMAIL = 'CF_EMAIL'
+    CF_AUTH_KEY = 'CF_AUTH_KEY'
+    CF_API_TOKEN = 'CF_API_TOKEN'
 
     def default_credentials
       email = ENV.fetch(CF_EMAIL)

data/lib/glare/api_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare/errors'
 
 module Glare
@@ -12,6 +14,7 @@ module Glare
 
     def valid!
       raise Glare::Errors::ApiError.new(errors) unless success?
+
       self
     end
 

data/lib/glare/cf_dns_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Glare
   class CfDnsRecord
     def initialize(id:, name:, type:, content:, proxied: false, ttl:)
@@ -9,12 +11,12 @@ module Glare
       @ttl = ttl
     end
 
-    def ==(cf_dns_record)
-      @type == cf_dns_record.type &&
-        @name == cf_dns_record.name &&
-        @content == cf_dns_record.content &&
-        @proxied == cf_dns_record.proxied &&
-        @ttl == cf_dns_record.ttl
+    def ==(other)
+      @type == other.type &&
+        @name == other.name &&
+        @content == other.content &&
+        @proxied == other.proxied &&
+        @ttl == other.ttl
     end
 
     def to_h

data/lib/glare/cf_dns_records.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare/cf_dns_record'
 require 'glare/cf_dns_records/updater'
 

data/lib/glare/cf_dns_records/updater.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Glare
   class CfDnsRecords
     class Updater
@@ -33,9 +35,9 @@ module Glare
           @action = action
         end
 
-        def ==(operation)
-          @record == operation.record &&
-            @action == operation.action
+        def ==(other)
+          @record == other.record &&
+            @action == other.action
         end
 
         attr_reader :action, :record

data/lib/glare/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'faraday'
 require 'faraday_middleware'
 require 'logger'
@@ -6,15 +8,15 @@ require 'glare/api_response'
 module Glare
   class Client
     BASE_HOST = 'https://api.cloudflare.com'
-    BASE_PATH = '/client/v4'.freeze
+    BASE_PATH = '/client/v4'
 
     def initialize
       @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.response :json, content_type: /\bjson$/
 
-        builder.adapter  :net_http
+        builder.adapter :net_http
       end
     end
 

data/lib/glare/credentials.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Glare
   class Credentials
     def initialize(email, auth_key)

data/lib/glare/dns_record.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Glare
   class DnsRecord
-    def initialize(name:, type:, content:, proxied:, ttl: )
+    def initialize(name:, type:, content:, proxied:, ttl:)
       @name = name
       @type = type
       @content = content
@@ -18,12 +20,12 @@ module Glare
       }
     end
 
-    def ==(dns_record)
-      @type == dns_record.type &&
-        @name == dns_record.name &&
-        @content == dns_record.content &&
-        @proxied == dns_record.proxied &&
-        @ttl == dns_record.ttl
+    def ==(other)
+      @type == other.type &&
+        @name == other.name &&
+        @content == other.content &&
+        @proxied == other.proxied &&
+        @ttl == other.ttl
     end
 
     attr_reader :content, :type, :name, :proxied, :ttl

data/lib/glare/domain.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare/domain/zone'
 require 'glare/domain/record'
 

data/lib/glare/domain/cf_zones.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare/domain/cf_zones'
 require 'glare/errors'
 
@@ -23,6 +25,7 @@ module Glare
 
       def first_id
         raise ::Glare::Errors::NotExistingZoneError.new if @zones.empty?
+
         @zones.first.id
       end
     end

data/lib/glare/domain/record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Glare
   class Domain
     class Record

data/lib/glare/domain/zone.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare/domain/cf_zones'
 
 module Glare
@@ -15,6 +17,7 @@ module Glare
 
       def id
         return @id if @id
+
         zone_search = @client.get('/zones', name: registered_domain)
         @id = CfZones.from_result(zone_search).first_id
       end

data/lib/glare/errors.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Glare
   module Errors
     class NotExistingZoneError < StandardError; end

data/lib/glare/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Glare
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.2.0'
 end

data/spec/delete_domain_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare'
 
 RSpec.describe 'delete domain', integration: true do

data/spec/proxied_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare'
 
 RSpec.describe 'retrieves proxied values', integration: true do

data/spec/resolve_domain_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare'
 
 RSpec.describe 'Resolve domain', integration: true do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'coveralls'
 Coveralls.wear!
 

data/spec/ttl_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare'
 
 RSpec.describe 'retrieves proxied values', integration: true do
@@ -12,8 +14,8 @@ RSpec.describe 'retrieves proxied values', integration: true do
       let(:destination) { ['1.2.3.4', '5.6.7.8'] }
 
       it 'sets custom ttl' do
-         records_with_correct_ttl = records(domain).all? { |r| r.ttl == 300 }
-         expect(records_with_correct_ttl).to eq(true)
+        records_with_correct_ttl = records(domain).all? { |r| r.ttl == 300 }
+        expect(records_with_correct_ttl).to eq(true)
       end
     end
   end

data/spec/units/api_response_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare/api_response'
 
 RSpec.describe Glare::ApiResponse do

data/spec/units/glare_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare'
 
 RSpec.describe Glare do
@@ -116,7 +118,8 @@ RSpec.describe Glare do
         name: 'not-exist.example.com', type: 'CNAME'
       ).and_return(empty_result)
 
-      Glare.register('not-exist.example.com', ['a_destination', 'another_destination'].shuffle, 'CNAME', proxied: true, ttl: 1)
+      destinations = %w[a_destination another_destination].shuffle
+      Glare.register('not-exist.example.com', destinations, 'CNAME', proxied: true, ttl: 1)
 
       expect(client).not_to have_received(:put).
         with('/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records', any_args)

data/spec/units/operations_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'glare/cf_dns_records'
 require 'glare/domain/record'
 require 'glare/dns_record'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glare
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Jose Luis Salas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -54,53 +54,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.7'
 - !ruby/object:Gem::Dependency
-  name: public_suffix
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.2
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 1.0.0.rc1
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.0
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 description: 
 email:
 - josacar@users.noreply.github.com
@@ -161,21 +161,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: API client for CloudFlare v4 API
 test_files:
-- spec/delete_domain_spec.rb
+- spec/units/operations_spec.rb
+- spec/units/api_response_spec.rb
+- spec/units/glare_spec.rb
+- spec/resolve_domain_spec.rb
 - spec/spec_helper.rb
-- spec/ttl_spec.rb
 - spec/proxied_spec.rb
-- spec/resolve_domain_spec.rb
-- spec/units/glare_spec.rb
-- spec/units/api_response_spec.rb
-- spec/units/operations_spec.rb
+- spec/delete_domain_spec.rb
+- spec/ttl_spec.rb
 - spec/fixtures/wadus_records_reverse_order.json
-- spec/fixtures/error_response.json
 - spec/fixtures/wadus_records.json
-- spec/fixtures/list_zone.json
 - spec/fixtures/empty_result.json
+- spec/fixtures/error_response.json
+- spec/fixtures/list_zone.json