record_store 5.7.1 → 5.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76a9b267be27d4f9f0f013f7bbfd4ea2b55f5e364bf720abd614244ae0943c04
-  data.tar.gz: d638f51c612e9e45aca478400ddd7f3b42d20bc4de0cf8575bd26efd6d8d9002
+  metadata.gz: 7d36a7207b563630aaad6b46c14ea53bcd101ecab97a080626c5f352e52820af
+  data.tar.gz: 91c4744ccf18f391f82fccf47663d4706222944029131a9a0d00d42c37360a5e
 SHA512:
-  metadata.gz: aa98bccefee0aedecde5a2ea5582205fe8abdd4324220e76a3e728dfd43fef909be0e4561d828f6a41e91e908ea5d9f481fc8e1714d0adb80c3ffc38ef67f1ec
-  data.tar.gz: b2b8bde921e73d537a48edc9fc8f9ae731f2af91555b713ad565e5f4deb6e9b05d7d55cee3f9d8e9dffb1dc8ed70cfa5e000570186fffc9477fa4efb41985ec4
+  metadata.gz: 4a34d35d02f00de085fe658ec928b8407f5470a4ab3e1679957de94bf3311bbb289eec0a2cb2281a1309565011a8522159abeeeb924237b55db8c0a7d7e3f982
+  data.tar.gz: '09f3ae5443ef6a06ac977002c79fbc6e37f8c8524bc310a3e4e43b954c8446de1a2dca18c673a33be727156669a00bb19789f0bfef1fe4341f2114f56d0b5697'

data/.rubocop-https---shopify-github-io-ruby-style-guide-rubocop-yml

@@ -20,7 +20,7 @@ Style/Alias:
   - prefer_alias
   - prefer_alias_method
 
-Layout/AlignHash:
+Layout/HashAlignment:
   EnforcedHashRocketStyle: key
   EnforcedColonStyle: key
   EnforcedLastArgumentHashStyle: ignore_implicit
@@ -30,7 +30,7 @@ Layout/AlignHash:
   - ignore_implicit
   - ignore_explicit
 
-Layout/AlignParameters:
+Layout/ParameterAlignment:
   EnforcedStyle: with_fixed_indentation
   SupportedStyles:
   - with_first_parameter
@@ -172,7 +172,7 @@ Naming/FileName:
   Regex:
   IgnoreExecutableScripts: true
 
-Layout/IndentFirstArgument:
+Layout/FirstArgumentIndentation:
   EnforcedStyle: consistent
   SupportedStyles:
   - consistent
@@ -225,7 +225,7 @@ Layout/IndentationConsistency:
 Layout/IndentationWidth:
   Width: 2
 
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
   SupportedStyles:
   - special_inside_parentheses
@@ -233,10 +233,10 @@ Layout/IndentFirstArrayElement:
   - align_brackets
   IndentationWidth:
 
-Layout/IndentAssignment:
+Layout/AssignmentIndentation:
   IndentationWidth:
 
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
   SupportedStyles:
   - special_inside_parentheses
@@ -340,9 +340,9 @@ Style/PercentQLiterals:
 Naming/PredicateName:
   NamePrefix:
   - is_
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
   - is_
-  NameWhitelist:
+  AllowedMethods:
   - is_a?
   Exclude:
   - 'spec/**/*'
@@ -467,7 +467,7 @@ Style/TernaryParentheses:
   - require_no_parentheses
   AllowSafeAssignment: true
 
-Layout/TrailingBlankLines:
+Layout/TrailingEmptyLines:
   EnforcedStyle: final_newline
   SupportedStyles:
   - final_newline
@@ -478,7 +478,7 @@ Style/TrivialAccessors:
   AllowPredicates: true
   AllowDSLWriters: false
   IgnoreClassMethods: false
-  Whitelist:
+  AllowedMethod:
   - to_ary
   - to_a
   - to_c
@@ -561,7 +561,7 @@ Lint/UnusedMethodArgument:
 Naming/AccessorMethodName:
   Enabled: true
 
-Layout/AlignArray:
+Layout/ArrayAlignment:
   Enabled: true
 
 Style/ArrayJoin:
@@ -840,7 +840,7 @@ Style/WhileUntilDo:
 Style/ZeroLengthPredicate:
   Enabled: true
 
-Layout/IndentHeredoc:
+Layout/HeredocIndentation:
   EnforcedStyle: squiggly
 
 Lint/AmbiguousOperator:
@@ -864,7 +864,7 @@ Lint/DeprecatedClassMethods:
 Lint/DuplicateMethods:
   Enabled: true
 
-Lint/DuplicatedKey:
+Lint/DuplicateHashKey:
   Enabled: true
 
 Lint/EachWithObjectArgument:
@@ -891,7 +891,7 @@ Lint/FloatOutOfRange:
 Lint/FormatParameterMismatch:
   Enabled: true
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   AllowComments: true
 
 Lint/ImplicitStringConcatenation:
@@ -947,7 +947,7 @@ Lint/ShadowedException:
 Lint/ShadowingOuterLocalVariable:
   Enabled: true
 
-Lint/StringConversionInInterpolation:
+Lint/RedundantStringCoercion:
   Enabled: true
 
 Lint/UnderscorePrefixedVariableName:

data/lib/record_store/provider/ns1.rb

@@ -5,6 +5,41 @@ module RecordStore
   class Provider::NS1 < Provider
     class Error < StandardError; end
 
+    class ApiAnswer
+      class << self
+        def from_full_api_answer(type:, record_id:, answer:)
+          ApiAnswer.new(type: type, record_id: record_id, rrdata: answer['answer'])
+        end
+
+        def from_short_api_answer(type:, record_id:, answer:)
+          rrdata_fields = case type
+          when 'SPF', 'TXT'
+            [answer]
+          else
+            answer.split
+          end
+
+          ApiAnswer.new(type: type, record_id: record_id, rrdata: rrdata_fields)
+        end
+      end
+
+      attr_accessor :type, :record_id, :rrdata
+
+      def initialize(type:, record_id:, rrdata:)
+        @type = type
+        @record_id = record_id
+        @rrdata = rrdata
+      end
+
+      def rrdata_string
+        rrdata.join(' ')
+      end
+
+      def id
+        [record_id, type, *rrdata]
+      end
+    end
+
     class << self
       def client
         Provider::NS1::Client.new(api_key: secrets['api_key'])
@@ -14,16 +49,9 @@ module RecordStore
       #
       # Returns: an array of `Record` for each record in the provider's zone
       def retrieve_current_records(zone:, stdout: $stdout) # rubocop:disable Lint/UnusedMethodArgument
-        full_api_records = records_for_zone(zone).map do |short_record|
-          client.record(
-            zone: zone,
-            fqdn: short_record["domain"],
-            type: short_record["type"],
-            must_exist: true,
-          )
-        end
-
-        full_api_records.map { |r| build_from_api(r) }.flatten.compact
+        records_for_zone(zone)
+          .flat_map { |short_record| build_from_api(short_record) }
+          .compact
       end
 
       # Returns an array of the zones managed by provider as strings
@@ -35,7 +63,7 @@ module RecordStore
 
       # Fetches simplified records for the provided zone
       def records_for_zone(zone)
-        client.zone(zone)["records"]
+        client.zone(zone)['records']
       end
 
       # Creates a new record to the zone. It is expected this call modifies external state.
@@ -124,10 +152,17 @@ module RecordStore
 
         # Identify the answer in this record with the matching ID, and update it
         updated = false
-        existing_record["answers"].each do |answer|
-          next if answer["id"] != id
+        existing_record['answers'].each do |existing_answer|
+          existing_answer_id = ApiAnswer.from_full_api_answer(
+            record_id: existing_record['id'],
+            type: existing_record['type'],
+            answer: existing_answer,
+          ).id
+
+          next if existing_answer_id != id
+
           updated = true
-          answer["answer"] = build_api_answer_from_record(record)
+          existing_answer['answer'] = build_api_answer_from_record(record)
         end
 
         unless updated
@@ -140,31 +175,38 @@ module RecordStore
           zone: zone,
           fqdn: record_fqdn,
           type: record.type,
-          params: { answers: existing_record["answers"], ttl: record.ttl }
+          params: { answers: existing_record['answers'], ttl: record.ttl }
         )
       end
 
       def build_from_api(api_record)
-        fqdn = Record.ensure_ends_with_dot(api_record["domain"])
+        fqdn = Record.ensure_ends_with_dot(api_record['domain'])
 
-        record_type = api_record["type"]
+        record_type = api_record['type']
         return if record_type == 'SOA'
 
-        api_record["answers"].map do |api_answer|
-          answer = api_answer["answer"]
+        answers = api_record['short_answers'].map do |raw_answer|
+          ApiAnswer.from_short_api_answer(
+            record_id: api_record['id'],
+            type: api_record['type'],
+            answer: raw_answer,
+          )
+        end
+
+        answers.map do |answer|
           record = {
-            ttl: api_record["ttl"],
+            ttl: api_record['ttl'],
             fqdn: fqdn.downcase,
-            record_id: api_answer["id"],
+            record_id: answer.id,
           }
 
           case record_type
           when 'A', 'AAAA'
-            record.merge!(address: answer.first)
+            record.merge!(address: answer.rrdata_string)
           when 'ALIAS'
-            record.merge!(alias: answer.first)
+            record.merge!(alias: answer.rrdata_string)
           when 'CAA'
-            flags, tag, value = answer
+            flags, tag, value = answer.rrdata
 
             record.merge!(
               flags: flags.to_i,
@@ -172,21 +214,21 @@ module RecordStore
               value: Record.unquote(value),
             )
           when 'CNAME'
-            record.merge!(cname: answer.first)
+            record.merge!(cname: answer.rrdata_string)
           when 'MX'
 
-            preference, exchange = answer
+            preference, exchange = answer.rrdata
 
             record.merge!(
               preference: preference.to_i,
               exchange: exchange,
             )
           when 'NS'
-            record.merge!(nsdname: answer.first)
+            record.merge!(nsdname: answer.rrdata_string)
           when 'SPF', 'TXT'
-            record.merge!(txtdata: Record.unlong_quote(Record.unescape(answer.first).gsub(';', '\;')))
+            record.merge!(txtdata: Record.unlong_quote(Record.unescape(answer.rrdata_string).gsub(';', '\;')))
           when 'SRV'
-            priority, weight, port, host = answer
+            priority, weight, port, host = answer.rrdata
 
             record.merge!(
               priority: priority.to_i,

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '5.7.1'.freeze
+  VERSION = '5.7.2'.freeze
 end

data/record_store.gemspec

@@ -43,4 +43,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'webmock'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'minitest-focus'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 5.7.1
+  version: 5.7.2
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2019-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -311,6 +311,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-focus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Manage DNS through a git-based workflow. If you're looking for the original
   'record_store', that has been renamed to 'sequel_record_store'.
 email: