record_store 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b0eb3158b6884906c3158f0b09e46417b714d9f
-  data.tar.gz: f2d23e9c6aee9c94bfd276f8dec1db488d78d900
+  metadata.gz: d39d4eef870b4fb7d6634f320f94c1eafdc744e9
+  data.tar.gz: dd9eba4966da027f358a0f82b0b515a916188774
 SHA512:
-  metadata.gz: 7aa13c01efa056267a2cdcdb791d288830c2d9372b54ca9ee0ea547bf6b05302d34065128bce6701d5fb655d36425fb28b74bab2abaa3e722c1f10bfe1970b9b
-  data.tar.gz: 6ac7dcd241e3385df6b93694514615b4231b599ce18b3a940d15060a4d92d7cda3c4e967fb35379460099d4ed188e41de27c309f404943d56a67b150221dc5fe
+  metadata.gz: b5e25983fc1d7cafa44207f6c8e0ec38969eeda47da61b876bb60e783c19627f06e3468ed2f948553331523e5b8f3fa1bd2c355023dbfae1fa3dafba579eaf26
+  data.tar.gz: 406d44994a2b93a02ec891f35ee1a86f95e56b5e88d325185016a4f0cecedf5a151e930b13ba1e8a6ed3f23fb4a306115defa85770e18d91df5548a6286714ac

data/.gitignore

@@ -3,3 +3,4 @@ test/vcr_debug.log
 dev/
 pkg/
 Gemfile.lock
+.bundle/config

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## 5.2.2
+- support regex based ignore patterns [FEATURE]
+
 ## 5.2.1
 - remove alias at domain root validation
 

data/lib/record_store/version.rb

@@ -1,3 +1,3 @@
 module RecordStore
-  VERSION = '5.2.1'.freeze
+  VERSION = '5.2.2'.freeze
 end

data/lib/record_store/zone/config/ignore_pattern.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module RecordStore
+  class Zone
+    class Config
+      class IgnorePattern
+        MATCH_TYPE_FIELD = 'match'
+        MATCH_TYPE_REGEX = 'regex'
+        MATCH_TYPE_EXACT = 'exact'
+
+        def initialize(orig_hash)
+          @orig_hash = orig_hash
+        end
+
+        def ignore?(record)
+          all_pairs.all? do |(key, value)|
+            record.respond_to?(key) && value_matches?(value, record.send(key))
+          end
+        end
+
+        def to_hash
+          @orig_hash
+        end
+
+        private
+
+        def all_pairs
+          to_hash.reject { |key| key == MATCH_TYPE_FIELD }
+        end
+
+        def value_matches?(ignore_pattern_value, record_value)
+          return record_value.match?(ignore_pattern_value) if regex?
+          return record_value == ignore_pattern_value if exact?
+
+          false
+        end
+
+        def regex?
+          to_hash[MATCH_TYPE_FIELD] == MATCH_TYPE_REGEX
+        end
+
+        def exact?
+          to_hash.fetch(MATCH_TYPE_FIELD, MATCH_TYPE_EXACT) == MATCH_TYPE_EXACT
+        end
+      end
+    end
+  end
+end

data/lib/record_store/zone/config.rb

@@ -8,7 +8,10 @@ module RecordStore
       validate :validate_zone_config
 
       def initialize(ignore_patterns: [], providers: nil, supports_alias: nil)
-        @ignore_patterns = ignore_patterns
+        @ignore_patterns = ignore_patterns.map do |ignore_pattern|
+          Zone::Config::IgnorePattern.new(ignore_pattern)
+        end
+
         @providers = providers
         @supports_alias = supports_alias
       end
@@ -24,7 +27,7 @@ module RecordStore
       def to_hash
         config_hash = {
           providers: providers,
-          ignore_patterns: ignore_patterns,
+          ignore_patterns: ignore_patterns.map(&:to_hash)
         }
         config_hash.merge!(supports_alias: supports_alias) if supports_alias
 

data/lib/record_store/zone.rb

@@ -35,7 +35,7 @@ module RecordStore
       def filter_records(current_records, ignore_patterns)
         ignore_patterns.inject(current_records) do |remaining_records, pattern|
           remaining_records.reject do |record|
-            pattern.all? { |(key, value)| record.respond_to?(key) && value === record.send(key) }
+            pattern.ignore?(record)
           end
         end
       end

data/lib/record_store.rb

@@ -24,6 +24,7 @@ require 'record_store/record/srv'
 require 'record_store/zone/yaml_definitions'
 require 'record_store/zone'
 require 'record_store/zone/config'
+require 'record_store/zone/config/ignore_pattern'
 require 'record_store/changeset'
 require 'record_store/provider'
 require 'record_store/provider/dynect'

data/record_store.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'fog-json'
   spec.add_runtime_dependency 'fog-xml'
   spec.add_runtime_dependency 'fog-dynect', '~> 0.2.0'
-  spec.add_runtime_dependency 'dnsimple-ruby', '~> 2.0'
+  spec.add_runtime_dependency 'dnsimple', '~> 4.4.0'
   spec.add_runtime_dependency 'google-cloud-dns'
   spec.add_runtime_dependency 'ruby-limiter', '~> 1.0', '>= 1.0.1'
 

data/template/secrets.json

@@ -17,7 +17,7 @@
     "client_email": "client_email",
     "client_id": "client_id",
     "auth_uri": "https://accounts.google.com/o/oauth2/auth",
-    "token_uri": "https://accounts.google.com/o/oauth2/token",
+    "token_uri": "https://oauth2.googleapis.com/token",
     "auth_provider_x509_cert_url": "auth_provider_x509_cert_url",
     "client_x509_cert_url": "client_x509_cert_url"
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: record_store
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - Willem van Bergen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-18 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -124,19 +124,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
-  name: dnsimple-ruby
+  name: dnsimple
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-dns
   requirement: !ruby/object:Gem::Requirement
@@ -297,6 +297,7 @@ files:
 - lib/record_store/version.rb
 - lib/record_store/zone.rb
 - lib/record_store/zone/config.rb
+- lib/record_store/zone/config/ignore_pattern.rb
 - lib/record_store/zone/yaml_definitions.rb
 - record_store.gemspec
 - shipit.rubygems.yml