glare 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a704d9f5af8df8ee5a03f7e2c73ecdcca75eabc2
-  data.tar.gz: a4e53971ad770c1239f06bddb568b366e4cfb736
+SHA256:
+  metadata.gz: 27e49ade7bb6778f14de878da4ad2bbc90fdf192542682086c22888805d957fe
+  data.tar.gz: d2f684300c0acb3652dccbf0956b28a49a82b016f8cbb0864c48dbc33a2fcba4
 SHA512:
-  metadata.gz: d69f25042bf3de9da4028ba361ad1ab7deaf82f651c1bbf671c59d71fb8931cc831d73bb3f55b3f580ad08d9db58969e408bfcda2d41065160fee1d64d495d04
-  data.tar.gz: eae5c856c6dd64a9f4ae4e7e21f0fdea8aa082beff6a4baf73d7036c2338780353f42ccb27767fc82696a4fc69f2051fff523b4fc4aaab5425186ac55a24050d
+  metadata.gz: b0b1b129746cdedf5bd3ac073345396a746e162103802231f3363bcecc39da13ab249abaccae66037bc5607f30570b5538e87760020b0b7f739654a111d75d32
+  data.tar.gz: be5bd9e5ebf93bc27ce1e9966ec95f9fd766eae8c9620ec12f0e16f1ed1935342cccd3f49ccc3a11368e78dd49323fc692b654756bc0b69fac2c12f9d56f45d3

data/glare.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |spec|
   spec.test_files = Dir['spec/**/*.{rb,json}']
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.9'
-  spec.add_development_dependency 'rake', '~> 11.0'
-  spec.add_development_dependency 'rspec', '~> 3.4'
+  spec.add_development_dependency 'bundler', '>= 1.9'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec', '~> 3.7'
 
-  spec.add_dependency 'public_suffix'
-  spec.add_dependency 'httpclient'
+  spec.add_dependency 'public_suffix', '>= 3.0.2', '< 4.0'
+  spec.add_dependency 'httpclient', '>= 2.8.3', '< 3.0'
 end

data/lib/glare.rb

@@ -10,9 +10,9 @@ require 'glare/errors'
 
 module Glare
   class << self
-    def register(fqdn, destination, type)
+    def register(fqdn, destination, type, proxied = false)
       client = build_client
-      Domain.new(client).register(fqdn, destination, type)
+      Domain.new(client).register(fqdn, destination, type, proxied)
     end
 
     def resolve(fqdn, type)

data/lib/glare/cf_dns_record.rb

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

data/lib/glare/cf_dns_records.rb

@@ -12,7 +12,8 @@ module Glare
             id: item['id'],
             name: item['name'],
             type: item['type'],
-            content: item['content']
+            content: item['content'],
+            proxied: item['proxied']
           )
         end
 

data/lib/glare/cf_dns_records/updater.rb

@@ -28,16 +28,14 @@ module Glare
       end
 
       class Operation
-        include Comparable
-
         def initialize(record, action)
           @record = record.dup
           @action = action
         end
 
-        def <=>(operation)
-          @record <=> operation.record &&
-            @action <=> operation.action
+        def ==(operation)
+          @record == operation.record &&
+            @action == operation.action
         end
 
         attr_reader :action, :record

data/lib/glare/dns_record.rb

@@ -1,27 +1,28 @@
 module Glare
   class DnsRecord
-    include Comparable
-
-    def initialize(name:, type:, content:)
+    def initialize(name:, type:, content:, proxied: false)
       @name = name
       @type = type
       @content = content
+      @proxied = proxied
     end
 
     def to_h
       {
         type: @type,
         name: @name,
-        content: @content
+        content: @content,
+        proxied: @proxied
       }
     end
 
-    def <=>(dns_record)
-      @type <=> dns_record.type &&
-        @name <=> dns_record.name &&
-        @content <=> dns_record.content
+    def ==(dns_record)
+      @type == dns_record.type &&
+        @name == dns_record.name &&
+        @content == dns_record.content &&
+        @proxied == dns_record.proxied
     end
 
-    attr_reader :content, :type, :name
+    attr_reader :content, :type, :name, :proxied
   end
 end

data/lib/glare/domain.rb

@@ -7,9 +7,9 @@ module Glare
       @client = client
     end
 
-    def register(fqdn, destinations, type)
+    def register(fqdn, destinations, type, proxied = false)
       dns_records = Array(destinations).map do |destination|
-        DnsRecord.new(type: type, name: fqdn, content: destination)
+        DnsRecord.new(type: type, name: fqdn, content: destination, proxied: proxied)
       end
 
       zone = Zone.new(@client, fqdn)

data/lib/glare/domain/record.rb

@@ -2,7 +2,7 @@ module Glare
   class Domain
     class Record
       class << self
-        def register(client, zone, dns_records)
+        def register(client, zone, dns_records, proxied = false)
           @client = client
           existing_records = zone.records(dns_records.first.type)
           zone_id = zone.id

data/lib/glare/version.rb

@@ -1,3 +1,3 @@
 module Glare
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

data/spec/delete_domain_spec.rb

@@ -1,8 +1,8 @@
 require 'glare'
 
-RSpec.describe 'delete domain' do
+RSpec.describe 'delete domain', integration: true do
   context 'when a domain is registered' do
-    let(:domain) { 'a.flywire.cc' }
+    let(:domain) { 'a.flywire.com.cn' }
     let(:type) { 'A' }
     let(:destination) { ['1.2.3.5', '6.7.8.9'] }
     before do

data/spec/resolve_domain_spec.rb

@@ -1,8 +1,8 @@
 require 'glare'
 
-RSpec.describe 'Resolve domain' do
+RSpec.describe 'Resolve domain', integration: true do
   context 'when a domain is registered' do
-    let(:domain) { 'cname.flywire.cc' }
+    let(:domain) { 'cname.flywire.com.cn' }
     let(:destination) { ['peertransfer.me'] }
     let(:type) { 'CNAME' }
 
@@ -22,13 +22,13 @@ RSpec.describe 'Resolve domain' do
 
     it 'raises an exception if api returns error' do
       expect do
-        register_domain('error.flywire.cc', '1.1.1.1')
+        register_domain('error.flywire.com.cn', '1.1.1.1')
       end.to raise_error(Glare::Errors::ApiError)
     end
   end
 
   context 'when a domain contains more than one destination' do
-    let(:domain) { 'a.flywire.cc' }
+    let(:domain) { 'a.flywire.com.cn' }
     let(:type) { 'A' }
     before do
       register_domain(domain, destination)

data/spec/units/glare_spec.rb

@@ -92,7 +92,7 @@ RSpec.describe Glare do
 
       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', proxied: false
       )
     end
 
@@ -109,12 +109,12 @@ RSpec.describe Glare do
 
       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', proxied: false
       )
 
       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', proxied: false
       )
     end
 
@@ -155,7 +155,7 @@ RSpec.describe Glare do
 
             expect(client).to have_received(:put).with(
               '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records/a1f984afe5544840505494298f54c33e',
-              type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com'
+              type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com', proxied: false
             )
 
             expect(client).not_to have_received(:put).with(
@@ -174,12 +174,12 @@ RSpec.describe Glare do
 
             expect(client).to have_received(:put).with(
               any_args,
-              type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com'
+              type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com', proxied: false
             )
 
             expect(client).to have_received(:put).with(
               any_args,
-              type: 'CNAME', name: 'wadus.example.com', content: 'yet_another_destination.com'
+              type: 'CNAME', name: 'wadus.example.com', content: 'yet_another_destination.com', proxied: false
             )
           end
         end
@@ -194,7 +194,7 @@ RSpec.describe Glare do
 
         expect(client).to have_received(:put).with(
           any_args,
-          { type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com' }
+          { type: 'CNAME', name: 'wadus.example.com', content: 'a_destination.com', proxied: false }
         )
 
         expect(client).to have_received(:delete).once
@@ -215,7 +215,7 @@ RSpec.describe Glare do
 
         expect(client).to have_received(:post).with(
           '/zones/9de4eb694c380d79845d35cd939cc7a7/dns_records',
-          type: 'CNAME', name: 'wadus.example.com', content: 'a_third_destination.com'
+          type: 'CNAME', name: 'wadus.example.com', content: 'a_third_destination.com', proxied: false
         )
       end
     end

data/spec/units/operations_spec.rb

@@ -21,7 +21,7 @@ RSpec.describe Glare::CfDnsRecords::Updater do
     expect(operations.count).to be_zero
   end
 
-  it 'can detects new records to add when there are some records' do
+  it 'can detect 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])
 
@@ -44,10 +44,9 @@ RSpec.describe Glare::CfDnsRecords::Updater do
     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)
+    add_operation = Glare::CfDnsRecords::Updater::Operation.new(new_records.last, :add)
 
-    current_record.content = '1.2.3.6'
-    update_operation = Glare::CfDnsRecords::Updater::Operation.new(current_record, :update)
+    update_operation = Glare::CfDnsRecords::Updater::Operation.new(new_records.first, :update)
 
     expect(operations.insertions).to eq([add_operation])
     expect(operations.updates).to eq([update_operation])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glare
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jose Luis Salas
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2019-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
@@ -31,56 +31,68 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: public_suffix
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: 
 email:
 - josacar@users.noreply.github.com
@@ -140,19 +152,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: API client for CloudFlare v4 API
 test_files:
+- spec/units/operations_spec.rb
 - 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/delete_domain_spec.rb
+- spec/fixtures/wadus_records_reverse_order.json
 - 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
+- spec/fixtures/list_zone.json