ezdyn 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 27245dd948ed180b98c7c3f1546e3a4239d5ad79
-  data.tar.gz: 165e52bfa90722ee772a86386b2983e3ff653fcc
+SHA256:
+  metadata.gz: 4ba5f7252dbce98914e413a84e9721e5363e3c3b8dc217b95585f745ce7dd35e
+  data.tar.gz: adc0b38aab81daf21235845ccc0098d6ddb9e60fe372f4d12c0fc1a4386a815a
 SHA512:
-  metadata.gz: fe8505dc8afae76e3b612cb43075848ffd607f6449fa8bbc1bd388285fe05ce365faa8a5a5705807578deada140b8a4e5a33081b9284e6c8f2a511a5b8b4015e
-  data.tar.gz: 5e7f19e6b6200c547e0bf4d7d039d01397de0137793c5071dfc13c2cec0f019b385fa3e9a3fc86e7c2d1dc0b8eec71439614f7f6541f2b5fddd45bbb18b833cb
+  metadata.gz: 7c3db8aabdd6d5801da22bf28849422d9984b5976889fedaa61a72cf39fd72bf58aa6ed5878d9505debe4166680c4da2bb727904b558ead22e8b16357c935498
+  data.tar.gz: 66b0831ecf710fab181c15bcbdac141962e6132227b7dca25e61e63eec1926f729869aa82b0029e4b330b9f85b711d92207192aecb7f183b8d698ae2e0265486

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ezdyn changelog
 
+## Version 0.3.1 - 2018-04-04
+
+* Bugfix of typo in error message
+
 ## Version 0.3.0 - 2017-11-06
 
 * Added AllRecords support for fetching all records in a zone.

data/bin/ezdyn

@@ -139,7 +139,7 @@ commands.each do |line|
     next if $options[:check]
 
     say "DynAPI: Creating #{fqdn} #{ttl||"(#{EZDyn::Record::DefaultTTL})"} #{type.upcase} #{value}"
-    $dyn.create(type: type, fqdn: fqdn, value: value, ttl: ttl)
+    $dyn.create(type: type, fqdn: fqdn, value: value.split(','), ttl: ttl)
 
   when 'update','upsert'
     type, fqdn, value, ttl = tokens.shift(4)
@@ -153,7 +153,7 @@ commands.each do |line|
     next if $options[:check]
 
     say "DynAPI: Upserting #{fqdn} #{ttl||"(#{EZDyn::Record::DefaultTTL})"} #{type.upcase} #{value}"
-    $dyn.update(type: type, fqdn: fqdn, value: value, ttl: ttl)
+    $dyn.update(type: type, fqdn: fqdn, value: value.split(','), ttl: ttl)
 
   when 'delete'
     type, fqdn = tokens.shift(2)

data/ezdyn.gemspec

@@ -3,7 +3,7 @@ require_relative 'lib/ezdyn/version'
 Gem::Specification.new do |s|
   s.name = "ezdyn"
   s.version = EZDyn::VERSION
-  s.author = "David Adams"
+  s.authors = ["David Adams","Dan Dorman","Eric Coan"]
   s.email = "dadams@instructure.com"
   s.date = Time.now.strftime("%Y-%m-%d")
   s.license = "Nonstandard"

data/lib/ezdyn/changes.rb

@@ -67,9 +67,13 @@ module EZDyn
   # A pending record update.
   class UpdateChange < Change
     # @private
-    def initialize(record:, new_record:)
-      @record = record.sync!
-      @new_record = new_record
+    def initialize(records:, new_records:)
+      @records = records.map(&:sync!)
+      @new_records = new_records
+    end
+
+    def zone
+      @new_records.first.zone
     end
 
     # Returns a string representation of the change.
@@ -77,20 +81,20 @@ module EZDyn
     # @return [String] A string representation of this change.
     def to_s
       ttl_string =
-        if @record.ttl == @new_record.ttl
-          @record.ttl
+        if @records.map(&:ttl).min == @new_records.map(&:ttl).min
+          @records.map(&:ttl).min
         else
-          "(( #{@record.ttl} -> #{@new_record.ttl} ))"
+          "(( #{@records.map(&:ttl).min} -> #{@new_records.map(&:ttl).min} ))"
         end
 
       value_string =
-        if @record.value == @new_record.value
-          @record.value
+        if @records.map(&:value).join(',') == @new_records.map(&:value).join(',')
+          @records.map(&:value).join(',')
         else
-          "(( #{@record.value} -> #{@new_record.value} ))"
+          "(( #{@records.map(&:value).join(',')} -> #{@new_records.map(&:value).join(',')} ))"
         end
 
-      "UPDATE #{@record.fqdn}.   #{ttl_string} #{@record.type}   #{value_string}"
+      "UPDATE #{@new_records.first.fqdn}.   #{ttl_string} #{@new_records.first.type}   #{value_string}"
     end
   end
 

data/lib/ezdyn/crud.rb

@@ -5,35 +5,35 @@ module EZDyn
     # @note As a side effect upon success, this method creates a [CreateChange]
     #   object in the `pending_changes` array.
     #
-    # @raise [RuntimeError] if such a record already exists.
     # @raise [RuntimeError] if the record could not be created.
     # @param type [RecordType, String, Symbol] Type of record to create.
     # @param fqdn [String] FQDN of the record to create.
-    # @param value [String, Hash] Value to submit for the record data.
+    # @param value [String, Array] Value(s) to submit for the record data.
     # @param ttl [String, Integer] TTL value (optional).
     # @return [Record] A Record object filled with the values returned by the API.
     def create(type:, fqdn:, value:, ttl: nil)
       EZDyn.debug { "Client.create( type: #{type}, fqdn: #{fqdn}, value: #{value}, ttl: #{ttl} )" }
-      if self.exists?(type: type, fqdn: fqdn)
-        raise "EZDyn does not yet support multiple records of the same type on a single node."
-      end
 
       ttl = ( ttl || Record::DefaultTTL ).to_i
+      values = Array(value)
 
-      response = self.call_api(
-        method: "post",
-        uri: self.build_uri(type: type, fqdn: fqdn),
-        payload: { rdata: { RecordType.find(type).value_key => value }, ttl: ttl }
-      )
-
-      if not response.success?
-        raise "Failed to create record: #{response.simple_message}"
-      end
+      return values.map do |val|
+        value_key = Array(RecordType.find(type).value_key)
+        split_val = val.split(' ', value_key.length)
+        response = self.call_api(
+          method: "post",
+          uri: self.build_uri(type: type, fqdn: fqdn),
+          payload: { rdata: value_key.zip(split_val).to_h, ttl: ttl }
+        )
 
-      record = Record.new(client: self, raw: response.data)
-      self.add_pending_change(CreateChange.new(record: record))
+        if not response.success?
+          raise "Failed to create record: #{response.simple_message}"
+        end
 
-      return record
+        record = Record.new(client: self, raw: response.data)
+        self.add_pending_change(CreateChange.new(record: record))
+        record
+      end
     end
 
     # Calls the Dyn API to update or create a record. Could also be called
@@ -42,53 +42,43 @@ module EZDyn
     # @note As a side effect upon success, this method creates an [UpdateChange]
     #   or a [CreateChange] object in the `pending_changes` array.
     #
-    # @raise [RuntimeError] if multiple records exist and no specific Record object was passed.
     # @raise [RuntimeError] if the record could not be created or updated.
     # @param record [Record] A Record object for the record to be updated.
     #   Either this parameter or the `type` and `fqdn` parameters are
     #   required.
     # @param type [RecordType, String, Symbol] Type of record to update/create (not required if `record` is provided).
     # @param fqdn [String] FQDN of the record to update/create (not requried if `record` is provided).
-    # @param value [String, Hash] New value to submit for the record data (optional if updating TTL and record already exists).
+    # @param value [String, Array] New value(s) to submit for the record data (optional if updating TTL and record already exists).
     # @param ttl [String, Integer] New TTL value (optional).
     # @return [Record] A Record object filled with the values returned by the API.
     def update(record: nil, type: nil, fqdn: nil, value: nil, ttl: nil)
       EZDyn.debug { "Client.update( record: #{record.nil? ? nil : "Record{#{record.record_id}}"}, type: #{type}, fqdn: #{fqdn}, value: #{value}, ttl: #{ttl} )" }
 
+      values = Array(value)
+
       if record.nil?
         if type.nil? or fqdn.nil?
           raise "Cannot update a record without a Record object or both record type and FQDN"
         end
         records = self.records_for(type: type, fqdn: fqdn)
-        record =
-          if records.count == 0
-            # do nothing, and let it be created
-            nil
-          elsif records.count == 1
-            records.first
-          else
-            raise "EZDyn does not (yet) support updating over multiple records"
-          end
+      else
+        records = [record]
       end
 
       response = nil
-      if record.nil?
-        if not fqdn.nil? and not type.nil? and not value.nil?
-          return self.create(type: type, fqdn: fqdn, value: value, ttl: ttl)
-        else
-          raise "Record doesn't exist, and insufficient information to create it was given"
-        end
+      if records.count.zero? && (fqdn.nil? || type.nil? || value.nil?)
+        raise "Record doesn't exist, and insufficient information to create it was given"
       end
 
-      record.sync!
       response = self.call_api(
         method: "put",
-        uri: record.uri,
+        uri: self.build_uri(type: type, fqdn: fqdn),
         payload: {
-          rdata: {
-            record.type.value_key => ( value || record.value ),
-          },
-          ttl: ( ttl || record.ttl ),
+          "#{type}Records" => values.map do |val|
+            value_key = Array(RecordType.find(type).value_key)
+            split_val = val.split(' ', value_key.length)
+            { rdata: value_key.zip(split_val).to_h, ttl: ttl || records.map(&:ttl).min }
+          end
         }
       )
 
@@ -96,10 +86,10 @@ module EZDyn
         raise "Could not update: #{response.simple_message}"
       end
 
-      new_record = Record.new(client: self, raw: response.data)
-      self.add_pending_change(UpdateChange.new(record: record, new_record: new_record))
+      new_records = response.data.map { |res| Record.new(client: self, raw: res) }
+      self.add_pending_change(UpdateChange.new(records: records, new_records: new_records))
 
-      return new_record
+      return new_records
     end
 
     # Delete a record.

data/lib/ezdyn/record.rb

@@ -129,7 +129,7 @@ module EZDyn
       @fqdn = raw["fqdn"]
       @type = RecordType.find(raw["record_type"])
       @record_id = raw["record_id"].to_s
-      @value = raw["rdata"][@type.value_key]
+      @value = Array(@type.value_key).map { |k| raw["rdata"][k] }.join(' ')
       @in_sync = true
       @exists = true
     end

data/lib/ezdyn/record_type.rb

@@ -73,9 +73,9 @@ module EZDyn
       { name: :cname, uri_name: "CNAMERecord", value_key: "cname"   },
       { name: :aaaa,  uri_name: "AAAARecord",  value_key: "address" },
       { name: :soa,   uri_name: "SOARecord",   value_key: nil },
-      { name: :mx,    uri_name: "MXRecord",    value_key: nil },
-      { name: :ns,    uri_name: "NSRecord",    value_key: nil },
-      { name: :text,  uri_name: "TXTRecord",   value_key: nil },
+      { name: :mx,    uri_name: "MXRecord",    value_key: ["exchange", "preference"] },
+      { name: :ns,    uri_name: "NSRecord",    value_key: "nsdname" },
+      { name: :txt,   uri_name: "TXTRecord",   value_key: "txtdata" },
       { name: :spf,   uri_name: "SPFRecord",   value_key: nil }
     ].each do |args|
       @@types << EZDyn::RecordType.new(**args)

data/lib/ezdyn/version.rb

@@ -1,4 +1,4 @@
 module EZDyn
   # The version number of the library.
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: ezdyn
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - David Adams
+- Dan Dorman
+- Eric Coan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-05 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -65,8 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Simple library for Dyn Managed DNS