dapi-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3af6232965a19b8ed245ab347a0d82e0da95f8a686d653463fa9e48e9635c30d
-  data.tar.gz: d47460d0bbc734c3bb2df565d712f29fe010991ebb60c2c4a2381c348e352921
+  metadata.gz: a9475f64c82e86742b38333c59b329a2a2f0873920cfa99a46f2ef0b099ea176
+  data.tar.gz: 7fcd29bf890170ba4f7f42b17849cb36538b1e43d81dfd8122978dcdb0dd79aa
 SHA512:
-  metadata.gz: 91508607d01994bd0d1a63f2775884f44624189c6d505e03f40d74fc00a3e988b9af9210dd8be62a1a9e5eecf955d8cdf9e093ef72efa05bf56cb70e08cf0950
-  data.tar.gz: 48e415ba642caf12a1d8753ca011d0661e13bd1a2bcb77a76fb80578039a9d299f04ca7f8377cf0c63d75df7dd95e55306be7d05cf7106d544a7fa2587368066
+  metadata.gz: 0253ccf3080e0b77b994b9d5035193ac7f04e2df77be52c6679a47e9f9e8b6d4a8716f50bc0c03ea52f8ac552c04822ebd7759ac14ccfe1cd9fc58185b4f004a
+  data.tar.gz: 51ef22b2d7a6619130382a25c176499d5ead0768541d75516d999de9c6a854f00017cbc2d455457f35ac6c74fd7c394bf821d2ff961ecad24a3177a63782779c

data/lib/dapi/client.rb

@@ -5,8 +5,8 @@ module Dapi
 
   class Client
 
-    OPTIMISTIC_LOCKING_CHECK_WAIT = 1.0 unless defined?(OPTIMISTIC_LOCKING_CHECK_WAIT)
-    OPTIMISTIC_LOCKING_RETRIES = 10 unless defined?(OPTIMISTIC_LOCKING_RETRIES)
+    OPTIMISTIC_LOCKING_CHECK_WAIT = 3.0 unless defined?(OPTIMISTIC_LOCKING_CHECK_WAIT)
+    OPTIMISTIC_LOCKING_RETRIES = 5 unless defined?(OPTIMISTIC_LOCKING_RETRIES)
 
     def initialize(url:, token:, http: HTTP)
       @url = url
@@ -14,23 +14,21 @@ module Dapi
       @token = token
     end
 
+    def delete_record(zone_name, lvalue, type)
+      with_optimistic_locking { delete_record!(zone_name, lvalue, type) }
+    end
+
     def get_zone(zone_name)
       unwrap { http.get(@url + "zone/" + zone_name) }
     end
 
+    # Useful for test suites, and staging domains
+    def truncate_zone(zone_name)
+      with_optimistic_locking { truncate_zone!(zone_name) }
+    end
+
     def upsert_record(zone_name, lvalue, type, rvalue, ttl)
-      retries = OPTIMISTIC_LOCKING_RETRIES
-      begin
-        upsert_record!(zone_name, lvalue, type, rvalue, ttl)
-      rescue Dapi::Client::OptimisticLockFailure
-        if retries > 0
-          retries -= 1
-          sleep(0.1)
-          retry
-        else
-          raise
-        end
-      end
+      with_optimistic_locking { upsert_record!(zone_name, lvalue, type, rvalue, ttl) }
     end
 
     private
@@ -57,19 +55,57 @@ module Dapi
       raise Dapi::Client::Error, "error parsing server response (JSON)"
     end
 
+    def delete_record!(zone_name, lvalue, type)
+      zone = get_zone(zone_name)
+      zone["records"].reject! { |r| r["name"] == lvalue && r["type"] == type }
+      unwrap { http.post(@url + "zone/" + zone_name, json: {data: zone}) }
+      optimistic_lock_check(zone_name) do |check|
+        not check["records"].detect { |r| r["name"] == lvalue && r["type"] == type }
+      end
+    end
+
+    def truncate_zone!(zone_name)
+      zone = get_zone(zone_name)
+      zone["records"].reject! { |r| r["type"] == "A" && r["name"] != "@" }
+      unwrap { http.post(@url + "zone/" + zone_name, json: {data: zone}) }
+      optimistic_lock_check(zone_name) do |check|
+        not check["records"].detect { |r| r["type"] == "A" && r["name"] != "@" }
+      end
+    end
+
     def upsert_record!(zone_name, lvalue, type, rvalue, ttl)
       zone = get_zone(zone_name)
       zone["records"].reject! { |r| r["name"] == lvalue && r["type"] == type }
       zone["records"] << {"name" => lvalue, "type" => type, "value" => rvalue, "ttl" => ttl}
       unwrap { http.post(@url + "zone/" + zone_name, json: {data: zone}) }
+      optimistic_lock_check(zone_name) do |check|
+        check["records"].detect { |r| r["name"] == lvalue && r["type"] == type && r["value"] == rvalue && r["ttl"] == ttl }
+      end
+    end
+
+    def optimistic_lock_check(zone_name, &block)
       sleep(OPTIMISTIC_LOCKING_CHECK_WAIT)
-      zone = get_zone(zone_name)
-      unless zone["records"].detect { |r| r["name"] == lvalue && r["type"] == type && r["value"] == rvalue && r["ttl"] == ttl }
-        raise Dapi::Client::OptimisticLockFailure, "upsert_record: optimistic locking failed"
+      get_zone(zone_name).tap do |zone|
+        raise Dapi::Client::OptimisticLockFailure, "upsert_record: optimistic locking failed" unless block.call(zone)
+      end
+    end
+
+    def with_optimistic_locking(&block)
+      retries = OPTIMISTIC_LOCKING_RETRIES
+      begin
+        block.call
+      rescue Dapi::Client::OptimisticLockFailure
+        if retries > 0
+          retries -= 1
+          sleep(0.1)
+          retry
+        else
+          raise
+        end
       end
-      zone
     end
 
+
   end
 
 end

data/lib/dapi/client/version.rb

@@ -1,5 +1,5 @@
 module Dapi
   class Client
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dapi-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Sheldon Hearn