droplet_kit 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7ec2875e0c5cdc19cca7b6660ea0a1ccb03e3dd
-  data.tar.gz: 8e293ff411e4fa8c276b402a8c046a30dabb512a
+  metadata.gz: 8248d66e3b2a7ea6e7525aa221378fefd3089202
+  data.tar.gz: 2fc041cce279e282b2775a7dfc183aff9fd3dbb8
 SHA512:
-  metadata.gz: da7a4a687a6b048947355157036e0ed363c37d3a5cd274b0d802846be0ba734af181839e74d1f190a8f43159604be1a5e26342dfaaf26a985294f97e365932cb
-  data.tar.gz: 5a81bcc796c32dedfb5247333c53bf5e2fad5b6c285b38ddd872f619cfbced1c6cc8e7dd3fa2d90994fc4a128bc793b0119ff66d13c8a532493ff291986398d6
+  metadata.gz: f8546836585fd8f04ed333ab3a66e66e3d7ac9bc34690e09e91323090d9d60c2a908ed968dc3412826177f4b67e72482f51fe190d6d9e31cfceba60ab9c6279b
+  data.tar.gz: 5b3bbc5443f5119c09bfeca6138f6d0636ea6b193e50cf75011ee6df591ab93cd85621cc34c591e8b651a4a6b690f6e72cb1c434094ea7acd350fd1e71412f88

data/lib/droplet_kit/mappings/size_mapping.rb

@@ -7,9 +7,14 @@ module DropletKit
       root_key singular: 'size', plural: 'sizes', scopes: [:read]
 
       property :slug, scopes: [:read]
+      property :memory, scopes: [:read]
+      property :vcpus, scopes: [:read]
+      property :disk, scopes: [:read]
       property :transfer, scopes: [:read]
       property :price_monthly, scopes: [:read]
       property :price_hourly, scopes: [:read]
+      property :regions, scopes: [:read]
+      property :available, scopes: [:read]
     end
   end
-end
+end

data/lib/droplet_kit/models/size.rb

@@ -1,8 +1,13 @@
 module DropletKit
   class Size < BaseModel
     attribute :slug
+    attribute :memory
+    attribute :vcpus
+    attribute :disk
     attribute :transfer
     attribute :price_monthly
     attribute :price_hourly
+    attribute :regions
+    attribute :available
   end
-end
+end

data/lib/droplet_kit/resources/domain_record_resource.rb

@@ -2,6 +2,7 @@ module DropletKit
   class DomainRecordResource < ResourceKit::Resource
     resources do
       action :all, 'GET /v2/domains/:for_domain/records' do
+        query_keys :per_page, :page
         handler(200) { |response| DomainRecordMapping.extract_collection(response.body, :read) }
       end
 
@@ -28,4 +29,4 @@ module DropletKit
       PaginatedResource.new(action(:all), self, *args)
     end
   end
-end
+end

data/lib/droplet_kit/resources/domain_resource.rb

@@ -2,6 +2,7 @@ module DropletKit
   class DomainResource < ResourceKit::Resource
     resources do
       action :all, 'GET /v2/domains' do
+        query_keys :per_page, :page
         handler(200) { |response| DomainMapping.extract_collection(response.body, :read) }
       end
 
@@ -23,4 +24,4 @@ module DropletKit
       PaginatedResource.new(action(:all), self, *args)
     end
   end
-end
+end

data/lib/droplet_kit/resources/droplet_upgrade_resource.rb

@@ -2,7 +2,6 @@ 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

data/lib/droplet_kit/resources/image_action_resource.rb

@@ -12,6 +12,7 @@ module DropletKit
       end
 
       action :all, 'GET /v2/images/:image_id/actions' do
+        query_keys :per_page, :page
         handler(200) { |response| ImageActionMapping.extract_collection(response.body, :read) }
       end
 
@@ -24,4 +25,4 @@ module DropletKit
       PaginatedResource.new(action(:all), self, *args)
     end
   end
-end
+end

data/lib/droplet_kit/resources/region_resource.rb

@@ -2,6 +2,7 @@ module DropletKit
   class RegionResource < ResourceKit::Resource
     resources do
       action :all, 'GET /v2/regions' do
+        query_keys :per_page, :page
         handler(200) { |r| RegionMapping.extract_collection(r.body, :read) }
       end
     end
@@ -10,4 +11,4 @@ module DropletKit
       PaginatedResource.new(action(:all), self, *args)
     end
   end
-end
+end

data/lib/droplet_kit/resources/size_resource.rb

@@ -2,6 +2,7 @@ module DropletKit
   class SizeResource < ResourceKit::Resource
     resources do
       action :all, 'GET /v2/sizes' do
+        query_keys :per_page, :page
         handler(200) { |r| SizeMapping.extract_collection(r.body, :read) }
       end
     end
@@ -10,4 +11,4 @@ module DropletKit
       PaginatedResource.new(action(:all), self, *args)
     end
   end
-end
+end

data/lib/droplet_kit/resources/ssh_key_resource.rb

@@ -4,6 +4,7 @@ module DropletKit
       default_handler(:ok, :created) {|r| SSHKeyMapping.extract_single(r.body, :read) }
 
       action :all, 'GET /v2/account/keys' do
+        query_keys :per_page, :page
         handler(:ok) { |response| SSHKeyMapping.extract_collection(response.body, :read) }
       end
 
@@ -23,4 +24,4 @@ module DropletKit
       PaginatedResource.new(action(:all), self, *args)
     end
   end
-end
+end

data/lib/droplet_kit/version.rb

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

data/spec/fixtures/sizes/all.json

@@ -12,7 +12,8 @@
         "nyc1",
         "ams1",
         "sfo1"
-      ]
+      ],
+      "available": true
     },
     {
       "slug": "1gb",
@@ -26,10 +27,11 @@
         "nyc1",
         "ams1",
         "sfo1"
-      ]
+      ],
+      "available": true
     }
   ],
   "meta": {
     "total": 2
   }
-}
+}

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

@@ -34,6 +34,11 @@ RSpec.describe DropletKit::ActionResource do
       expect(actions.first.region.available).to be(true)
       expect(actions.first.region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) { 'actions/all' }
+      let(:api_path) { '/v2/actions' }
+    end
   end
 
   describe '#find' do

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

@@ -15,6 +15,11 @@ RSpec.describe DropletKit::DomainRecordResource do
       expect(returned_records).to all(be_kind_of(DropletKit::DomainRecord))
       expect(returned_records).to eq(expected_records)
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) {'domain_records/all'}
+      let(:api_path) {'/v2/domains/example.com/records'}
+    end
   end
 
   describe '#create' do
@@ -80,4 +85,4 @@ RSpec.describe DropletKit::DomainRecordResource do
       expect(updated_domain_record.data).to eq('@')
     end
   end
-end
+end

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

@@ -12,6 +12,11 @@ RSpec.describe DropletKit::DomainResource do
 
       expect(resource.all).to eq(expected_domains)
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) {'domains/all'}
+      let(:api_path) {'/v2/domains'}
+    end
   end
 
   describe '#create' do
@@ -50,4 +55,4 @@ RSpec.describe DropletKit::DomainResource do
       expect(request).to have_been_made
     end
   end
-end
+end

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

@@ -75,6 +75,11 @@ RSpec.describe DropletKit::DropletResource do
       droplets = resource.all.map(&:id)
       expect(droplets).to be_empty
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) { 'droplets/all' }
+      let(:api_path) { '/v2/droplets' }
+    end
   end
 
   describe '#find' do
@@ -143,6 +148,12 @@ RSpec.describe DropletKit::DropletResource do
       expect(kernels[1].name).to eq('Ubuntu 14.04 x64 vmlinuz-3.13.0-24-generic (1221)')
       expect(kernels[1].version).to eq('3.13.0-24-generic')
     end
+
+    it 'returns a paginated resource' do
+      stub_do_api('/v2/droplets/1066/kernels', :get).to_return(body: api_fixture('droplets/list_kernels'))
+      kernels = resource.kernels(id: 1066, page: 1, per_page: 1)
+      expect(kernels).to be_kind_of(DropletKit::PaginatedResource)
+    end
   end
 
   describe '#snapshots' do
@@ -159,6 +170,12 @@ RSpec.describe DropletKit::DropletResource do
       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
+      stub_do_api('/v2/droplets/1066/snapshots', :get).to_return(body: api_fixture('droplets/list_snapshots'))
+      snapshots = resource.snapshots(id: 1066, page: 1, per_page: 1)
+      expect(snapshots).to be_kind_of(DropletKit::PaginatedResource)
+    end
   end
 
   describe '#backups' do
@@ -175,6 +192,12 @@ RSpec.describe DropletKit::DropletResource do
       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
+      stub_do_api('/v2/droplets/1066/backups', :get).to_return(body: api_fixture('droplets/list_backups'))
+      backups = resource.backups(id: 1066, page: 1, per_page: 1)
+      expect(backups).to be_kind_of(DropletKit::PaginatedResource)
+    end
   end
 
   describe '#actions' do
@@ -198,6 +221,12 @@ RSpec.describe DropletKit::DropletResource do
       expect(actions[0].region.available).to be(true)
       expect(actions[0].region.features).to include("virtio", "private_networking", "backups", "ipv6", "metadata")
     end
+
+    it 'returns a paginated resource' do
+      stub_do_api('/v2/droplets/1066/actions', :get).to_return(body: api_fixture('droplets/list_actions'))
+      actions = resource.actions(id: 1066, page: 1, per_page: 1)
+      expect(actions).to be_kind_of(DropletKit::PaginatedResource)
+    end
   end
 
   describe '#delete' do

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

@@ -113,6 +113,11 @@ RSpec.describe DropletKit::ImageActionResource do
       expect(action.region).to eq(nil)
       expect(action.region_slug).to eq(nil)
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) {'image_actions/all'}
+      let(:api_path) {'/v2/images/45646587/actions'}
+    end
   end
 
   describe '#find' do

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

@@ -32,6 +32,11 @@ RSpec.describe DropletKit::ImageResource do
 
       expect(resource.all(type: :application)).to eq(expected_images)
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) { 'images/all' }
+      let(:api_path) { '/v2/images' }
+    end
   end
 
   describe '#find' do

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

@@ -12,5 +12,10 @@ RSpec.describe DropletKit::RegionResource do
 
       expect(resource.all).to eq(expected)
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) {'regions/all'}
+      let(:api_path) {'/v2/regions'}
+    end
   end
 end

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

@@ -12,5 +12,10 @@ RSpec.describe DropletKit::SizeResource do
 
       expect(resource.all).to eq(expected)
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) {'sizes/all'}
+      let(:api_path) {'/v2/sizes'}
+    end
   end
-end
+end

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

@@ -16,6 +16,11 @@ RSpec.describe DropletKit::SSHKeyResource do
       expect(ssh_keys.first.public_key).to eq("ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAQQDGk5V68BJ4P3Ereh779Vi/Ft2qs/rbXrcjKLGo6zsyeyFUE0svJUpRDEJvFSf8RlezKx1/1ulJu9+kZsxRiUKn example")
       expect(ssh_keys.first.name).to eq("Example Key")
     end
+
+    it_behaves_like 'a paginated index' do
+      let(:fixture_path) {'ssh_keys/all'}
+      let(:api_path) {'/v2/ssh_keys'}
+    end
   end
 
   describe '#create' do
@@ -77,4 +82,4 @@ RSpec.describe DropletKit::SSHKeyResource do
       expect(request).to have_been_made
     end
   end
-end
+end

data/spec/support/shared_examples/paginated_endpoint.rb

@@ -0,0 +1,13 @@
+# To use this, `fixture_path`, `api_path` and a `resource` must be defined
+# using `let`s.
+shared_examples_for 'a paginated index' do
+  let(:fixture_path) { }
+  let(:api_path) { }
+
+  it 'returns a paginated resource' do
+    fixture = api_fixture(fixture_path)
+    stub_do_api(api_path, :get).to_return(body: fixture)
+    response = resource.all(page: 1, per_page: 1)
+    expect(response).to be_kind_of(DropletKit::PaginatedResource)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -289,6 +289,7 @@ files:
 - spec/support/null_hash_load.rb
 - spec/support/request_stub_helpers.rb
 - spec/support/resource_context.rb
+- spec/support/shared_examples/paginated_endpoint.rb
 homepage: ''
 licenses:
 - MIT
@@ -364,3 +365,4 @@ test_files:
 - spec/support/null_hash_load.rb
 - spec/support/request_stub_helpers.rb
 - spec/support/resource_context.rb
+- spec/support/shared_examples/paginated_endpoint.rb