droplet_kit 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e28942bdd478cd811a6f8e8aa0ee9632b5d4f50
-  data.tar.gz: 96fca5ad6cb96e1e4c58f0d4bc513bcc770e05a7
+  metadata.gz: ce63bc5aac34db2dc7a39b5c7fef9f5fb02654a1
+  data.tar.gz: 6d22b740f138522b5e765965ac2557965e79abbb
 SHA512:
-  metadata.gz: 1efaaffe2af2dd9f717e09c61742a16fb6c8c3bf3602e67164550bd3c7842cf26b7b7d35165a8447c366ecc97528c22e65c86b399c7a9204a2284d9ebb6ed65f
-  data.tar.gz: 32839b6b91778d2414440ecb9de9b8aad17a1306525d55226fe462b15abcbfc3287233858eea2672568b1beccb8d8782dcc38ef4830a0a88e8a24a94c907ad6b
+  metadata.gz: 1656f66b808a250ff08508204571c8ff0b6ceeff50c7ba3678585db457e3a9b2f1cd6faadc5982b0edc7950b553b52c8a9782e3de2c16877c7c2d4f61a96941c
+  data.tar.gz: aa6b612faceeb0428448d583833f8bc4345666e6a2b891fc3a6d6558b8f310375f91dcd67b51951953b283584bc526841edcffd0b7ab3de15cf7c4f927e37def

data/.travis.yml

@@ -1,5 +1,6 @@
 rvm:
-  - "2.0.0-p594"
-  - "2.1.4"
-  
+  - "2.0.0"
+  - "2.1.5"
+  - "2.2.0"
+
 script: bundle exec rspec ./spec

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+### Version 1.2.0
+
+* Add droplet upgrade action.
+* Pass disk option through to Droplet resize.
+* Add support for region_slug in action objects.
+* Test coverage for Ruby 2.2.0.
+* Documentation updates.
+
+### Version 1.1.3
+
+* Paginate the resource for image actions to retrieve all of them.
+* Fix infinite loop bug on pagination last page.
+* Updates to documentation.
+
 ### Version 1.1.2
 
 * Add `public_ip` and `private_ip` to easily get the IP address on `DropletKit::Droplet` objects returned.

data/README.md

@@ -66,8 +66,10 @@ droplet = client.droplets.find(id: 123)
 
 ## Droplet resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.droplets #=> DropletKit::DropletResource
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.droplets #=> DropletKit::DropletResource
+```
 
 Actions supported:
 
@@ -82,8 +84,10 @@ Actions supported:
 
 ## Droplet Action resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.droplet_actions #=> DropletKit::DropletAction
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.droplet_actions #=> DropletKit::DropletAction
+```
 
 Actions supported:
 
@@ -95,6 +99,7 @@ Actions supported:
 * `client.droplet_actions.password_reset(droplet_id: droplet.id)`
 * `client.droplet_actions.enable_ipv6(droplet_id: droplet.id)`
 * `client.droplet_actions.disable_backups(droplet_id: droplet.id)`
+* `client.droplet_actions.upgrade(droplet_id: droplet.id)`
 * `client.droplet_actions.enable_private_networking(droplet_id: droplet.id)`
 * `client.droplet_actions.snapshot(droplet_id: droplet.id, name: 'Snapshot Name')`
 * `client.droplet_actions.change_kernel(droplet_id: droplet.id, kernel: 'kernel_id')`
@@ -106,8 +111,10 @@ Actions supported:
 
 ## Domain resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.domains #=> DropletKit::DomainResource
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.domains #=> DropletKit::DomainResource
+```
 
 Actions supported:
 
@@ -119,14 +126,15 @@ Actions supported:
 
 ## Domain record resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.domain_records #=> DropletKit::DomainRecordResource
-    domain_record = DropletKit::DomainRecord.new(
-        type: 'CNAME',
-        name: 'www',
-        data: '@'
-    )
-
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.domain_records #=> DropletKit::DomainRecordResource
+domain_record = DropletKit::DomainRecord.new(
+  type: 'CNAME',
+  name: 'www',
+  data: '@'
+)
+```
 
 Actions supported:
 
@@ -139,8 +147,10 @@ Actions supported:
 
 ## Image resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.images #=> DropletKit::ImageResource
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.images #=> DropletKit::ImageResource
+```
 
 Actions supported:
 
@@ -152,8 +162,10 @@ Actions supported:
 
 ## Image Action Resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.image_actions #=> DropletKit::ImageActionResource
+```
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.image_actions #=> DropletKit::ImageActionResource
+```
 
 Image Actions Supported:
 
@@ -164,8 +176,10 @@ Image Actions Supported:
 
 ## Region resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.regions #=> DropletKit::RegionResource
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.regions #=> DropletKit::RegionResource
+```
 
 Actions supported:
 
@@ -174,18 +188,22 @@ Actions supported:
 
 ## Size resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.sizes #=> DropletKit::SizeResource
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.sizes #=> DropletKit::SizeResource
+```
 
 Actions supported:
 
 * `client.sizes.all()`
 
 
-## Ssh key resource
+## SSH key resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.ssh_keys #=> DropletKit::SSHKeyResource
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.ssh_keys #=> DropletKit::SSHKeyResource
+```
 
 Actions supported:
 
@@ -197,8 +215,10 @@ Actions supported:
 
 ## Account resource
 
-    client = DropletKit::Client.new(access_token: 'TOKEN')
-    client.account #=> DropletKit::AccountResource
+```ruby
+client = DropletKit::Client.new(access_token: 'TOKEN')
+client.account #=> DropletKit::AccountResource
+```
 
 Actions supported:
 

data/droplet_kit.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "droplet_kit"
   spec.version       = DropletKit::VERSION
   spec.authors       = ["Robert Ross"]
-  spec.email         = ["rross@digitalocean.com"]
+  spec.email         = ["engineering@digitalocean.com", "rross@digitalocean.com"]
   spec.summary       = %q{Droplet Kit is the official Ruby library for DigitalOcean's API}
   spec.description   = %q{Droplet Kit is the official Ruby library for DigitalOcean's API}
   spec.homepage      = ""

data/lib/droplet_kit/mappings/action_mapping.rb

@@ -14,6 +14,7 @@ module DropletKit
       property :resource_id, scopes: [:read]
       property :resource_type, scopes: [:read]
       property :region, scopes: [:read]
+      property :region_slug, scopes: [:read]
     end
   end
-end
+end

data/lib/droplet_kit/mappings/image_action_mapping.rb

@@ -14,6 +14,7 @@ module DropletKit
       property :resource_id, scopes: [:read]
       property :resource_type, scopes: [:read]
       property :region, scopes: [:read]
+      property :region_slug, scopes: [:read]
     end
   end
-end
+end

data/lib/droplet_kit/mappings/ssh_key_mapping.rb

@@ -7,11 +7,11 @@ module DropletKit
       root_key singular: 'ssh_key', plural: 'ssh_keys', scopes: [:read]
 
       property :id, :fingerprint, :public_key, :name,
-        scopes: :read
+        scopes: [:read]
 
-      property :name, :public_key, scopes: :create
+      property :name, :public_key, scopes: [:create]
 
-      property :name, scopes: :update
+      property :name, scopes: [:update]
     end
   end
 end

data/lib/droplet_kit/models/action.rb

@@ -8,5 +8,6 @@ module DropletKit
     attribute :resource_id
     attribute :resource_type
     attribute :region
+    attribute :region_slug
   end
-end
+end

data/lib/droplet_kit/models/image_action.rb

@@ -8,5 +8,6 @@ module DropletKit
     attribute :resource_id
     attribute :resource_type
     attribute :region
+    attribute :region_slug
   end
-end
+end

data/lib/droplet_kit/resources/droplet_action_resource.rb

@@ -37,7 +37,12 @@ module DropletKit
       end
 
       action :resize, 'POST /v2/droplets/:droplet_id/actions' do
-        body { |hash| { type: 'resize', size: hash[:size] }.to_json }
+        body { |hash| { type: 'resize', size: hash[:size], disk: hash[:disk] }.to_json }
+        handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
+      end
+
+      action :upgrade, 'POST /v2/droplets/:droplet_id/actions' do
+        body { |hash| { type: 'upgrade' }.to_json }
         handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
       end
 

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "1.1.3"
+  VERSION = "1.2.0"
 end

data/spec/fixtures/actions/all.json

@@ -8,10 +8,11 @@
       "completed_at": null,
       "resource_id": null,
       "resource_type": "backend",
-      "region": "nyc1"
+      "region": "nyc1",
+      "region_slug": "nyc1"
     }
   ],
   "meta": {
     "total": 1
   }
-}
+}

data/spec/fixtures/actions/find.json

@@ -7,6 +7,7 @@
     "completed_at": null,
     "resource_id": null,
     "resource_type": "backend",
-    "region": "nyc1"
+    "region": "nyc1",
+    "region_slug": "nyc1"
   }
-}
+}

data/spec/fixtures/droplets/list_actions.json

@@ -8,10 +8,11 @@
       "completed_at": null,
       "resource_id": 24,
       "resource_type": "droplet",
-      "region": "nyc1"
+      "region": "nyc1",
+      "region_slug": "nyc1"
     }
   ],
   "meta": {
     "total": 1
   }
-}
+}

data/spec/fixtures/image_actions/all.json

@@ -8,7 +8,8 @@
             "completed_at": "2014-10-28T17:11:06Z",
             "resource_id": 45646587,
             "resource_type": "image",
-            "region": null
+            "region": null,
+            "region_slug": null
         },
         {
             "id": 234598,
@@ -18,11 +19,12 @@
             "completed_at": "2014-10-28T17:12:04Z",
             "resource_id": 45646587,
             "resource_type": "image",
-            "region": "nyc2"
+            "region": "nyc2",
+            "region_slug": "nyc2"
         }
     ],
     "links": {},
     "meta": {
         "total": 2
     }
-}
+}

data/spec/fixtures/image_actions/create.json

@@ -7,6 +7,7 @@
     "completed_at": null,
     "resource_id": 449676391,
     "resource_type": "image",
-    "region": "nyc1"
+    "region": "nyc1",
+    "region_slug": "nyc1"
   }
-}
+}

data/spec/fixtures/image_actions/find.json

@@ -7,6 +7,7 @@
     "completed_at": null,
     "resource_id": 449676391,
     "resource_type": "image",
-    "region": "nyc1"
+    "region": "nyc1",
+    "region_slug": "nyc1"
   }
-}
+}

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

@@ -12,6 +12,23 @@ RSpec.describe DropletKit::ActionResource do
 
       expect(resource.all).to eq(expected_actions)
     end
+
+    it 'returns a list of correctly mapped actions' do
+      response = api_fixture('actions/all')
+      stub_do_api('/v2/actions', :get).to_return(body: response)
+      actions = resource.all
+
+      expect(actions.first).to be_kind_of(DropletKit::Action)
+      expect(actions.first.id).to eq(1)
+      expect(actions.first.status).to eq("in-progress")
+      expect(actions.first.type).to eq("test")
+      expect(actions.first.started_at).to eq("2014-07-29T14:35:26Z")
+      expect(actions.first.completed_at).to eq(nil)
+      expect(actions.first.resource_id).to eq(nil)
+      expect(actions.first.resource_type).to eq("backend")
+      expect(actions.first.region).to eq("nyc1")
+      expect(actions.first.region_slug).to eq("nyc1")
+    end
   end
 
   describe '#find' do
@@ -22,5 +39,22 @@ RSpec.describe DropletKit::ActionResource do
 
       expect(resource.find(id: 123)).to eq(expected_action)
     end
+
+    it 'returns a correctly mapped action' do
+      response = api_fixture('actions/find')
+      stub_do_api('/v2/actions/123', :get).to_return(body: response)
+      action = resource.find(id: 123)
+
+      expect(action).to be_kind_of(DropletKit::Action)
+      expect(action.id).to eq(2)
+      expect(action.status).to eq("in-progress")
+      expect(action.type).to eq("test")
+      expect(action.started_at).to eq("2014-07-29T14:35:27Z")
+      expect(action.completed_at).to eq(nil)
+      expect(action.resource_id).to eq(nil)
+      expect(action.resource_type).to eq("backend")
+      expect(action.region).to eq("nyc1")
+      expect(action.region_slug).to eq("nyc1")
+    end
   end
-end
+end

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

@@ -13,7 +13,8 @@ RSpec.describe DropletKit::DropletActionResource do
         "completed_at" => nil,
         "resource_id" => 12,
         "resource_type" => "droplet",
-        "region" => "nyc1"
+        "region" => "nyc1",
+        "region_slug" => "nyc1"
       }
     }.to_json
   end
@@ -21,7 +22,8 @@ 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_private_networking)
+    power_on password_reset enable_ipv6 disable_backups enable_private_networking
+    upgrade)
 
   ACTIONS_WITHOUT_INPUT.each do |action_name|
     describe "Action #{action_name}" do
@@ -120,7 +122,7 @@ RSpec.describe DropletKit::DropletActionResource do
 
     it 'performs the action' do
       request = stub_do_api("/v2/droplets/#{droplet_id}/actions", :post).with(
-        body: { type: action, size: '1gb' }.to_json
+        body: { type: action, size: '1gb', disk: nil }.to_json
       ).to_return(body: json, status: 201)
 
       returned_action = resource.send(action, droplet_id: droplet_id, size: '1gb')
@@ -130,6 +132,21 @@ RSpec.describe DropletKit::DropletActionResource do
     end
   end
 
+  describe "Action resize with disk" do
+    let(:action) { 'resize' }
+
+    it 'performs the action' do
+      request = stub_do_api("/v2/droplets/#{droplet_id}/actions", :post).with(
+        body: { type: action, size: '1gb', disk: true }.to_json
+      ).to_return(body: json, status: 201)
+
+      returned_action = resource.send(action, droplet_id: droplet_id, size: '1gb', disk: true)
+
+      expect(request).to have_been_made
+      expect(returned_action.type).to eq(action)
+    end
+  end
+
   describe '#find' do
     it 'returns an action' do
       request = stub_do_api("/v2/droplets/1066/actions/123", :get).to_return(
@@ -145,6 +162,7 @@ RSpec.describe DropletKit::DropletActionResource do
       expect(returned_action.resource_id).to eq(nil)
       expect(returned_action.resource_type).to eq("backend")
       expect(returned_action.region).to eq("nyc1")
+      expect(returned_action.region_slug).to eq("nyc1")
     end
   end
-end
+end

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

@@ -23,6 +23,7 @@ RSpec.describe DropletKit::ImageActionResource do
       expect(action.resource_id).to eq(449676391)
       expect(action.resource_type).to eq("image")
       expect(action.region).to eq("nyc1")
+      expect(action.region_slug).to eq("nyc1")
     end
   end
 
@@ -49,6 +50,7 @@ RSpec.describe DropletKit::ImageActionResource do
       expect(action.resource_id).to eq(45646587)
       expect(action.resource_type).to eq("image")
       expect(action.region).to eq(nil)
+      expect(action.region_slug).to eq(nil)
     end
   end
 
@@ -66,6 +68,7 @@ RSpec.describe DropletKit::ImageActionResource do
       expect(action.resource_id).to eq(449676391)
       expect(action.resource_type).to eq("image")
       expect(action.region).to eq("nyc1")
+      expect(action.region_slug).to eq("nyc1")
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -166,6 +166,7 @@ dependencies:
         version: '1.18'
 description: Droplet Kit is the official Ruby library for DigitalOcean's API
 email:
+- engineering@digitalocean.com
 - rross@digitalocean.com
 executables: []
 extensions: []