droplet_kit 1.3.3 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a86ff8a04cf0c309cc0664c732326179bb5c645
-  data.tar.gz: d38e878482a1ebe271bc139dc5a90a3f0b1d094b
+  metadata.gz: 3766abf70fbb920d8beb72cfc9b8db1b84c68d93
+  data.tar.gz: a39c01eb0af5fbb13da576c578419a1ba4f8765f
 SHA512:
-  metadata.gz: ce73f66a82d4a2d08638c4e4af1a8e171fee5d0ae0c50ee10dfc40701c5a6aab5c536a11e68fca4fbc6160cb635d203d4a1c6c89c53ba08b762f0cbcb928ec70
-  data.tar.gz: af22eec48bfa4e8e159df286252db56da1de69247857933e6c35be9b559d600746920b328f6d87c2ba2510b1518afbb4a2eba9f5a30eaf155b10d21360ed979e
+  metadata.gz: d79cc94964d34123b130791442d112cc1ca9926611132dfff1f3d9d174069a1f24e2ebde48463fcc0545ac6a9a543e40b9b45592ff5f4175ee16d97125e62547
+  data.tar.gz: 38028b0f20a9219ba2db2794de0bb608f922a05bd24dae3c58e5f671eaf5d7f696cfd6109dbf3a61c81a28716ae3ffac2b68ffde4ed3b944c218223105c38f92

data/Gemfile

@@ -11,4 +11,4 @@ version = case (ENV['ACTIVESUPPORT_VERSION'] || '4')
             '~> 3.1'
           end
 
-gem 'activesupport', version
+gem 'activesupport', version

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Robert Ross
+Copyright (c) 2014-2016 Robert Ross
 
 MIT License
 

data/README.md

@@ -74,10 +74,12 @@ client.droplets #=> DropletKit::DropletResource
 Actions supported:
 
 * `client.droplets.all()`
+* `client.droplets.all(tag_name: 'tag_name')`
 * `client.droplets.find(id: 'id')`
 * `client.droplets.create(droplet)`
 * `client.droplets.create_multiple(droplet)`
 * `client.droplets.delete(id: 'id')`
+* `client.droplets.delete_for_tag(tag_name: 'tag_name')`
 * `client.droplets.kernels(id: 'id')`
 * `client.droplets.snapshots(id: 'id')`
 * `client.droplets.backups(id: 'id')`
@@ -94,22 +96,33 @@ Actions supported:
 
 * `client.droplet_actions.reboot(droplet_id: droplet.id)`
 * `client.droplet_actions.power_cycle(droplet_id: droplet.id)`
+* `client.droplet_actions.power_cycle_for_tag(tag: 'tag_name')`
 * `client.droplet_actions.shutdown(droplet_id: droplet.id)`
+* `client.droplet_actions.shutdown_for_tag(tag: 'tag_name')`
 * `client.droplet_actions.power_off(droplet_id: droplet.id)`
+* `client.droplet_actions.power_off_for_tag(tag: 'tag_name')`
 * `client.droplet_actions.power_on(droplet_id: droplet.id)`
+* `client.droplet_actions.power_on_for_tag(tag: 'tag_name')`
 * `client.droplet_actions.password_reset(droplet_id: droplet.id)`
 * `client.droplet_actions.enable_ipv6(droplet_id: droplet.id)`
+* `client.droplet_actions.enable_ipv6_for_tag(tag: 'tag_name')`
 * `client.droplet_actions.enable_backups(droplet_id: droplet.id)`
+* `client.droplet_actions.enable_backups_for_tag(tag: 'tag_name')`
 * `client.droplet_actions.disable_backups(droplet_id: droplet.id)`
+* `client.droplet_actions.disable_backups_for_tag(tag: 'tag_name')`
 * `client.droplet_actions.upgrade(droplet_id: droplet.id)`
 * `client.droplet_actions.enable_private_networking(droplet_id: droplet.id)`
+* `client.droplet_actions.enable_private_networking_for_tag(tag: 'tag_name')`
 * `client.droplet_actions.snapshot(droplet_id: droplet.id, name: 'Snapshot Name')`
+* `client.droplet_actions.snapshot_for_tag(tag: 'tag_name', name: 'Snapshot Name')`
 * `client.droplet_actions.change_kernel(droplet_id: droplet.id, kernel: 'kernel_id')`
 * `client.droplet_actions.rename(droplet_id: droplet.id, name: 'New-Droplet-Name')`
 * `client.droplet_actions.rebuild(droplet_id: droplet.id, image: 'image_id')`
 * `client.droplet_actions.restore(droplet_id: droplet.id, image: 'image_id')`
 * `client.droplet_actions.resize(droplet_id: droplet.id, size: '1gb')`
 * `client.droplet_actions.find(droplet_id: droplet.id, id: action.id)`
+* `client.droplet_actions.action_for_id(droplet_id: droplet.id, type: 'event_name', param: 'value')`
+* `client.droplet_actions.action_for_tag(tag: 'tag_name', type: 'event_name', param: 'value')`
 
 ## Domain resource
 
@@ -207,6 +220,16 @@ client = DropletKit::Client.new(access_token: 'TOKEN')
 client.ssh_keys #=> DropletKit::SSHKeyResource
 ```
 
+When you want to create a droplet using your stored SSH key.
+
+```ruby
+client = DropletKit::Client.new(access_token: 'YOUR_TOKEN')
+my_ssh_keys = client.ssh_keys.all.collect {|key| key.fingerprint}
+droplet = DropletKit::Droplet.new(name: 'mysite.com', region: 'nyc2', image: 'ubuntu-14-04-x64', size: '512mb', ssh_keys: my_ssh_keys)
+created = client.droplets.create(droplet)
+# => DropletKit::Droplet(id: 1231, name: 'something.com', ...)
+```
+
 Actions supported:
 
 * `client.ssh_keys.all()`
@@ -227,6 +250,29 @@ Actions supported:
 * `client.account.info()`
 
 
+## Floating IP resource
+
+    client = DropletKit::Client.new(access_token: 'TOKEN')
+    client.floating_ips #=> DropletKit::FloatingIpResource
+
+Actions supported:
+
+* `client.floating_ips.all()`
+* `client.floating_ips.find(ip: 'ip address')`
+* `client.floating_ips.create(floating_ip)`
+* `client.floating_ips.delete(ip: 'ip address')`
+
+## Floating IP Action resource
+
+    client = DropletKit::Client.new(access_token: 'TOKEN')
+    client.floating_ip_actions #=> DropletKit::FloatingIpActionResource
+
+Actions supported:
+
+* `client.floating_ip_actions.assign(ip: floating_ip.ip, droplet_id: droplet.id)`
+* `client.floating_ip_actions.unassign(ip: floating_ip.ip)`
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/digitalocean/droplet_kit/fork )

data/Rakefile

@@ -1,4 +1,3 @@
 require "bundler/gem_tasks"
 
 load './lib/tasks/resource_doc.rake'
-

data/droplet_kit.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'virtus', '~> 1.0.3'
-  spec.add_dependency "resource_kit", '~> 0.1.4'
+  spec.add_dependency "resource_kit", '~> 0.1.5'
   spec.add_dependency "kartograph", '~> 0.2.3'
   spec.add_dependency "activesupport", '> 3.0', '< 5.0.0'
   spec.add_dependency "faraday", '~> 0.9.1'

data/lib/droplet_kit.rb

@@ -26,6 +26,9 @@ module DropletKit
   autoload :Account, 'droplet_kit/models/account'
   autoload :DropletUpgrade, 'droplet_kit/models/droplet_upgrade'
   autoload :FloatingIp, 'droplet_kit/models/floating_ip'
+  autoload :Tag, 'droplet_kit/models/tag'
+  autoload :TaggedResources, 'droplet_kit/models/tagged_resources'
+  autoload :TaggedDropletsResources, 'droplet_kit/models/tagged_droplets_resources'
 
   # Resources
   autoload :DropletResource, 'droplet_kit/resources/droplet_resource'
@@ -42,6 +45,7 @@ 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 :TagResource, 'droplet_kit/resources/tag_resource'
 
   # JSON Maps
   autoload :DropletMapping, 'droplet_kit/mappings/droplet_mapping'
@@ -62,6 +66,9 @@ module DropletKit
   autoload :AccountMapping, 'droplet_kit/mappings/account_mapping'
   autoload :DropletUpgradeMapping, 'droplet_kit/mappings/droplet_upgrade_mapping'
   autoload :FloatingIpMapping, 'droplet_kit/mappings/floating_ip_mapping'
+  autoload :TagMapping, 'droplet_kit/mappings/tag_mapping'
+  autoload :TaggedResourcesMapping, 'droplet_kit/mappings/tagged_resources_mapping'
+  autoload :TaggedDropletsResourcesMapping, 'droplet_kit/mappings/tagged_droplets_resources_mapping'
 
   # Utils
   autoload :PaginatedResource, 'droplet_kit/paginated_resource'
@@ -74,7 +81,8 @@ module DropletKit
   FailedUpdate = Class.new(DropletKit::Error)
 
   class RateLimitReached < DropletKit::Error
-    attr_accessor :limit, :remaining, :reset_at
+    attr_accessor :reset_at
+    attr_writer :limit, :remaining
 
     def limit
       @limit.to_i if @limit

data/lib/droplet_kit/client.rb

@@ -31,6 +31,7 @@ module DropletKit
         account: AccountResource,
         floating_ips: FloatingIpResource,
         floating_ip_actions: FloatingIpActionResource,
+        tags: TagResource
       }
     end
 
@@ -59,4 +60,4 @@ module DropletKit
       }
     end
   end
-end
+end

data/lib/droplet_kit/mappings/droplet_mapping.rb

@@ -19,6 +19,7 @@ module DropletKit
       property :action_ids, scopes: [:read]
       property :features, scopes: [:read]
       property :size_slug, scopes: [:read]
+      property :tags, scopes: [:read]
 
       property :region, scopes: [:read], include: RegionMapping
       property :image, scopes: [:read], include: ImageMapping

data/lib/droplet_kit/mappings/tag_mapping.rb

@@ -0,0 +1,18 @@
+module DropletKit
+  class TagMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping Tag
+      root_key plural: 'tags', singular: 'tag', scopes: [:read]
+
+      scoped :read, :create, :update do
+        property :name
+      end
+
+      scoped :read do
+        property :resources, include: TaggedResourcesMapping
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/tagged_droplets_resources_mapping.rb

@@ -0,0 +1,16 @@
+module DropletKit
+  class TaggedDropletsResourcesMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping TaggedDropletsResources
+
+      root_key plural: 'droplets', singular: 'tag', scopes: [:read]
+
+      scoped :read do
+        property :count
+        property :last_tagged, include: DropletMapping
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/tagged_resources_mapping.rb

@@ -0,0 +1,15 @@
+module DropletKit
+  class TaggedResourcesMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping TaggedResources
+
+      root_key plural: 'resources', singular: 'resource', scopes: [:read]
+
+      scoped :read do
+        property :droplets, include: TaggedDropletsResourcesMapping
+      end
+    end
+  end
+end

data/lib/droplet_kit/models/droplet.rb

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

data/lib/droplet_kit/models/tag.rb

@@ -0,0 +1,6 @@
+module DropletKit
+  class Tag < BaseModel
+    attribute :name
+    attribute :resources
+  end
+end

data/lib/droplet_kit/models/tagged_droplets_resources.rb

@@ -0,0 +1,6 @@
+module DropletKit
+  class TaggedDropletsResources < BaseModel
+    attribute :count
+    attribute :last_tagged
+  end
+end

data/lib/droplet_kit/models/tagged_resources.rb

@@ -0,0 +1,5 @@
+module DropletKit
+  class TaggedResources < BaseModel
+    attribute :droplets
+  end
+end

data/lib/droplet_kit/paginated_resource.rb

@@ -21,6 +21,10 @@ module DropletKit
       @options[:per_page] || PER_PAGE
     end
 
+    def [](index)
+      @collection[index]
+    end
+
     def each(start = 0)
       # Start off with the first page if we have no idea of anything yet
       fetch_next_page if total.nil?
@@ -73,4 +77,4 @@ module DropletKit
       end
     end
   end
-end
+end

data/lib/droplet_kit/resources/droplet_action_resource.rb

@@ -6,9 +6,25 @@ module DropletKit
       password_reset enable_ipv6 enable_backups disable_backups
       enable_private_networking)
 
+    TAG_ACTIONS = %w(
+      enable_backups disable_backups power_cycle power_on power_off shutdown
+      enable_private_networking enable_ipv6 snapshot
+    )
+
     resources do
       default_handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }
 
+      action :action_for_id, 'POST /v2/droplets/:droplet_id/actions' do
+        body { |hash| hash.tap { |h| h.delete(:droplet_id) }.to_json }
+        handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
+      end
+
+      action :action_for_tag, 'POST /v2/droplets/actions' do
+        query_keys :tag
+        body { |hash| hash.to_json }
+        handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
+      end
+
       ACTIONS_WITHOUT_INPUT.each do |action_name|
         action action_name.to_sym, 'POST /v2/droplets/:droplet_id/actions' do
           body { |_| { type: action_name }.to_json }
@@ -16,6 +32,14 @@ module DropletKit
         end
       end
 
+      TAG_ACTIONS.each do |action_name|
+        action "#{action_name}_for_tag".to_sym, 'POST /v2/droplets/actions' do
+          query_keys :tag
+          body { |_| { type: action_name }.to_json }
+          handler(201, 200) { |response| ActionMapping.extract_collection(response.body, :read) }
+        end
+      end
+
       action :snapshot, 'POST /v2/droplets/:droplet_id/actions' do
         body { |hash| { type: 'snapshot', name: hash[:name] }.to_json }
         handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }

data/lib/droplet_kit/resources/droplet_resource.rb

@@ -4,7 +4,7 @@ module DropletKit
 
     resources do
       action :all, 'GET /v2/droplets' do
-        query_keys :per_page, :page
+        query_keys :per_page, :page, :tag_name
         handler(200) { |response| DropletMapping.extract_collection(response.body, :read) }
       end
 
@@ -47,6 +47,12 @@ module DropletKit
         query_keys :per_page, :page
         handler(200) { |response| ActionMapping.extract_collection(response.body, :read) }
       end
+
+      action :delete_for_tag, 'DELETE /v2/droplets' do
+        verb :delete
+        query_keys :tag_name
+        handler(204) { |_| true }
+      end
     end
 
     def all(*args)

data/lib/droplet_kit/resources/tag_resource.rb

@@ -0,0 +1,48 @@
+module DropletKit
+  class TagResource < ResourceKit::Resource
+    include ErrorHandlingResourcable
+
+    resources do
+      action :all, 'GET /v2/tags' do
+        query_keys :per_page, :page
+        handler(200) { |response| TagMapping.extract_collection(response.body, :read) }
+      end
+
+      action :find, 'GET /v2/tags/:name' do
+        handler(200) { |response| TagMapping.extract_single(response.body, :read) }
+      end
+
+      action :create, 'POST /v2/tags' do
+        body { |object| TagMapping.representation_for(:create, object) }
+        handler(201) { |response| TagMapping.extract_single(response.body, :read) }
+        handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }
+      end
+
+      action :update, 'PUT /v2/tags/:name' do
+        body { |object| TagMapping.representation_for(:update, object) }
+        handler(200) { |response| TagMapping.extract_single(response.body, :read) }
+      end
+
+      action :delete, 'DELETE /v2/tags/:name' do
+        handler(204) { |_| true }
+        handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }
+      end
+
+      action :tag_resources, 'POST /v2/tags/:name/resources' do
+        verb :post
+        body { |hash| { resources: hash[:resources] }.to_json }
+        handler(204) { |_| true }
+      end
+
+      action :untag_resources, 'DELETE /v2/tags/:name/resources' do
+        verb :delete
+        body { |hash| { resources: hash[:resources] }.to_json }
+        handler(204) { |_| true }
+      end
+    end
+
+    def all(*args)
+      PaginatedResource.new(action(:all), self, *args)
+    end
+  end
+end

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "1.3.3"
+  VERSION = "1.4.0"
 end

data/spec/fixtures/droplets/all.json

@@ -76,6 +76,10 @@
       ],
       "action_ids": [
 
+      ],
+      "tags": [
+        "tag-1",
+        "tag-2"
       ]
     }
   ],

data/spec/fixtures/droplets/create.json

@@ -75,6 +75,9 @@
     ],
     "action_ids": [
 
+    ],
+    "tags": [
+
     ]
   }
 }

data/spec/fixtures/droplets/find.json

@@ -75,6 +75,10 @@
     ],
     "action_ids": [
 
+    ],
+    "tags": [
+      "tag-1",
+      "tag-2"
     ]
   }
 }

data/spec/fixtures/tags/all.json

@@ -0,0 +1,26 @@
+{
+  "tags": [
+    {
+      "name": "testing-1",
+      "resources": {
+        "droplets": {
+          "count": 0,
+          "last_tagged": null
+        }
+      }
+    },
+    {
+      "name": "testing-2",
+      "resources": {
+        "droplets": {
+          "count": 0,
+          "last_tagged": null
+        }
+      }
+    }
+  ],
+  "links": {},
+  "meta": {
+    "total": 2
+  }
+}

data/spec/fixtures/tags/all_empty.json

@@ -0,0 +1,7 @@
+{
+  "tags": [
+  ],
+  "meta": {
+    "total": 0
+  }
+}

data/spec/fixtures/tags/create.json

@@ -0,0 +1,11 @@
+{
+  "tag": {
+    "name": "testing-1",
+    "resources": {
+      "droplets": {
+        "count": 0,
+        "last_tagged": null
+      }
+    }
+  }
+}

data/spec/fixtures/tags/find.json

@@ -0,0 +1,92 @@
+{
+  "tag": {
+    "name": "testing-1",
+    "resources": {
+      "droplets": {
+        "count": 1,
+        "last_tagged": {
+          "id": 1,
+          "name": "test.example.com",
+          "memory": 1024,
+          "vcpus": 2,
+          "disk": 20,
+          "region": {
+            "slug": "nyc1",
+            "name": "New York",
+            "sizes": [
+              "1024mb",
+              "512mb"
+            ],
+            "available": true,
+            "features": [
+              "virtio",
+              "private_networking",
+              "backups",
+              "ipv6"
+            ]
+          },
+          "image": {
+            "id": 119192817,
+            "name": "Ubuntu 13.04",
+            "distribution": "ubuntu",
+            "slug": "ubuntu1304",
+            "public": true,
+            "regions": [
+              "nyc1"
+            ],
+            "created_at": "2014-07-29T14:35:37Z"
+          },
+          "size_slug": "1024mb",
+          "locked": false,
+          "status": "active",
+          "networks": {
+            "v4": [
+              {
+                "ip_address": "10.0.0.19",
+                "netmask": "255.255.0.0",
+                "gateway": "10.0.0.1",
+                "type": "private"
+              },
+              {
+                "ip_address": "127.0.0.19",
+                "netmask": "255.255.255.0",
+                "gateway": "127.0.0.20",
+                "type": "public"
+              }
+            ],
+            "v6": [
+              {
+                "ip_address": "2001::13",
+                "cidr": 124,
+                "gateway": "2400:6180:0000:00D0:0000:0000:0009:7000",
+                "type": "public"
+              }
+            ]
+          },
+          "kernel": {
+            "id": 485432985,
+            "name": "DO-recovery-static-fsck",
+            "version": "3.8.0-25-generic"
+          },
+          "created_at": "2014-07-29T14:35:37Z",
+          "features": [
+            "ipv6"
+          ],
+          "backup_ids": [
+            449676382
+          ],
+          "snapshot_ids": [
+            449676383
+          ],
+          "action_ids": [
+
+          ],
+          "tags": [
+            "tag-1",
+            "tag-2"
+          ]
+        }
+      }
+    }
+  }
+}

data/spec/lib/droplet_kit/paginated_resource_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'addressable/uri'
 
 RequestCounter = Struct.new(:count)
 
@@ -45,6 +44,16 @@ RSpec.describe DropletKit::PaginatedResource do
     end
   end
 
+  describe '#[]' do
+    subject(:paginated) { DropletKit::PaginatedResource.new(action, resource) }
+
+    it 'returns the nth element in the collection' do
+      paginated.each_with_index do |elem, i|
+        expect(paginated[i]).to eq(elem)
+      end
+    end
+  end
+
   describe '#each' do
     subject(:paginated) { DropletKit::PaginatedResource.new(action, resource) }
 
@@ -73,4 +82,4 @@ RSpec.describe DropletKit::PaginatedResource do
       end
     end
   end
-end
+end

data/spec/lib/droplet_kit/resources/droplet_action_resource_spec.rb

@@ -8,11 +8,37 @@ RSpec.describe DropletKit::DropletActionResource do
 
   include_context 'resources'
 
-  ACTIONS_WITHOUT_INPUT = %w(reboot power_cycle shutdown power_off
-    power_on password_reset enable_ipv6 disable_backups enable_backups
-    enable_private_networking upgrade)
+  describe '#action_for_id' do
+    let(:action) { 'event' }
+    let(:path) { "/v2/droplets/#{droplet_id}/actions" }
+    let(:fixture) { api_fixture('droplet_actions/find') }
 
-  ACTIONS_WITHOUT_INPUT.each do |action_name|
+    it 'performs the action' do
+      request = stub_do_api(path, :post).with(
+        body: { type: action, param_1: 1, param_2: 2 }.to_json
+      ).to_return(body: fixture, status: 201)
+
+      resource.action_for_id(droplet_id: droplet_id, type: action, param_1: 1, param_2: 2)
+      expect(request).to have_been_made
+    end
+  end
+
+  describe '#action_for_tag' do
+    let(:action) { 'event' }
+    let(:path) { '/v2/droplets/actions' }
+    let(:fixture) { api_fixture('droplet_actions/find') }
+
+    it 'performs the action' do
+      request = stub_do_api(path, :post).with(
+        body: { tag: 'test-tag', type: action, param_1: 1, param_2: 2 }.to_json
+      ).to_return(body: fixture, status: 201)
+
+      resource.action_for_tag(tag: 'test-tag', type: action, param_1: 1, param_2: 2)
+      expect(request).to have_been_made
+    end
+  end
+
+  described_class::ACTIONS_WITHOUT_INPUT.each do |action_name|
     describe "Action #{action_name}" do
       let(:action) { action_name }
       let(:path) { "/v2/droplets/#{droplet_id}/actions" }
@@ -35,6 +61,29 @@ RSpec.describe DropletKit::DropletActionResource do
     end
   end
 
+  described_class::TAG_ACTIONS.each do |action_name|
+    describe "Batch Action #{action_name}" do
+      let(:action) { "#{action_name}_for_tag" }
+      let(:path) { "/v2/droplets/actions?tag=testing-1" }
+      let(:fixture) do
+        single_action = DropletKit::ActionMapping.extract_single(api_fixture("droplet_actions/#{action_name}"), :read)
+
+        DropletKit::ActionMapping.represent_collection_for(:read, [single_action])
+      end
+
+      it 'performs the action' do
+        request = stub_do_api(path, :post).with(
+          body: { type: action_name }.to_json
+        ).to_return(body: fixture, status: 201)
+
+        returned_actions = resource.send(action, tag: 'testing-1')
+
+        expect(request).to have_been_made
+        expect(returned_actions.first.type).to eq(action_name)
+      end
+    end
+  end
+
   describe "Action snapshot" do
     let(:action) { 'snapshot' }
 

data/spec/lib/droplet_kit/resources/droplet_resource_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe DropletKit::DropletResource do
   include_context 'resources'
 
   # There's a lot to check
-  def check_droplet(droplet, overrides = {})
+  def check_droplet(droplet, tags = [], overrides = {})
     attrs = {
       id: 19,
       name: 'test.example.com',
@@ -25,6 +25,9 @@ RSpec.describe DropletKit::DropletResource do
     expect(droplet.snapshot_ids).to include(449676383)
     expect(droplet.action_ids).to be_empty
     expect(droplet.features).to include('ipv6')
+    tags.each do |tag|
+      expect(droplet.tags).to include(tag)
+    end
 
     expect(droplet.region).to be_kind_of(DropletKit::Region)
     expect(droplet.region.slug).to eq('nyc1')
@@ -74,7 +77,7 @@ RSpec.describe DropletKit::DropletResource do
       droplets = resource.all
       expect(droplets).to all(be_kind_of(DropletKit::Droplet))
 
-      check_droplet(droplets.first)
+      check_droplet(droplets.first, ['tag-1', 'tag-2'])
     end
 
     it 'returns an empty array of droplets' do
@@ -94,7 +97,7 @@ RSpec.describe DropletKit::DropletResource do
       stub_do_api('/v2/droplets/20', :get).to_return(body: api_fixture('droplets/find'))
       droplet = resource.find(id: 20)
       expect(droplet).to be_kind_of(DropletKit::Droplet)
-      check_droplet(droplet)
+      check_droplet(droplet, ['tag-1', 'tag-2'])
     end
 
     it_behaves_like 'resource that handles common errors' do
@@ -192,8 +195,8 @@ RSpec.describe DropletKit::DropletResource do
         stub_do_api(path, :post).with(body: as_string).to_return(body: api_fixture('droplets/create_multiple'), status: 202)
 
         created_droplets = resource.create_multiple(droplet)
-        check_droplet(created_droplets[0], name: 'test-01.example.com')
-        check_droplet(created_droplets[1], id: 20, name: 'test-02.example.com')
+        check_droplet(created_droplets[0], [], name: 'test-01.example.com')
+        check_droplet(created_droplets[1], [], id: 20, name: 'test-02.example.com')
       end
 
       it 'reuses the same object' do
@@ -207,8 +210,8 @@ RSpec.describe DropletKit::DropletResource do
         json = DropletKit::DropletMapping.representation_for(:create, droplet)
         stub_do_api(path, :post).with(body: json).to_return(body: api_fixture('droplets/create_multiple'), status: 202)
         created_droplets = resource.create_multiple(droplet)
-        check_droplet(created_droplets[0], name: 'test-01.example.com')
-        check_droplet(created_droplets[1], id: 20, name: 'test-02.example.com')
+        check_droplet(created_droplets[0], [], name: 'test-01.example.com')
+        check_droplet(created_droplets[1], [], id: 20, name: 'test-02.example.com')
       end
     end
 
@@ -321,4 +324,13 @@ RSpec.describe DropletKit::DropletResource do
       expect(request).to have_been_made
     end
   end
+
+  describe '#delete_tagged' do
+    it 'sends a delete request for the tagged droplet' do
+      request = stub_do_api('/v2/droplets?tag_name=testing-1', :delete)
+      resource.delete_for_tag(tag_name: 'testing-1')
+
+      expect(request).to have_been_made
+    end
+  end
 end

data/spec/lib/droplet_kit/resources/tag_resource_spec.rb

@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+describe DropletKit::TagResource do
+  subject(:resource) { described_class.new(connection: connection) }
+  include_context 'resources'
+
+  RSpec::Matchers.define :match_tag_fixture do |expected|
+    match do |actual|
+      expect(actual).to be_kind_of(DropletKit::Tag)
+      expect(actual.name).to eq('testing-1')
+    end
+  end
+
+  describe '#all' do
+    it 'returns all of the tags' do
+      stub_do_api('/v2/tags', :get)
+        .to_return(body: api_fixture('tags/all'))
+      tags = resource.all
+
+      expect(tags).to all(be_kind_of(DropletKit::Tag))
+      expect(tags[0].name).to eq('testing-1')
+      expect(tags[1].name).to eq('testing-2')
+    end
+
+    context 'when empty' do
+      it 'returns an empty array of tags' do
+        stub_do_api('/v2/tags', :get)
+          .to_return(body: api_fixture('tags/all_empty'))
+        tags = resource.all.map(&:id)
+
+        expect(tags).to be_empty
+      end
+    end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) { 'tags/all' }
+      let(:api_path) { '/v2/tags' }
+    end
+  end
+
+  describe '#find' do
+    it 'returns a singular tag' do
+      stub_do_api('/v2/tags/testing-1', :get)
+        .to_return(body: api_fixture('tags/find'))
+
+      tag = resource.find(name: 'testing-1')
+
+      expect(tag).to be_kind_of(DropletKit::Tag)
+      expect(tag).to match_tag_fixture
+      expect(tag.resources.droplets.count).to eq(1)
+      expect(tag.resources.droplets.last_tagged).to be_kind_of(DropletKit::Droplet)
+      expect(tag.resources.droplets.last_tagged.id).to eq(1)
+    end
+  end
+
+  describe '#create' do
+    it 'returns the created tag' do
+      tag = DropletKit::Tag.new(name: 'testing-1')
+
+      as_string = DropletKit::TagMapping.representation_for(:create, tag)
+
+      stub_do_api('/v2/tags', :post).with(body: as_string)
+        .to_return(body: api_fixture('tags/create'), status: 201)
+      created_tag = resource.create(tag)
+
+      expect(created_tag).to match_tag_fixture
+    end
+  end
+
+  describe '#update' do
+    it 'updateds a tag' do
+      tag = DropletKit::Tag.new(name: 'old-testing-1')
+      tag.name = 'testing-1'
+
+      request = stub_do_api('/v2/tags/old-testing-1', :put)
+        .with(body: DropletKit::TagMapping.representation_for(:update, tag))
+        .to_return(body: api_fixture('tags/find'))
+
+      tag = resource.update(tag, name: 'old-testing-1')
+      expect(tag.name).to eq('testing-1')
+    end
+  end
+
+  describe '#delete' do
+    it 'deletes a tag' do
+      request = stub_do_api('/v2/tags/testing-1', :delete)
+        .to_return(body: '', status: 204)
+
+      resource.delete(name: 'testing-1')
+      expect(request).to have_been_made
+    end
+  end
+
+  describe '#tag_resources' do
+    it 'adds a tag' do
+      params = {
+        resources: [
+          {
+            resource_id: '1',
+            resource_type: "droplet"
+          }
+        ]
+      }
+
+      request = stub_do_api('/v2/tags/testing-1/resources', :post)
+        .with(body: params.to_json)
+        .to_return(body: '', status: 204)
+
+      resource.tag_resources(params.merge(name: 'testing-1'))
+
+      expect(request).to have_been_made
+    end
+  end
+
+  describe '#untag_resources' do
+    it 'removes a tag' do
+      params = {
+        resources: [
+          {
+            resource_id: '1',
+            resource_type: "droplet"
+          }
+        ]
+      }
+
+      request = stub_do_api('/v2/tags/testing-1/resources', :delete)
+        .with(body: params.to_json)
+        .to_return(body: '', status: 204)
+
+      resource.untag_resources(params.merge(name: 'testing-1'))
+
+      expect(request).to have_been_made
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -2,6 +2,8 @@ require 'simplecov'
 
 SimpleCov.start
 
+require 'faraday'
+require 'addressable/uri'
 require 'droplet_kit'
 require 'webmock/rspec'
 

data/spec/support/request_stub_helpers.rb

@@ -1,6 +1,6 @@
 module RequestStubHelpers
   def stub_do_api(path, verb = :any)
-    stub_request(verb, %r[#{DropletKit::Client::DIGITALOCEAN_API}#{path}])
+    stub_request(verb, %r[#{DropletKit::Client::DIGITALOCEAN_API}#{Regexp.escape(path)}])
   end
 
   def api_fixture(fixture_name)
@@ -25,4 +25,4 @@ module RequestStubHelpers
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: kartograph
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,9 @@ files:
 - lib/droplet_kit/mappings/size_mapping.rb
 - lib/droplet_kit/mappings/snapshot_mapping.rb
 - lib/droplet_kit/mappings/ssh_key_mapping.rb
+- lib/droplet_kit/mappings/tag_mapping.rb
+- lib/droplet_kit/mappings/tagged_droplets_resources_mapping.rb
+- lib/droplet_kit/mappings/tagged_resources_mapping.rb
 - lib/droplet_kit/models/account.rb
 - lib/droplet_kit/models/action.rb
 - lib/droplet_kit/models/backup.rb
@@ -227,6 +230,9 @@ files:
 - lib/droplet_kit/models/size.rb
 - lib/droplet_kit/models/snapshot.rb
 - lib/droplet_kit/models/ssh_key.rb
+- lib/droplet_kit/models/tag.rb
+- lib/droplet_kit/models/tagged_droplets_resources.rb
+- lib/droplet_kit/models/tagged_resources.rb
 - lib/droplet_kit/paginated_resource.rb
 - lib/droplet_kit/resources/account_resource.rb
 - lib/droplet_kit/resources/action_resource.rb
@@ -242,6 +248,7 @@ files:
 - lib/droplet_kit/resources/region_resource.rb
 - lib/droplet_kit/resources/size_resource.rb
 - lib/droplet_kit/resources/ssh_key_resource.rb
+- lib/droplet_kit/resources/tag_resource.rb
 - lib/droplet_kit/version.rb
 - lib/tasks/resource_doc.rake
 - spec/fixtures/account/info.json
@@ -305,6 +312,10 @@ files:
 - spec/fixtures/ssh_keys/create.json
 - spec/fixtures/ssh_keys/find.json
 - spec/fixtures/ssh_keys/update.json
+- spec/fixtures/tags/all.json
+- spec/fixtures/tags/all_empty.json
+- spec/fixtures/tags/create.json
+- spec/fixtures/tags/find.json
 - spec/lib/droplet_kit/client_spec.rb
 - spec/lib/droplet_kit/models/base_model_spec.rb
 - spec/lib/droplet_kit/models/droplet_spec.rb
@@ -323,6 +334,7 @@ files:
 - spec/lib/droplet_kit/resources/region_resource_spec.rb
 - spec/lib/droplet_kit/resources/size_resource_spec.rb
 - spec/lib/droplet_kit/resources/ssh_key_resource_spec.rb
+- spec/lib/droplet_kit/resources/tag_resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_server.rb
 - spec/support/request_stub_helpers.rb
@@ -350,7 +362,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Droplet Kit is the official Ruby library for DigitalOcean's API
@@ -416,6 +428,10 @@ test_files:
 - spec/fixtures/ssh_keys/create.json
 - spec/fixtures/ssh_keys/find.json
 - spec/fixtures/ssh_keys/update.json
+- spec/fixtures/tags/all.json
+- spec/fixtures/tags/all_empty.json
+- spec/fixtures/tags/create.json
+- spec/fixtures/tags/find.json
 - spec/lib/droplet_kit/client_spec.rb
 - spec/lib/droplet_kit/models/base_model_spec.rb
 - spec/lib/droplet_kit/models/droplet_spec.rb
@@ -434,6 +450,7 @@ test_files:
 - spec/lib/droplet_kit/resources/region_resource_spec.rb
 - spec/lib/droplet_kit/resources/size_resource_spec.rb
 - spec/lib/droplet_kit/resources/ssh_key_resource_spec.rb
+- spec/lib/droplet_kit/resources/tag_resource_spec.rb
 - spec/spec_helper.rb
 - spec/support/fake_server.rb
 - spec/support/request_stub_helpers.rb