dapi-client 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9475f64c82e86742b38333c59b329a2a2f0873920cfa99a46f2ef0b099ea176
-  data.tar.gz: 7fcd29bf890170ba4f7f42b17849cb36538b1e43d81dfd8122978dcdb0dd79aa
+  metadata.gz: 9e0f07cc669169a046a40ea32e1560801a51711ae4b4a242b177c302daf9915d
+  data.tar.gz: 30d5902bab99804b96080253cc3253f1cec060a885771e29ee91f12b48b23b77
 SHA512:
-  metadata.gz: 0253ccf3080e0b77b994b9d5035193ac7f04e2df77be52c6679a47e9f9e8b6d4a8716f50bc0c03ea52f8ac552c04822ebd7759ac14ccfe1cd9fc58185b4f004a
-  data.tar.gz: 51ef22b2d7a6619130382a25c176499d5ead0768541d75516d999de9c6a854f00017cbc2d455457f35ac6c74fd7c394bf821d2ff961ecad24a3177a63782779c
+  metadata.gz: 63264c21d46017aaf1739c314982b2705dc9583f8afd12d6f8cdfc9cec0582bad26d2fe317986d271a6a4ce63f5e89b4b91386a76e6062f26ca6abd8aa48d4b0
+  data.tar.gz: 7f0b4a9e75714a82300ee1483b339eb64ee1b50c506efb3e4d21dc4132c1534c981011c7197a618ebd66a38e9bc65da8a906838e4744e483d6dca1e9ebe9106a

data/README.md

@@ -36,7 +36,9 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 To run the tests in an isolated docker-compose graph:
 
 ```
-docker-compose build test && docker-compose run test
+docker-compose down --volumes --remove-orphans && \
+  docker-compose build test && \
+  docker-compose run test
 ```
 
 To bring dapi up on a local host port to run tests against it:

data/lib/dapi/client.rb

@@ -8,14 +8,20 @@ module Dapi
     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)
+    def initialize(url:, token:, http: HTTP, check_wait: OPTIMISTIC_LOCKING_CHECK_WAIT, retries: OPTIMISTIC_LOCKING_RETRIES)
       @url = url
       @http = http
       @token = token
+      @check_wait = check_wait
+      @retries = retries
     end
 
     def delete_record(zone_name, lvalue, type)
-      with_optimistic_locking { delete_record!(zone_name, lvalue, type) }
+      modify_zone_records(
+        zone_name,
+        modify: ->(records) { records.reject { |r| r["name"] == lvalue && r["type"] == type } },
+        check: ->(records) { not records.detect { |r| r["name"] == lvalue && r["type"] == type } }
+      )
     end
 
     def get_zone(zone_name)
@@ -24,15 +30,38 @@ module Dapi
 
     # Useful for test suites, and staging domains
     def truncate_zone(zone_name)
-      with_optimistic_locking { truncate_zone!(zone_name) }
+      modify_zone_records(
+        zone_name,
+        modify: ->(records) { records.reject { |r| r["type"] == "A" && r["name"] != "@" } },
+        check: ->(records) { not records.detect { |r| r["type"] == "A" && r["name"] != "@" } }
+      )
     end
 
-    def upsert_record(zone_name, lvalue, type, rvalue, ttl)
-      with_optimistic_locking { upsert_record!(zone_name, lvalue, type, rvalue, ttl) }
+    def upsert_record(zone_name, lvalue, type, rvalue, ttl = nil)
+      modify_zone_records(
+        zone_name,
+        modify: ->(records) {
+          records.
+            reject { |r| r["name"] == lvalue && r["type"] == type }.
+            push("name" => lvalue, "type" => type, "value" => rvalue, "ttl" => ttl)
+        },
+        check: ->(records) { records.detect { |r| r["name"] == lvalue && r["type"] == type && r["value"] == rvalue && r["ttl"] == ttl } }
+      )
     end
 
     private
 
+    def modify_zone_records(zone_name, modify:, check:)
+      with_optimistic_locking do
+        zone = get_zone(zone_name)
+        zone["records"] = modify.call(zone["records"])
+        unwrap { http.post(@url + "zone/" + zone_name, json: {data: zone}) }
+        optimistic_lock_check(zone_name) do |modified|
+          check.call(modified["records"])
+        end
+      end
+    end
+
     def http
       @http.auth(@token)
     end
@@ -55,43 +84,15 @@ 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)
+      sleep(@check_wait)
       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
+      retries = @retries
       begin
         block.call
       rescue Dapi::Client::OptimisticLockFailure
@@ -105,7 +106,6 @@ module Dapi
       end
     end
 
-
   end
 
 end

data/lib/dapi/client/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dapi-client
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sheldon Hearn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http