cloudlb 0.0.1 → 0.1.0

data/.gitignore

@@ -1 +1,2 @@
 *.gem
+Gemfile.lock

data/cloudlb.gemspec

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib/', __FILE__)
 $:.unshift lib unless $:.include?(lib)
- 
-require 'cloudlb'
+
+require File.expand_path('../lib/cloudlb/version', __FILE__)
  
 Gem::Specification.new do |s|
   s.name        = "cloudlb"
@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "json"
  
   s.files = [
-    "VERSION",
     "COPYING",
     ".gitignore",
     "README.rdoc",
@@ -32,7 +31,8 @@ Gem::Specification.new do |s|
     "lib/cloudlb/exception.rb",
     "lib/cloudlb/node.rb",
     "lib/cloudlb/health_monitor.rb",
-    "lib/cloudlb/connection_throttle.rb"
+    "lib/cloudlb/connection_throttle.rb",
+    "lib/cloudlb/version.rb"
   ]
   s.require_path = 'lib'
-end
+end

data/lib/cloudlb.rb

@@ -20,7 +20,6 @@ module CloudLB
   AUTH_USA = "https://auth.api.rackspacecloud.com/v1.0"
   AUTH_UK = "https://lon.auth.api.rackspacecloud.com/v1.0"
 
-  VERSION = IO.read(File.dirname(__FILE__) + '/../VERSION').chomp
   require 'uri'
   require 'rubygems'
   require 'json'
@@ -33,6 +32,7 @@ module CloudLB
   end
 
   $:.unshift(File.dirname(__FILE__))
+  require 'cloudlb/version'
   require 'cloudlb/exception'
   require 'cloudlb/authentication'
   require 'cloudlb/connection'

data/lib/cloudlb/authentication.rb

@@ -9,10 +9,10 @@ module CloudLB
     # Should probably never be called directly.
     def initialize(connection)
       request = Typhoeus::Request.new(connection.auth_url,
-        :method => :get,
-        :headers => { "X-Auth-User" => connection.authuser, "X-Auth-Key" => connection.authkey },
-        :disable_ssl_peer_verification => true,
-        :verbose => ENV['LOADBALANCERS_VERBOSE'] ? true : false)
+        :method                        => :get,
+        :headers                       => { "X-Auth-User" => connection.authuser, "X-Auth-Key" => connection.authkey },
+        :user_agent                    => "Cloud Load Balancers Ruby API #{VERSION}",
+        :verbose                       => ENV['LOADBALANCERS_VERBOSE'] ? true : false)
       CloudLB.hydra.queue(request)
       CloudLB.hydra.run
       response = request.response
@@ -20,14 +20,7 @@ module CloudLB
       if (response.code.to_s == "204")
         connection.authtoken = headers["x-auth-token"]
         user_id = headers["x-server-management-url"].match(/.*\/(\d+)$/)[1]
-        headers["x-server-management-url"] = case connection.region
-        when :ord
-          "https://ord.loadbalancers.api.rackspacecloud.com/v1.0/#{user_id}"
-        when :dfw
-          "https://dfw.loadbalancers.api.rackspacecloud.com/v1.0/#{user_id}"
-        else
-          raise
-        end
+        headers["x-server-management-url"] = "https://#{connection.region}.loadbalancers.api.rackspacecloud.com/v1.0/#{user_id}"
         connection.lbmgmthost = URI.parse(headers["x-server-management-url"]).host
         connection.lbmgmtpath = URI.parse(headers["x-server-management-url"]).path.chomp
         # Force the path into the v1.0 URL space

data/lib/cloudlb/balancer.rb

@@ -32,7 +32,7 @@ module CloudLB
       @protocol              = data["protocol"]
       @port                  = data["port"]
       @algorithm             = data["algorithm"]
-      @connection_logging    = data["connectionLogging"]
+      @connection_logging    = data["connectionLogging"]["enabled"]
       @status                = data["status"]
       true
     end
@@ -182,10 +182,16 @@ module CloudLB
     end
     alias :access_list :list_access_list
     
-    # FIXME: Does not work (JSON error)
+    # Adds an entry to your access list. You must supply the :address (an IP address) and :type (either ALLOW or DENY). 
+    # Items that are configured with the ALLOW type will always take precedence over items with the DENY type.
+    # 
+    #     >> balancer.add_to_access_list(:address => '192.168.5.99', :type => 'DENY')
+    #     => true
+    #     >> b.list_access_list
+    #     => [{"address"=>"192.168.5.99", "id"=>96, "type"=>"DENY"}]
     def add_to_access_list(options={})
       (raise CloudLB::Exception::MissingArgument, "Must supply address and type") unless (options[:address] && options[:type])
-      body = {'networkItems' => [ { :address => options[:address], :type => options[:type].upcase}]}.to_json
+      body = {'accessList' => [ { :address => options[:address], :type => options[:type].upcase}]}.to_json
       response = @connection.lbreq("POST",@lbmgmthost,"#{@lbmgmtpath}/loadbalancers/#{CloudLB.escape(@id.to_s)}/accesslist",@lbmgmtport,@lbmgmtscheme,{},body)
       CloudLB::Exception.raise_exception(response) unless response.code.to_s.match(/^20.$/)
       true
@@ -202,7 +208,10 @@ module CloudLB
       true
     end
     
-    # TODO
+    # Deletes one member of the access list by id.
+    #
+    #    >> balancer.delete_access_list_member(95)
+    #    => true
     def delete_access_list_member(id)
       response = @connection.lbreq("DELETE",@lbmgmthost,"#{@lbmgmtpath}/loadbalancers/#{CloudLB.escape(@id.to_s)}/accesslist/#{CloudLB.escape(id.to_s)}",@lbmgmtport,@lbmgmtscheme,{})
       CloudLB::Exception.raise_exception(response) unless response.code.to_s.match(/^20.$/)

data/lib/cloudlb/connection.rb

@@ -80,7 +80,7 @@ module CloudLB
     
     # Creates a brand new load balancer under your account.
     #
-    # A minimal request must pass in :name, :protocol, :nodes, and either :virtual_ip_ids or :virtual_ip_types.
+    # A minimal request must pass in :name, :protocol, :port, :nodes, and either :virtual_ip_ids or :virtual_ip_types.
     #
     # Options:
     # :name - the name of the load balancer.  Limted to 128 characters or less.
@@ -90,7 +90,7 @@ module CloudLB
     #          the port on the target server, and the condition ("ENABLED", "DISABLED", "DRAINING"). Optionally supply a :weight for use
     #          in the WEIGHTED_ algorithms.
     #          {:address => "1.2.3.4", :port => "80", :condition => "ENABLED", :weight => 1}
-    # :port - the port that the load balancer listens on. Defaults to the standard port for the protocol.
+    # :port - the port that the load balancer listens on. *required*
     # :algorithm - A valid balancing algorithm.  Use the algorithms method to get the list. Valid in the current documentation
     #              are RANDOM (default), LEAST_CONNECTIONS, ROUND_ROBIN, WEIGHTED_LEAST_CONNECTIONS, WEIGHTED_ROUND_ROBIN
     # :virtual_ip_id -  If you have existing virtual IPs and would like to reuse them in a different balancer (for example, to
@@ -104,10 +104,10 @@ module CloudLB
       (raise CloudLB::Exception::Syntax, "Load balancer name must be 128 characters or less") if options[:name].size > 128
       (raise CloudLB::Exception::Syntax, "Must provide at least one node in the :nodes array") if (!options[:nodes].is_a?(Array) || options[:nodes].size < 1)
       body[:protocol] = options[:protocol] or raise CloudLB::Exception::MissingArgument, "Must provide a protocol to create a load balancer"
+      body[:protocol].upcase! if body[:protocol]
       body[:port] = options[:port] if options[:port]
       body[:nodes] = options[:nodes]
-      body[:protocol].upcase! if body[:protocol]
-      body[:algorithm].upcase! if body[:algorithm]
+      body[:algorithm] = options[:algorithm].upcase if options[:algorithm]
       if options[:virtual_ip_id]
         body['virtualIps'] = [{:id => options[:virtual_ip_id]}]
       elsif options[:virtual_ip_type]
@@ -159,7 +159,7 @@ module CloudLB
                                       :body          => data,
                                       :method        => method.downcase.to_sym,
                                       :headers       => hdrhash,
-                                      # :user_agent    => "CloudLB Ruby API #{VERSION}",
+                                      :user_agent    => "Cloud Load Balancers Ruby API #{VERSION}",
                                       :verbose       => ENV['LOADBALANCERS_VERBOSE'] ? true : false)
       CloudLB.hydra.queue(request)
       CloudLB.hydra.run

data/lib/cloudlb/exception.rb

@@ -14,6 +14,8 @@ module CloudLB
 
     end
     
+    class ServiceFault                < CloudLBError # :nodoc:
+    end
     class LoadBalancerFault           < CloudLBError # :nodoc:
     end
     class ServiceUnavailable          < CloudLBError # :nodoc:
@@ -22,8 +24,16 @@ module CloudLB
     end
     class BadRequest                  < CloudLBError # :nodoc:
     end
+    class ItemNotFound                < CloudLBError # :nodoc:
+    end
     class OverLimit                   < CloudLBError # :nodoc:
     end
+    class OutOfVirtualIps             < CloudLBError # :nodoc:
+    end
+    class ImmutableEntity             < CloudLBError # :nodoc:
+    end
+    class UnprocessableEntity         < CloudLBError # :nodoc:
+    end
     class Other                       < CloudLBError # :nodoc:
     end
     

data/lib/cloudlb/version.rb

@@ -0,0 +1,3 @@
+module CloudLB
+  VERSION = '0.1.0'
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudlb
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  version: 0.0.1
+  - 0
+  version: 0.1.0
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -05:00
+date: 2011-11-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- VERSION
 - COPYING
 - .gitignore
 - README.rdoc
@@ -69,6 +68,7 @@ files:
 - lib/cloudlb/node.rb
 - lib/cloudlb/health_monitor.rb
 - lib/cloudlb/connection_throttle.rb
+- lib/cloudlb/version.rb
 has_rdoc: true
 homepage: http://github.com/rackspace/ruby-cloudlb
 licenses: []
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Ruby API into the Rackspace Cloud Load Balancers product

data/VERSION

@@ -1 +0,0 @@
-0.0.1