gehirn_dns 1.0.0.pre → 1.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58c59e72437e8283188c2c51075d062b11e4b58a
-  data.tar.gz: 270c708b1baa5ea61359797db016b9318351e1b0
+  metadata.gz: 1a6e1664a9de06793124e132a120b3b532c638c1
+  data.tar.gz: c8e1c9035c7a7a75947f966e1fb7f2856f8fa1e5
 SHA512:
-  metadata.gz: 1b6af906fe22e06b6aa6c7b04cf21c47e769cc1b274cc41d5192a5fadb4a54d87d2b4796e7de53ba553a28bbe9749b91d76550250d0b73adad9bb92fdb672171
-  data.tar.gz: 4ef110de89b2b7a047d84ac0480e0f9189d7e2e218e09bf4089bfdf26a308a1dc5b6d5cdac467028c3667579d11c7d0366a5976c72b1e978ca60741b2c3c8ca2
+  metadata.gz: bba7ad504607f9eac051ea1835e39442e1e1c0e3a7eadce23f34df8f79cb767d269b7b431d8f4dfcd2ffab495a43c6d2c1f9a12bfc6209ba1f27e6259affed77
+  data.tar.gz: fb334cbfb24d6401e5cbd962196d99c1036d7b31cfe13e2f78645f438fbb4460d0f8e715377942a35752cb3281e1c35defafd3b12c929728bedf34a31de50c7b

data/.rubocop.yml

@@ -14,6 +14,12 @@ Metrics/AbcSize:
   Enabled: false
 Style/ClassAndModuleChildren:
   Enabled: false
+Style/TrailingCommaInLiteral:
+  EnforcedStyleForMultiline: comma
+Metrics/PerceivedComplexity:
+  Max: 9
+Metrics/CyclomaticComplexity:
+  Max: 9
 AllCops:
   Exclude:
     - 'Rakefile'

data/gehirn_dns.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 lib = File.expand_path('../lib', __FILE__)
@@ -21,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.3'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'

data/lib/gehirn_dns/client.rb

@@ -13,7 +13,8 @@ require 'gehirn_dns/version'
 
 module GehirnDns
   class Client
-    attr_accessor :base_uri, :token, :secret
+    attr_reader :base_uri
+    attr_accessor :token, :secret
 
     DEFAULT_USER_AGENT = "gehirndns-ruby/#{::GehirnDns::VERSION}"
 
@@ -45,11 +46,12 @@ module GehirnDns
     end
 
     def inspect
-      %Q(#<#{self.class}:#{object_id} @base_uri=#{@base_uri.inspect}, @secret=<HIDDEN>, @token=<HIDDEN>, @user_agent=#{@user_agent.inspect}>)
+      %(#<#{self.class}:#{object_id} @base_uri=#{@base_uri.inspect}, @secret=<HIDDEN>, @token=<HIDDEN>, @user_agent=#{@user_agent.inspect}>)
     end
 
     private
 
+    # rubocop:disable Metrics/MethodLength
     def execute(method, path, body = nil)
       response = request(method, path, body)
 
@@ -76,6 +78,7 @@ module GehirnDns
         raise RequestError.new(path, body)
       end
     end
+    # rubocop:enable Metrics/MethodLength
 
     def request_class_for(method)
       case method.downcase.to_sym

data/lib/gehirn_dns/resource/record.rb

@@ -2,8 +2,7 @@
 
 module GehirnDns
   class Record
-    attr_reader :id
-    attr_accessor :record_set
+    attr_reader :id, :record_set
 
     RECORD_TYPES = %i(A AAAA CNAME MX NS SRV TXT).freeze
     RECORD_FIELDS = {
@@ -39,11 +38,11 @@ module GehirnDns
     end
 
     def attributes(type: @record_set&.type)
-      Hash[attribute_names(type: type).map{|attr| [attr, instance_variable_get(:"@#{attr}")] }]
+      Hash[attribute_names(type: type).map { |attr| [attr, instance_variable_get(:"@#{attr}")] }]
     end
 
     def attribute_names(type: @record_set&.type)
-      return RECORD_FIELDS.values.flatten unless RECORD_FIELDS.has_key? type
+      return RECORD_FIELDS.values.flatten.uniq unless RECORD_FIELDS.key? type
       RECORD_FIELDS[type]
     end
 
@@ -73,9 +72,8 @@ module GehirnDns
           end
         else
           remove_instance_variable(inst_var_sym) if instance_variable_defined?(inst_var_sym)
-          singleton_class.class_eval do
-            undef_method attr, setter_sym if respond_to?(setter_sym)
-          end
+          singleton_class.class_eval { undef_method setter_sym } if respond_to?(setter_sym)
+          singleton_class.class_eval { undef_method attr } if respond_to?(attr)
         end
       end
     end

data/lib/gehirn_dns/resource/record_set.rb

@@ -2,8 +2,7 @@
 
 module GehirnDns
   class RecordSet < Resource
-    attr_reader :id, :type, :enable_alias, :editable, :version
-    attr_accessor :name, :alias_to, :ttl, :records
+    attr_reader :id, :type, :enable_alias, :editable, :version, :name, :alias_to, :ttl
 
     include Enumerable
 
@@ -63,34 +62,23 @@ module GehirnDns
         response = http_post '../records', to_h
         @id = response[:id]
         @name = response[:name]
-      rescue => e # failed to add record set, revert
+      rescue StandardError => e # failed to add record set, revert
         @version = nil
         @client = nil
         @base_path = nil
         raise e
       end
-
-      self
     end
 
     # append record
     def <<(record)
-      return self if @records.include?(record) || self.equal?(record.record_set)
-
-      record =  case record
-                when Hash
-                  Record.new(record, record_set: self)
-                when Record
-                  if record.record_set.nil?
-                    record.record_set = self
-                  elsif record.record_set != self
-                    raise ArgumentError, "record is already member of a RecordSet"
-                  end
-
-                  record
-                else
-                  raise ArgumentError
-                end
+      record = Record.new(record) unless record.is_a? Record
+
+      return self if @records.include?(record) || equal?(record.record_set)
+
+      raise ArgumentError, 'record is already member of a RecordSet' if record.record_set && record.record_set != self
+
+      record.record_set = self
 
       @enable_alias = false
       @alias_to = nil
@@ -98,13 +86,17 @@ module GehirnDns
 
       begin
         update
-      rescue => e # failed to add record, revert
+      rescue StandardError => e # failed to add record, revert
         @records.delete(record)
         record.record_set = nil
         raise e
       end
     end
 
+    def records
+      @records.clone
+    end
+
     def records=(records)
       @records = records.map { |r| Record.new(r, record_set: self) }
       @enable_alias = false
@@ -136,7 +128,7 @@ module GehirnDns
     end
 
     def delete_record(record)
-      raise ArgumentError, "record isn't member of record set" unless @records.include? record || self.equal?(record.record_set)
+      raise ArgumentError, "record isn't member of record set" unless @records.include?(record) || equal?(record.record_set)
       raise ValidationError, "Can't delete only record of record set" if @records.size == 1
       @records.delete(record)
       update

data/lib/gehirn_dns/resource/version.rb

@@ -21,8 +21,8 @@ module GehirnDns
     end
 
     def record_set(id: nil, name: nil, type: nil)
-      raise ArgumentError, "passing both id and name is not allowed" if id && (name || type)
-      raise ArgumentError, "missing keyword: one of id, name, type is required" if !id && !(name || type)
+      raise ArgumentError, 'passing both id and name is not allowed' if id && (name || type)
+      raise ArgumentError, 'missing keyword: one of id, name, type is required' if !id && !(name || type)
 
       if id
         respnose = http_get "records/#{id}"
@@ -61,7 +61,7 @@ module GehirnDns
       payload = {
         applied_at: applied_at ? applied_at.getutc.strftime('%FT%TZ') : nil,
         name: name,
-        next_version_id: @id
+        next_version_id: @id,
       }.compact
 
       response = http_post '../../presets', payload

data/lib/gehirn_dns/resource/zone.rb

@@ -8,8 +8,8 @@ module GehirnDns
     end
 
     def zone(id: nil, name: nil)
-      raise ArgumentError, "passing both id and name is not allowed" if id && name
-      raise ArgumentError, "missing keyword: id or name" if !id && !name
+      raise ArgumentError, 'passing both id and name is not allowed' if id && name
+      raise ArgumentError, 'missing keyword: id or name' if !id && !name
 
       if id
         response = get "zones/#{id}"
@@ -46,8 +46,8 @@ module GehirnDns
     end
 
     def version(id: nil, name: nil)
-      raise ArgumentError, "passing both id and name is not allowed" if id && name
-      raise ArgumentError, "missing keyword: id or name" if !id && !name
+      raise ArgumentError, 'passing both id and name is not allowed' if id && name
+      raise ArgumentError, 'missing keyword: id or name' if !id && !name
 
       if id
         response = http_get "versions/#{id}"

data/lib/gehirn_dns/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GehirnDns
-  VERSION = '1.0.0.pre'
+  VERSION = '1.0.0.pre2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gehirn_dns
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre
+  version: 1.0.0.pre2
 platform: ruby
 authors:
 - kyontan
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"