colombo 0.0.5 → 0.0.6

data/README.md

@@ -30,6 +30,10 @@ end
 ### Droplets
 
 ```ruby
+
+# This method returns a specfic droplet (via droplet id) without having to fetch all droplets first
+@client.droplet( droplet_id )
+
 # This method returns all active droplets that are currently running in your account
 @client.droplets()
 
@@ -71,6 +75,9 @@ new_droplet = droplets.create({
 # snapshots or backups that you have created in your own account.
 @client.images
 
+# Takes the optional parameter filter, either :my_images or :global
+@client.images(:filter => :my_images)
+
 # This method displays the attributes of an image.
 @client.images.find(image_id)
 

data/lib/colombo/client.rb

@@ -16,6 +16,10 @@ module Colombo
 
     end
 
+    def droplet(droplet_id)
+      Droplet.find(self, droplet_id)
+    end
+
     def droplets
       Droplets.new(self)
     end
@@ -24,8 +28,8 @@ module Colombo
       Regions.new(self)
     end
 
-    def images
-      Images.new(self)
+    def images(options={})
+      Images.new(self, options)
     end
 
     def sizes

data/lib/colombo/droplet.rb

@@ -6,6 +6,12 @@ module Colombo
     attr_accessor :id, :name, :image_id, :size_id, :region_id
     attr_accessor :backups_active, :ip_address, :status
 
+    def self.find(client, droplet_id)
+      client.request(:get, "/droplets/#{droplet_id}") do |response|
+        return self.new(client, response['droplet'])
+      end
+    end
+
     def reboot
       @client.request(:get, "/droplets/#{self.id}/reboot/") do |response|
         return response['event_id']

data/lib/colombo/droplets.rb

@@ -20,7 +20,7 @@ module Colombo
         raise "Required `#{key}` attribute" if not options.include?( key )
       end
 
-      if not options[:ssh_keys].nil?
+      if options[:ssh_keys]
         options[:ssh_keys] = options[:ssh_keys].join(',')
       end
 

data/lib/colombo/image.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Colombo
   class Image < Resource
 

data/lib/colombo/images.rb

@@ -5,9 +5,9 @@ require "colombo/image"
 module Colombo
   class Images < Container
 
-    def initialize(client)
+    def initialize(client, options)
       @client = client
-      @client.request(:get, '/images/', {}) do |response|
+      @client.request(:get, '/images/', options) do |response|
          response['images'].each do |image|
             self << Image.new(@client, image)
          end

data/lib/colombo/region.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Colombo
   class Region < Resource
 

data/lib/colombo/size.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Colombo
   class Size < Resource
 

data/lib/colombo/ssh_key.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 module Colombo
   class SshKey < Resource
 

data/lib/colombo/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Colombo
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/test/colombo/images_test.rb

@@ -21,7 +21,6 @@ describe 'Images' do
     end
   end
 
-
   it 'find image via find method' do
     VCR.use_cassette('images') do
       @client.images.find(COLOMBO_IMAGE_ID).wont_be_nil
@@ -34,4 +33,16 @@ describe 'Images' do
     end
   end
 
+  it 'images filtered by my_images' do
+    VCR.use_cassette('images-filter-my_images') do
+      @client.images(:filter => :my_images).wont_be_empty
+    end
+  end
+
+  it 'images filtered by global' do
+    VCR.use_cassette('images-filter-global') do
+      @client.images(:filter => :global).wont_be_empty
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: colombo
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -36,11 +36,11 @@ cert_chain:
   TGVnalVadkdRSEdmSHN0bDdkd2lCVWluZ1UvMldOTFIKMXBIQThXeGsxVVJi
   Nmxxa2NRdERZbDkyU3FTSk1FY0s0Wk0zRmwrRFM0RXBtM1BINTZlWjR3Qlha
   REhMRUNuTwpubjhCMXUyKwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
-date: 2013-07-30 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70314675746380 !ruby/object:Gem::Requirement
+  requirement: &70331982662780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -48,10 +48,10 @@ dependencies:
         version: 1.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70314675746380
+  version_requirements: *70331982662780
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70314675777760 !ruby/object:Gem::Requirement
+  requirement: &70331982662260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -59,10 +59,10 @@ dependencies:
         version: 1.6.7
   type: :runtime
   prerelease: false
-  version_requirements: *70314675777760
+  version_requirements: *70331982662260
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70314675776940 !ruby/object:Gem::Requirement
+  requirement: &70331982661780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -70,10 +70,10 @@ dependencies:
         version: 5.0.6
   type: :development
   prerelease: false
-  version_requirements: *70314675776940
+  version_requirements: *70331982661780
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70314675775580 !ruby/object:Gem::Requirement
+  requirement: &70331982661140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -81,10 +81,10 @@ dependencies:
         version: 1.8.0
   type: :development
   prerelease: false
-  version_requirements: *70314675775580
+  version_requirements: *70331982661140
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70314675774200 !ruby/object:Gem::Requirement
+  requirement: &70331982660420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -92,10 +92,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *70314675774200
+  version_requirements: *70331982660420
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70314675772880 !ruby/object:Gem::Requirement
+  requirement: &70331982659600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -103,10 +103,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314675772880
+  version_requirements: *70331982659600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70314675771400 !ruby/object:Gem::Requirement
+  requirement: &70331982674760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -114,7 +114,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70314675771400
+  version_requirements: *70331982674760
 description: A simple ruby client for Digital Ocean API
 email:
 - lmmendes@gmail.com