digitalocean 1.0.6 → 1.1.0

data/README.md

@@ -1,11 +1,11 @@
-# Digitalocean Rubygem 
+# Digitalocean Rubygem
 
 ![](https://raw.github.com/scottmotte/digitalocean/master/digitalocean-rubygem.jpg)
 
-### The easiest and most complete rubygem for [DigitalOcean](https://www.digitalocean.com). 
+### The easiest and most complete rubygem for [DigitalOcean](https://www.digitalocean.com).
 
-[![BuildStatus](https://travis-ci.org/scottmotte/digitalocean.png?branch=master)](https://travis-ci.org/scottmotte/digitalocean)
-[![Gem Version](https://badge.fury.io/rb/digitalocean.png)](http://badge.fury.io/rb/digitalocean)
+[![Build Status](https://travis-ci.org/scottmotte/digitalocean.svg?branch=master)](https://travis-ci.org/scottmotte/digitalocean)
+[![Gem Version](https://badge.fury.io/rb/digitalocean.svg)](http://badge.fury.io/rb/digitalocean)
 
 ```ruby
 Digitalocean.client_id  = "your_client_id"
@@ -13,7 +13,7 @@ Digitalocean.api_key    = "your_api_key"
 result = Digitalocean::Droplet.all
 # =>
 # <RecursiveOpenStruct status="OK", droplets=[
-#   {"id"=>12345, "name"=>"dev", "image_id"=>2676, "size_id"=>63, "region_id"=>3, "backups_active"=>false, "ip_address"=>"198.555.55.55", "private_ip_address"=>nil, "locked"=>false, "status"=>"active", "created_at"=>"2013-06-12T03:07:14Z"}, 
+#   {"id"=>12345, "name"=>"dev", "image_id"=>2676, "size_id"=>63, "region_id"=>3, "backups_active"=>false, "ip_address"=>"198.555.55.55", "private_ip_address"=>nil, "locked"=>false, "status"=>"active", "created_at"=>"2013-06-12T03:07:14Z"},
 #   {"id"=>234674, "name"=>"server2", "image_id"=>441012, "size_id"=>62, "region_id"=>1, "backups_active"=>false, "ip_address"=>"192.555.55.56", "private_ip_address"=>nil, "locked"=>false, "status"=>"active", "created_at"=>"2013-06-17T00:30:12Z"}
 # ]>
 #
@@ -92,6 +92,7 @@ Digitalocean::Droplet.power_on(id)
 Digitalocean::Droplet.snapshot(id, {name: name})
 Digitalocean::Droplet.create({name: name, size_id: size_id, image_id: image_id, region_id: region_id, ssh_key_ids: ssh_key_ids})
 Digitalocean::Droplet.destroy(id)
+Digitalocean::Droplet.resize(id, {size_id: size_id})
 
 Digitalocean::Image.all
 Digitalocean::Image.all({filter: "my_images"})
@@ -120,7 +121,7 @@ Digitalocean::Event.find(id)
 
 ## Example
 
-There is a [digitalocean-rubygem-example](https://github.com/scottmotte/digitalocean-rubygem-example) to help jumpstart your development. 
+There is a [digitalocean-rubygem-example](https://github.com/scottmotte/digitalocean-rubygem-example) to help jumpstart your development.
 
 ## Contributing
 

data/digitalocean.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "faraday", "~> 0.8.9"
   gem.add_dependency "faraday_middleware", "~> 0.9.0"
   gem.add_dependency "recursive-open-struct", "~> 0.4.5"
-  
+
   gem.add_development_dependency "foreman"
   gem.add_development_dependency "pry"
   gem.add_development_dependency "rake"

data/lib/digitalocean.rb

@@ -8,53 +8,56 @@ module Digitalocean
 
   DEFINITIONS     = {
     "Domain"  => {
-      "all"       => "https://api.digitalocean.com/domains?client_id=[your_client_id]&api_key=[your_api_key]",
-      "find"      => "https://api.digitalocean.com/domains/[domain_id]?client_id=[your_client_id]&api_key=[your_api_key]",
-      "create"    => "https://api.digitalocean.com/domains/new?client_id=[your_client_id]&api_key=[your_api_key]&name=[domain]&ip_address=[ip_address]",
-      "destroy"   => "https://api.digitalocean.com/domains/[domain_id]/destroy?client_id=[your_client_id]&api_key=[your_api_key]"
+      "all"       => "https://api.digitalocean.com/v1/domains?client_id=[your_client_id]&api_key=[your_api_key]",
+      "find"      => "https://api.digitalocean.com/v1/domains/[domain_id]?client_id=[your_client_id]&api_key=[your_api_key]",
+      "create"    => "https://api.digitalocean.com/v1/domains/new?client_id=[your_client_id]&api_key=[your_api_key]&name=[domain]&ip_address=[ip_address]",
+      "destroy"   => "https://api.digitalocean.com/v1/domains/[domain_id]/destroy?client_id=[your_client_id]&api_key=[your_api_key]"
     },
     "Droplet" => {
-      "all"       => "https://api.digitalocean.com/droplets/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "find"      => "https://api.digitalocean.com/droplets/[droplet_id]?client_id=[your_client_id]&api_key=[your_api_key]",
-      "rename"    => "https://api.digitalocean.com/droplets/[droplet_id]/rename/?client_id=[your_client_id]&api_key=[your_api_key]&name=[name]",
-      "reboot"    => "https://api.digitalocean.com/droplets/[droplet_id]/reboot/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "power_cycle" => "https://api.digitalocean.com/droplets/[droplet_id]/power_cycle/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "shutdown" => "https://api.digitalocean.com/droplets/[droplet_id]/shutdown/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "power_off" => "https://api.digitalocean.com/droplets/[droplet_id]/power_off/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "power_on"  => "https://api.digitalocean.com/droplets/[droplet_id]/power_on/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "snapshot"  => "https://api.digitalocean.com/droplets/[droplet_id]/snapshot/?name=[snapshot_name]&client_id=[your_client_id]&api_key=[your_api_key]",
-      "create"    => "https://api.digitalocean.com/droplets/new?client_id=[your_client_id]&api_key=[your_api_key]&name=[droplet_name]&size_id=[size_id]&image_id=[image_id]&region_id=[region_id]&ssh_key_ids=[ssh_key_ids]&private_networking=[private_networking]&backups_enabled=[backups_enabled]", # unique case that is not copy/paste
-      "destroy"   => "https://api.digitalocean.com/droplets/[droplet_id]/destroy/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "resize"   => "https://api.digitalocean.com/droplets/[droplet_id]/resize/?size_id=[size_id]&client_id=[client_id]&api_key=[api_key]"
+      "all"       => "https://api.digitalocean.com/v1/droplets/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "find"      => "https://api.digitalocean.com/v1/droplets/[droplet_id]?client_id=[your_client_id]&api_key=[your_api_key]",
+      "rename"    => "https://api.digitalocean.com/v1/droplets/[droplet_id]/rename/?client_id=[your_client_id]&api_key=[your_api_key]&name=[name]",
+      "rebuild"   => "https://api.digitalocean.com/v1/droplets/[droplet_id]/rebuild/?image_id=[image_id]&client_id=[client_id]&api_key=[api_key]",
+      "reboot"    => "https://api.digitalocean.com/v1/droplets/[droplet_id]/reboot/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "power_cycle" => "https://api.digitalocean.com/v1/droplets/[droplet_id]/power_cycle/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "shutdown" => "https://api.digitalocean.com/v1/droplets/[droplet_id]/shutdown/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "power_off" => "https://api.digitalocean.com/v1/droplets/[droplet_id]/power_off/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "power_on"  => "https://api.digitalocean.com/v1/droplets/[droplet_id]/power_on/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "snapshot"  => "https://api.digitalocean.com/v1/droplets/[droplet_id]/snapshot/?name=[snapshot_name]&client_id=[your_client_id]&api_key=[your_api_key]",
+      "create"    => "https://api.digitalocean.com/v1/droplets/new?client_id=[your_client_id]&api_key=[your_api_key]&name=[droplet_name]&size_id=[size_id]&image_id=[image_id]&region_id=[region_id]&ssh_key_ids=[ssh_key_ids]&private_networking=[private_networking]&backups_enabled=[backups_enabled]", # unique case that is not copy/paste
+      "destroy"   => "https://api.digitalocean.com/v1/droplets/[droplet_id]/destroy/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "resize"   => "https://api.digitalocean.com/v1/droplets/[droplet_id]/resize/?size_id=[size_id]&client_id=[client_id]&api_key=[api_key]"
     },
     "Image"   => {
-      "all"       => "https://api.digitalocean.com/images/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "find"      => "https://api.digitalocean.com/images/[image_id]/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "destroy"      => "https://api.digitalocean.com/images/[image_id]/destroy/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "transfer"      => "https://api.digitalocean.com/images/[image_id]/transfer/?client_id=[your_client_id]&api_key=[your_api_key]&region_id=[region_id]"
+      "all"       => "https://api.digitalocean.com/v1/images/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "find"      => "https://api.digitalocean.com/v1/images/[image_id]/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "destroy"      => "https://api.digitalocean.com/v1/images/[image_id]/destroy/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "transfer"      => "https://api.digitalocean.com/v1/images/[image_id]/transfer/?client_id=[your_client_id]&api_key=[your_api_key]&region_id=[region_id]"
     },
     "Record"  => {
-      "all"       => "https://api.digitalocean.com/domains/[domain_id]/records?client_id=[your_client_id]&api_key=[your_api_key]",
-      "find"       => "https://api.digitalocean.com/domains/[domain_id]/records/[record_id]?client_id=[your_client_id]&api_key=[your_api_key]",
-      "create"     => "https://api.digitalocean.com/domains/[domain_id]/records/new?client_id=[your_client_id]&api_key=[your_api_key]&record_type=[record_type]&data=[data]",
-      "edit"       => "https://api.digitalocean.com/domains/[domain_id]/records/[record_id]/edit?client_id=[your_client_id]&api_key=[your_api_key]",
-      "destroy"    => "https://api.digitalocean.com/domains/[domain_id]/records/[record_id]/destroy?client_id=[your_client_id]&api_key=[your_api_key]"
+      "all"       => "https://api.digitalocean.com/v1/domains/[domain_id]/records?client_id=[your_client_id]&api_key=[your_api_key]",
+      "find"       => "https://api.digitalocean.com/v1/domains/[domain_id]/records/[record_id]?client_id=[your_client_id]&api_key=[your_api_key]",
+      "create"     => "https://api.digitalocean.com/v1/domains/[domain_id]/records/new?client_id=[your_client_id]&api_key=[your_api_key]&record_type=[record_type]&data=[data]",
+      "edit"       => "https://api.digitalocean.com/v1/domains/[domain_id]/records/[record_id]/edit?client_id=[your_client_id]&api_key=[your_api_key]",
+      "destroy"    => "https://api.digitalocean.com/v1/domains/[domain_id]/records/[record_id]/destroy?client_id=[your_client_id]&api_key=[your_api_key]"
     },
     "Region"  => {
-      "all"       => "https://api.digitalocean.com/regions/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "find"       => "https://api.digitalocean.com/regions/[region_id]?client_id=[your_client_id]&api_key=[your_api_key]"
+      "all"       => "https://api.digitalocean.com/v1/regions/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "find"       => "https://api.digitalocean.com/v1/regions/[region_id]?client_id=[your_client_id]&api_key=[your_api_key]"
     },
     "Size"    => {
-      "all"       => "https://api.digitalocean.com/sizes/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "find"       => "https://api.digitalocean.com/sizes/[size_id]?client_id=[your_client_id]&api_key=[your_api_key]"
+      "all"       => "https://api.digitalocean.com/v1/sizes/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "find"       => "https://api.digitalocean.com/v1/sizes/[size_id]?client_id=[your_client_id]&api_key=[your_api_key]"
     },
     "SshKey"  => {
-      "all"       => "https://api.digitalocean.com/ssh_keys/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "find"      => "https://api.digitalocean.com/ssh_keys/[ssh_key_id]/?client_id=[your_client_id]&api_key=[your_api_key]",
-      "create"    => "https://api.digitalocean.com/ssh_keys/new/?name=[ssh_key_name]&ssh_pub_key=[ssh_public_key]&client_id=[your_client_id]&api_key=[your_api_key]"
+      "all"       => "https://api.digitalocean.com/v1/ssh_keys/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "find"      => "https://api.digitalocean.com/v1/ssh_keys/[ssh_key_id]/?client_id=[your_client_id]&api_key=[your_api_key]",
+      "edit"      => "https://api.digitalocean.com/v1/ssh_keys/[ssh_key_id]/edit/?name=[ssh_key_name]&ssh_pub_key=[ssh_public_key]&client_id=[client_id]&api_key=[api_key]",
+      "create"    => "https://api.digitalocean.com/v1/ssh_keys/new/?name=[ssh_key_name]&ssh_pub_key=[ssh_public_key]&client_id=[your_client_id]&api_key=[your_api_key]",
+     "destroy"   => "https://api.digitalocean.com/v1/ssh_keys/[ssh_key_id]/destroy/?client_id=[your_client_id]&api_key=[your_api_key]"
     },
     "Event"   => {
-      "find"      => "https://api.digitalocean.com/events/[event_id]/?client_id=[your_client_id]&api_key=[your_api_key]"
+      "find"      => "https://api.digitalocean.com/v1/events/[event_id]/?client_id=[your_client_id]&api_key=[your_api_key]"
     }
   }
 

data/lib/digitalocean/version.rb

@@ -1,3 +1,3 @@
 module Digitalocean
-  VERSION = "1.0.6"
+  VERSION = "1.1.0"
 end

data/spec/digitalocean/domain_spec.rb

@@ -1,53 +1,34 @@
 require 'spec_helper'
 
 describe Digitalocean::Domain do
-  let(:subject)   { Digitalocean::Domain }
+  subject(:domain) { described_class }
 
   describe "._all" do
-    before do
-      @url = subject._all
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/domains?client_id=client_id_required&api_key=api_key_required" 
-    end
+    let(:url) { domain._all }
+    it { url.should eq "https://api.digitalocean.com/v1/domains?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._find" do
     let(:domain_id) { "1234" }
+    let(:url) { domain._find(domain_id) }
 
-    before do
-      @url = subject._find(domain_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/domains/#{domain_id}?client_id=client_id_required&api_key=api_key_required" 
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/domains/#{domain_id}?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._create" do
-    let(:name)        { "test_domain" }
-    let(:ip_address)  { "test_ip_address" }
-    let(:args)        { {name: name, ip_address: ip_address } }
+    let(:name)       { "test_domain" }
+    let(:ip_address) { "test_ip_address" }
+    let(:args)       { { name: name, ip_address: ip_address } }
 
-    before do
-      @url = subject._create(args)
-    end
+    let(:url) { domain._create(args) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/domains/new?client_id=client_id_required&api_key=api_key_required&name=test_domain&ip_address=test_ip_address"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/domains/new?client_id=client_id_required&api_key=api_key_required&name=test_domain&ip_address=test_ip_address" }
   end
 
   describe "._destroy" do
     let(:domain_id) { "test_domain_id" }
+    let(:url) { domain._destroy(domain_id) }
 
-    before do
-      @url = subject._destroy(domain_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/domains/test_domain_id/destroy?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/domains/test_domain_id/destroy?client_id=client_id_required&api_key=api_key_required" }
   end
 end

data/spec/digitalocean/droplet_spec.rb

@@ -1,114 +1,79 @@
 require 'spec_helper'
 
 describe Digitalocean::Droplet do
-  let(:subject)   { Digitalocean::Droplet }
+  subject(:droplet) { described_class }
 
   describe "._all" do
-    before do
-      @url = subject._all
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/?client_id=client_id_required&api_key=api_key_required"
-    end
+    let(:url) { droplet._all }
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._find" do
     let(:droplet_id) { "1234" }
+    let(:url) { droplet._find(droplet_id) }
 
-    before do
-      @url = subject._find(droplet_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._rename" do
     let(:droplet_id) { "1234" }
     let(:name) { "new_name" }
+    let(:url) { droplet._rename(droplet_id, {name: name}) }
 
-    before do
-      @url = subject._rename(droplet_id, {name: name})
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/rename/?client_id=client_id_required&api_key=api_key_required&name=#{name}" }
+  end
 
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}/rename/?client_id=client_id_required&api_key=api_key_required&name=#{name}"
-    end
+  describe "._rebuild" do
+    let(:droplet_id) { "1234" }
+    let(:image_id)  { "11" }
+
+    let(:url) { droplet._rebuild(droplet_id, {image_id: image_id}) }
+
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/rebuild/?image_id=#{image_id}&client_id=client_id_required&api_key=api_key_required" }
   end
-  
+
   describe "._reboot" do
     let(:droplet_id) { "1234" }
+    let(:url) { droplet._reboot(droplet_id) }
 
-    before do
-      @url = subject._reboot(droplet_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}/reboot/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/reboot/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._power_cycle" do
     let(:droplet_id) { "1234" }
+    let(:url) { droplet._power_cycle(droplet_id) }
 
-    before do
-      @url = subject._power_cycle(droplet_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}/power_cycle/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/power_cycle/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._shutdown" do
     let(:droplet_id) { "1234" }
+    let(:url) { droplet._shutdown(droplet_id) }
 
-    before do
-      @url = subject._shutdown(droplet_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}/shutdown/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/shutdown/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._power_off" do
     let(:droplet_id) { "1234" }
+    let(:url) { droplet._power_off(droplet_id) }
 
-    before do
-      @url = subject._power_off(droplet_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}/power_off/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/power_off/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._power_on" do
     let(:droplet_id) { "1234" }
+    let(:url) { droplet._power_on(droplet_id) }
 
-    before do
-      @url = subject._power_on(droplet_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}/power_on/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/power_on/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._snapshot" do
     let(:droplet_id) { "1234" }
     let(:snapshot_name) { "test_name" }
 
-    before do
-      @url = subject._snapshot(droplet_id, {name: snapshot_name})
-    end
+    let(:url) { droplet._snapshot(droplet_id, {name: snapshot_name}) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}/snapshot/?name=#{snapshot_name}&client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/snapshot/?name=#{snapshot_name}&client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._create" do
@@ -118,24 +83,24 @@ describe Digitalocean::Droplet do
     let(:region_id) { "44" }
     let(:ssh_key_ids) { "12,92" }
 
-    before do
-      @url = subject._create({name: name, size_id: size_id, image_id: image_id, region_id: region_id, ssh_key_ids: ssh_key_ids})
-    end
+    let(:url) { droplet._create({name: name, size_id: size_id, image_id: image_id, region_id: region_id, ssh_key_ids: ssh_key_ids}) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/new?client_id=client_id_required&api_key=api_key_required&name=#{name}&size_id=#{size_id}&image_id=#{image_id}&region_id=#{region_id}&ssh_key_ids=#{ssh_key_ids}&private_networking=private_networking&backups_enabled=backups_enabled"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/new?client_id=client_id_required&api_key=api_key_required&name=#{name}&size_id=#{size_id}&image_id=#{image_id}&region_id=#{region_id}&ssh_key_ids=#{ssh_key_ids}&private_networking=private_networking&backups_enabled=backups_enabled" }
   end
 
   describe "._destroy" do
     let(:droplet_id) { "1234" }
+    let(:url) { droplet._destroy(droplet_id) }
+
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/destroy/?client_id=client_id_required&api_key=api_key_required" }
+  end
+
+  describe "._resize" do
+    let(:droplet_id) { "1234" }
+    let(:size_id) { "45" }
 
-    before do
-      @url = subject._destroy(droplet_id)
-    end
+    let(:url) { droplet._resize(droplet_id, {size_id: size_id}) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/droplets/#{droplet_id}/destroy/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/droplets/#{droplet_id}/resize/?size_id=#{size_id}&client_id=client_id_required&api_key=api_key_required" }
   end
 end

data/spec/digitalocean/event_spec.rb

@@ -1,17 +1,12 @@
 require 'spec_helper'
 
 describe Digitalocean::Event do
-  let(:subject)   { Digitalocean::Event }
+  subject(:event) { described_class }
 
   describe "._find" do
     let(:event_id) { "1234" }
+    let(:url) { event._find(event_id) }
 
-    before do
-      @url = subject._find(event_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/events/#{event_id}/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/events/#{event_id}/?client_id=client_id_required&api_key=api_key_required" }
   end
 end

data/spec/digitalocean/image_spec.rb

@@ -1,52 +1,32 @@
 require 'spec_helper'
 
 describe Digitalocean::Image do
-  let(:subject)   { Digitalocean::Image }
+  subject(:image) { described_class }
 
   describe "._all" do
-    before do
-      @url = subject._all
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/images/?client_id=client_id_required&api_key=api_key_required"
-    end
+    let(:url) { image._all }
+    it { url.should eq "https://api.digitalocean.com/v1/images/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._all with optional parameters" do
     let(:args) { { filter: "my_images" } }
+    let(:url) { image._all(args) }
 
-    before do
-      @url = subject._all(args)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/images/?client_id=client_id_required&api_key=api_key_required&filter=my_images"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/images/?client_id=client_id_required&api_key=api_key_required&filter=my_images" }
   end
 
   describe "._find" do
     let(:id) { "1234" }
+    let(:url) { image._find(id) }
 
-    before do
-      @url = subject._find(id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/images/#{id}/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/images/#{id}/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._destroy" do
     let(:id) { "1234" }
+    let(:url) { image._destroy(id) }
 
-    before do
-      @url = subject._destroy(id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/images/#{id}/destroy/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/images/#{id}/destroy/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._transfer" do
@@ -54,12 +34,8 @@ describe Digitalocean::Image do
     let(:region_id) { "44" }
     let(:args) { {region_id: region_id } }
 
-    before do
-      @url = subject._transfer(id, args)
-    end
+    let(:url) { image._transfer(id, args) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/images/#{id}/transfer/?client_id=client_id_required&api_key=api_key_required&region_id=44"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/images/#{id}/transfer/?client_id=client_id_required&api_key=api_key_required&region_id=44" }
   end
 end

data/spec/digitalocean/integration_spec.rb

@@ -1,12 +1,12 @@
 require 'spec_helper'
 
 describe "integrations" do
-  before do
-    Digitalocean.send(:setup_request!)
-  end
+  subject(:region) { Digitalocean::Region }
+
+  before { Digitalocean.send(:setup_request!) }
 
   it "makes a real call" do
-    regions = Digitalocean::Region.all
+    regions = region.all
     regions.status.should eq "ERROR"
   end
 end

data/spec/digitalocean/record_spec.rb

@@ -1,31 +1,22 @@
 require 'spec_helper'
 
 describe Digitalocean::Record do
-  let(:subject)   { Digitalocean::Record }
+  subject(:record) { described_class }
 
   describe "._all" do
     let(:domain_id) { "100" }
+    let(:url) { record._all(domain_id) }
 
-    before do
-      @url = subject._all(domain_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/domains/#{domain_id}/records?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/domains/#{domain_id}/records?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._find" do
     let(:domain_id) { "100" }
     let(:record_id) { "50" }
 
-    before do
-      @url = subject._find(domain_id, record_id)
-    end
+    let(:url) { record._find(domain_id, record_id) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/domains/#{domain_id}/records/#{record_id}?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/domains/#{domain_id}/records/#{record_id}?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._create" do
@@ -34,13 +25,9 @@ describe Digitalocean::Record do
     let(:data)        { "@" }
     let(:attrs) { {record_type: record_type, data: data } }
 
-    before do
-      @url = subject._create(domain_id, attrs)
-    end
+    let(:url) { record._create(domain_id, attrs) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/domains/#{domain_id}/records/new?client_id=client_id_required&api_key=api_key_required&record_type=#{record_type}&data=#{data}"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/domains/#{domain_id}/records/new?client_id=client_id_required&api_key=api_key_required&record_type=#{record_type}&data=#{data}" }
   end
 
   describe "._edit" do
@@ -50,25 +37,17 @@ describe Digitalocean::Record do
     let(:data)        { "@" }
     let(:attrs) { {record_type: record_type, data: data } }
 
-    before do
-      @url = subject._edit(domain_id, record_id, attrs)
-    end
+    let(:url) { record._edit(domain_id, record_id, attrs) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/domains/#{domain_id}/records/#{record_id}/edit?client_id=client_id_required&api_key=api_key_required&record_type=#{record_type}&data=#{data}"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/domains/#{domain_id}/records/#{record_id}/edit?client_id=client_id_required&api_key=api_key_required&record_type=#{record_type}&data=#{data}" }
   end
 
   describe "._destroy" do
     let(:domain_id)   { "100" }
     let(:record_id)   { "50" }
 
-    before do
-      @url = subject._destroy(domain_id, record_id)
-    end
+    let(:url) { record._destroy(domain_id, record_id) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/domains/#{domain_id}/records/#{record_id}/destroy?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/domains/#{domain_id}/records/#{record_id}/destroy?client_id=client_id_required&api_key=api_key_required" }
   end
 end

data/spec/digitalocean/region_spec.rb

@@ -1,28 +1,18 @@
 require 'spec_helper'
 
 describe Digitalocean::Region do
-  let(:subject)   { Digitalocean::Region }
+  subject(:region) { described_class }
 
   describe "._all" do
-    before do
-      @url = subject._all
-    end
+    let(:url) { region._all }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/regions/?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/regions/?client_id=client_id_required&api_key=api_key_required" }
   end
 
   describe "._find" do
     let(:region_id) { "1234" }
+    let(:url) { region._find(region_id) }
 
-    before do
-      @url = subject._find(region_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/regions/#{region_id}?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/regions/#{region_id}?client_id=client_id_required&api_key=api_key_required" }
   end
-
 end

data/spec/digitalocean/size_spec.rb

@@ -1,28 +1,17 @@
 require 'spec_helper'
 
 describe Digitalocean::Size do
-  let(:subject)   { Digitalocean::Size }
+  subject(:size) { described_class }
 
   describe "._all" do
-    before do
-      @url = subject._all
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/sizes/?client_id=client_id_required&api_key=api_key_required" 
-    end
+    let(:url) { size._all }
+    it { url.should eq "https://api.digitalocean.com/v1/sizes/?client_id=client_id_required&api_key=api_key_required"  }
   end
 
   describe "._find" do
     let(:size_id) { "1234" }
+    let(:url) { size._find(size_id) }
 
-    before do
-      @url = subject._find(size_id)
-    end
-
-    it do
-      @url.should eq "https://api.digitalocean.com/sizes/#{size_id}?client_id=client_id_required&api_key=api_key_required"
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/sizes/#{size_id}?client_id=client_id_required&api_key=api_key_required" }
   end
-
 end

data/spec/digitalocean/ssh_key_spec.rb

@@ -1,27 +1,29 @@
 require 'spec_helper'
 
 describe Digitalocean::SshKey do
-  let(:subject)   { Digitalocean::SshKey }
+  subject(:ssh_key) { described_class }
 
   describe "._all" do
-    before do
-      @url = subject._all
-    end
+    let(:url) { ssh_key._all }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/ssh_keys/?client_id=client_id_required&api_key=api_key_required" 
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/ssh_keys/?client_id=client_id_required&api_key=api_key_required"  }
   end
 
   describe "._find" do
     let(:ssh_key_id) { "test_key" }
-    before do
-      @url = subject._find(ssh_key_id)
-    end
+    let(:url) { ssh_key._find(ssh_key_id) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/ssh_keys/test_key/?client_id=client_id_required&api_key=api_key_required" 
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/ssh_keys/test_key/?client_id=client_id_required&api_key=api_key_required"  }
+  end
+
+  describe "._edit" do
+    let(:ssh_key_id) { "test_key" }
+    let(:ssh_pub_key) { "test_pub_key" }
+    let(:name) { "test_name" }
+    let(:attrs) { { name: name, ssh_pub_key: ssh_pub_key } }
+    let(:url) { ssh_key._edit(ssh_key_id, attrs) }
+
+    it { url.should eq "https://api.digitalocean.com/v1/ssh_keys/test_key/edit/?name=#{name}&ssh_pub_key=#{ssh_pub_key}&client_id=client_id_required&api_key=api_key_required"  }
   end
 
   describe "._create" do
@@ -29,12 +31,15 @@ describe Digitalocean::SshKey do
     let(:ssh_pub_key) { "test_pub_key" }
     let(:attrs) { { name: name, ssh_pub_key: ssh_pub_key } }
 
-    before do
-      @url = subject._create(attrs)
-    end
+    let(:url) { ssh_key._create(attrs) }
+
+    it { url.should eq "https://api.digitalocean.com/v1/ssh_keys/new/?name=#{name}&ssh_pub_key=#{ssh_pub_key}&client_id=client_id_required&api_key=api_key_required"  }
+  end
+
+  describe "._destroy" do
+    let(:ssh_key_id) { "test_key" }
+    let(:url) { ssh_key._destroy(ssh_key_id) }
 
-    it do
-      @url.should eq "https://api.digitalocean.com/ssh_keys/new/?name=#{name}&ssh_pub_key=#{ssh_pub_key}&client_id=client_id_required&api_key=api_key_required" 
-    end
+    it { url.should eq "https://api.digitalocean.com/v1/ssh_keys/#{ssh_key_id}/destroy/?client_id=client_id_required&api_key=api_key_required"  }
   end
 end

data/spec/digitalocean_spec.rb

@@ -1,30 +1,29 @@
 require 'spec_helper'
 
 describe Digitalocean do
-  subject { Digitalocean }
+  subject(:digitalocean) { described_class }
+
+  before do
+    digitalocean.client_id = client_id
+    digitalocean.api_key   = api_key
+  end
 
   describe "defaults" do
-    before do
-      subject.client_id       = nil
-      subject.api_key         = nil
-    end
+    let(:client_id) { nil }
+    let(:api_key)   { nil}
 
-    it { subject.api_endpoint.should eq "https://api.digitalocean.com" }
-    it { subject.client_id.should eq "client_id_required" }
-    it { subject.api_key.should eq "api_key_required" }
-    it { subject::VERSION.should eq "1.0.6" }
+    its(:api_endpoint) { should eq "https://api.digitalocean.com" }
+    its(:client_id)    { should eq "client_id_required" }
+    its(:api_key)      { should eq "api_key_required" }
+
+    it { digitalocean::VERSION.should eq "1.1.0" }
   end
 
   describe "setting values" do
-    let(:client_id)   { "1234" }
-    let(:api_key)     { "adf3434938492fjkdfj" }
-
-    before do
-      subject.client_id   = client_id
-      subject.api_key     = api_key
-    end
+    let(:client_id) { "1234" }
+    let(:api_key)   { "adf3434938492fjkdfj" }
 
-    it { subject.client_id.should eq client_id }
-    it { subject.api_key.should eq api_key }
+    its(:client_id) { should eq client_id }
+    its(:api_key)   { should eq api_key }
   end
 end

data/spec/spec_helper.rb

@@ -5,9 +5,3 @@ require 'digitalocean'
 require 'securerandom'
 
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
-
-RSpec.configure do |config|
-  config.before(:suite) do
-  end
-end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: digitalocean
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-29 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday