droplet_kit 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23066062e13119e43659c08818ac400f8f059b7ab4fba6fd6ad932cf92424cc3
-  data.tar.gz: 429825725ffa50893fd84bedca6cdbbe22c52863d03fd19b3661334caab392a3
+  metadata.gz: 2a482f4679dd8fe42fad27bbf85151777108bc2ac4d361c64c2a02480b988bfc
+  data.tar.gz: ac6c62a63eabbb5cf077fae7578bda59dab98fbb1c086b6b50bbf17dae50e1cc
 SHA512:
-  metadata.gz: 6ac8efdcb36b8f2c6bd9022b7b28146a147d116b035857ecc1151aaf071ee203b2699331fe7ae04152cf1ae97cd3dadd2426e063b473d5f44d0e5ac9c32b6f52
-  data.tar.gz: cff9d0911da3b859df5f4b3b720ae7c345728c74bf7ec9e1f42d00fe7d47c1a0b3499bf886e0788e6b01c4c5c8143bef4db222aa0cdb8e9de02f9a3fcafe25ba
+  metadata.gz: b830d7461f8fb8edcc430aef1e80f0893f6df649402f25489da8221eb484b0028f38feb6b925c15c9da8e339edb638cc58fa0ffd375915d9d2a80497969700c8
+  data.tar.gz: 73a313dc86a7eb1247ce335abc59bbd394dba2e2b27decda42d247e17c525cc11de7acbd501fe6b6dfd9ef4e7181bee6b59d2e3499f8bd698c65445764d9cdf4

data/lib/droplet_kit.rb

@@ -1,5 +1,4 @@
 require 'droplet_kit/version'
-require 'active_support/all'
 require 'resource_kit'
 require 'kartograph'
 

data/lib/droplet_kit/client.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'droplet_kit/utils'
 
 module DropletKit
   class Client
@@ -9,11 +10,12 @@ module DropletKit
     attr_reader :access_token, :api_url, :open_timeout, :timeout, :user_agent
 
     def initialize(options = {})
-      @access_token = options.with_indifferent_access[:access_token]
-      @api_url      = options.with_indifferent_access[:api_url] || DIGITALOCEAN_API
-      @open_timeout = options.with_indifferent_access[:open_timeout] || DEFAULT_OPEN_TIMEOUT
-      @timeout      = options.with_indifferent_access[:timeout] || DEFAULT_TIMEOUT
-      @user_agent   = options.with_indifferent_access[:user_agent]
+      options = DropletKit::Utils.transform_keys(options, &:to_sym)
+      @access_token = options[:access_token]
+      @api_url      = options[:api_url] || DIGITALOCEAN_API
+      @open_timeout = options[:open_timeout] || DEFAULT_OPEN_TIMEOUT
+      @timeout      = options[:timeout] || DEFAULT_TIMEOUT
+      @user_agent   = options[:user_agent]
     end
 
     def connection

data/lib/droplet_kit/mappings/droplet_mapping.rb

@@ -21,6 +21,7 @@ module DropletKit
       property :size_slug, scopes: [:read]
       property :tags, scopes: [:read]
       property :vpc_uuid, scopes: [:read]
+      property :volume_ids, scopes: [:read]
 
       property :region, scopes: [:read], include: RegionMapping
       property :image, scopes: [:read], include: ImageMapping

data/lib/droplet_kit/models/base_model.rb

@@ -1,4 +1,5 @@
 require 'virtus'
+require 'droplet_kit/utils'
 
 module DropletKit
   class BaseModel
@@ -18,7 +19,7 @@ module DropletKit
     end
 
     def collection_name
-      self.class.name.split('::').last.underscore
+      DropletKit::Utils.underscore self.class.name.split('::').last
     end
 
     def identifier
@@ -36,7 +37,7 @@ module DropletKit
       return true if UNSUPPORTED_COLLECTIONS.include?(collection)
 
       begin
-        "DropletKit::#{collection.camelize}".constantize
+        const_get "DropletKit::#{DropletKit::Utils.camelize(collection)}"
       rescue NameError
         return false
       end
@@ -53,7 +54,7 @@ module DropletKit
 
       return nil if UNSUPPORTED_COLLECTIONS.include?(collection)
 
-      klass = "DropletKit::#{collection.camelize}".constantize
+      klass = const_get("DropletKit::#{DropletKit::Utils.camelize(collection)}")
       klass.from_identifier(identifier)
     end
 
@@ -61,4 +62,4 @@ module DropletKit
       new(id: identifier)
     end
   end
-end
+end

data/lib/droplet_kit/models/droplet.rb

@@ -2,7 +2,8 @@ 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].each do |key|
+      :region, :image, :networks, :kernel, :size_slug, :tags,
+      :volume_ids].each do |key|
       attribute(key)
     end
 

data/lib/droplet_kit/models/project_assignment.rb

@@ -5,7 +5,9 @@ module DropletKit
     attribute :links
 
     def self_link
-      links.try(:myself)
+      return unless links
+
+      links.myself
     end
 
     def to_model

data/lib/droplet_kit/utils.rb

@@ -0,0 +1,33 @@
+module DropletKit
+  module Utils
+    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
+    end
+
+    def self.underscore(term)
+      return term unless /[A-Z-]|::/ =~ 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.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?
+
+      {}.tap do |result|
+        hash.each do |key, value|
+          result[block.call(key)] = value
+        end
+      end
+    end
+  end
+end

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

data/lib/tasks/resource_doc.rake

@@ -1,15 +1,22 @@
 require 'droplet_kit'
+require 'droplet_kit/utils'
 
 namespace :doc do
   task :resources do
     resources = DropletKit::Client.resources
 
     resources.each do |key, klass|
-      if klass.name.in?((ENV['SKIP_CLASSES'] || '').split(','))
+      if (ENV['SKIP_CLASSES'] || '').split(',').include?(klass.name)
         next
       end
 
-      puts "## #{klass.name.demodulize.underscore.humanize}"
+      class_name = DropletKit::Utils.underscore klass.name.split('::'.freeze).last
+      human_name = class_name.dup
+      human_name.tr!('_'.freeze, ' '.freeze)
+      human_name.gsub!(/([a-z\d]*)/i) { |match| match.downcase }
+      human_name.gsub!(/\A\w/) { |match| match.upcase }
+
+      puts "## #{human_name}"
       puts
       puts "    client = DropletKit::Client.new(access_token: 'TOKEN')"
       puts "    client.#{key} #=> #{klass.name}"
@@ -21,7 +28,10 @@ namespace :doc do
         params = []
 
         if action.body && action.body.arity > 0
-          params << klass.name.demodulize.underscore.downcase.gsub('_resource', '')
+          resource = class_name.dup
+          resource.gsub!('_resource', '')
+          resource.downcase!
+          params << resource
         end
 
         if action_options.any?
@@ -39,4 +49,4 @@ namespace :doc do
       puts
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Robert Ross
@@ -52,26 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.3
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -295,6 +275,7 @@ files:
 - lib/droplet_kit/resources/volume_action_resource.rb
 - lib/droplet_kit/resources/volume_resource.rb
 - lib/droplet_kit/resources/vpc_resource.rb
+- lib/droplet_kit/utils.rb
 - lib/droplet_kit/version.rb
 - lib/tasks/resource_doc.rake
 homepage: https://github.com/digitalocean/droplet_kit