dps 0.0.9 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe6edaca6bd54be5b2d4209106faad950c85d5e24723bd754924c6299b922c52
-  data.tar.gz: 846bfda91b9f26aa9319ad02783fe122fde0562b15fda31a38a8e1234751ddcd
+  metadata.gz: 591288310761ee808b58e9583dd14a51e14c32d1c6341d859d6560ce64e95cbc
+  data.tar.gz: 97e68d49c04562388eba7024b7d5c2a1ca49499543658f09e7f8032baf041dc3
 SHA512:
-  metadata.gz: 6a3882d7661bc5efcf9751d5bd3954a91fedce55d3a02a7137244d234b8312a2fc8cd3c2677a82c5e81db376df77ddc23d424d7285e10bec02c405823001bf9a
-  data.tar.gz: f68a33510f5fc4fbb285da2b2fcd6f5decf5ff494bb2e7e0e90630d30f07df5e4347cec7593d2e329f11c266696f376046f526f3182ddca39cf2b21e5e11d145
+  metadata.gz: 42a5e910ec0bcab2af1546396cce787ec34bc6a3c89d89251430f977845f870b588c33dda841b2bf89671f69d0e4aa5f644bd64dbc90fa3a293140d28f0cb7bd
+  data.tar.gz: 738d3a83c035de076664321ea784c6fb05fb31d54f006d08e3433cf633222a10150e349e9c0a65ee0cb5a8bfd6468c8be048721e1b92cd19f5bca1cd1e2ab14f

data/lib/dps.rb

@@ -7,11 +7,21 @@ module Dps
   class Error < StandardError; end
   class ProcNotSetError < StandardError; end
 
+  mattr_accessor :dns_nameservers
   mattr_accessor :endpoints
   mattr_accessor :domains
   mattr_accessor :new_payment_endpoints_renderers
+
   self.new_payment_endpoints_renderers = {}
-  
+  self.dns_nameservers = [
+    '1.1.1.1',        # Cloudflare
+    '1.0.0.1',        # Cloudflare
+    '84.200.69.80',   # DNS Watch
+    '84.200.70.40',   # DNS Watch
+    '91.239.100.100', # UncensoredDNS
+    '89.233.43.71',   # UncensoredDNS
+  ]
+    
   def self.setup
     yield(self)
   end

data/lib/dps/dns.rb

@@ -6,22 +6,20 @@ module Dps
     class << self
       def get_records(domain)
         get_txt_records(domain).
-        collect { |value| decode_txt_record(value) }.select(&:valid?)
+        collect { |value| decode_txt_record(value) }.
+        select(&:valid?)
       end
       
       def decode_txt_record(value)
         parts = value.gsub('"', '').split
         
-        # Reverse since Ruby #pop starts from end of list.
-        parts.reverse!
-        action = parts.pop
-        parts.reverse!
-
-        case action
+        head, tail = head_and_tail(parts)
+        
+        case head
         when "dps:endpoint"  
-          Endpoint.new(parts)
+          Endpoint.new(tail)
         else
-          InvalidRecord.new("Unexpected action '#{action}'")
+          InvalidRecord.new("Unexpected action '#{head}'")
         end
       end
       
@@ -39,15 +37,27 @@ module Dps
       
       private 
       
+      def head_and_tail(array)
+        head = array[0]
+        tail = array[1, array.length - 1]
+        [head, tail]
+      end
+      
+      def dnsruby_config
+        {
+          nameserver: Dps.dns_nameservers
+        }
+      end
+      
       def get_txt_records(domain)
         result = []
         
-        ::Dnsruby::DNS.open do |dns|
+        Dnsruby::DNS.open(dnsruby_config) do |dns|
           begin
-            record = dns.getresource(domain, "TXT")
+            record = dns.getresource(domain, Dnsruby::Types::TXT)
             result << record.data
           rescue Dnsruby::NXDomain => e
-            raise InvalidRecord.new("Invalid domain.")
+            raise StandardError.new("Invalid domain '#{domain}'.")
           end
         end
         

data/lib/dps/version.rb

@@ -1,3 +1,3 @@
 module Dps
-  VERSION = "0.0.9"
+  VERSION = "0.0.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dps
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.11
 platform: ruby
 authors:
 - Mat Holroyd
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-21 00:00:00.000000000 Z
+date: 2019-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dnsruby