droplet_kit 3.16.1 → 3.18.0

data/lib/droplet_kit/models/domain.rb

@@ -17,4 +17,4 @@ module DropletKit
       new(name: identifier)
     end
   end
-end
+end

data/lib/droplet_kit/models/droplet.rb

@@ -2,10 +2,10 @@
 
 module DropletKit
   class Droplet < BaseModel
-    [:id, :name, :memory, :vcpus, :disk, :locked, :created_at,
-      :status, :backup_ids, :snapshot_ids, :action_ids, :features,
-      :region, :image, :networks, :kernel, :size_slug, :tags,
-      :volume_ids].each do |key|
+    %i[id name memory vcpus disk locked created_at
+       status backup_ids snapshot_ids action_ids features
+       region image networks kernel size_slug tags
+       volume_ids].each do |key|
       attribute(key)
     end
 
@@ -24,12 +24,12 @@ module DropletKit
 
     def public_ip
       network = network_for(:v4, 'public')
-      network && network.ip_address
+      network&.ip_address
     end
 
     def private_ip
       network = network_for(:v4, 'private')
-      network && network.ip_address
+      network&.ip_address
     end
 
     private
@@ -46,4 +46,3 @@ module DropletKit
     end
   end
 end
-

data/lib/droplet_kit/models/invoice.rb

@@ -1,20 +1,19 @@
 # frozen_string_literal: true
 
 module DropletKit
-    class Invoice < BaseModel
-      attribute :invoice_uuid
-      attribute :amount
-      attribute :invoice_period
-      attribute :product
-      attribute :resource_uuid
-      attribute :group_description
-      attribute :description
-      attribute :duration
-      attribute :duration_unit
-      attribute :start_time
-      attribute :end_time
-      attribute :project_name
-      attribute :category
-    end
+  class Invoice < BaseModel
+    attribute :invoice_uuid
+    attribute :amount
+    attribute :invoice_period
+    attribute :product
+    attribute :resource_uuid
+    attribute :group_description
+    attribute :description
+    attribute :duration
+    attribute :duration_unit
+    attribute :start_time
+    attribute :end_time
+    attribute :project_name
+    attribute :category
   end
-  
+end

data/lib/droplet_kit/models/kernel.rb

@@ -6,4 +6,4 @@ module DropletKit
     attribute :name
     attribute :version
   end
-end
+end

data/lib/droplet_kit/models/kubernetes_cluster.rb

@@ -2,7 +2,7 @@
 
 module DropletKit
   class KubernetesCluster < BaseModel
-    [:id, :name, :region, :version, :auto_upgrade, :cluster_subnet, :service_subnet, :ipv4, :endpoint, :tags, :maintenance_policy, :node_pools, :vpc_uuid, :ha].each do |key|
+    %i[id name region version auto_upgrade cluster_subnet service_subnet ipv4 endpoint tags maintenance_policy node_pools vpc_uuid ha].each do |key|
       attribute(key)
     end
   end

data/lib/droplet_kit/models/kubernetes_node.rb

@@ -2,7 +2,7 @@
 
 module DropletKit
   class KubernetesNode < BaseModel
-    [:id, :name, :status, :created_at, :updated_at].each do |key|
+    %i[id name status created_at updated_at].each do |key|
       attribute(key)
     end
   end

data/lib/droplet_kit/models/kubernetes_node_pool.rb

@@ -2,7 +2,7 @@
 
 module DropletKit
   class KubernetesNodePool < BaseModel
-    [:id, :name, :size, :count, :tags, :labels, :nodes, :auto_scale, :min_nodes, :max_nodes].each do |key|
+    %i[id name size count tags labels nodes auto_scale min_nodes max_nodes].each do |key|
       attribute(key)
     end
   end

data/lib/droplet_kit/models/load_balancer.rb

@@ -12,10 +12,10 @@ module DropletKit
     attribute :region
     attribute :size
     attribute :size_unit
-    attribute :redirect_http_to_https, Boolean, :default => false
-    attribute :enable_proxy_protocol, Boolean, :default => false
-    attribute :enable_backend_keepalive, Boolean, :default => false
-    attribute :disable_lets_encrypt_dns_records, Boolean, :default => false
+    attribute :redirect_http_to_https, Boolean, default: false
+    attribute :enable_proxy_protocol, Boolean, default: false
+    attribute :enable_backend_keepalive, Boolean, default: false
+    attribute :disable_lets_encrypt_dns_records, Boolean, default: false
     attribute :droplet_ids
     attribute :sticky_sessions, StickySession
     attribute :health_check

data/lib/droplet_kit/models/meta_information.rb

@@ -13,4 +13,4 @@ module DropletKit
 
     attribute :total
   end
-end
+end

data/lib/droplet_kit/models/pagination_information.rb

@@ -16,4 +16,4 @@ module DropletKit
       end
     end
   end
-end
+end

data/lib/droplet_kit/models/project.rb

@@ -2,7 +2,7 @@
 
 module DropletKit
   class Project < BaseModel
-    DEFAULT = 'default'.freeze
+    DEFAULT = 'default'
 
     attribute :id
     attribute :owner_uuid

data/lib/droplet_kit/models/reserved_ip.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module DropletKit
+  class ReservedIp < BaseModel
+    attribute :ip
+    attribute :region
+    attribute :droplet
+
+    # Used for creates
+    attribute :droplet_id
+
+    def identifier
+      ip
+    end
+
+    def self.from_identifier(identifier)
+      new(ip: identifier)
+    end
+  end
+end

data/lib/droplet_kit/models/size.rb

@@ -11,6 +11,7 @@ module DropletKit
     attribute :price_hourly
     attribute :regions
     attribute :available
+    attribute :description
   end
 
   def self.from_identifier(identifier)

data/lib/droplet_kit/models/snapshot.rb

@@ -11,4 +11,4 @@ module DropletKit
     attribute :min_disk_size
     attribute :size_gigabytes
   end
-end
+end

data/lib/droplet_kit/models/ssh_key.rb

@@ -7,4 +7,4 @@ module DropletKit
     attribute :public_key
     attribute :name
   end
-end
+end

data/lib/droplet_kit/models/volume.rb

@@ -15,4 +15,4 @@ module DropletKit
     # Used for creates
     attribute :snapshot_id
   end
-end
+end

data/lib/droplet_kit/models/vpc.rb

@@ -11,4 +11,4 @@ module DropletKit
     attribute :created_at
     attribute :default
   end
-end
+end

data/lib/droplet_kit/models/vpc_member.rb

@@ -6,4 +6,4 @@ module DropletKit
     attribute :name
     attribute :created_at
   end
-end
+end

data/lib/droplet_kit/paginated_resource.rb

@@ -16,7 +16,7 @@ module DropletKit
       @resource = resource
       @collection = []
       @args = args
-      @options = args.last.kind_of?(Hash) ? args.last : {}
+      @options = args.last.is_a?(Hash) ? args.last : {}
     end
 
     def per_page
@@ -31,10 +31,9 @@ module DropletKit
       # Start off with the first page if we have no idea of anything yet
       fetch_next_page if total.nil?
 
-      return to_enum(:each, start) unless block_given?
-      Array(@collection[start..-1]).each do |element|
-        yield(element)
-      end
+      return to_enum(:each, start) unless block
+
+      Array(@collection[start..-1]).each(&block)
 
       unless last?
         start = [@collection.size, start].max
@@ -46,18 +45,19 @@ module DropletKit
     end
 
     def last?
-      return true if self.total.nil?
-      @current_page == total_pages || self.total.zero?
+      return true if total.nil?
+
+      @current_page == total_pages || total.zero?
     end
 
     def total_pages
-      return nil if self.total.nil?
+      return nil if total.nil?
 
-      (self.total.to_f / per_page.to_f).ceil
+      (total.to_f / per_page).ceil
     end
 
     def ==(other)
-      each_with_index.each.all? {|object, index| object == other[index] }
+      each_with_index.each.all? { |object, index| object == other[index] }
     end
 
     private

data/lib/droplet_kit/resources/account_resource.rb

@@ -5,7 +5,7 @@ module DropletKit
     include ErrorHandlingResourcable
 
     resources do
-      default_handler(:ok) {|r| AccountMapping.extract_single(r.body, :read) }
+      default_handler(:ok) { |r| AccountMapping.extract_single(r.body, :read) }
       get '/v2/account' => :info
     end
   end

data/lib/droplet_kit/resources/balance_resource.rb

@@ -5,7 +5,7 @@ module DropletKit
     include ErrorHandlingResourcable
 
     resources do
-      default_handler(:ok) {|r| BalanceMapping.extract_single(r.body, :read) }
+      default_handler(:ok) { |r| BalanceMapping.extract_single(r.body, :read) }
       get '/v2/customers/my/balance' => :info
     end
   end

data/lib/droplet_kit/resources/domain_record_resource.rb

@@ -11,7 +11,7 @@ module DropletKit
       end
 
       action :create, 'POST /v2/domains/:for_domain/records' do
-        body {|object| DomainRecordMapping.representation_for(:create, object) }
+        body { |object| DomainRecordMapping.representation_for(:create, object) }
         handler(201) { |response| DomainRecordMapping.extract_single(response.body, :read) }
       end
 
@@ -24,7 +24,7 @@ module DropletKit
       end
 
       action :update, 'PUT /v2/domains/:for_domain/records/:id' do
-        body {|object| DomainRecordMapping.representation_for(:update, object) }
+        body { |object| DomainRecordMapping.representation_for(:update, object) }
         handler(200) { |response| DomainRecordMapping.extract_single(response.body, :read) }
       end
     end

data/lib/droplet_kit/resources/droplet_action_resource.rb

@@ -4,14 +4,14 @@ module DropletKit
   class DropletActionResource < ResourceKit::Resource
     include ErrorHandlingResourcable
 
-    ACTIONS_WITHOUT_INPUT = %w(reboot power_cycle shutdown power_off power_on
-      password_reset enable_ipv6 enable_backups disable_backups
-      enable_private_networking)
+    ACTIONS_WITHOUT_INPUT = %w[reboot power_cycle shutdown power_off power_on
+                               password_reset enable_ipv6 enable_backups disable_backups
+                               enable_private_networking].freeze
 
-    TAG_ACTIONS = %w(
+    TAG_ACTIONS = %w[
       enable_backups disable_backups power_cycle power_on power_off shutdown
       enable_private_networking enable_ipv6 snapshot
-    )
+    ].freeze
 
     resources do
       default_handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }

data/lib/droplet_kit/resources/firewall_resource.rb

@@ -45,13 +45,13 @@ module DropletKit
         handler(204) { |_| true }
       end
 
-      action :add_tags, 'POST /v2/firewalls/:id/tags'  do
-        body { |tags| { tags: tags}.to_json }
+      action :add_tags, 'POST /v2/firewalls/:id/tags' do
+        body { |tags| { tags: tags }.to_json }
         handler(204) { |_| true }
       end
 
       action :remove_tags, 'DELETE /v2/firewalls/:id/tags' do
-        body { |tags| { tags: tags}.to_json }
+        body { |tags| { tags: tags }.to_json }
         handler(204) { |_| true }
       end
 

data/lib/droplet_kit/resources/image_resource.rb

@@ -19,7 +19,7 @@ module DropletKit
       end
 
       action :update, 'PUT /v2/images/:id' do
-        body {|image| ImageMapping.representation_for(:update, image) }
+        body { |image| ImageMapping.representation_for(:update, image) }
         handler(200) { |response| ImageMapping.extract_single(response.body, :read) }
       end
     end

data/lib/droplet_kit/resources/kubernetes_cluster_resource.rb

@@ -15,17 +15,15 @@ module DropletKit
       end
 
       action :create, 'POST /v2/kubernetes/clusters' do
-        body do |object| 
+        body do |object|
           # This ensures that both a hash and an instance of KubernetesNodePool can be passed
           # into the node_pools array
-          # 
+          #
           # Ex:
           # KubernetesCluster.new(node_pools: [{}])
           # or
           # KubernetesCluster.new(node_pools: [KubernetesNodePool.new()])
-          if object.respond_to?(:node_pools) && object.node_pools.respond_to?(:map)
-             object.node_pools = object.node_pools.map(&:to_hash)
-          end
+          object.node_pools = object.node_pools.map(&:to_hash) if object.respond_to?(:node_pools) && object.node_pools.respond_to?(:map)
 
           KubernetesClusterMapping.representation_for(:create, object)
         end

data/lib/droplet_kit/resources/load_balancer_resource.rb

@@ -21,7 +21,7 @@ module DropletKit
       end
 
       action :update, 'PUT /v2/load_balancers/:id' do
-        body {|load_balancer| LoadBalancerMapping.representation_for(:update, load_balancer) }
+        body { |load_balancer| LoadBalancerMapping.representation_for(:update, load_balancer) }
         handler(200) { |response| LoadBalancerMapping.extract_single(response.body, :read) }
         handler(422) { |response| ErrorMapping.fail_with(FailedUpdate, response.body) }
       end

data/lib/droplet_kit/resources/project_resource.rb

@@ -54,7 +54,7 @@ module DropletKit
             elsif resource.respond_to?(:urn) && resource.urn && DropletKit::BaseModel.valid_urn?(resource.urn)
               resource.urn
             else
-              raise DropletKit::Error.new("cannot assign resource without valid urn: #{resource}")
+              raise DropletKit::Error, "cannot assign resource without valid urn: #{resource}"
             end
           end
         end

data/lib/droplet_kit/resources/reserved_ip_action_resource.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module DropletKit
+  class ReservedIpActionResource < ResourceKit::Resource
+    resources do
+      default_handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }
+
+      action :assign, 'POST /v2/reserved_ips/:ip/actions' do
+        body { |hash| { type: 'assign', droplet_id: hash[:droplet_id] }.to_json }
+        handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
+      end
+
+      action :unassign, 'POST /v2/reserved_ips/:ip/actions' do
+        body { |hash| { type: 'unassign' }.to_json }
+        handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
+      end
+
+      action :find, 'GET /v2/reserved_ips/:ip/actions/:id' do
+        handler(200) { |response| ActionMapping.extract_single(response.body, :read) }
+      end
+
+      action :all, 'GET /v2/reserved_ips/:ip/actions' do
+        query_keys :per_page, :page
+        handler(200) { |response| ActionMapping.extract_collection(response.body, :read) }
+      end
+    end
+
+    def all(*args)
+      PaginatedResource.new(action(:all), self, *args)
+    end
+  end
+end

data/lib/droplet_kit/resources/reserved_ip_resource.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module DropletKit
+  class ReservedIpResource < ResourceKit::Resource
+    resources do
+      action :all, 'GET /v2/reserved_ips' do
+        query_keys :per_page, :page
+        handler(200) { |response| ReservedIpMapping.extract_collection(response.body, :read) }
+      end
+
+      action :find, 'GET /v2/reserved_ips/:ip' do
+        handler(200) { |response| ReservedIpMapping.extract_single(response.body, :read) }
+      end
+
+      action :create, 'POST /v2/reserved_ips' do
+        body { |object| ReservedIpMapping.representation_for(:create, object) }
+        handler(202) { |response| ReservedIpMapping.extract_single(response.body, :read) }
+        handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }
+      end
+
+      action :delete, 'DELETE /v2/reserved_ips/:ip' do
+        handler(202) { |response| ActionMapping.extract_single(response.body, :read) }
+        handler(204) { |response| true }
+      end
+    end
+
+    def all(*args)
+      PaginatedResource.new(action(:all), self, *args)
+    end
+  end
+end

data/lib/droplet_kit/resources/ssh_key_resource.rb

@@ -5,7 +5,7 @@ module DropletKit
     include ErrorHandlingResourcable
 
     resources do
-      default_handler(:ok, :created) {|r| SSHKeyMapping.extract_single(r.body, :read) }
+      default_handler(:ok, :created) { |r| SSHKeyMapping.extract_single(r.body, :read) }
 
       action :all, 'GET /v2/account/keys' do
         query_keys :per_page, :page
@@ -13,14 +13,14 @@ module DropletKit
       end
 
       action :create, 'POST /v2/account/keys' do
-        body {|object| SSHKeyMapping.representation_for(:create, object) }
+        body { |object| SSHKeyMapping.representation_for(:create, object) }
       end
 
       action :find, 'GET /v2/account/keys/:id'
       action :delete, 'DELETE /v2/account/keys/:id'
 
       action :update, 'PUT /v2/account/keys/:id' do
-        body {|ssh_key| SSHKeyMapping.representation_for(:update, ssh_key) }
+        body { |ssh_key| SSHKeyMapping.representation_for(:update, ssh_key) }
       end
     end
 

data/lib/droplet_kit/resources/volume_action_resource.rb

@@ -11,7 +11,7 @@ module DropletKit
             type: 'attach',
             droplet_id: hash[:droplet_id],
             volume_id: hash[:volume_id], # seems redundant to the id in the url?
-            region: hash[:region], # seems redundant - inferred from the droplet?
+            region: hash[:region] # seems redundant - inferred from the droplet?
           }.to_json
         end
         handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
@@ -23,7 +23,7 @@ module DropletKit
             type: 'detach',
             droplet_id: hash[:droplet_id],
             volume_id: hash[:volume_id], # seems redundant to the id in the url?
-            region: hash[:region], # seems redundant - inferred from the droplet?
+            region: hash[:region] # seems redundant - inferred from the droplet?
           }.to_json
         end
         handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
@@ -34,7 +34,7 @@ module DropletKit
           {
             type: 'resize',
             size_gigabytes: hash[:size_gigabytes],
-            region: hash[:region],
+            region: hash[:region]
           }.to_json
         end
         handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }

data/lib/droplet_kit/resources/vpc_resource.rb

@@ -26,16 +26,16 @@ module DropletKit
       end
 
       action :update, 'PUT /v2/vpcs/:id' do
-        body {|vpc| VPCMapping.representation_for(:update, vpc) }
+        body { |vpc| VPCMapping.representation_for(:update, vpc) }
         handler(200) { |response| VPCMapping.extract_single(response.body, :read) }
         handler(422) { |response| ErrorMapping.fail_with(FailedUpdate, response.body) }
       end
 
       action :patch, 'PATCH /v2/vpcs/:id' do
-          body {|vpc| VPCMapping.representation_for(:patch, vpc) }
-          handler(200) { |response| VPCMapping.extract_single(response.body, :read) }
-          handler(422) { |response| ErrorMapping.fail_with(FailedUpdate, response.body) }
-        end
+        body { |vpc| VPCMapping.representation_for(:patch, vpc) }
+        handler(200) { |response| VPCMapping.extract_single(response.body, :read) }
+        handler(422) { |response| ErrorMapping.fail_with(FailedUpdate, response.body) }
+      end
 
       action :delete, 'DELETE /v2/vpcs/:id' do
         handler(204) { |_| true }

data/lib/droplet_kit/utils.rb

@@ -5,29 +5,29 @@ module DropletKit
     def self.camelize(term)
       string = term.to_s
       string.sub!(/^[a-z\d]*/, &:capitalize)
-      string.gsub!(%r{(?:_|(/))([a-z\d]*)}i) { $2.capitalize }
-      string.gsub!('/'.freeze, '::'.freeze)
+      string.gsub!(%r{(?:_|(/))([a-z\d]*)}i) { Regexp.last_match(2).capitalize }
+      string.gsub!('/', '::')
       string
     end
 
     def self.underscore(term)
-      return term unless /[A-Z-]|::/ =~ term
+      return term unless /[A-Z-]|::/.match?(term)
 
-      word = term.to_s.gsub('::'.freeze, '/'.freeze)
-      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2'.freeze)
-      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2'.freeze)
-      word.tr!('-'.freeze, '_'.freeze)
+      word = term.to_s.gsub('::', '/')
+      word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+      word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+      word.tr!('-', '_')
       word.downcase!
       word
     end
 
     def self.transform_keys(hash, &block)
       return hash.transform_keys(&block) if hash.respond_to?(:transform_keys)
-      return to_enum(__caller__) unless block_given?
+      return to_enum(__caller__) unless block
 
       {}.tap do |result|
         hash.each do |key, value|
-          result[block.call(key)] = value
+          result[yield(key)] = value
         end
       end
     end

data/lib/droplet_kit/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DropletKit
-  VERSION = "3.16.1"
+  VERSION = '3.18.0'
 end

data/lib/droplet_kit.rb

@@ -30,6 +30,7 @@ module DropletKit
   autoload :Balance, 'droplet_kit/models/balance'
   autoload :DropletUpgrade, 'droplet_kit/models/droplet_upgrade'
   autoload :FloatingIp, 'droplet_kit/models/floating_ip'
+  autoload :ReservedIp, 'droplet_kit/models/reserved_ip'
   autoload :Project, 'droplet_kit/models/project'
   autoload :ProjectAssignment, 'droplet_kit/models/project_assignment'
   autoload :Links, 'droplet_kit/models/links'
@@ -88,6 +89,8 @@ module DropletKit
   autoload :DropletUpgradeResource, 'droplet_kit/resources/droplet_upgrade_resource'
   autoload :FloatingIpResource, 'droplet_kit/resources/floating_ip_resource'
   autoload :FloatingIpActionResource, 'droplet_kit/resources/floating_ip_action_resource'
+  autoload :ReservedIpResource, 'droplet_kit/resources/reserved_ip_resource'
+  autoload :ReservedIpActionResource, 'droplet_kit/resources/reserved_ip_action_resource'
   autoload :ProjectResource, 'droplet_kit/resources/project_resource'
   autoload :TagResource, 'droplet_kit/resources/tag_resource'
   autoload :VolumeResource, 'droplet_kit/resources/volume_resource'
@@ -125,6 +128,7 @@ module DropletKit
   autoload :BalanceMapping, 'droplet_kit/mappings/balance_mapping'
   autoload :DropletUpgradeMapping, 'droplet_kit/mappings/droplet_upgrade_mapping'
   autoload :FloatingIpMapping, 'droplet_kit/mappings/floating_ip_mapping'
+  autoload :ReservedIpMapping, 'droplet_kit/mappings/reserved_ip_mapping'
   autoload :ProjectMapping, 'droplet_kit/mappings/project_mapping'
   autoload :ProjectAssignmentMapping, 'droplet_kit/mappings/project_assignment_mapping'
   autoload :LinksMapping, 'droplet_kit/mappings/links_mapping'
@@ -181,11 +185,11 @@ module DropletKit
     attr_writer :limit, :remaining
 
     def limit
-      @limit.to_i if @limit
+      @limit&.to_i
     end
 
     def remaining
-      @remaining.to_i if @remaining
+      @remaining&.to_i
     end
   end
 end