droplet_kit 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4573b2ad1d55aa0ad804badf5bce1b2614800b34
-  data.tar.gz: 02c8d03d60f9f1ef07aeddaf8a39005c58b1206e
+  metadata.gz: c7ec2875e0c5cdc19cca7b6660ea0a1ccb03e3dd
+  data.tar.gz: 8e293ff411e4fa8c276b402a8c046a30dabb512a
 SHA512:
-  metadata.gz: b5b1a994c2dbe57857d9ae95bdc61aba6704d3f6be89cf091cfe5ec0652e1e9eaf75796822bb527c85c901a5e44e59fe3f903174bd4d1de6bbf6c215c40522d8
-  data.tar.gz: ef0228046db08ff59a8d21053efb37ca0460a073304057efe83be3d9aac6684525b61f345068e68407815a9dc2a075129e5dc885540213013e11ff24c3172728
+  metadata.gz: da7a4a687a6b048947355157036e0ed363c37d3a5cd274b0d802846be0ba734af181839e74d1f190a8f43159604be1a5e26342dfaaf26a985294f97e365932cb
+  data.tar.gz: 5a81bcc796c32dedfb5247333c53bf5e2fad5b6c285b38ddd872f619cfbced1c6cc8e7dd3fa2d90994fc4a128bc793b0119ff66d13c8a532493ff291986398d6

data/.travis.yml

@@ -1,6 +1,14 @@
+language: ruby
+cache: bundler
+
 rvm:
   - "2.0.0"
   - "2.1.5"
   - "2.2.0"
 
-script: bundle exec rspec ./spec
+env:
+  - ACTIVESUPPORT_VERSION=3
+  - ACTIVESUPPORT_VERSION=4
+
+script:
+  - bundle exec rspec ./spec

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+### Version 1.2.2
+
+* Add image convert action.
+* Loosen dependency on ActiveSupport, update travis.
+* Add Image#type property.
+* Allow client option with indifferent access.
+* Add private filtering to image endpoint.
+* Add droplet upgrades resource.
+
+### Version 1.2.1
+
+* Update to action resources to support embedded region breaking changes in API.
+
 ### Version 1.2.0
 
 * Add droplet upgrade action.

data/Gemfile

@@ -2,4 +2,13 @@ source 'https://rubygems.org'
 
 gem 'simplecov'
 # Specify your gem's dependencies in droplet_kit.gemspec
-gemspec
+gemspec
+
+version = case (ENV['ACTIVESUPPORT_VERSION'] || '4')
+          when '4'
+            '~> 4.0'
+          when '3'
+            '~> 3.1'
+          end
+
+gem 'activesupport', version

data/droplet_kit.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'virtus', '~> 1.0.3'
   spec.add_dependency "resource_kit", '~> 0.1.1'
   spec.add_dependency "kartograph", '~> 0.2.1'
-  spec.add_dependency "activesupport", '~> 4.1.6'
+  spec.add_dependency "activesupport", '> 3.0', '< 5.0.0'
   spec.add_dependency "faraday", '~> 0.9.1'
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/droplet_kit.rb

@@ -24,6 +24,7 @@ module DropletKit
   autoload :SSHKey, 'droplet_kit/models/ssh_key'
   autoload :MetaInformation, 'droplet_kit/models/meta_information'
   autoload :Account, 'droplet_kit/models/account'
+  autoload :DropletUpgrade, 'droplet_kit/models/droplet_upgrade'
 
   # Resources
   autoload :DropletResource, 'droplet_kit/resources/droplet_resource'
@@ -37,6 +38,7 @@ module DropletKit
   autoload :RegionResource, 'droplet_kit/resources/region_resource'
   autoload :SizeResource, 'droplet_kit/resources/size_resource'
   autoload :AccountResource, 'droplet_kit/resources/account_resource'
+  autoload :DropletUpgradeResource, 'droplet_kit/resources/droplet_upgrade_resource'
 
   # JSON Maps
   autoload :DropletMapping, 'droplet_kit/mappings/droplet_mapping'
@@ -55,6 +57,7 @@ module DropletKit
   autoload :ImageActionMapping, 'droplet_kit/mappings/image_action_mapping'
   autoload :SSHKeyMapping, 'droplet_kit/mappings/ssh_key_mapping'
   autoload :AccountMapping, 'droplet_kit/mappings/account_mapping'
+  autoload :DropletUpgradeMapping, 'droplet_kit/mappings/droplet_upgrade_mapping'
 
 
   # Utils

data/lib/droplet_kit/client.rb

@@ -7,7 +7,7 @@ module DropletKit
     attr_reader :access_token
 
     def initialize(options = {})
-      @access_token = options[:access_token]
+      @access_token = options.with_indifferent_access[:access_token]
     end
 
     def connection

data/lib/droplet_kit/mappings/droplet_upgrade_mapping.rb

@@ -0,0 +1,12 @@
+module DropletKit
+  class DropletUpgradeMapping
+    include Kartograph::DSL
+
+    kartograph do
+      mapping DropletUpgrade
+
+      property :droplet_id, scopes: [:read]
+      property :date_of_migration, scopes: [:read]
+    end
+  end
+end

data/lib/droplet_kit/mappings/image_mapping.rb

@@ -12,6 +12,7 @@ module DropletKit
       property :slug, scopes: [:read]
       property :public, scopes: [:read]
       property :regions, scopes: [:read]
+      property :type, scopes: [:read]
     end
   end
 end

data/lib/droplet_kit/models/droplet_upgrade.rb

@@ -0,0 +1,6 @@
+module DropletKit
+  class DropletUpgrade < BaseModel
+    attribute :droplet_id
+    attribute :date_of_migration
+  end
+end

data/lib/droplet_kit/models/image.rb

@@ -6,5 +6,6 @@ module DropletKit
     attribute :slug
     attribute :public
     attribute :regions
+    attribute :type
   end
 end

data/lib/droplet_kit/resources/droplet_upgrade_resource.rb

@@ -0,0 +1,10 @@
+module DropletKit
+  class DropletUpgradeResource < ResourceKit::Resource
+    resources do
+      action :all, 'GET /v2/droplet_upgrades' do
+        query_keys :per_page, :page
+        handler(200) { |response| DropletUpgradeMapping.extract_collection(response.body, :read) }
+      end
+    end
+  end
+end

data/lib/droplet_kit/resources/image_action_resource.rb

@@ -6,6 +6,11 @@ module DropletKit
         handler(200, 201) { |response| ImageActionMapping.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) }
+      end
+
       action :all, 'GET /v2/images/:image_id/actions' do
         handler(200) { |response| ImageActionMapping.extract_collection(response.body, :read) }
       end

data/lib/droplet_kit/resources/image_resource.rb

@@ -2,7 +2,7 @@ module DropletKit
   class ImageResource < ResourceKit::Resource
     resources do
       action :all, 'GET /v2/images' do
-        query_keys :page, :per_page, :type
+        query_keys :page, :per_page, :type, :private
         handler(200) { |response| ImageMapping.extract_collection(response.body, :read) }
       end
 

data/lib/droplet_kit/version.rb

@@ -1,3 +1,3 @@
 module DropletKit
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/fixtures/droplet_upgrades/all.json

@@ -0,0 +1,7 @@
+[
+  {
+    "droplet_id": 123,
+    "date_of_migration": "2014-12-01T12:00:00Z",
+    "url": "https://api.digitalocean.com/v2/droplets/123"
+  }
+]

data/spec/fixtures/images/all.json

@@ -9,7 +9,8 @@
       "regions": [
         "nyc1"
       ],
-      "created_at": "2014-07-29T14:35:40Z"
+      "created_at": "2014-07-29T14:35:40Z",
+      "type": "snapshot"
     },
     {
       "id": 449676376,
@@ -20,7 +21,8 @@
       "regions": [
         "nyc1"
       ],
-      "created_at": "2014-07-29T14:35:40Z"
+      "created_at": "2014-07-29T14:35:40Z",
+      "type": "snapshot"
     }
   ],
   "meta": {

data/spec/fixtures/images/find.json

@@ -8,6 +8,7 @@
     "regions": [
       "region--1"
     ],
-    "created_at": "2014-07-29T14:35:41Z"
+    "created_at": "2014-07-29T14:35:41Z",
+    "type": "snapshot"
   }
 }

data/spec/lib/droplet_kit/client_spec.rb

@@ -8,10 +8,14 @@ RSpec.describe DropletKit::Client do
       client = DropletKit::Client.new(access_token: 'my-token')
       expect(client.access_token).to eq('my-token')
     end
+
+    it 'allows string option keys for the client' do
+      client = DropletKit::Client.new('access_token' => 'my-token')
+      expect(client.access_token).to eq('my-token')
+    end
   end
 
   describe "#method_missing" do
-
     context "called with an existing method" do
       it { expect{ client.actions}.to_not raise_error }
     end

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

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+RSpec.describe DropletKit::DropletUpgradeResource do
+  subject(:resource) { described_class.new(connection: connection) }
+  include_context 'resources'
+
+  describe '#all' do
+    it 'returns a collection of Droplet upgrades' do
+      body = api_fixture('droplet_upgrades/all')
+      stub_do_api('/v2/droplet_upgrades').to_return(body: body)
+      expected = DropletKit::DropletUpgradeMapping.extract_collection(body, :read)
+
+      expect(resource.all).to eq(expected)
+    end
+  end
+end

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

@@ -4,11 +4,35 @@ RSpec.describe DropletKit::ImageActionResource do
   subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
+  def json
+    {
+      "action" => {
+        "id" => 23,
+        "status" => "in-progress",
+        "type" => action,
+        "started_at" => "2014-08-05T15:15:28Z",
+        "completed_at" => nil,
+        "resource_id" => 449676391,
+        "resource_type" => "image",
+        "region_slug" => "nyc1",
+        "region" => {
+          "name" => "New York",
+          "slug" => "nyc1",
+          "available" => true,
+          "sizes" => ["512mb"],
+          "features" => ["virtio", "private_networking", "backups", "ipv6", "metadata"]
+        }
+      }
+    }.to_json
+  end
+
   describe '#transfer' do
+    let(:action) { 'transfer' }
+
     it 'sends a transfer request for an image' do
       request = stub_do_api('/v2/images/449676391/actions').with(
-        body: { type: 'transfer', region: 'sfo1' }.to_json
-      ).to_return(body: api_fixture('image_actions/create'), status: 201)
+        body: { type: action, region: 'sfo1' }.to_json
+      ).to_return(body: json, status: 201)
 
       action = resource.transfer(image_id: 449676391, region: 'sfo1')
 
@@ -33,6 +57,37 @@ RSpec.describe DropletKit::ImageActionResource do
     end
   end
 
+  describe '#convert' do
+    let(:action) { 'convert' }
+
+    it 'sends a convert request for an image' do
+      request = stub_do_api('/v2/images/449676391/actions').with(
+        body: { type: action }.to_json
+      ).to_return(body: json, status: 201)
+
+      action = resource.convert(image_id: 449676391)
+
+      expect(request).to have_been_made
+
+      expect(action).to be_kind_of(DropletKit::ImageAction)
+      expect(action.id).to eq(23)
+      expect(action.status).to eq("in-progress")
+      expect(action.type).to eq("convert")
+      expect(action.started_at).to eq("2014-08-05T15:15:28Z")
+      expect(action.completed_at).to eq(nil)
+      expect(action.resource_id).to eq(449676391)
+      expect(action.resource_type).to eq("image")
+      expect(action.region_slug).to eq("nyc1")
+
+      expect(action.region).to be_kind_of(DropletKit::Region)
+      expect(action.region.slug).to eq('nyc1')
+      expect(action.region.name).to eq('New York')
+      expect(action.region.sizes).to include('512mb')
+      expect(action.region.available).to be(true)
+      expect(action.region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
+    end
+  end
+
   describe '#all' do
     it 'returns all of the image actions via a paginated resources' do
       request = stub_do_api('/v2/images/449676391/actions', :get).to_return(

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

@@ -12,6 +12,26 @@ RSpec.describe DropletKit::ImageResource do
 
       expect(resource.all).to eq(expected_images)
     end
+
+    it 'returns private images' do
+      images_json = api_fixture('images/all')
+      stub_do_api('/v2/images', :get)
+        .with(query: hash_including({ private: 'true' }))
+        .to_return(body: images_json)
+      expected_images = DropletKit::ImageMapping.extract_collection images_json, :read
+
+      expect(resource.all(private: true)).to eq(expected_images)
+    end
+
+    it 'returns images of a type' do
+      images_json = api_fixture('images/all')
+      stub_do_api('/v2/images', :get)
+        .with(query: hash_including({ type: 'application' }))
+        .to_return(body: images_json)
+      expected_images = DropletKit::ImageMapping.extract_collection images_json, :read
+
+      expect(resource.all(type: :application)).to eq(expected_images)
+    end
   end
 
   describe '#find' do
@@ -25,6 +45,7 @@ RSpec.describe DropletKit::ImageResource do
       expect(image.slug).to eq(nil)
       expect(image.public).to eq(false)
       expect(image.regions).to eq(["region--1"])
+      expect(image.type).to eq("snapshot")
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-20 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -56,16 +56,22 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>'
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - <
       - !ruby/object:Gem::Version
-        version: 4.1.6
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -188,6 +194,7 @@ files:
 - 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/image_action_mapping.rb
 - lib/droplet_kit/mappings/image_mapping.rb
@@ -205,6 +212,7 @@ files:
 - lib/droplet_kit/models/domain.rb
 - lib/droplet_kit/models/domain_record.rb
 - lib/droplet_kit/models/droplet.rb
+- lib/droplet_kit/models/droplet_upgrade.rb
 - lib/droplet_kit/models/image.rb
 - lib/droplet_kit/models/image_action.rb
 - lib/droplet_kit/models/kernel.rb
@@ -223,6 +231,7 @@ files:
 - lib/droplet_kit/resources/domain_resource.rb
 - lib/droplet_kit/resources/droplet_action_resource.rb
 - lib/droplet_kit/resources/droplet_resource.rb
+- lib/droplet_kit/resources/droplet_upgrade_resource.rb
 - lib/droplet_kit/resources/image_action_resource.rb
 - lib/droplet_kit/resources/image_resource.rb
 - lib/droplet_kit/resources/region_resource.rb
@@ -240,6 +249,7 @@ files:
 - spec/fixtures/domains/all.json
 - spec/fixtures/domains/create.json
 - spec/fixtures/domains/find.json
+- spec/fixtures/droplet_upgrades/all.json
 - spec/fixtures/droplets/all.json
 - spec/fixtures/droplets/all_empty.json
 - spec/fixtures/droplets/create.json
@@ -249,7 +259,6 @@ files:
 - spec/fixtures/droplets/list_kernels.json
 - spec/fixtures/droplets/list_snapshots.json
 - spec/fixtures/image_actions/all.json
-- spec/fixtures/image_actions/create.json
 - spec/fixtures/image_actions/find.json
 - spec/fixtures/images/all.json
 - spec/fixtures/images/find.json
@@ -269,6 +278,7 @@ files:
 - spec/lib/droplet_kit/resources/domain_resource_spec.rb
 - spec/lib/droplet_kit/resources/droplet_action_resource_spec.rb
 - spec/lib/droplet_kit/resources/droplet_resource_spec.rb
+- spec/lib/droplet_kit/resources/droplet_upgrade_resource_spec.rb
 - spec/lib/droplet_kit/resources/image_action_resource_spec.rb
 - spec/lib/droplet_kit/resources/image_resource_spec.rb
 - spec/lib/droplet_kit/resources/region_resource_spec.rb
@@ -314,6 +324,7 @@ test_files:
 - spec/fixtures/domains/all.json
 - spec/fixtures/domains/create.json
 - spec/fixtures/domains/find.json
+- spec/fixtures/droplet_upgrades/all.json
 - spec/fixtures/droplets/all.json
 - spec/fixtures/droplets/all_empty.json
 - spec/fixtures/droplets/create.json
@@ -323,7 +334,6 @@ test_files:
 - spec/fixtures/droplets/list_kernels.json
 - spec/fixtures/droplets/list_snapshots.json
 - spec/fixtures/image_actions/all.json
-- spec/fixtures/image_actions/create.json
 - spec/fixtures/image_actions/find.json
 - spec/fixtures/images/all.json
 - spec/fixtures/images/find.json
@@ -343,6 +353,7 @@ test_files:
 - spec/lib/droplet_kit/resources/domain_resource_spec.rb
 - spec/lib/droplet_kit/resources/droplet_action_resource_spec.rb
 - spec/lib/droplet_kit/resources/droplet_resource_spec.rb
+- spec/lib/droplet_kit/resources/droplet_upgrade_resource_spec.rb
 - spec/lib/droplet_kit/resources/image_action_resource_spec.rb
 - spec/lib/droplet_kit/resources/image_resource_spec.rb
 - spec/lib/droplet_kit/resources/region_resource_spec.rb

data/spec/fixtures/image_actions/create.json

@@ -1,19 +0,0 @@
-{
-  "action": {
-    "id": 23,
-    "status": "in-progress",
-    "type": "transfer",
-    "started_at": "2014-08-05T15:15:28Z",
-    "completed_at": null,
-    "resource_id": 449676391,
-    "resource_type": "image",
-    "region_slug": "nyc1",
-    "region": {
-      "name": "New York",
-      "slug": "nyc1",
-      "available": true,
-      "sizes": ["512mb"],
-      "features": ["virtio", "private_networking", "backups", "ipv6", "metadata"]
-    }
-  }
-}