droplet_kit 1.4.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c6c0a5bca047be0aab328d01e7cca4c3abd19c3
-  data.tar.gz: a7737a18b385672e5e94069d53dad88aed3db638
+  metadata.gz: 03dcba690c63223939582769ffe69abcfa1c56ac
+  data.tar.gz: ae895f01786428f1643659da6dbc94299e69c284
 SHA512:
-  metadata.gz: 3afbe6fef22f3f09d35978771cec474704ce69039c243b303f21f71e126dc3b260f1582d26c21a3142a6a270a74bfd26373e807ab83a7b67a5cd24e2a1ab3b75
-  data.tar.gz: c913513dbf0adea27a22fb1c97c4d9ec5d543677eec2a2c1b89a212e09bf39d31e9834553e15a8250c7ef1aaa6dacc4bf485d72389c340758b6fdd39014fd1d8
+  metadata.gz: da75b47a74c59c5e56a198e487e587f5dab664365893fe9d94fbbcba7157323a9776dabb217d158e5039f7dd93eb1a55bc757a5bd22fd95bc66faebca26f1fb8
+  data.tar.gz: ab33f8e593bc48c5c52c40e916dd3266998080fb49dcaf5f55ecd9b99cd74ff4a8404e076bdd79974c88cec43e744f97d25b8ebd081f970adea9477c4ace7690

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### Version 2.0.0
+* Several duplicate classes have been deprecated and combined:
+ * Replace duplicate Backup model/mapping with Image.
+ * Remove duplicate ImageAction(Mapping), use Action.
+ * Redefine Snapshot model for new Snapshot object, use Image for Droplet snapshots.
+* Added support for Snapshot endpoint with volume snapshots.
+
 ### Version 1.2.2
 
 * Add image convert action.

data/README.md

@@ -282,8 +282,11 @@ Actions supported:
 * `client.volumes.all()`
 * `client.volumes.find(id: 'id')`
 * `client.volumes.create(volume)`
+* `client.volumes.snapshots(id: 'id')`
+* `client.volumes.create_snapshot(id: 'id', name: 'snapshot-name')`
 * `client.volumes.delete(id: 'id')`
 
+
 ## Volume Action resource
 
     client = DropletKit::Client.new(access_token: 'TOKEN')
@@ -293,6 +296,18 @@ Actions supported:
 
 * `client.volume_actions.attach(volume_id: volume.id, droplet_id: droplet.id, region: droplet.region.slug)`
 * `client.volume_actions.detach(volume_id: volume.id, droplet_id: droplet.id, region: droplet.region.slug)`
+* `client.volume_actions.resize(volume_id: volume.id, size_gigabytes: 123, region: droplet.region.slug)`
+
+## Volume resource
+
+    client = DropletKit::Client.new(access_token: 'TOKEN')
+    client.snapshots #=> DropletKit::SnapshotResource
+
+Actions supported:
+
+* `client.snapshots.all(resource_type: 'droplet')`
+* `client.snapshots.find(id: 'id')`
+* `client.snapshots.delete(id: 'id')`
 
 ## Contributing
 

data/lib/droplet_kit.rb

@@ -11,13 +11,11 @@ module DropletKit
   autoload :Droplet, 'droplet_kit/models/droplet'
   autoload :Region, 'droplet_kit/models/region'
   autoload :Image, 'droplet_kit/models/image'
-  autoload :ImageAction, 'droplet_kit/models/image_action'
   autoload :Size, 'droplet_kit/models/size'
   autoload :NetworkHash, 'droplet_kit/models/network_hash'
   autoload :Network, 'droplet_kit/models/network'
   autoload :Kernel, 'droplet_kit/models/kernel'
   autoload :Snapshot, 'droplet_kit/models/snapshot'
-  autoload :Backup, 'droplet_kit/models/backup'
   autoload :Action, 'droplet_kit/models/action'
   autoload :Domain, 'droplet_kit/models/domain'
   autoload :DomainRecord, 'droplet_kit/models/domain_record'
@@ -49,6 +47,7 @@ module DropletKit
   autoload :TagResource, 'droplet_kit/resources/tag_resource'
   autoload :VolumeResource, 'droplet_kit/resources/volume_resource'
   autoload :VolumeActionResource, 'droplet_kit/resources/volume_action_resource'
+  autoload :SnapshotResource, 'droplet_kit/resources/snapshot_resource'
 
   # JSON Maps
   autoload :DropletMapping, 'droplet_kit/mappings/droplet_mapping'
@@ -59,7 +58,6 @@ module DropletKit
   autoload :NetworkDetailMapping, 'droplet_kit/mappings/network_detail_mapping'
   autoload :KernelMapping, 'droplet_kit/mappings/kernel_mapping'
   autoload :SnapshotMapping, 'droplet_kit/mappings/snapshot_mapping'
-  autoload :BackupMapping, 'droplet_kit/mappings/backup_mapping'
   autoload :ActionMapping, 'droplet_kit/mappings/action_mapping'
   autoload :DomainMapping, 'droplet_kit/mappings/domain_mapping'
   autoload :DomainRecordMapping, 'droplet_kit/mappings/domain_record_mapping'

data/lib/droplet_kit/client.rb

@@ -11,7 +11,7 @@ module DropletKit
     end
 
     def connection
-      Faraday.new(connection_options) do |req|
+      @faraday ||= Faraday.new connection_options do |req|
         req.adapter :net_http
       end
     end
@@ -28,6 +28,7 @@ module DropletKit
         regions: RegionResource,
         sizes: SizeResource,
         ssh_keys: SSHKeyResource,
+        snapshots: SnapshotResource,
         account: AccountResource,
         floating_ips: FloatingIpResource,
         floating_ip_actions: FloatingIpActionResource,

data/lib/droplet_kit/mappings/image_mapping.rb

@@ -5,14 +5,16 @@ module DropletKit
     kartograph do
       mapping Image
       root_key plural: 'images', singular: 'image', scopes: [:read]
+      root_key plural: 'snapshots', singular: 'snapshot', scopes: [:read_snapshot]
+      root_key plural: 'backups', singular: 'backup', scopes: [:read_backup]
 
-      property :id, scopes: [:read]
-      property :name, scopes: [:read, :update]
-      property :distribution, scopes: [:read]
-      property :slug, scopes: [:read]
-      property :public, scopes: [:read]
-      property :regions, scopes: [:read]
-      property :type, scopes: [:read]
+      property :id, scopes: [:read, :read_snapshot, :read_backup]
+      property :name, scopes: [:read, :update, :read_snapshot, :read_backup]
+      property :distribution, scopes: [:read, :read_snapshot, :read_backup]
+      property :slug, scopes: [:read, :read_snapshot, :read_backup]
+      property :public, scopes: [:read, :read_snapshot, :read_backup]
+      property :regions, scopes: [:read, :read_snapshot, :read_backup]
+      property :type, scopes: [:read, :read_snapshot, :read_backup]
     end
   end
 end

data/lib/droplet_kit/mappings/snapshot_mapping.rb

@@ -8,12 +8,12 @@ module DropletKit
 
       property :id, scopes: [:read]
       property :name, scopes: [:read]
-      property :distribution, scopes: [:read]
-      property :slug, scopes: [:read]
-      property :public, scopes: [:read]
       property :regions, scopes: [:read]
-      property :action_ids, scopes: [:read]
       property :created_at, scopes: [:read]
+      property :resource_id, scopes: [:read]
+      property :resource_type, scopes: [:read]
+      property :min_disk_size, scopes: [:read]
+      property :size_gigabytes, scopes: [:read]
     end
   end
 end

data/lib/droplet_kit/mappings/volume_mapping.rb

@@ -15,6 +15,7 @@ module DropletKit
       property :created_at, scopes: [:read]
 
       property :region, scopes: [:create]
+      property :snapshot_id, scopes: [:create]
     end
   end
 end

data/lib/droplet_kit/models/snapshot.rb

@@ -2,11 +2,11 @@ module DropletKit
   class Snapshot < BaseModel
     attribute :id
     attribute :name
-    attribute :distribution
-    attribute :slug
-    attribute :public
     attribute :regions
-    attribute :action_ids
     attribute :created_at
+    attribute :resource_id
+    attribute :resource_type
+    attribute :min_disk_size
+    attribute :size_gigabytes
   end
 end

data/lib/droplet_kit/models/volume.rb

@@ -7,5 +7,8 @@ module DropletKit
     attribute :description
     attribute :size_gigabytes
     attribute :created_at
+
+    # Used for creates
+    attribute :snapshot_id
   end
 end

data/lib/droplet_kit/resources/droplet_resource.rb

@@ -35,12 +35,12 @@ module DropletKit
 
       action :snapshots, 'GET /v2/droplets/:id/snapshots' do
         query_keys :per_page, :page
-        handler(200) { |response| SnapshotMapping.extract_collection(response.body, :read) }
+        handler(200) { |response| ImageMapping.extract_collection(response.body, :read_snapshot) }
       end
 
       action :backups, 'GET /v2/droplets/:id/backups' do
         query_keys :per_page, :page
-        handler(200) { |response| BackupMapping.extract_collection(response.body, :read) }
+        handler(200) { |response| ImageMapping.extract_collection(response.body, :read_backup) }
       end
 
       action :actions, 'GET /v2/droplets/:id/actions' do

data/lib/droplet_kit/resources/image_action_resource.rb

@@ -7,21 +7,21 @@ module DropletKit
 
       action :transfer, 'POST /v2/images/:image_id/actions' do
         body { |object| { type: 'transfer', region: object[:region] }.to_json }
-        handler(200, 201) { |response| ImageActionMapping.extract_single(response.body, :read) }
+        handler(200, 201) { |response| ActionMapping.extract_single(response.body, :read) }
       end
 
       action :convert, 'POST /v2/images/:image_id/actions' do
         body { |object| { type: 'convert' }.to_json }
-        handler(200, 201) { |response| ImageActionMapping.extract_single(response.body, :read) }
+        handler(200, 201) { |response| ActionMapping.extract_single(response.body, :read) }
       end
 
       action :all, 'GET /v2/images/:image_id/actions' do
         query_keys :per_page, :page
-        handler(200) { |response| ImageActionMapping.extract_collection(response.body, :read) }
+        handler(200) { |response| ActionMapping.extract_collection(response.body, :read) }
       end
 
       action :find, 'GET /v2/images/:image_id/actions/:id' do
-        handler(200) { |response| ImageActionMapping.extract_single(response.body, :read) }
+        handler(200) { |response| ActionMapping.extract_single(response.body, :read) }
       end
     end
 

data/lib/droplet_kit/resources/snapshot_resource.rb

@@ -0,0 +1,24 @@
+module DropletKit
+  class SnapshotResource < ResourceKit::Resource
+    include ErrorHandlingResourcable
+
+    resources do
+      action :all, 'GET /v2/snapshots' do
+        query_keys :page, :per_page, :resource_type
+        handler(200) { |response| SnapshotMapping.extract_collection(response.body, :read) }
+      end
+
+      action :find, 'GET /v2/snapshots/:id' do
+        handler(200) { |response| SnapshotMapping.extract_single(response.body, :read) }
+      end
+
+      action :delete, 'DELETE /v2/snapshots/:id' do
+        handler(204) { |_| true }
+      end
+    end
+
+    def all(*args)
+      PaginatedResource.new(action(:all), self, *args)
+    end
+  end
+end

data/lib/droplet_kit/resources/volume_action_resource.rb

@@ -27,6 +27,17 @@ module DropletKit
         handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
       end
 
+      action :resize, 'POST /v2/volumes/:volume_id/actions' do
+        body do |hash|
+          {
+            type: 'resize',
+            size_gigabytes: hash[:size_gigabytes],
+            region: hash[:region],
+          }.to_json
+        end
+        handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
+      end
+
       action :find, 'GET /v2/volumes/:volume_id/actions/:id' do
         handler(200) { |response| ActionMapping.extract_single(response.body, :read) }
       end

data/lib/droplet_kit/resources/volume_resource.rb

@@ -21,10 +21,25 @@ module DropletKit
       action :delete, 'DELETE /v2/volumes/:id' do
         handler(204) { |response| true }
       end
+
+      action :snapshots, 'GET /v2/volumes/:id/snapshots' do
+        query_keys :per_page, :page
+        handler(200) { |response| SnapshotMapping.extract_collection(response.body, :read) }
+      end
+
+      action :create_snapshot, 'POST /v2/volumes/:id/snapshots' do
+        body { |hash| { name: hash[:name] }.to_json }
+        handler(201) { |response| SnapshotMapping.extract_single(response.body, :read) }
+        handler(422) { |response| ErrorMapping.fail_with(FailedCreate, response.body) }
+      end
     end
 
     def all(*args)
       PaginatedResource.new(action(:all), self, *args)
     end
+
+    def snapshots(*args)
+      PaginatedResource.new(action(:snapshots), self, *args)
+    end
   end
 end

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "1.4.3"
+  VERSION = "2.0.0"
 end

data/spec/fixtures/snapshots/all.json

@@ -0,0 +1,32 @@
+{
+  "snapshots": [
+    {
+      "id": "119192817",
+      "name": "Ubuntu 13.04",
+      "regions": [
+        "nyc1"
+      ],
+      "created_at": "2014-07-29T14:35:40Z",
+      "resource_type": "droplet",
+      "resource_id": "123",
+      "resource_type": "droplet",
+      "min_disk_size": 10,
+      "size_gigabytes": 0.4
+    },
+    {
+      "id": "7724db7c-e098-11e5-b522-000f53304e51",
+      "name": "Ubuntu Foo",
+      "regions": [
+        "nyc1"
+      ],
+      "created_at": "2014-07-29T14:35:40Z",
+      "resource_type": "volume",
+      "resource_id": "7724db7c-e098-11e5-b522-000f53304e51",
+      "min_disk_size": 10,
+      "size_gigabytes": 0.4
+    }
+  ],
+  "meta": {
+    "total": 2
+  }
+}

data/spec/fixtures/snapshots/find.json

@@ -0,0 +1,14 @@
+{
+  "snapshot": {
+    "id": "7724db7c-e098-11e5-b522-000f53304e51",
+    "name": "Ubuntu Foo",
+    "regions": [
+      "nyc1"
+    ],
+    "created_at": "2014-07-29T14:35:40Z",
+    "resource_type": "volume",
+    "resource_id": "7724db7c-e098-11e5-b522-000f53304e51",
+    "min_disk_size": 10,
+    "size_gigabytes": 0.4
+  }
+}

data/spec/fixtures/snapshots/resource_type.json

@@ -0,0 +1,20 @@
+{
+  "snapshots": [
+    {
+      "id": "119192817",
+      "name": "Ubuntu 13.04",
+      "regions": [
+        "nyc1"
+      ],
+      "created_at": "2014-07-29T14:35:40Z",
+      "resource_type": "droplet",
+      "resource_id": "123",
+      "resource_type": "droplet",
+      "min_disk_size": 10,
+      "size_gigabytes": 0.4
+    }
+  ],
+  "meta": {
+    "total": 1
+  }
+}

data/spec/fixtures/volume_actions/resize.json

@@ -0,0 +1,34 @@
+{
+  "action": {
+    "id": 72531856,
+    "status": "in-progress",
+    "type": "resize_volume",
+    "started_at": "2015-11-12T17:51:03Z",
+    "completed_at": null,
+    "resource_id": null,
+    "resource_type": "volume",
+    "region": {
+      "name": "New York 1",
+      "slug": "nyc1",
+      "sizes": [
+        "512mb",
+        "1gb",
+        "2gb",
+        "4gb",
+        "8gb",
+        "16gb",
+        "32gb",
+        "48gb",
+        "64gb"
+      ],
+      "features": [
+        "private_networking",
+        "backups",
+        "ipv6",
+        "metadata"
+      ],
+      "available": true
+    },
+    "region_slug": "nyc1"
+  }
+}

data/spec/fixtures/volumes/create_snapshot.json

@@ -0,0 +1,14 @@
+{
+  "snapshot": {
+    "id": "7724db7c-e098-11e5-b522-000f53304e51",
+    "name": "Ubuntu Foo",
+    "regions": [
+      "nyc1"
+    ],
+    "created_at": "2014-07-29T14:35:40Z",
+    "resource_type": "volume",
+    "resource_id": "7724db7c-e098-11e5-b522-000f53304e51",
+    "min_disk_size": 10,
+    "size_gigabytes": 0.4
+  }
+}

data/spec/lib/droplet_kit/client_spec.rb

@@ -26,6 +26,11 @@ RSpec.describe DropletKit::Client do
   end
 
   describe '#connection' do
+    module AcmeApp
+      class CustomLogger < Faraday::Middleware
+      end
+    end
+
     it 'populates the authorization header correctly' do
       expect(client.connection.headers['Authorization']).to eq("Bearer #{client.access_token}")
     end
@@ -33,5 +38,12 @@ RSpec.describe DropletKit::Client do
     it 'sets the content type' do
       expect(client.connection.headers['Content-Type']).to eq("application/json")
     end
+
+    it 'allows access to faraday instance' do
+      client.connection.use AcmeApp::CustomLogger
+      expect(client.connection.builder.handlers).to include(AcmeApp::CustomLogger)
+    end
   end
-end
+
+end
+

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

@@ -244,18 +244,17 @@ RSpec.describe DropletKit::DropletResource do
   end
 
   describe '#snapshots' do
-    it 'returns a list of kernels for a droplet' do
+    it 'returns a list of image snapshots for a droplet' do
       stub_do_api('/v2/droplets/1066/snapshots', :get).to_return(body: api_fixture('droplets/list_snapshots'))
       snapshots = resource.snapshots(id: 1066).take(20)
 
-      expect(snapshots).to all(be_kind_of(DropletKit::Snapshot))
+      expect(snapshots).to all(be_kind_of(DropletKit::Image))
       expect(snapshots[0].id).to eq(449676387)
       expect(snapshots[0].name).to eq("Ubuntu 13.04")
       expect(snapshots[0].distribution).to eq("ubuntu")
       expect(snapshots[0].slug).to eq(nil)
       expect(snapshots[0].public).to eq(false)
       expect(snapshots[0].regions).to eq(["nyc1"])
-      expect(snapshots[0].created_at).to eq("2014-07-29T14:35:38Z")
     end
 
     it 'returns a paginated resource' do
@@ -270,14 +269,13 @@ RSpec.describe DropletKit::DropletResource do
       stub_do_api('/v2/droplets/1066/backups', :get).to_return(body: api_fixture('droplets/list_backups'))
       backups = resource.backups(id: 1066).take(20)
 
-      expect(backups).to all(be_kind_of(DropletKit::Backup))
+      expect(backups).to all(be_kind_of(DropletKit::Image))
       expect(backups[0].id).to eq(449676388)
       expect(backups[0].name).to eq("Ubuntu 13.04")
       expect(backups[0].distribution).to eq("ubuntu")
       expect(backups[0].slug).to eq(nil)
       expect(backups[0].public).to eq(false)
       expect(backups[0].regions).to eq(["nyc1"])
-      expect(backups[0].created_at).to eq("2014-07-29T14:35:38Z")
     end
 
     it 'returns a paginated resource' do

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

@@ -20,7 +20,7 @@ RSpec.describe DropletKit::ImageActionResource do
 
       expect(request).to have_been_made
 
-      expect(action).to be_kind_of(DropletKit::ImageAction)
+      expect(action).to be_kind_of(DropletKit::Action)
       expect(action.id).to eq(23)
       expect(action.status).to eq("in-progress")
       expect(action.type).to eq("transfer")
@@ -60,7 +60,7 @@ RSpec.describe DropletKit::ImageActionResource do
 
       expect(request).to have_been_made
 
-      expect(action).to be_kind_of(DropletKit::ImageAction)
+      expect(action).to be_kind_of(DropletKit::Action)
       expect(action.id).to eq(23)
       expect(action.status).to eq("in-progress")
       expect(action.type).to eq("convert")
@@ -121,7 +121,7 @@ RSpec.describe DropletKit::ImageActionResource do
       stub_do_api('/v2/images/449676391/actions/23').to_return(body: api_fixture('image_actions/find'))
       action = resource.find(image_id: 449676391, id: 23)
 
-      expect(action).to be_kind_of(DropletKit::ImageAction)
+      expect(action).to be_kind_of(DropletKit::Action)
       expect(action.id).to eq(23)
       expect(action.status).to eq("in-progress")
       expect(action.type).to eq("transfer")

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

@@ -0,0 +1,61 @@
+require 'spec_helper'
+
+RSpec.describe DropletKit::SnapshotResource do
+  subject(:resource) { described_class.new(connection: connection) }
+  include_context 'resources'
+
+  describe '#all' do
+    it 'returns all of the snapshots' do
+      snapshots_json = api_fixture('snapshots/all')
+      stub_do_api('/v2/snapshots', :get).to_return(body: snapshots_json)
+      expected_snapshots = DropletKit::SnapshotMapping.extract_collection(snapshots_json, :read)
+
+      expect(resource.all).to eq(expected_snapshots)
+    end
+
+    it 'returns snapshots of a type' do
+      snapshots_json = api_fixture('snapshots/resource_type')
+      stub_do_api('/v2/snapshots', :get)
+        .with(query: hash_including({ resource_type: 'droplet' }))
+        .to_return(body: snapshots_json)
+      expected_snapshots = DropletKit::SnapshotMapping.extract_collection(snapshots_json, :read)
+
+      expect(resource.all(resource_type: :droplet)).to eq(expected_snapshots)
+    end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) { 'snapshots/all' }
+      let(:api_path) { '/v2/snapshots' }
+    end
+  end
+
+  describe '#find' do
+    it 'returns a singular snapshot' do
+      stub_do_api('/v2/snapshots/7724db7c-e098-11e5-b522-000f53304e51', :get).to_return(body: api_fixture('snapshots/find'))
+      snapshot = resource.find(id: "7724db7c-e098-11e5-b522-000f53304e51")
+
+      expect(snapshot.id).to eq("7724db7c-e098-11e5-b522-000f53304e51")
+      expect(snapshot.name).to eq("Ubuntu Foo")
+      expect(snapshot.regions).to eq(["nyc1"])
+      expect(snapshot.resource_type).to eq("volume")
+      expect(snapshot.resource_id).to eq("7724db7c-e098-11e5-b522-000f53304e51")
+      expect(snapshot.min_disk_size).to eq(10)
+      expect(snapshot.size_gigabytes).to eq(0.4)
+    end
+
+    it_behaves_like 'resource that handles common errors' do
+      let(:path) { '/v2/snapshots/123' }
+      let(:method) { :get }
+      let(:action) { :find }
+      let(:arguments) { { id: 123 } }
+    end
+  end
+
+  describe '#delete' do
+    it 'deletes an snapshot' do
+      request = stub_do_api('/v2/snapshots/146', :delete).to_return(body: '', status: 204)
+      resource.delete(id: 146)
+      expect(request).to have_been_made
+    end
+  end
+end

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

@@ -86,6 +86,37 @@ RSpec.describe DropletKit::VolumeActionResource do
     end
   end
 
+  describe '#resize' do
+    let(:volume_id) { '7724db7c-e098-11e5-b522-000f53304e51' }
+    let(:region) { 'nyc1' }
+    let(:path) { "/v2/volumes/#{volume_id}/actions" }
+    let(:action) { 'resize' }
+    let(:fixture) { api_fixture("volume_actions/#{action}") }
+
+    it 'sends an resize request for a volume' do
+      request = stub_do_api(path).with(
+        body: {
+          type: action,
+          size_gigabytes: 100,
+          region: region
+        }.to_json
+      ).to_return(body: fixture, status: 201)
+
+      action = resource.resize(
+        volume_id: volume_id,
+        region: region,
+        size_gigabytes: 100
+      )
+
+      expect(request).to have_been_made
+      expect(action).to match_volume_action_fixture('resize_volume')
+    end
+
+    it_behaves_like 'an action that handles invalid parameters' do
+      let(:arguments) { { volume_id: volume_id } }
+    end
+  end
+
   describe '#all' do
     let(:volume_id) { '7724db7c-e098-11e5-b522-000f53304e51' }
 

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

@@ -62,12 +62,57 @@ RSpec.describe DropletKit::VolumeResource do
       end
     end
 
+    context 'with a snapshot id' do
+      it 'returns the created volume' do
+        volume = DropletKit::Volume.new(
+          size_gigabytes: 10,
+          name: "Example",
+          description: "Block store for examples",
+          snapshot_id: "7724db7c-e098-11e5-b522-000f53304e51"
+        )
+
+        as_string = DropletKit::VolumeMapping.representation_for(:create, volume)
+        stub_do_api(path, :post).with(body: as_string).to_return(body: api_fixture('volumes/create'), status: 201)
+        created_volume = resource.create(volume)
+
+        expect(created_volume).to match_volume_fixture
+      end
+    end
+
     it_behaves_like 'an action that handles invalid parameters' do
       let(:action) { 'create' }
       let(:arguments) { DropletKit::Volume.new }
     end
   end
 
+  describe '#create_snapshot' do
+    let(:id) { '7724db7c-e098-11e5-b522-000f53304e51' }
+    let(:path) { "/v2/volumes/#{id}/snapshot" }
+
+    context 'for a successful create' do
+      it 'returns the created volume' do
+        as_string = { name: 'foo' }.to_json
+        stub_do_api(path, :post).with(body: as_string).to_return(body: api_fixture('volumes/create_snapshot'), status: 201)
+        created_snapshot = resource.create_snapshot(id: id, name: 'foo')
+
+        expect(created_snapshot).to be_kind_of(DropletKit::Snapshot)
+
+        expect(created_snapshot.id).to eq("7724db7c-e098-11e5-b522-000f53304e51")
+        expect(created_snapshot.name).to eq("Ubuntu Foo")
+        expect(created_snapshot.regions).to eq(["nyc1"])
+        expect(created_snapshot.resource_type).to eq("volume")
+        expect(created_snapshot.resource_id).to eq("7724db7c-e098-11e5-b522-000f53304e51")
+        expect(created_snapshot.min_disk_size).to eq(10)
+        expect(created_snapshot.size_gigabytes).to eq(0.4)
+      end
+    end
+
+    it_behaves_like 'an action that handles invalid parameters' do
+      let(:action) { 'create_snapshot' }
+      let(:arguments) { { id: id } }
+    end
+  end
+
   describe '#delete' do
     it 'sends a delete request for the volume' do
       request = stub_do_api('/v2/volumes/7724db7c-e098-11e5-b522-000f53304e51', :delete)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2016-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -191,14 +191,12 @@ files:
 - lib/droplet_kit/error_handling_resourcable.rb
 - lib/droplet_kit/mappings/account_mapping.rb
 - lib/droplet_kit/mappings/action_mapping.rb
-- lib/droplet_kit/mappings/backup_mapping.rb
 - lib/droplet_kit/mappings/domain_mapping.rb
 - lib/droplet_kit/mappings/domain_record_mapping.rb
 - lib/droplet_kit/mappings/droplet_mapping.rb
 - lib/droplet_kit/mappings/droplet_upgrade_mapping.rb
 - lib/droplet_kit/mappings/error_mapping.rb
 - lib/droplet_kit/mappings/floating_ip_mapping.rb
-- lib/droplet_kit/mappings/image_action_mapping.rb
 - lib/droplet_kit/mappings/image_mapping.rb
 - lib/droplet_kit/mappings/kernel_mapping.rb
 - lib/droplet_kit/mappings/network_detail_mapping.rb
@@ -213,7 +211,6 @@ files:
 - lib/droplet_kit/mappings/volume_mapping.rb
 - lib/droplet_kit/models/account.rb
 - lib/droplet_kit/models/action.rb
-- lib/droplet_kit/models/backup.rb
 - lib/droplet_kit/models/base_model.rb
 - lib/droplet_kit/models/domain.rb
 - lib/droplet_kit/models/domain_record.rb
@@ -221,7 +218,6 @@ files:
 - lib/droplet_kit/models/droplet_upgrade.rb
 - lib/droplet_kit/models/floating_ip.rb
 - lib/droplet_kit/models/image.rb
-- lib/droplet_kit/models/image_action.rb
 - lib/droplet_kit/models/kernel.rb
 - lib/droplet_kit/models/meta_information.rb
 - lib/droplet_kit/models/network.rb
@@ -249,6 +245,7 @@ files:
 - lib/droplet_kit/resources/image_resource.rb
 - lib/droplet_kit/resources/region_resource.rb
 - lib/droplet_kit/resources/size_resource.rb
+- lib/droplet_kit/resources/snapshot_resource.rb
 - lib/droplet_kit/resources/ssh_key_resource.rb
 - lib/droplet_kit/resources/tag_resource.rb
 - lib/droplet_kit/resources/volume_action_resource.rb
@@ -312,6 +309,9 @@ files:
 - spec/fixtures/images/type.json
 - spec/fixtures/regions/all.json
 - spec/fixtures/sizes/all.json
+- spec/fixtures/snapshots/all.json
+- spec/fixtures/snapshots/find.json
+- spec/fixtures/snapshots/resource_type.json
 - spec/fixtures/ssh_keys/all.json
 - spec/fixtures/ssh_keys/create.json
 - spec/fixtures/ssh_keys/find.json
@@ -324,8 +324,10 @@ files:
 - spec/fixtures/volume_actions/attach.json
 - spec/fixtures/volume_actions/detach.json
 - spec/fixtures/volume_actions/find.json
+- spec/fixtures/volume_actions/resize.json
 - spec/fixtures/volumes/all.json
 - spec/fixtures/volumes/create.json
+- spec/fixtures/volumes/create_snapshot.json
 - spec/fixtures/volumes/find.json
 - spec/lib/droplet_kit/client_spec.rb
 - spec/lib/droplet_kit/models/base_model_spec.rb
@@ -344,6 +346,7 @@ files:
 - spec/lib/droplet_kit/resources/image_resource_spec.rb
 - spec/lib/droplet_kit/resources/region_resource_spec.rb
 - spec/lib/droplet_kit/resources/size_resource_spec.rb
+- spec/lib/droplet_kit/resources/snapshot_resource_spec.rb
 - spec/lib/droplet_kit/resources/ssh_key_resource_spec.rb
 - spec/lib/droplet_kit/resources/tag_resource_spec.rb
 - spec/lib/droplet_kit/resources/volume_action_resource_spec.rb
@@ -437,6 +440,9 @@ test_files:
 - spec/fixtures/images/type.json
 - spec/fixtures/regions/all.json
 - spec/fixtures/sizes/all.json
+- spec/fixtures/snapshots/all.json
+- spec/fixtures/snapshots/find.json
+- spec/fixtures/snapshots/resource_type.json
 - spec/fixtures/ssh_keys/all.json
 - spec/fixtures/ssh_keys/create.json
 - spec/fixtures/ssh_keys/find.json
@@ -449,8 +455,10 @@ test_files:
 - spec/fixtures/volume_actions/attach.json
 - spec/fixtures/volume_actions/detach.json
 - spec/fixtures/volume_actions/find.json
+- spec/fixtures/volume_actions/resize.json
 - spec/fixtures/volumes/all.json
 - spec/fixtures/volumes/create.json
+- spec/fixtures/volumes/create_snapshot.json
 - spec/fixtures/volumes/find.json
 - spec/lib/droplet_kit/client_spec.rb
 - spec/lib/droplet_kit/models/base_model_spec.rb
@@ -469,6 +477,7 @@ test_files:
 - spec/lib/droplet_kit/resources/image_resource_spec.rb
 - spec/lib/droplet_kit/resources/region_resource_spec.rb
 - spec/lib/droplet_kit/resources/size_resource_spec.rb
+- spec/lib/droplet_kit/resources/snapshot_resource_spec.rb
 - spec/lib/droplet_kit/resources/ssh_key_resource_spec.rb
 - spec/lib/droplet_kit/resources/tag_resource_spec.rb
 - spec/lib/droplet_kit/resources/volume_action_resource_spec.rb

data/lib/droplet_kit/mappings/backup_mapping.rb

@@ -1,19 +0,0 @@
-module DropletKit
-  class BackupMapping
-    include Kartograph::DSL
-
-    kartograph do
-      root_key plural: 'backups', singular: 'backup', scopes: [:read]
-      mapping Backup
-
-      property :id, scopes: [:read]
-      property :name, scopes: [:read]
-      property :distribution, scopes: [:read]
-      property :slug, scopes: [:read]
-      property :public, scopes: [:read]
-      property :regions, scopes: [:read]
-      property :action_ids, scopes: [:read]
-      property :created_at, scopes: [:read]
-    end
-  end
-end

data/lib/droplet_kit/mappings/image_action_mapping.rb

@@ -1,20 +0,0 @@
-module DropletKit
-  class ImageActionMapping
-    include Kartograph::DSL
-
-    kartograph do
-      mapping ImageAction
-      root_key singular: 'action', plural: 'actions', scopes: [:read]
-
-      property :id, scopes: [:read]
-      property :status, scopes: [:read]
-      property :type, scopes: [:read]
-      property :started_at, scopes: [:read]
-      property :completed_at, scopes: [:read]
-      property :resource_id, scopes: [:read]
-      property :resource_type, scopes: [:read]
-      property :region, scopes: [:read], include: RegionMapping
-      property :region_slug, scopes: [:read]
-    end
-  end
-end

data/lib/droplet_kit/models/backup.rb

@@ -1,12 +0,0 @@
-module DropletKit
-  class Backup < BaseModel
-    attribute :id
-    attribute :name
-    attribute :distribution
-    attribute :slug
-    attribute :public
-    attribute :regions
-    attribute :action_ids
-    attribute :created_at
-  end
-end

data/lib/droplet_kit/models/image_action.rb

@@ -1,13 +0,0 @@
-module DropletKit
-  class ImageAction < BaseModel
-    attribute :id
-    attribute :status
-    attribute :type
-    attribute :started_at
-    attribute :completed_at
-    attribute :resource_id
-    attribute :resource_type
-    attribute :region
-    attribute :region_slug
-  end
-end