glare 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e8578b25f97445a55d9f6c54dbdf8c5dc261fac5
-  data.tar.gz: eac8475ba924ae0aaaefccfa4cd356fe654be477
+  metadata.gz: a704d9f5af8df8ee5a03f7e2c73ecdcca75eabc2
+  data.tar.gz: a4e53971ad770c1239f06bddb568b366e4cfb736
 SHA512:
-  metadata.gz: 915652c5f9414bc54ecd1ed031973c3c8466bbf5412f1806a312171057f4e1e3c22ab4c4ce2fdee48bcaa4e42fd40d432f611c760d9274bf27970069ee36f378
-  data.tar.gz: 322574e10153826cf4442a4f8946986439ddc1ac2c4b2d888f35452255c49f4147c24457b69e3b29d30949aee1943b519e9fa82be69220219859bda523c8f8e2
+  metadata.gz: d69f25042bf3de9da4028ba361ad1ab7deaf82f651c1bbf671c59d71fb8931cc831d73bb3f55b3f580ad08d9db58969e408bfcda2d41065160fee1d64d495d04
+  data.tar.gz: eae5c856c6dd64a9f4ae4e7e21f0fdea8aa082beff6a4baf73d7036c2338780353f42ccb27767fc82696a4fc69f2051fff523b4fc4aaab5425186ac55a24050d

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

@@ -1,3 +1,5 @@
+require 'glare/errors'
+
 module Glare
   class ApiResponse
     def initialize(response)
@@ -8,11 +10,23 @@ 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_record.rb

@@ -0,0 +1,29 @@
+module Glare
+  class CfDnsRecord
+    include Comparable
+
+    def initialize(id:, name:, type:, content:)
+      @id = id
+      @name = name
+      @type = type
+      @content = content
+    end
+
+    def <=>(cf_dns_record)
+      @type <=> cf_dns_record.type &&
+        @name <=> cf_dns_record.name &&
+        @content <=> cf_dns_record.content
+    end
+
+    def to_h
+      {
+        type: @type,
+        name: @name,
+        content: @content
+      }
+    end
+
+    attr_reader :id, :name, :type
+    attr_accessor :content
+  end
+end

data/lib/glare/cf_dns_records.rb

@@ -1,19 +1,11 @@
-module Glare
-  class CfDnsRecord
-    def initialize(id:, name:, type:, content:)
-      @id = id
-      @name = name
-      @type = type
-      @content = content
-    end
-    attr_reader :id, :name, :type, :content
-  end
+require 'glare/cf_dns_record'
+require 'glare/cf_dns_records/updater'
 
+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(
@@ -36,14 +28,12 @@ module Glare
       @records = records
     end
 
-    def to_update(desired_records)
-      @records.reject do |record|
-        desired_records.any? { |r| r.content == record.content }
-      end
+    def calculate(desired_records)
+      Updater.new(@records.dup, desired_records.dup).calculate
     end
 
-    def count
-      @records.count
+    def dup
+      CfDnsRecords.new(@records.dup)
     end
 
     def contents
@@ -54,15 +44,16 @@ module Glare
       @records.each { |record| yield(record) }
     end
 
-    def to_delete(target_number)
-      records_to_delete = count - target_number
-      return CfDnsRecords.empty if records_to_delete < 0
+    def map
+      @records.map { |record| yield(record) }
+    end
 
-      @records.last(records_to_delete)
+    def any?
+      @records.any? { |record| yield(record) }
     end
 
-    def to_create(desired_records)
-      desired_records.drop(count)
+    def delete_if
+      @records.delete_if { |record| yield(record) }
     end
   end
 end

data/lib/glare/cf_dns_records/updater.rb

@@ -0,0 +1,107 @@
+module Glare
+  class CfDnsRecords
+    class Updater
+      class Operations
+        def initialize
+          @updates = []
+          @insertions = []
+          @deletions = []
+          @count = 0
+        end
+
+        attr_reader :updates, :insertions, :deletions, :count
+
+        def add_updates(updates)
+          @count += updates.count
+          @updates += updates
+        end
+
+        def add_insertions(insertions)
+          @count += insertions.count
+          @insertions += insertions
+        end
+
+        def add_deletions(deletions)
+          @count += deletions.count
+          @deletions += deletions
+        end
+      end
+
+      class Operation
+        include Comparable
+
+        def initialize(record, action)
+          @record = record.dup
+          @action = action
+        end
+
+        def <=>(operation)
+          @record <=> operation.record &&
+            @action <=> operation.action
+        end
+
+        attr_reader :action, :record
+      end
+
+      def initialize(current_records, new_contents)
+        @current_records = current_records.dup
+        @new_contents = new_contents.dup
+      end
+
+      def calculate
+        drop_same_records
+
+        operations = Operations.new
+        operations.add_updates(updated_records)
+        operations.add_insertions(new_records)
+        operations.add_deletions(deleted_records)
+
+        operations
+      end
+
+      private
+
+      def drop_same_records
+        new_contents =  @new_contents.dup
+        current_records = @current_records.dup
+
+        @new_contents.delete_if do |new_content|
+          current_records.any? { |x| x == new_content }
+        end
+
+        @current_records.delete_if do |current_record|
+          new_contents.any? { |x| x == current_record }
+        end
+      end
+
+      def updated_records
+        operations = []
+
+        @current_records.delete_if do |record|
+          if new_record = @new_contents.shift
+            final_record = record.dup
+            final_record.content = new_record.content
+            operations << Operation.new(final_record, :update)
+            true
+          else
+            false
+          end
+        end
+
+        operations
+      end
+
+      def new_records
+        @new_contents.map do |new_record|
+          Operation.new(new_record, :add)
+        end
+      end
+
+      def deleted_records
+        @current_records.map do |record|
+          Operation.new(record, :delete)
+        end
+      end
+    end
+  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/dns_record.rb

@@ -1,5 +1,7 @@
 module Glare
   class DnsRecord
+    include Comparable
+
     def initialize(name:, type:, content:)
       @name = name
       @type = type
@@ -13,7 +15,13 @@ module Glare
         content: @content
       }
     end
-    attr_reader :content, :type
+
+    def <=>(dns_record)
+      @type <=> dns_record.type &&
+        @name <=> dns_record.name &&
+        @content <=> dns_record.content
+    end
+
+    attr_reader :content, :type, :name
   end
-  private_constant :DnsRecord
 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,34 +26,27 @@ 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)
-          create_new_records(zone_id, dns_records, existing_records)
+          operations = existing_records.calculate(dns_records)
+          update_current_records(zone_id, operations.updates)
+          delete_uneeded_records(zone_id, operations.deletions)
+          create_new_records(zone_id, operations.insertions)
         end
 
-        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)
+        def update_current_records(zone_id, updates)
+          updates.each do |update|
+            @client.put("/zones/#{zone_id}/dns_records/#{update.record.id}", update.record.to_h)
           end
         end
 
-        def delete_uneeded_records(zone_id, dns_records, existing_records)
-          records_to_delete = existing_records.to_delete(dns_records.count)
-          records_to_delete.each do |record|
-            @client.delete("/zones/#{zone_id}/dns_records/#{record.id}")
+        def delete_uneeded_records(zone_id, deletions)
+          deletions.each do |deletion|
+            @client.delete("/zones/#{zone_id}/dns_records/#{deletion.record.id}")
           end
         end
 
-        def create_new_records(zone_id, dns_records, existing_records)
-          records_to_create = existing_records.to_create(dns_records)
-          create(zone_id, records_to_create)
-        end
-
-        def create(zone_id, dns_records)
-          dns_records.each do |dns_record|
-            @client.post("/zones/#{zone_id}/dns_records", dns_record.to_h)
+        def create_new_records(zone_id, insertions)
+          insertions.each do |insertion|
+            @client.post("/zones/#{zone_id}/dns_records", insertion.record.to_h)
           end
         end
       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.3.0'.freeze
+  VERSION = '0.4.0'.freeze
 end

data/spec/fixtures/error_response.json

@@ -0,0 +1,17 @@
+{
+  "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/fixtures/wadus_records_reverse_order.json

@@ -0,0 +1,48 @@
+{
+  "errors": [],
+  "messages": [],
+  "result": [
+    {
+      "content": "another_destination.com",
+      "created_on": "2016-05-12T11:53:49.233342Z",
+      "id": "b3142498230989gsd0f88h80998908fc",
+      "locked": false,
+      "meta": {
+        "auto_added": false
+      },
+      "modified_on": "2016-05-12T11:53:49.233342Z",
+      "name": "wadus.example.com",
+      "proxiable": true,
+      "proxied": false,
+      "ttl": 1,
+      "type": "CNAME",
+      "zone_id": "9de4eb694c380d79845d35cd939cc7a7",
+      "zone_name": "example.com"
+    },
+    {
+      "content": "destination.com",
+      "created_on": "2016-05-12T11:53:49.233342Z",
+      "id": "a1f984afe5544840505494298f54c33e",
+      "locked": false,
+      "meta": {
+        "auto_added": false
+      },
+      "modified_on": "2016-05-12T11:53:49.233342Z",
+      "name": "wadus.example.com",
+      "proxiable": true,
+      "proxied": false,
+      "ttl": 1,
+      "type": "CNAME",
+      "zone_id": "9de4eb694c380d79845d35cd939cc7a7",
+      "zone_name": "example.com"
+    }
+  ],
+  "result_info": {
+    "count": 2,
+    "page": 1,
+    "per_page": 20,
+    "total_count": 1,
+    "total_pages": 1
+  },
+  "success": true
+}

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/spec_helper.rb

@@ -95,3 +95,9 @@ 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/api_response_spec.rb

@@ -0,0 +1,30 @@
+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

data/spec/units/glare_spec.rb

@@ -8,9 +8,14 @@ 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) do
+    [
+      Glare::ApiResponse.new(load_fixture('wadus_records')),
+      Glare::ApiResponse.new(load_fixture('wadus_records_reverse_order'))
+    ].sample
+  end
 
   describe '.resolve' do
     it 'resolves a fqdn' do
@@ -24,7 +29,7 @@ RSpec.describe Glare do
       ).and_return(wadus_records)
 
       destination = Glare.resolve('wadus.example.com', 'CNAME')
-      expect(destination).to eq(['destination.com', 'another_destination.com'])
+      expect(destination).to match_array(['destination.com', 'another_destination.com'])
     end
   end
 
@@ -41,13 +46,13 @@ RSpec.describe Glare do
     end
 
     it 'uses default credentials' do
-      Glare.register('example.com', :a_destination, 'CNAME')
+      Glare.register('example.com', 'a_destination', 'CNAME')
 
       expect(Glare::Client).to have_received(:new).with('an_email', 'an_auth_key')
     end
 
     it 'uses the registration endpoint' do
-      Glare.register('example.com', :a_destination, 'CNAME')
+      Glare.register('example.com', 'a_destination', 'CNAME')
 
       expect(client).to have_received(:post) do |*args|
         expect(args.first).to match(%r{/zones/.*/dns_records})
@@ -55,7 +60,7 @@ RSpec.describe Glare do
     end
 
     it 'retrieves zone id for a given domain name' do
-      Glare.register('example.com', :a_destination, 'CNAME')
+      Glare.register('example.com', 'a_destination', 'CNAME')
 
       expect(client).to have_received(:get).
         with('/zones', name: 'example.com')
@@ -66,7 +71,7 @@ RSpec.describe Glare do
     end
 
     it 'retrieves record to check if exists' do
-      Glare.register('example.com', :a_destination, 'CNAME')
+      Glare.register('example.com', 'a_destination', 'CNAME')
 
       expect(client).to have_received(:get).with(
         '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records',
@@ -80,14 +85,14 @@ RSpec.describe Glare do
         name: 'not-exist.example.com', type: 'CNAME'
       ).and_return(empty_result)
 
-      Glare.register('not-exist.example.com', :a_destination, 'CNAME')
+      Glare.register('not-exist.example.com', 'a_destination', 'CNAME')
 
       expect(client).not_to have_received(:put).
         with('/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records', any_args)
 
       expect(client).to have_received(:post).with(
         '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records',
-        type: 'CNAME', name: 'not-exist.example.com', content: :a_destination
+        type: 'CNAME', name: 'not-exist.example.com', content: 'a_destination'
       )
     end
 
@@ -97,19 +102,19 @@ 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], 'CNAME')
+      Glare.register('not-exist.example.com', ['a_destination', 'another_destination'].shuffle, 'CNAME')
 
       expect(client).not_to have_received(:put).
         with('/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records', any_args)
 
       expect(client).to have_received(:post).with(
         '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records',
-        type: 'CNAME', name: 'not-exist.example.com', content: :a_destination
+        type: 'CNAME', name: 'not-exist.example.com', content: 'a_destination'
       )
 
       expect(client).to have_received(:post).with(
         '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records',
-        type: 'CNAME', name: 'not-exist.example.com', content: :another_destination
+        type: 'CNAME', name: 'not-exist.example.com', content: 'another_destination'
       )
     end
 
@@ -122,35 +127,35 @@ RSpec.describe Glare do
       end
 
       context 'same number of records to update' do
-        context 'records contents are different' do
-          it 'sends registration data to update endpoint' do
-            Glare.register('wadus.example.com', ['a_destination.com', 'yet_another_destination.com'], 'CNAME')
+        context 'records contents are the same' do
+          it 'does not send registration data to update endpoint' do
+            Glare.register('wadus.example.com', ['destination.com', 'another_destination.com'].shuffle, 'CNAME')
 
             expect(client).not_to have_received(:post).
               with('/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records', any_args)
 
-            expect(client).to have_received(:put).with(
+            expect(client).not_to have_received(:put).with(
               '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records/a1f984afe5544840505494298f54c33e',
-              type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com'
+              any_args
             )
 
-            expect(client).to have_received(:put).with(
+            expect(client).not_to have_received(:put).with(
               '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records/b3142498230989gsd0f88h80998908fc',
-              type: 'CNAME', name: 'wadus.example.com', content: 'yet_another_destination.com'
+              any_args
             )
           end
         end
 
-        context 'records contents are the same' do
-          it 'sends registration data to update endpoint' do
-            Glare.register('wadus.example.com', ['destination.com', 'another_destination.com'], 'CNAME')
+        context 'some records contents are the same' do
+          it 'send registration data to update endpoint in different records' do
+            Glare.register('wadus.example.com', ['a_destination.com', 'another_destination.com'].shuffle, 'CNAME')
 
             expect(client).not_to have_received(:post).
               with('/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records', any_args)
 
-            expect(client).not_to have_received(:put).with(
+            expect(client).to have_received(:put).with(
               '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records/a1f984afe5544840505494298f54c33e',
-              any_args
+              type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com'
             )
 
             expect(client).not_to have_received(:put).with(
@@ -159,6 +164,26 @@ RSpec.describe Glare do
             )
           end
         end
+
+        context 'all records contents are different' do
+          it 'sends registration data to update endpoint' do
+            Glare.register('wadus.example.com', ['a_destination.com', 'yet_another_destination.com'].shuffle, 'CNAME')
+
+            expect(client).not_to have_received(:post).
+              with('/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records', any_args)
+
+            expect(client).to have_received(:put).with(
+              any_args,
+              type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com'
+            )
+
+            expect(client).to have_received(:put).with(
+              any_args,
+              type: 'CNAME', name: 'wadus.example.com', content: 'yet_another_destination.com'
+            )
+          end
+        end
+
       end
 
       it 'updates different records and deletes extra ones' do
@@ -168,17 +193,15 @@ RSpec.describe Glare do
           with('/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records', any_args)
 
         expect(client).to have_received(:put).with(
-          '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records/a1f984afe5544840505494298f54c33e',
-          any_args
+          any_args,
+          { type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com' }
         )
 
-        expect(client).to have_received(:delete).with(
-          '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records/b3142498230989gsd0f88h80998908fc'
-        )
+        expect(client).to have_received(:delete).once
       end
 
       it 'updates different records and creates new ones' do
-        Glare.register('wadus.example.com', ['destination.com', 'another_destination.com', 'a_third_destination.com'], 'CNAME')
+        Glare.register('wadus.example.com', ['destination.com', 'another_destination.com', 'a_third_destination.com'].shuffle, 'CNAME')
 
         expect(client).not_to have_received(:put).with(
           '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records/a1f984afe5544840505494298f54c33e',
@@ -220,10 +243,4 @@ 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

data/spec/units/operations_spec.rb

@@ -0,0 +1,111 @@
+require 'glare/cf_dns_records'
+require 'glare/domain/record'
+require 'glare/dns_record'
+
+RSpec.describe Glare::CfDnsRecords::Updater do
+  it 'can detects new records to add' do
+    current_records = Glare::CfDnsRecords.empty
+    new_record = dns_record(content: '1.2.3.4')
+    new_records = [new_record]
+    operations = Glare::CfDnsRecords::Updater.new(current_records, new_records).calculate
+    operation = Glare::CfDnsRecords::Updater::Operation.new(new_record, :add)
+    expect(operations.insertions).to match_array([operation])
+  end
+
+  it 'can detects new records to keep' do
+    current_record = existing_record(content: '1.2.3.4')
+    current_records = Glare::CfDnsRecords.new([current_record])
+    new_record = dns_record(content: '1.2.3.4')
+    new_records = [new_record]
+    operations = Glare::CfDnsRecords::Updater.new(current_records, new_records).calculate
+    expect(operations.count).to be_zero
+  end
+
+  it 'can detects new records to add when there are some records' do
+    current_record = existing_record(content: '1.2.3.4')
+    current_records = Glare::CfDnsRecords.new([current_record])
+
+    new_record = dns_record(content: '1.2.3.5')
+    existing_record = dns_record(content: '1.2.3.4')
+    new_records = [new_record, existing_record]
+
+    operations = Glare::CfDnsRecords::Updater.new(current_records, new_records).calculate
+    operation = Glare::CfDnsRecords::Updater::Operation.new(new_record, :add)
+
+    expect(operations.insertions).to eq([operation])
+  end
+
+  it 'can detects new records to update when there are some records' do
+    current_record = existing_record(content: '1.2.3.4')
+    current_records = Glare::CfDnsRecords.new([current_record])
+
+    new_record = dns_record(content: '1.2.3.5')
+    update_record = dns_record(content: '1.2.3.6')
+    new_records = [update_record, new_record].shuffle
+
+    operations = Glare::CfDnsRecords::Updater.new(current_records, new_records).calculate
+    add_operation = Glare::CfDnsRecords::Updater::Operation.new(new_record, :add)
+
+    current_record.content = '1.2.3.6'
+    update_operation = Glare::CfDnsRecords::Updater::Operation.new(current_record, :update)
+
+    expect(operations.insertions).to eq([add_operation])
+    expect(operations.updates).to eq([update_operation])
+  end
+
+  it 'can detects new records to delete' do
+    current_record = existing_record(content: '1.2.3.4')
+    current_records = Glare::CfDnsRecords.new([current_record])
+
+    new_records = []
+
+    operations = Glare::CfDnsRecords::Updater.new(current_records, new_records).calculate
+    operation = Glare::CfDnsRecords::Updater::Operation.new(current_record, :delete)
+
+    expect(operations.deletions).to match_array([operation])
+  end
+
+  it 'can detects new records to delete and update' do
+    current_record = existing_record(content: '1.2.3.4')
+    current_record2 = existing_record(content: '1.2.3.6')
+    current_record3 = existing_record(content: '1.2.3.5')
+    current_records = Glare::CfDnsRecords.new([current_record2, current_record, current_record3])
+
+    new_record = dns_record(content: '1.2.3.8')
+    update_record = dns_record(content: '1.2.3.4')
+    new_records = [new_record, update_record].shuffle
+
+    operations = Glare::CfDnsRecords::Updater.new(current_records, new_records).calculate
+
+    current_record2.content = '1.2.3.8'
+    update_operation = Glare::CfDnsRecords::Updater::Operation.new(current_record2, :update)
+    delete_operation = Glare::CfDnsRecords::Updater::Operation.new(current_record3, :delete)
+
+    expect(operations.updates).to eq([update_operation])
+    expect(operations.deletions).to eq([delete_operation])
+  end
+
+  it 'can detects new records to delete and update' do
+    current_record = existing_record(content: '1.2.3.4')
+    current_record2 = existing_record(content: '1.2.3.6')
+    current_record3 = existing_record(content: '1.2.3.5')
+    current_records = Glare::CfDnsRecords.new([current_record2, current_record, current_record3].shuffle)
+
+    new_record = dns_record(content: '1.2.3.6')
+    new_record2 = dns_record(content: '1.2.3.4')
+    new_record3 = dns_record(content: '1.2.3.5')
+    new_records = [new_record, new_record2, new_record3].shuffle
+
+    operations = Glare::CfDnsRecords::Updater.new(current_records, new_records).calculate
+
+    expect(operations.count).to be_zero
+  end
+
+  def existing_record(id: 1_234, name: 'name', type: 'A', content:)
+    Glare::CfDnsRecord.new(id: id, name: name, type: type, content: content)
+  end
+
+  def dns_record(name: 'name', type: 'A', content:)
+    Glare::DnsRecord.new(name: name, type: type, content: content)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glare
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jose Luis Salas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-31 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,7 +97,9 @@ files:
 - glare.gemspec
 - lib/glare.rb
 - lib/glare/api_response.rb
+- lib/glare/cf_dns_record.rb
 - lib/glare/cf_dns_records.rb
+- lib/glare/cf_dns_records/updater.rb
 - lib/glare/client.rb
 - lib/glare/credentials.rb
 - lib/glare/dns_record.rb
@@ -105,14 +107,19 @@ 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/fixtures/wadus_records_reverse_order.json
 - spec/resolve_domain_spec.rb
 - spec/spec_helper.rb
+- spec/units/api_response_spec.rb
 - spec/units/glare_spec.rb
+- spec/units/operations_spec.rb
 homepage: https://github.com/peertransfer/glare
 licenses:
 - MIT
@@ -138,10 +145,14 @@ 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/units/operations_spec.rb
 - spec/delete_domain_spec.rb
 - spec/resolve_domain_spec.rb
 - spec/spec_helper.rb
 - spec/fixtures/wadus_records.json
 - spec/fixtures/empty_result.json
 - spec/fixtures/list_zone.json
+- spec/fixtures/error_response.json
+- spec/fixtures/wadus_records_reverse_order.json