glare 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5f191a543603fccd5d3f0b0c8de96a5f91cd657
-  data.tar.gz: 25c831074962b9946ccde5958252820987120087
+  metadata.gz: 7176b88b94cbb8eb1635f374010d3781c9abcb92
+  data.tar.gz: 23dfafaf1b6c0fd137615c3bf6671a43f9c28ec9
 SHA512:
-  metadata.gz: 505288e7e9ec1ea1ab83d81034962e7eeb77b29ecf29a6c681448da5a806a483287b3f4c0e7ebe4246a31b9c781493fe48957254d7f4f2001d89d527d5636519
-  data.tar.gz: 053d5b8a1b9a195eae1ccc02c99879f084e54b3351b00c50e5ab966b561a8d59c2c46ed1417120b5e41cbddee3e8d6f376bf499ed0bf5ae42e1bc64b5742d311
+  metadata.gz: b48e09275b67e1246760bec68ec00a55e0ee59034bc6a09501e814c792ee532321170a3fdbda25d16c41c139f0802c1d6e537fe20fdf85259f63a1549fcdc5b7
+  data.tar.gz: 93b4c521285065f59d378dd0cc6713ba65ed3b724895097975a464b51b83c2e35aa5448a11d1f748f36500daff52c8e7161a9075837e29bb4356c185aa761bbc

data/.gitignore

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

data/lib/glare.rb

@@ -6,6 +6,7 @@ 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

@@ -8,11 +8,19 @@ module Glare
       content['result']
     end
 
+    def valid!
+      raise Glare::Errors::ApiError unless success?
+      self
+    end
+
     private
 
+    def success?
+      content['success']
+    end
+
     def content
       @response.content
     end
   end
-  private_constant :ApiResponse
 end

data/lib/glare/cf_dns_records.rb

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

data/lib/glare/client.rb

@@ -1,4 +1,5 @@
 require 'jsonclient'
+require 'glare/api_response'
 
 module Glare
   class Client
@@ -14,19 +15,19 @@ module Glare
     end
 
     def get(query, params)
-      @http.get(BASE_URL + query, params, @headers)
+      ApiResponse.new(@http.get(BASE_URL + query, params, @headers)).valid!
     end
 
     def post(query, data)
-      @http.post(BASE_URL + query, data, @headers)
+      ApiResponse.new(@http.post(BASE_URL + query, data, @headers)).valid!
     end
 
     def put(query, data)
-      @http.put(BASE_URL + query, data, @headers)
+      ApiResponse.new(@http.put(BASE_URL + query, data, @headers)).valid!
     end
 
     def delete(query, params=nil)
-      @http.delete(BASE_URL + query, params, @headers)
+      ApiResponse.new(@http.delete(BASE_URL + query, params, @headers)).valid!
     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)
-        response = ApiResponse.new(api_response)
-        result = response.result
+        result = api_response.result
 
         zones = result.map do |item|
           CfZone.new(
@@ -21,8 +21,9 @@ module Glare
         @zones = zones
       end
 
-      def first
-        @zones.first
+      def first_id
+        raise ::Glare::Errors::NotExistingZoneError.new if @zones.empty?
+        @zones.first.id
       end
     end
 

data/lib/glare/domain/record.rb

@@ -26,8 +26,8 @@ module Glare
         end
 
         def update(zone_id, dns_records, existing_records)
-          update_current_records(zone_id, dns_records, existing_records)
           delete_uneeded_records(zone_id, dns_records, existing_records)
+          update_current_records(zone_id, dns_records, existing_records)
           create_new_records(zone_id, dns_records, existing_records)
         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/errors.rb

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

data/lib/glare/version.rb

@@ -1,3 +1,3 @@
 module Glare
-  VERSION = '0.1.2'.freeze
+  VERSION = '0.2.0'.freeze
 end

data/spec/resolve_domain_spec.rb

@@ -5,13 +5,26 @@ RSpec.describe 'Resolve domain' do
     let(:domain) { 'cname.flywire.cc' }
     let(:destination) { ['peertransfer.me'] }
     let(:type) { 'CNAME' }
-    before do
-      register_domain(domain, destination)
-    end
 
     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
+      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)
+    end
   end
 
   context 'when a domain contains more than one destination' do

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) { load_fixture('list_zone') }
-  let(:empty_result) { load_fixture('empty_result') }
-  let(:wadus_records) { load_fixture('wadus_records') }
+  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')) }
 
   describe '.resolve' do
     it 'resolves a fqdn' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glare
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Jose Luis Salas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,6 +105,7 @@ 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
@@ -133,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: API client for CloudFlare v4 API