droplet_kit 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62a4987734e9797532835df94d983541b086ae07
-  data.tar.gz: ec155d10bdc6283b0a89000d17fc529eeab3a166
+  metadata.gz: 049df1218b2a89e735a4aa6a21b6021f1aa2babf
+  data.tar.gz: c04ff432b31fb45e1cdf3bb05af3674f07adfc32
 SHA512:
-  metadata.gz: f3b979fe64594230f98330f6b140455cd2e9c55f673f3afe33ef1dcf088d04465d2f9489a45dcf037c0805ca45608d2cc3efd32c01ddec4663ee6d0f0922bd38
-  data.tar.gz: fbb993a4c5592d5ae321e86771ba01740848720c2f3b7119e77ed1a6797ff74e1e24608c65867b9d47430d3e86f6f892c61dcb314b744e782c2b5b81dfd2cece
+  metadata.gz: 9dff4c196ff43708ae25e5ee2d285e86758a021cba20045d37bb8d7016d21e1644b1b439e657de6de6f8bcb87c974ccd28ae2edf683f2d0658c99ca540554561
+  data.tar.gz: 8f28a270b70529fbca2862f461c24dee13af86ba5dbb9a13acce7ad6173b9ee7286fc15d6ded6beb6404eb95a5641b7d19aaac8587c47234f55e7f68139b76fb

data/.travis.yml

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

data/CHANGELOG.md

@@ -0,0 +1,17 @@
+### Version 1.1.0
+
+* Changing kernels is now `client.droplet_actions.change_kernel(kernel: 'name', droplet_id: 123)` instead of `droplet_actions.kernel()`.
+* Include Account resource. `client.account`. This allows you to grab information about the user for the access token provided.
+* Paginate more resources. This includes:
+  * Droplet Kernels
+  * Actions
+  * Snapshots
+  * Backups
+* Allow creating droplets with User Data and Private Networking
+  * See [#8](https://github.com/digitalocean/droplet_kit/pull/8) - Thanks @rbishop !
+* Fixed a bug where if the resource was paginated and returning 0 entries, an infinite loop would occur.
+  * See [#11](https://github.com/digitalocean/droplet_kit/pull/11) - Thanks @webdestroya !
+
+### August 8, 2014 (Initial Release)
+
+* Initial Release

data/README.md

@@ -2,6 +2,8 @@
 
 DropletKit is the official [DigitalOcean V2 API](https://developers.digitalocean.com/v2/) client. It supports everything the API can do with a simple interface written in Ruby.
 
+[![Build Status](https://travis-ci.org/digitalocean/droplet_kit.svg?branch=master)](https://travis-ci.org/digitalocean/droplet_kit)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -61,6 +63,7 @@ droplet = client.droplets.find(id: 123)
 ```
 
 # All Resources and actions.
+
 ## Droplet resource
 
     client = DropletKit::Client.new(access_token: 'TOKEN')
@@ -77,6 +80,29 @@ Actions supported:
 * `client.droplets.backups(id: 'id')`
 * `client.droplets.actions(id: 'id')`
 
+## Droplet Action resource
+
+    client = DropletKit::Client.new(access_token: 'TOKEN')
+    client.droplet_actions #=> DropletKit::DropletAction
+
+Actions supported:
+
+* `client.droplet_actions.reboot(droplet_id: droplet.id)`
+* `client.droplet_actions.power_cycle(droplet_id: droplet.id)`
+* `client.droplet_actions.shutdown(droplet_id: droplet.id)`
+* `client.droplet_actions.power_off(droplet_id: droplet.id)`
+* `client.droplet_actions.power_on(droplet_id: droplet.id)`
+* `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.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')`
+* `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)`
 
 ## Domain resource
 
@@ -151,6 +177,15 @@ Actions supported:
 * `client.ssh_keys.delete(id: 'id')`
 * `client.ssh_keys.update(ssh_key, id: 'id')`
 
+## Account resource
+
+    client = DropletKit::Client.new(access_token: 'TOKEN')
+    client.account #=> DropletKit::AccountResource
+
+Actions supported:
+
+* `client.account.info()`
+
 
 ## Contributing
 

data/droplet_kit.gemspec

@@ -17,10 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  
+  spec.required_ruby_version = '>= 2.0.0'
 
   spec.add_dependency 'virtus', '~> 1.0.3'
-  spec.add_dependency "resource_kit", '~> 0.0.5'
-  spec.add_dependency "kartograph", '~> 0.0.5'
+  spec.add_dependency "resource_kit", '~> 0.1.1'
+  spec.add_dependency "kartograph", '~> 0.2.0'
   spec.add_dependency "activesupport", '~> 4.1.6'
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/droplet_kit.rb

@@ -23,6 +23,7 @@ module DropletKit
   autoload :DomainRecord, 'droplet_kit/models/domain_record'
   autoload :SSHKey, 'droplet_kit/models/ssh_key'
   autoload :MetaInformation, 'droplet_kit/models/meta_information'
+  autoload :Account, 'droplet_kit/models/account'
 
   # Resources
   autoload :DropletResource, 'droplet_kit/resources/droplet_resource'
@@ -35,6 +36,7 @@ module DropletKit
   autoload :SSHKeyResource, 'droplet_kit/resources/ssh_key_resource'
   autoload :RegionResource, 'droplet_kit/resources/region_resource'
   autoload :SizeResource, 'droplet_kit/resources/size_resource'
+  autoload :AccountResource, 'droplet_kit/resources/account_resource'
 
   # JSON Maps
   autoload :DropletMapping, 'droplet_kit/mappings/droplet_mapping'
@@ -52,6 +54,7 @@ module DropletKit
   autoload :DropletActionMapping, 'droplet_kit/mappings/droplet_action_mapping'
   autoload :ImageActionMapping, 'droplet_kit/mappings/image_action_mapping'
   autoload :SSHKeyMapping, 'droplet_kit/mappings/ssh_key_mapping'
+  autoload :AccountMapping, 'droplet_kit/mappings/account_mapping'
 
 
   # Utils

data/lib/droplet_kit/client.rb

@@ -18,6 +18,7 @@ module DropletKit
 
     def self.resources
       {
+        actions: ActionResource,
         droplets: DropletResource,
         domains: DomainResource,
         domain_records: DomainRecordResource,
@@ -27,12 +28,13 @@ module DropletKit
         regions: RegionResource,
         sizes: SizeResource,
         ssh_keys: SSHKeyResource,
+        account: AccountResource,
       }
     end
 
     def method_missing(name, *args, &block)
       if self.class.resources.keys.include?(name)
-        resources[name] ||= self.class.resources[name].new(connection)
+        resources[name] ||= self.class.resources[name].new(connection: connection)
         resources[name]
       else
         super

data/lib/droplet_kit/mappings/account_mapping.rb

@@ -0,0 +1,17 @@
+module DropletKit
+  class AccountMapping
+    include Kartograph::DSL
+
+    kartograph do
+      root_key singular: 'account', scopes: [:read]
+      mapping Account
+
+      scoped :read do
+        property :droplet_limit
+        property :email
+        property :uuid
+        property :email_verified
+      end
+    end
+  end
+end

data/lib/droplet_kit/mappings/droplet_mapping.rb

@@ -33,6 +33,8 @@ module DropletKit
       property :ssh_keys, scopes: [:create]
       property :backups, scopes: [:create]
       property :ipv6, scopes: [:create]
+      property :user_data, scopes: [:create]
+      property :private_networking, scopes: [:create]
     end
   end
 end

data/lib/droplet_kit/models/account.rb

@@ -0,0 +1,8 @@
+module DropletKit
+  class Account < BaseModel
+    attribute :droplet_limit
+    attribute :email
+    attribute :uuid
+    attribute :email_verified
+  end
+end

data/lib/droplet_kit/models/droplet.rb

@@ -10,6 +10,8 @@ module DropletKit
     attribute :ssh_keys
     attribute :backups
     attribute :ipv6
+    attribute :user_data
+    attribute :private_networking
   end
 end
 

data/lib/droplet_kit/models/image.rb

@@ -7,4 +7,4 @@ module DropletKit
     attribute :public
     attribute :regions
   end
-end
+end

data/lib/droplet_kit/paginated_resource.rb

@@ -4,14 +4,14 @@ module DropletKit
 
     PER_PAGE = 20
 
-    attr_reader :action, :connection, :collection
+    attr_reader :action, :resource, :collection
     attr_accessor :total
 
-    def initialize(action_connection, *args)
+    def initialize(action, resource, *args)
       @current_page = 0
       @total = nil
-      @action = action_connection.action
-      @connection = action_connection.connection
+      @action = action
+      @resource = resource
       @collection = []
       @args = args
       @options = args.last.kind_of?(Hash) ? args.last : {}
@@ -44,7 +44,6 @@ module DropletKit
     end
 
     def ==(other)
-      return false if self.total != other.length
       each_with_index.each.all? {|object, index| object == other[index] }
     end
 
@@ -56,7 +55,7 @@ module DropletKit
     end
 
     def retrieve(page, per_page = self.per_page)
-      invoker = ResourceKit::ActionInvoker.new(action, connection, *@args)
+      invoker = ResourceKit::ActionInvoker.new(action, resource, *@args)
       invoker.options[:per_page] ||= per_page
       invoker.options[:page]       = page
 

data/lib/droplet_kit/resources/account_resource.rb

@@ -0,0 +1,8 @@
+module DropletKit
+  class AccountResource < ResourceKit::Resource
+    resources do
+      default_handler(:ok) {|r| AccountMapping.extract_single(r.body, :read) }
+      get '/v2/account' => :info
+    end
+  end
+end

data/lib/droplet_kit/resources/action_resource.rb

@@ -2,6 +2,7 @@ module DropletKit
   class ActionResource < ResourceKit::Resource
     resources do
       action :all, 'GET /v2/actions' do
+        query_keys :per_page, :page
         handler(200) { |response| ActionMapping.extract_collection(response.body, :read) }
       end
 
@@ -11,7 +12,7 @@ module DropletKit
     end
 
     def all(*args)
-      PaginatedResource.new(action_and_connection(:all), *args)
+      PaginatedResource.new(action(:all), self, *args)
     end
   end
 end

data/lib/droplet_kit/resources/domain_record_resource.rb

@@ -25,7 +25,7 @@ module DropletKit
     end
 
     def all(*args)
-      PaginatedResource.new(action_and_connection(:all), *args)
+      PaginatedResource.new(action(:all), self, *args)
     end
   end
 end

data/lib/droplet_kit/resources/domain_resource.rb

@@ -20,7 +20,7 @@ module DropletKit
     end
 
     def all(*args)
-      PaginatedResource.new(action_and_connection(:all), *args)
+      PaginatedResource.new(action(:all), self, *args)
     end
   end
 end

data/lib/droplet_kit/resources/droplet_action_resource.rb

@@ -16,8 +16,8 @@ module DropletKit
         handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
       end
 
-      action :kernel, 'POST /v2/droplets/:droplet_id/actions' do
-        body { |hash| { type: 'kernel', kernel: hash[:kernel] }.to_json }
+      action :change_kernel, 'POST /v2/droplets/:droplet_id/actions' do
+        body { |hash| { type: 'change_kernel', kernel: hash[:kernel] }.to_json }
         handler(201, 200) { |response| ActionMapping.extract_single(response.body, :read) }
       end
 

data/lib/droplet_kit/resources/droplet_resource.rb

@@ -21,24 +21,44 @@ module DropletKit
       end
 
       action :kernels, 'GET /v2/droplets/:id/kernels' do
+        query_keys :per_page, :page
         handler(200) { |response| KernelMapping.extract_collection(response.body, :read) }
       end
 
       action :snapshots, 'GET /v2/droplets/:id/snapshots' do
+        query_keys :per_page, :page
         handler(200) { |response| SnapshotMapping.extract_collection(response.body, :read) }
       end
 
       action :backups, 'GET /v2/droplets/:id/backups' do
+        query_keys :per_page, :page
         handler(200) { |response| BackupMapping.extract_collection(response.body, :read) }
       end
 
       action :actions, 'GET /v2/droplets/:id/actions' do
+        query_keys :per_page, :page
         handler(200) { |response| ActionMapping.extract_collection(response.body, :read) }
       end
     end
 
     def all(*args)
-      PaginatedResource.new(action_and_connection(:all), *args)
+      PaginatedResource.new(action(:all), self, *args)
+    end
+
+    def kernels(*args)
+      PaginatedResource.new(action(:kernels), self, *args)
+    end
+
+    def snapshots(*args)
+      PaginatedResource.new(action(:snapshots), self, *args)
+    end
+
+    def backups(*args)
+      PaginatedResource.new(action(:backups), self, *args)
+    end
+
+    def actions(*args)
+      PaginatedResource.new(action(:actions), self, *args)
     end
   end
-end
+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
+        query_keys :page, :per_page, :type
         handler(200) { |response| ImageMapping.extract_collection(response.body, :read) }
       end
 
@@ -21,7 +21,7 @@ module DropletKit
     end
 
     def all(*args)
-      PaginatedResource.new(action_and_connection(:all), *args)
+      PaginatedResource.new(action(:all), self, *args)
     end
   end
 end

data/lib/droplet_kit/resources/region_resource.rb

@@ -7,7 +7,7 @@ module DropletKit
     end
 
     def all(*args)
-      PaginatedResource.new(action_and_connection(:all), *args)
+      PaginatedResource.new(action(:all), self, *args)
     end
   end
 end

data/lib/droplet_kit/resources/size_resource.rb

@@ -7,7 +7,7 @@ module DropletKit
     end
 
     def all(*args)
-      PaginatedResource.new(action_and_connection(:all), *args)
+      PaginatedResource.new(action(:all), self, *args)
     end
   end
 end

data/lib/droplet_kit/resources/ssh_key_resource.rb

@@ -20,7 +20,7 @@ module DropletKit
     end
 
     def all(*args)
-      PaginatedResource.new(action_and_connection(: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.0.2"
+  VERSION = "1.1.0"
 end

data/spec/fixtures/account/info.json

@@ -0,0 +1,8 @@
+{
+    "account": {
+        "droplet_limit": 200,
+        "email": "droplet_kit@digitalocean.com",
+        "uuid": "alksdjfhlakjdsfh12983712",
+        "email_verified": true
+    }
+}

data/spec/fixtures/droplets/all.json

@@ -42,6 +42,12 @@
       "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",
@@ -81,4 +87,4 @@
   "meta": {
     "total": 1
   }
-}
+}

data/spec/fixtures/droplets/create.json

@@ -41,6 +41,12 @@
     "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",
@@ -76,4 +82,4 @@
 
     ]
   }
-}
+}

data/spec/fixtures/droplets/find.json

@@ -41,6 +41,12 @@
     "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",
@@ -76,4 +82,4 @@
 
     ]
   }
-}
+}

data/spec/lib/droplet_kit/paginated_resource_spec.rb

@@ -4,6 +4,7 @@ require 'addressable/uri'
 RequestCounter = Struct.new(:count)
 
 RSpec.describe DropletKit::PaginatedResource do
+  let(:resource) { ResourceKit::Resource.new(connection: connection) }
   let(:request_count) { RequestCounter.new(0) }
 
   let(:connection) { Faraday.new {|b| b.adapter :test, stubs } }
@@ -23,7 +24,6 @@ RSpec.describe DropletKit::PaginatedResource do
     end
   end
   let(:action) { ResourceKit::Action.new(:find, :get, '/droplets') }
-  let(:action_connection) { ResourceKit::ActionConnection.new(action, connection) }
 
   before do
     action.query_keys :per_page, :page
@@ -31,15 +31,15 @@ RSpec.describe DropletKit::PaginatedResource do
   end
 
   describe '#initialize' do
-    it 'initializes with a action connection struct' do
-      instance = DropletKit::PaginatedResource.new(action_connection)
+    it 'initializes with a action and resource' do
+      instance = DropletKit::PaginatedResource.new(action, resource)
       expect(instance.action).to be(action)
-      expect(instance.connection).to be(connection)
+      expect(instance.resource).to be(resource)
     end
   end
 
   describe '#each' do
-    subject(:paginated) { DropletKit::PaginatedResource.new(action_connection) }
+    subject(:paginated) { DropletKit::PaginatedResource.new(action, resource) }
 
     it 'iterates over every object returned from the API' do
       total = 0
@@ -59,7 +59,7 @@ RSpec.describe DropletKit::PaginatedResource do
     end
 
     context 'for changing size' do
-      subject(:paginated) { DropletKit::PaginatedResource.new(action_connection, per_page: 40) }
+      subject(:paginated) { DropletKit::PaginatedResource.new(action, resource, per_page: 40) }
 
       it 'only calls the API once' do
         expect {|b| paginated.each {|c| c } }.to change { request_count.count }.to(1).from(0)

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

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+RSpec.describe DropletKit::AccountResource do
+  subject(:resource) { described_class.new(connection: connection) }
+  include_context 'resources'
+
+  describe '#info' do
+    it 'returns the information about the current user' do
+      fixture = api_fixture('account/info')
+      parsed  = JSON.load(fixture)
+
+      stub_do_api('/v2/account').to_return(body: fixture)
+      account_info = resource.info
+
+      expect(account_info).to be_kind_of(DropletKit::Account)
+
+      expect(account_info.droplet_limit).to eq(parsed['account']['droplet_limit'])
+      expect(account_info.email).to eq(parsed['account']['email'])
+      expect(account_info.uuid).to eq(parsed['account']['uuid'])
+      expect(account_info.email_verified).to eq(parsed['account']['email_verified'])
+
+    end
+  end
+end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::ActionResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   describe '#all' do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::DomainRecordResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   describe '#all' do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::DomainResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   describe '#all' do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::DropletActionResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   let(:droplet_id) { 1066 }
   def json
     {
@@ -55,8 +55,8 @@ RSpec.describe DropletKit::DropletActionResource do
     end
   end
 
-  describe "Action kernel" do
-    let(:action) { 'kernel' }
+  describe "Action change_kernel" do
+    let(:action) { 'change_kernel' }
 
     it 'performs the action' do
       request = stub_do_api("/v2/droplets/#{droplet_id}/actions", :post).with(

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::DropletResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   # Theres a lot to check
@@ -41,11 +41,17 @@ RSpec.describe DropletKit::DropletResource do
     expect(droplet.size.price_hourly).to eq(0.01488)
 
     expect(droplet.networks).to be_kind_of(DropletKit::NetworkHash)
-    v4_network = droplet.networks.v4.first
-    expect(v4_network.ip_address).to eq('127.0.0.19')
-    expect(v4_network.netmask).to eq("255.255.255.0")
-    expect(v4_network.gateway).to eq("127.0.0.20")
-    expect(v4_network.type).to eq("public")
+    private_v4_network = droplet.networks.v4.first
+    expect(private_v4_network.ip_address).to eq('10.0.0.19')
+    expect(private_v4_network.netmask).to eq("255.255.0.0")
+    expect(private_v4_network.gateway).to eq("10.0.0.1")
+    expect(private_v4_network.type).to eq("private")
+
+    public_v4_network = droplet.networks.v4.last
+    expect(public_v4_network.ip_address).to eq('127.0.0.19')
+    expect(public_v4_network.netmask).to eq("255.255.255.0")
+    expect(public_v4_network.gateway).to eq("127.0.0.20")
+    expect(public_v4_network.type).to eq("public")
 
     v6_network = droplet.networks.v6.first
     expect(v6_network.ip_address).to eq('2001::13')
@@ -88,7 +94,9 @@ RSpec.describe DropletKit::DropletResource do
           image: 'ubuntu-14-04-x86',
           ssh_keys: [123],
           backups: true,
-          ipv6: true
+          ipv6: true,
+          private_networking: true,
+          user_data: "#cloud-config\nruncmd\n\t- echo 'Hello!'"
         )
 
         as_hash = DropletKit::DropletMapping.representation_for(:create, droplet, NullHashLoad)
@@ -99,6 +107,8 @@ RSpec.describe DropletKit::DropletResource do
         expect(as_hash[:ssh_keys]).to eq(droplet.ssh_keys)
         expect(as_hash[:backups]).to eq(droplet.backups)
         expect(as_hash[:ipv6]).to eq(droplet.ipv6)
+        expect(as_hash[:private_networking]).to eq(droplet.private_networking)
+        expect(as_hash[:user_data]).to eq(droplet.user_data)
 
         as_string = DropletKit::DropletMapping.representation_for(:create, droplet)
         stub_do_api('/v2/droplets', :post).with(body: as_string).to_return(body: api_fixture('droplets/create'), status: 202)
@@ -120,7 +130,7 @@ RSpec.describe DropletKit::DropletResource do
   describe '#kernels' do
     it 'returns a list of kernels for a droplet' do
       stub_do_api('/v2/droplets/1066/kernels', :get).to_return(body: api_fixture('droplets/list_kernels'))
-      kernels = resource.kernels(id: 1066)
+      kernels = resource.kernels(id: 1066).take(20)
 
       expect(kernels).to all(be_kind_of(DropletKit::Kernel))
       expect(kernels[0].id).to eq(61833229)
@@ -136,7 +146,7 @@ RSpec.describe DropletKit::DropletResource do
   describe '#snapshots' do
     it 'returns a list of kernels 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)
+      snapshots = resource.snapshots(id: 1066).take(20)
 
       expect(snapshots).to all(be_kind_of(DropletKit::Snapshot))
       expect(snapshots[0].id).to eq(449676387)
@@ -152,7 +162,7 @@ RSpec.describe DropletKit::DropletResource do
   describe '#backups' do
     it 'returns a list of backups for a droplet' do
       stub_do_api('/v2/droplets/1066/backups', :get).to_return(body: api_fixture('droplets/list_backups'))
-      backups = resource.backups(id: 1066)
+      backups = resource.backups(id: 1066).take(20)
 
       expect(backups).to all(be_kind_of(DropletKit::Backup))
       expect(backups[0].id).to eq(449676388)
@@ -168,7 +178,7 @@ RSpec.describe DropletKit::DropletResource do
   describe '#actions' do
     it 'returns a list of actions for the droplet' do
       stub_do_api('/v2/droplets/1066/actions', :get).to_return(body: api_fixture('droplets/list_actions'))
-      actions = resource.actions(id: 1066)
+      actions = resource.actions(id: 1066).take(20)
 
       expect(actions).to all(be_kind_of(DropletKit::Action))
 

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::ImageActionResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   describe '#transfer' do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::ImageResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   describe '#all' do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::RegionResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   describe '#all' do
@@ -13,4 +13,4 @@ RSpec.describe DropletKit::RegionResource do
       expect(resource.all).to eq(expected)
     end
   end
-end
+end

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::SizeResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   describe '#all' do

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe DropletKit::SSHKeyResource do
-  subject(:resource) { described_class.new(connection) }
+  subject(:resource) { described_class.new(connection: connection) }
   include_context 'resources'
 
   describe '#all' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: droplet_kit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Robert Ross
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: kartograph
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +159,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -166,6 +168,7 @@ files:
 - droplet_kit.gemspec
 - lib/droplet_kit.rb
 - lib/droplet_kit/client.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
@@ -181,6 +184,7 @@ 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/models/account.rb
 - lib/droplet_kit/models/action.rb
 - lib/droplet_kit/models/backup.rb
 - lib/droplet_kit/models/base_model.rb
@@ -199,6 +203,7 @@ files:
 - lib/droplet_kit/models/snapshot.rb
 - lib/droplet_kit/models/ssh_key.rb
 - lib/droplet_kit/paginated_resource.rb
+- lib/droplet_kit/resources/account_resource.rb
 - lib/droplet_kit/resources/action_resource.rb
 - lib/droplet_kit/resources/domain_record_resource.rb
 - lib/droplet_kit/resources/domain_resource.rb
@@ -211,6 +216,7 @@ files:
 - lib/droplet_kit/resources/ssh_key_resource.rb
 - lib/droplet_kit/version.rb
 - lib/tasks/resource_doc.rake
+- spec/fixtures/account/info.json
 - spec/fixtures/actions/all.json
 - spec/fixtures/actions/find.json
 - spec/fixtures/domain_records/all.json
@@ -239,6 +245,7 @@ files:
 - spec/fixtures/ssh_keys/update.json
 - spec/lib/droplet_kit/client_spec.rb
 - spec/lib/droplet_kit/paginated_resource_spec.rb
+- spec/lib/droplet_kit/resources/account_resource_spec.rb
 - spec/lib/droplet_kit/resources/action_resource_spec.rb
 - spec/lib/droplet_kit/resources/domain_record_resource_spec.rb
 - spec/lib/droplet_kit/resources/domain_resource_spec.rb
@@ -266,7 +273,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -279,6 +286,7 @@ signing_key:
 specification_version: 4
 summary: Droplet Kit is the official Ruby library for Digital Ocean's API
 test_files:
+- spec/fixtures/account/info.json
 - spec/fixtures/actions/all.json
 - spec/fixtures/actions/find.json
 - spec/fixtures/domain_records/all.json
@@ -307,6 +315,7 @@ test_files:
 - spec/fixtures/ssh_keys/update.json
 - spec/lib/droplet_kit/client_spec.rb
 - spec/lib/droplet_kit/paginated_resource_spec.rb
+- spec/lib/droplet_kit/resources/account_resource_spec.rb
 - spec/lib/droplet_kit/resources/action_resource_spec.rb
 - spec/lib/droplet_kit/resources/domain_record_resource_spec.rb
 - spec/lib/droplet_kit/resources/domain_resource_spec.rb