glare 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4a589da3c254fdca06a73b781d66118653269f3
-  data.tar.gz: 9e05730f1f912cf502fb2aad6583256a5005038f
+  metadata.gz: e8578b25f97445a55d9f6c54dbdf8c5dc261fac5
+  data.tar.gz: eac8475ba924ae0aaaefccfa4cd356fe654be477
 SHA512:
-  metadata.gz: 9aa057266e6b79ff0f91f231f07a2d09a8d1afa1017ebcd1103e23dec2be426d34611a4b3aea84e7a86ce302709d67b2ddd499333207dfb91008423eba642ab9
-  data.tar.gz: cec20af8b032913a2a0c80ef65665b21b79c4c67900061132b3a6e1875d40064ce19eeeca4874d7ed3f64b3a0112885182bd1a6c760ccbe0aa2c55205219ac47
+  metadata.gz: 915652c5f9414bc54ecd1ed031973c3c8466bbf5412f1806a312171057f4e1e3c22ab4c4ce2fdee48bcaa4e42fd40d432f611c760d9274bf27970069ee36f378
+  data.tar.gz: 322574e10153826cf4442a4f8946986439ddc1ac2c4b2d888f35452255c49f4147c24457b69e3b29d30949aee1943b519e9fa82be69220219859bda523c8f8e2

data/.gitignore

@@ -9,4 +9,3 @@
 /tmp/
 .envrc
 /spec/examples.txt
-/.ruby-version

data/lib/glare.rb

@@ -6,7 +6,6 @@ require 'glare/domain'
 require 'glare/api_response'
 require 'glare/dns_record'
 require 'glare/cf_dns_records'
-require 'glare/errors'
 
 module Glare
   class << self

data/lib/glare/api_response.rb

@@ -1,5 +1,3 @@
-require 'glare/errors'
-
 module Glare
   class ApiResponse
     def initialize(response)
@@ -10,23 +8,11 @@ module Glare
       content['result']
     end
 
-    def valid!
-      raise Glare::Errors::ApiError.new(errors) unless success?
-      self
-    end
-
     private
 
-    def success?
-      content['success']
-    end
-
     def content
       @response.content
     end
-
-    def errors
-      content['errors'].map { |e| e['message'] }.join(',')
-    end
   end
+  private_constant :ApiResponse
 end

data/lib/glare/cf_dns_records.rb

@@ -11,8 +11,9 @@ module Glare
 
   class CfDnsRecords
     class << self
-      def from_result(api_response)
-        result = api_response.result
+      def from_result(api_result)
+        response = ApiResponse.new(api_result)
+        result = response.result
 
         records = result.map do |item|
           CfDnsRecord.new(
@@ -36,16 +37,9 @@ module Glare
     end
 
     def to_update(desired_records)
-      records_to_update = @records - desired_records
-      records_to_update.first(desired_records.count)
-    end
-
-    def -(records)
-      @records.reject { |record| records.any? { |r| r.content == record.content } }
-    end
-
-    def to_a
-      @records.dup
+      @records.reject do |record|
+        desired_records.any? { |r| r.content == record.content }
+      end
     end
 
     def count

data/lib/glare/client.rb

@@ -1,5 +1,4 @@
 require 'jsonclient'
-require 'glare/api_response'
 
 module Glare
   class Client
@@ -15,19 +14,19 @@ module Glare
     end
 
     def get(query, params)
-      ApiResponse.new(@http.get(BASE_URL + query, params, @headers)).valid!
+      @http.get(BASE_URL + query, params, @headers)
     end
 
     def post(query, data)
-      ApiResponse.new(@http.post(BASE_URL + query, data, @headers)).valid!
+      @http.post(BASE_URL + query, data, @headers)
     end
 
     def put(query, data)
-      ApiResponse.new(@http.put(BASE_URL + query, data, @headers)).valid!
+      @http.put(BASE_URL + query, data, @headers)
     end
 
     def delete(query, params=nil)
-      ApiResponse.new(@http.delete(BASE_URL + query, params, @headers)).valid!
+      @http.delete(BASE_URL + query, params, @headers)
     end
   end
 end

data/lib/glare/domain/cf_zones.rb

@@ -1,11 +1,11 @@
 require 'glare/domain/cf_zones'
-require 'glare/errors'
 
 module Glare
   class Domain
     class CfZones
       def self.from_result(api_response)
-        result = api_response.result
+        response = ApiResponse.new(api_response)
+        result = response.result
 
         zones = result.map do |item|
           CfZone.new(
@@ -21,9 +21,8 @@ module Glare
         @zones = zones
       end
 
-      def first_id
-        raise ::Glare::Errors::NotExistingZoneError.new if @zones.empty?
-        @zones.first.id
+      def first
+        @zones.first
       end
     end
 

data/lib/glare/domain/record.rb

@@ -26,14 +26,14 @@ module Glare
         end
 
         def update(zone_id, dns_records, existing_records)
-          delete_uneeded_records(zone_id, dns_records, existing_records)
           update_current_records(zone_id, dns_records, existing_records)
+          delete_uneeded_records(zone_id, dns_records, existing_records)
           create_new_records(zone_id, dns_records, existing_records)
         end
 
-        def update_current_records(zone_id, new_records, existing_records)
-          records_to_update = existing_records.to_update(new_records)
-          updates = records_to_update.zip(new_records - existing_records.to_a)
+        def update_current_records(zone_id, dns_records, existing_records)
+          records_to_update = existing_records.to_update(dns_records)
+          updates = records_to_update.zip(dns_records)
           updates.each do |existing_record, dns_record|
             @client.put("/zones/#{zone_id}/dns_records/#{existing_record.id}", dns_record.to_h)
           end

data/lib/glare/domain/zone.rb

@@ -16,7 +16,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
+        @id = CfZones.from_result(zone_search).first.id
       end
 
       private

data/lib/glare/version.rb

@@ -1,3 +1,3 @@
 module Glare
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.3.0'.freeze
 end

data/spec/resolve_domain_spec.rb

@@ -5,25 +5,12 @@ RSpec.describe 'Resolve domain' do
     let(:domain) { 'cname.flywire.cc' }
     let(:destination) { ['peertransfer.me'] }
     let(:type) { 'CNAME' }
-
-    it 'resolves to right destination' do
-      register_domain(domain, destination)
-
-      expect(resolve(domain)).to eq(destination)
-    end
-
-    it 'raises an exception if domain does not exist in account' do
+    before do
       register_domain(domain, destination)
-
-      expect do
-        resolve('error.ojete.cc')
-      end.to raise_error(Glare::Errors::NotExistingZoneError)
     end
 
-    it 'raises an exception if api returns error' do
-      expect do
-        register_domain('error.flywire.cc', '1.1.1.1')
-      end.to raise_error(Glare::Errors::ApiError)
+    it 'resolves to right destination' do
+      expect(resolve(domain)).to eq(destination)
     end
   end
 

data/spec/spec_helper.rb

@@ -95,9 +95,3 @@ RSpec.configure do |config|
   # as the one that triggered the failure.
   Kernel.srand config.seed
 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))
-end

data/spec/units/glare_spec.rb

@@ -8,9 +8,9 @@ RSpec.describe Glare do
     allow(Glare::Client).to receive(:new).and_return(client)
   end
   let(:client) { spy(Glare::Client) }
-  let(:zone_list) { Glare::ApiResponse.new(load_fixture('list_zone')) }
-  let(:empty_result) { Glare::ApiResponse.new(load_fixture('empty_result')) }
-  let(:wadus_records) { Glare::ApiResponse.new(load_fixture('wadus_records')) }
+  let(:zone_list) { load_fixture('list_zone') }
+  let(:empty_result) { load_fixture('empty_result') }
+  let(:wadus_records) { load_fixture('wadus_records') }
 
   describe '.resolve' do
     it 'resolves a fqdn' do
@@ -220,4 +220,10 @@ RSpec.describe Glare do
       )
     end
   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))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glare
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Jose Luis Salas
@@ -105,16 +105,13 @@ files:
 - lib/glare/domain/cf_zones.rb
 - lib/glare/domain/record.rb
 - lib/glare/domain/zone.rb
-- lib/glare/errors.rb
 - lib/glare/version.rb
 - spec/delete_domain_spec.rb
 - spec/fixtures/empty_result.json
-- spec/fixtures/error_response.json
 - spec/fixtures/list_zone.json
 - spec/fixtures/wadus_records.json
 - spec/resolve_domain_spec.rb
 - spec/spec_helper.rb
-- spec/units/api_response_spec.rb
 - spec/units/glare_spec.rb
 homepage: https://github.com/peertransfer/glare
 licenses:
@@ -141,7 +138,6 @@ signing_key:
 specification_version: 4
 summary: API client for CloudFlare v4 API
 test_files:
-- spec/units/api_response_spec.rb
 - spec/units/glare_spec.rb
 - spec/delete_domain_spec.rb
 - spec/resolve_domain_spec.rb
@@ -149,4 +145,3 @@ test_files:
 - spec/fixtures/wadus_records.json
 - spec/fixtures/empty_result.json
 - spec/fixtures/list_zone.json
-- spec/fixtures/error_response.json

data/lib/glare/errors.rb

@@ -1,6 +0,0 @@
-module Glare
-  module Errors
-    class NotExistingZoneError < StandardError; end
-    class ApiError < StandardError; end
-  end
-end

data/spec/fixtures/error_response.json

@@ -1,17 +0,0 @@
-{
-  "errors": [
-    {
-      "code": 1004,
-      "error_chain": [
-        {
-          "code": 9007,
-          "message": "Content for CNAME record is invalid"
-        }
-      ],
-      "message": "DNS Validation Error"
-    }
-  ],
-  "messages": [],
-  "result": null,
-  "success": false
-}

data/spec/units/api_response_spec.rb

@@ -1,30 +0,0 @@
-require 'glare/api_response'
-require 'httpclient/http'
-
-RSpec.describe Glare::ApiResponse do
-  let(:error_response) { load_fixture('error_response') }
-  let(:empty_response) { load_fixture('empty_result') }
-
-  context 'when api returns success response' do
-    it 'returns api reponse' do
-      expect do
-        Glare::ApiResponse.new(empty_response).valid!
-      end.not_to raise_error
-    end
-  end
-
-  context 'when api returns error response' do
-    it 'raises an exception if api result is not success' do
-      expect do
-        Glare::ApiResponse.new(error_response).valid!
-      end.to raise_error(Glare::Errors::ApiError)
-    end
-
-    it 'shows error messages' do
-      expect do
-        Glare::ApiResponse.new(error_response).valid!
-      end.to raise_error(Glare::Errors::ApiError).
-        with_message('DNS Validation Error')
-    end
-  end
-end