cloudfiles 1.4.10 → 1.4.11

data/CHANGELOG

@@ -0,0 +1,11 @@
+================================================================================
+ 1.4.1 (2011/02/04)
+================================================================================
+  o Configurable :auth_url support for OpenStack Swift and non-US deployments. Add constants for Cloud Servers USA and UK. (Chmouel Boudjnah, Dan Prince)
+  o Moved exceptions under the CloudFiles::Exception scope
+  o Added support for configurable path delimiters (Corey Ward)
+  o Improvements in path escaping (Corey Ward)
+  o Support for the new COPY method on objects, via storage_object.copy and storage_object.move
+  o Reduced the number of API calls for loading metadata (Edmund Salvacion)
+  o Allow setting of content_type on more operations (suggestion by Bo Benson)
+  

data/CONTRIBUTORS

@@ -0,0 +1,28 @@
+The following people have contributed to this software, either with code, patches, bug reports, or suggestions.
+
+Thank you for your help! If you have contributed and are not on the list, feel free to email minter@lunenburg.org
+
+Major Hayden
+H. Wade Minter
+Niels Ganser
+phillc
+Todd Eichel
+Cory Forsyth
+Dan Prince
+Carl Woodward
+Conrad Weidenkeller
+Chmouel Boudjnah
+Corey Ward
+Edmund Salvacion
+mindgap
+Bo Benson
+Ryuujinx
+Ivan Torres
+creiht
+Vladimir Zhukov
+JCallicoat
+Jeremy McNevin
+Ryan Williams
+drue
+mkcode
+megaphone

data/COPYING

@@ -1,6 +1,6 @@
 Unless otherwise noted, all files are released under the MIT license, exceptions contain licensing information in them.
 
-  Copyright (C) 2008 Rackspace US, Inc.
+  Copyright (C) 2011 Rackspace US, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/README.rdoc

@@ -37,6 +37,9 @@ See the class definitions for documentation on specific methods and operations.
   # Log into the Cloud Files system
   cf = CloudFiles::Connection.new(:username => "MY_USERNAME", :api_key => "MY_API_KEY")
 
+  # Or, if you want to access the United Kingdom cloud installations, there's a handy constant:
+  cf = CloudFiles::Connection.new(:username => "MY_USERNAME", :api_key => "MY_API_KEY", :auth_url => CloudFiles::AUTH_UK)
+
   # Get a listing of all containers under this account
   cf.containers
   => ["backup", "Books", "cftest", "test", "video", "webpics"]
@@ -47,6 +50,10 @@ See the class definitions for documentation on specific methods and operations.
   # See how many objects are under this container
   container.count
   => 3
+  
+  # Upload a file
+  object = container.create_object 'filename.txt', false
+  object.write file
 
   # List the objects
   container.objects
@@ -63,9 +70,9 @@ See the class definitions for documentation on specific methods and operations.
 
 Initial work by Major Hayden <major.hayden@rackspace.com>
 
-Subsequent work by H. Wade Minter <minter@lunenburg.org>
+Subsequent work by H. Wade Minter <minter@lunenburg.org> and Dan Prince <dan.prince@rackspace.com>
 
 == License
 
 See COPYING for license information.
-Copyright (c) 2009, Rackspace US, Inc.
+Copyright (c) 2011, Rackspace US, Inc.

data/VERSION

@@ -1 +1 @@
-1.4.10
+1.4.11

data/cloudfiles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudfiles}
-  s.version = "1.4.10"
+  s.version = "1.4.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["H. Wade Minter", "Rackspace Hosting"]
-  s.date = %q{2010-11-19}
+  s.date = %q{2011-02-05}
   s.description = %q{A Ruby version of the Rackspace Cloud Files API.}
   s.email = %q{minter@lunenburg.org}
   s.extra_rdoc_files = [
@@ -18,8 +18,9 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     "CHANGELOG",
+     "CONTRIBUTORS",
      "COPYING",
-     "Manifest",
      "README.rdoc",
      "Rakefile",
      "TODO",
@@ -29,6 +30,7 @@ Gem::Specification.new do |s|
      "lib/cloudfiles/authentication.rb",
      "lib/cloudfiles/connection.rb",
      "lib/cloudfiles/container.rb",
+     "lib/cloudfiles/exception.rb",
      "lib/cloudfiles/storage_object.rb",
      "test/cf-testunit.rb",
      "test/cloudfiles_authentication_test.rb",
@@ -40,7 +42,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://www.rackspacecloud.com/cloud_hosting_products/files}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.0}
   s.summary = %q{A Ruby API into Rackspace Cloud Files}
   s.test_files = [
     "test/cf-testunit.rb",
@@ -52,7 +54,6 @@ Gem::Specification.new do |s|
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/lib/cloudfiles.rb

@@ -1,27 +1,32 @@
 #!/usr/bin/env ruby
-# 
+#
 # == Cloud Files API
 # ==== Connects Ruby Applications to Rackspace's {Cloud Files service}[http://www.rackspacecloud.com/cloud_hosting_products/files]
 # Initial work by Major Hayden <major.hayden@rackspace.com>
-# 
-# Subsequent work by H. Wade Minter <minter@lunenburg.org>
+#
+# Subsequent work by H. Wade Minter <minter@lunenburg.org> and Dan Prince <dan.prince@rackspace.com>
 #
 # See COPYING for license information.
-# Copyright (c) 2009, Rackspace US, Inc.
+# Copyright (c) 2011, Rackspace US, Inc.
 # ----
-# 
+#
 # === Documentation & Examples
-# To begin reviewing the available methods and examples, peruse the README file, or begin by looking at documentation for the 
+# To begin reviewing the available methods and examples, peruse the README file, or begin by looking at documentation for the
 # CloudFiles::Connection class.
 #
 # The CloudFiles class is the base class.  Not much of note happens here.
-# To create a new CloudFiles connection, use the CloudFiles::Connection.new('user_name', 'api_key') method.
+# To create a new CloudFiles connection, use the CloudFiles::Connection.new(:username => 'user_name', :api_key => 'api_key') method.
+
 module CloudFiles
 
+  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')
   require 'net/http'
   require 'net/https'
   require 'rexml/document'
+  require 'cgi'
   require 'uri'
   require 'digest/md5'
   require 'time'
@@ -34,6 +39,7 @@ module CloudFiles
   end
 
   $:.unshift(File.dirname(__FILE__))
+  require 'cloudfiles/exception'
   require 'cloudfiles/authentication'
   require 'cloudfiles/connection'
   require 'cloudfiles/container'
@@ -42,6 +48,13 @@ module CloudFiles
   def self.lines(str)
     (str.respond_to?(:lines) ? str.lines : str).to_a.map { |x| x.chomp }
   end
+
+  # CGI.escape, but without special treatment on spaces
+  def self.escape(str)
+    str.gsub(/([^a-zA-Z0-9_.-]+)/) do
+      '%' + $1.unpack('H2' * $1.bytesize).join('%').upcase
+    end
+  end
 end
 
 

data/lib/cloudfiles/authentication.rb

@@ -1,33 +1,38 @@
 module CloudFiles
   class Authentication
     # See COPYING for license information.
-    # Copyright (c) 2009, Rackspace US, Inc.
-    
+    # Copyright (c) 2011, Rackspace US, Inc.
+
     # Performs an authentication to the Cloud Files servers.  Opens a new HTTP connection to the API server,
     # sends the credentials, and looks for a successful authentication.  If it succeeds, it sets the cdmmgmthost,
     # cdmmgmtpath, storagehost, storagepath, authtoken, and authok variables on the connection.  If it fails, it raises
-    # an AuthenticationException.
+    # an CloudFiles::Exception::Authentication exception.
     #
     # Should probably never be called directly.
     def initialize(connection)
-      parsed_authurl = URI.parse(connection.authurl)
-      path = parsed_authurl.path
+      parsed_auth_url = URI.parse(connection.auth_url)
+      path = parsed_auth_url.path
       hdrhash = { "X-Auth-User" => connection.authuser, "X-Auth-Key" => connection.authkey }
       begin
-        server             = get_server(connection, parsed_authurl)
-        server.use_ssl     = true
-        server.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        server             = get_server(connection, parsed_auth_url)
+
+        if parsed_auth_url.scheme == "https"
+          server.use_ssl     = true
+          server.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
         server.start
       rescue
-        raise ConnectionException, "Unable to connect to #{server}"
+        raise CloudFiles::Exception::Connection, "Unable to connect to #{server}"
       end
-      response = server.get(path,hdrhash)
+      response = server.get(path, hdrhash)
       if (response.code == "204")
-        connection.cdnmgmthost   = URI.parse(response["x-cdn-management-url"]).host
-        connection.cdnmgmtpath   = URI.parse(response["x-cdn-management-url"]).path
-        connection.cdnmgmtport   = URI.parse(response["x-cdn-management-url"]).port
-        connection.cdnmgmtscheme = URI.parse(response["x-cdn-management-url"]).scheme
-        connection.storagehost   = set_snet(connection,URI.parse(response["x-storage-url"]).host)
+        if response["x-cdn-management-url"]
+          connection.cdnmgmthost   = URI.parse(response["x-cdn-management-url"]).host
+          connection.cdnmgmtpath   = URI.parse(response["x-cdn-management-url"]).path
+          connection.cdnmgmtport   = URI.parse(response["x-cdn-management-url"]).port
+          connection.cdnmgmtscheme = URI.parse(response["x-cdn-management-url"]).scheme
+        end
+        connection.storagehost   = set_snet(connection, URI.parse(response["x-storage-url"]).host)
         connection.storagepath   = URI.parse(response["x-storage-url"]).path
         connection.storageport   = URI.parse(response["x-storage-url"]).port
         connection.storagescheme = URI.parse(response["x-storage-url"]).scheme
@@ -35,23 +40,23 @@ module CloudFiles
         connection.authok        = true
       else
         connection.authtoken = false
-        raise AuthenticationException, "Authentication failed"
+        raise CloudFiles::Exception::Authentication, "Authentication failed"
       end
       server.finish
     end
-    
+
     private
-    
-    def get_server(connection, parsed_authurl)
-      Net::HTTP::Proxy(connection.proxy_host, connection.proxy_port).new(parsed_authurl.host,parsed_authurl.port)
-    end
-    
-    def set_snet(connection,hostname)
-      if connection.snet?
-        "snet-#{hostname}"
-      else
-        hostname
+
+      def get_server(connection, parsed_auth_url)
+        Net::HTTP::Proxy(connection.proxy_host, connection.proxy_port).new(parsed_auth_url.host, parsed_auth_url.port)
+      end
+
+      def set_snet(connection, hostname)
+        if connection.snet?
+          "snet-#{hostname}"
+        else
+          hostname
+        end
       end
-    end
   end
 end

data/lib/cloudfiles/connection.rb

@@ -1,8 +1,8 @@
 module CloudFiles
   class Connection
     # See COPYING for license information.
-    # Copyright (c) 2009, Rackspace US, Inc.
-    
+    # Copyright (c) 2011, Rackspace US, Inc.
+
     # Authentication key provided when the CloudFiles class was instantiated
     attr_reader :authkey
 
@@ -11,19 +11,19 @@ module CloudFiles
 
     # Authentication username provided when the CloudFiles class was instantiated
     attr_reader :authuser
-    
+
     # API host to authenticate to
-    attr_reader :authurl
+    attr_reader :auth_url
 
     # Hostname of the CDN management server
     attr_accessor :cdnmgmthost
 
     # Path for managing containers on the CDN management server
     attr_accessor :cdnmgmtpath
-    
+
     # Port number for the CDN server
     attr_accessor :cdnmgmtport
-    
+
     # URI scheme for the CDN server
     attr_accessor :cdnmgmtscheme
 
@@ -32,67 +32,65 @@ module CloudFiles
 
     # Path for managing containers/objects on the storage server
     attr_accessor :storagepath
-    
+
     # Port for managing the storage server
     attr_accessor :storageport
-    
+
     # URI scheme for the storage server
     attr_accessor :storagescheme
-    
+
     # Instance variable that is set when authorization succeeds
     attr_accessor :authok
-    
-    # The total size in bytes under this connection
-    attr_reader :bytes
-    
-    # The total number of containers under this connection
-    attr_reader :count
-    
+
     # Optional proxy variables
     attr_reader :proxy_host
     attr_reader :proxy_port
-    
+
     # Creates a new CloudFiles::Connection object.  Uses CloudFiles::Authentication to perform the login for the connection.
     # The authuser is the Rackspace Cloud username, the authkey is the Rackspace Cloud API key.
     #
-    # Setting the optional retry_auth variable to false will cause an exception to be thrown if your authorization token expires.
+    # Setting the :retry_auth option to false will cause an exception to be thrown if your authorization token expires.
     # Otherwise, it will attempt to reauthenticate.
     #
-    # Setting the optional snet variable to true or setting an environment variable of RACKSPACE_SERVICENET to any value will cause 
-    # storage URLs to be returned with a prefix pointing them to the internal Rackspace service network, instead of a public URL.  
+    # Setting the :snet option to true or setting an environment variable of RACKSPACE_SERVICENET to any value will cause
+    # storage URLs to be returned with a prefix pointing them to the internal Rackspace service network, instead of a public URL.
     #
     # This is useful if you are using the library on a Rackspace-hosted system, as it provides faster speeds, keeps traffic off of
     # the public network, and the bandwidth is not billed.
     #
-    # If you need to connect to a Cloud Files installation that is NOT the standard Rackspace one, set the :authurl option to the URL 
-    # of your authentication endpoint.  The default is https://auth.api.rackspacecloud.com/v1.0
+    # If you need to connect to a Cloud Files installation that is NOT the standard Rackspace one, set the :auth_url option to the URL
+    # of your authentication endpoint.  The old option name of :authurl is deprecated.  The default is CloudFiles::AUTH_USA (https://auth.api.rackspacecloud.com/v1.0)
+    #
+    # There are two predefined constants to represent the United States-based authentication endpoint and the United Kingdom-based endpoint:
+    # CloudFiles::AUTH_USA (the default) and CloudFiles::AUTH_UK - both can be passed to the :auth_url option to quickly choose one or the other.
     #
     # This will likely be the base class for most operations.
-    # 
+    #
     # With gem 1.4.8, the connection style has changed.  It is now a hash of arguments.  Note that the proxy options are currently only
     # supported in the new style.
     #
-    #   cf = CloudFiles::Connection.new(:username => "MY_USERNAME", :api_key => "MY_API_KEY", :authurl => "https://auth.api.rackspacecloud.com/v1.0", :retry_auth => true, :snet => false, :proxy_host => "localhost", :proxy_port => "1234")
+    #   cf = CloudFiles::Connection.new(:username => "MY_USERNAME", :api_key => "MY_API_KEY", :auth_url => CloudFiles::AUTH_UK, :retry_auth => true, :snet => false, :proxy_host => "localhost", :proxy_port => "1234")
     #
     # The old style (positional arguments) is deprecated and will be removed at some point in the future.
-    # 
+    #
     #   cf = CloudFiles::Connection.new(MY_USERNAME, MY_API_KEY, RETRY_AUTH, USE_SNET)
     def initialize(*args)
       if args[0].is_a?(Hash)
         options = args[0]
-        @authuser = options[:username] ||( raise AuthenticationException, "Must supply a :username")
-        @authkey = options[:api_key] || (raise AuthenticationException, "Must supply an :api_key")
-        @authurl = options[:authurl] || "https://auth.api.rackspacecloud.com/v1.0"
+        @authuser = options[:username] ||( raise CloudFiles::Exception::Authentication, "Must supply a :username")
+        @authkey = options[:api_key] || (raise CloudFiles::Exception::Authentication, "Must supply an :api_key")
+        @auth_url = options[:authurl] || CloudFiles::AUTH_USA
+        @auth_url = options[:auth_url] || CloudFiles::AUTH_USA
         @retry_auth = options[:retry_auth] || true
         @snet = ENV['RACKSPACE_SERVICENET'] || options[:snet]
         @proxy_host = options[:proxy_host]
         @proxy_port = options[:proxy_port]
       elsif args[0].is_a?(String)
-        @authuser = args[0] ||( raise AuthenticationException, "Must supply the username as the first argument")
-        @authkey = args[1] || (raise AuthenticationException, "Must supply the API key as the second argument")
+        @authuser = args[0] ||( raise CloudFiles::Exception::Authentication, "Must supply the username as the first argument")
+        @authkey = args[1] || (raise CloudFiles::Exception::Authentication, "Must supply the API key as the second argument")
         @retry_auth = args[2] || true
         @snet = (ENV['RACKSPACE_SERVICENET'] || args[3]) ? true : false
-        @authurl = "https://auth.api.rackspacecloud.com/v1.0"
+        @auth_url = CloudFiles::AUTH_USA
       end
       @authok = false
       @http = {}
@@ -106,7 +104,7 @@ module CloudFiles
     def authok?
       @authok
     end
-    
+
     # Returns true if the library is requesting the use of the Rackspace service network
     def snet?
       @snet
@@ -119,7 +117,7 @@ module CloudFiles
     #    container.count
     #    => 2
     def container(name)
-      CloudFiles::Container.new(self,name)
+      CloudFiles::Container.new(self, name)
     end
     alias :get_container :container
 
@@ -129,15 +127,25 @@ module CloudFiles
     #   cf.get_info
     #   => {:count=>8, :bytes=>42438527}
     #   cf.bytes
-    #   => 42438527    
+    #   => 42438527
     def get_info
-      response = cfreq("HEAD",@storagehost,@storagepath,@storageport,@storagescheme)
-      raise InvalidResponseException, "Unable to obtain account size" unless (response.code == "204")
+      response = cfreq("HEAD", @storagehost, @storagepath, @storageport, @storagescheme)
+      raise CloudFiles::Exception::InvalidResponse, "Unable to obtain account size" unless (response.code == "204")
       @bytes = response["x-account-bytes-used"].to_i
       @count = response["x-account-container-count"].to_i
       {:bytes => @bytes, :count => @count}
     end
     
+    # The total size in bytes under this connection
+    def bytes
+      get_info[:bytes]
+    end
+    
+    # The total number of containers under this connection
+    def count
+      get_info[:count]
+    end
+
     # Gathers a list of the containers that exist for the account and returns the list of container names
     # as an array.  If no containers exist, an empty array is returned.  Throws an InvalidResponseException
     # if the request fails.
@@ -146,18 +154,17 @@ module CloudFiles
     # specified in limit, starting after the object named in marker.
     #
     #   cf.containers
-    #   => ["backup", "Books", "cftest", "test", "video", "webpics"] 
+    #   => ["backup", "Books", "cftest", "test", "video", "webpics"]
     #
     #   cf.containers(2,'cftest')
     #   => ["test", "video"]
-    def containers(limit=0,marker="")
-      paramarr = []
-      paramarr << ["limit=#{URI.encode(limit.to_s).gsub(/&/,'%26')}"] if limit.to_i > 0
-      paramarr << ["marker=#{URI.encode(marker.to_s).gsub(/&/,'%26')}"] unless marker.to_s.empty?
-      paramstr = (paramarr.size > 0)? paramarr.join("&") : "" ;
-      response = cfreq("GET",@storagehost,"#{@storagepath}?#{paramstr}",@storageport,@storagescheme)
+    def containers(limit = 0, marker = "")
+      query = []
+      query << "limit=#{CloudFiles.escape limit.to_s}" if limit.to_i > 0
+      query << "marker=#{CloudFiles.escape marker.to_s}" unless marker.to_s.empty?
+      response = cfreq("GET", @storagehost, "#{@storagepath}?#{query.join '&'}", @storageport, @storagescheme)
       return [] if (response.code == "204")
-      raise InvalidResponseException, "Invalid response code #{response.code}" unless (response.code == "200")
+      raise CloudFiles::Exception::InvalidResponse, "Invalid response code #{response.code}" unless (response.code == "200")
       CloudFiles.lines(response.body)
     end
     alias :list_containers :containers
@@ -168,18 +175,17 @@ module CloudFiles
     #
     # If you supply the optional limit and marker parameters, the call will return the number of containers
     # specified in limit, starting after the object named in marker.
-    # 
-    #   cf.containers_detail              
-    #   => { "container1" => { :bytes => "36543", :count => "146" }, 
+    #
+    #   cf.containers_detail
+    #   => { "container1" => { :bytes => "36543", :count => "146" },
     #        "container2" => { :bytes => "105943", :count => "25" } }
-    def containers_detail(limit=0,marker="")
-      paramarr = []
-      paramarr << ["limit=#{URI.encode(limit.to_s).gsub(/&/,'%26')}"] if limit.to_i > 0
-      paramarr << ["marker=#{URI.encode(marker.to_s).gsub(/&/,'%26')}"] unless marker.to_s.empty?
-      paramstr = (paramarr.size > 0)? paramarr.join("&") : "" ;
-      response = cfreq("GET",@storagehost,"#{@storagepath}?format=xml&#{paramstr}",@storageport,@storagescheme)
+    def containers_detail(limit = 0, marker = "")
+      query = ['format=xml']
+      query << "limit=#{CloudFiles.escape limit.to_s}" if limit.to_i > 0
+      query << "marker=#{CloudFiles.escape marker.to_s}" unless marker.to_s.empty?
+      response = cfreq("GET", @storagehost, "#{@storagepath}?#{query.join '&'}", @storageport, @storagescheme)
       return {} if (response.code == "204")
-      raise InvalidResponseException, "Invalid response code #{response.code}" unless (response.code == "200")
+      raise CloudFiles::Exception::InvalidResponse, "Invalid response code #{response.code}" unless (response.code == "200")
       doc = REXML::Document.new(response.body)
       detailhash = {}
       doc.elements.each("account/container/") { |c|
@@ -191,21 +197,21 @@ module CloudFiles
     alias :list_containers_info :containers_detail
 
     # Returns true if the requested container exists and returns false otherwise.
-    # 
+    #
     #   cf.container_exists?('good_container')
     #   => true
-    #  
+    #
     #   cf.container_exists?('bad_container')
     #   => false
     def container_exists?(containername)
-      response = cfreq("HEAD",@storagehost,"#{@storagepath}/#{URI.encode(containername).gsub(/&/,'%26')}",@storageport,@storagescheme)
+      response = cfreq("HEAD", @storagehost, "#{@storagepath}/#{CloudFiles.escape containername}", @storageport, @storagescheme)
       return (response.code == "204")? true : false ;
     end
 
-    # Creates a new container and returns the CloudFiles::Container object.  Throws an InvalidResponseException if the 
+    # Creates a new container and returns the CloudFiles::Container object.  Throws an InvalidResponseException if the
     # request fails.
     #
-    # Slash (/) and question mark (?) are invalid characters, and will be stripped out.  The container name is limited to 
+    # Slash (/) and question mark (?) are invalid characters, and will be stripped out.  The container name is limited to
     # 256 characters or less.
     #
     #   container = cf.create_container('new_container')
@@ -215,16 +221,16 @@ module CloudFiles
     #   container = cf.create_container('bad/name')
     #   => SyntaxException: Container name cannot contain the characters '/' or '?'
     def create_container(containername)
-      raise SyntaxException, "Container name cannot contain the characters '/' or '?'" if containername.match(/[\/\?]/)
-      raise SyntaxException, "Container name is limited to 256 characters" if containername.length > 256
-      response = cfreq("PUT",@storagehost,"#{@storagepath}/#{URI.encode(containername).gsub(/&/,'%26')}",@storageport,@storagescheme)
-      raise InvalidResponseException, "Unable to create container #{containername}" unless (response.code == "201" || response.code == "202")
-      CloudFiles::Container.new(self,containername)
+      raise CloudFiles::Exception::Syntax, "Container name cannot contain the characters '/' or '?'" if containername.match(/[\/\?]/)
+      raise CloudFiles::Exception::Syntax, "Container name is limited to 256 characters" if containername.length > 256
+      response = cfreq("PUT", @storagehost, "#{@storagepath}/#{CloudFiles.escape containername}", @storageport, @storagescheme)
+      raise CloudFiles::Exception::InvalidResponse, "Unable to create container #{containername}" unless (response.code == "201" || response.code == "202")
+      CloudFiles::Container.new(self, containername)
     end
 
     # Deletes a container from the account.  Throws a NonEmptyContainerException if the container still contains
     # objects.  Throws a NoSuchContainerException if the container doesn't exist.
-    # 
+    #
     #   cf.delete_container('new_container')
     #   => true
     #
@@ -234,9 +240,9 @@ module CloudFiles
     #   cf.delete_container('nonexistent')
     #   => NoSuchContainerException: Container nonexistent does not exist
     def delete_container(containername)
-      response = cfreq("DELETE",@storagehost,"#{@storagepath}/#{URI.encode(containername).gsub(/&/,'%26')}",@storageport,@storagescheme)
-      raise NonEmptyContainerException, "Container #{containername} is not empty" if (response.code == "409")
-      raise NoSuchContainerException, "Container #{containername} does not exist" unless (response.code == "204")
+      response = cfreq("DELETE", @storagehost, "#{@storagepath}/#{CloudFiles.escape containername}", @storageport, @storagescheme)
+      raise CloudFiles::Exception::NonEmptyContainer, "Container #{containername} is not empty" if (response.code == "409")
+      raise CloudFiles::Exception::NoSuchContainer, "Container #{containername} does not exist" unless (response.code == "204")
       true
     end
 
@@ -244,26 +250,26 @@ module CloudFiles
     # as an array.  If no containers are public, an empty array is returned.  Throws a InvalidResponseException if
     # the request fails.
     #
-    # If you pass the optional argument as true, it will only show containers that are CURRENTLY being shared on the CDN, 
+    # If you pass the optional argument as true, it will only show containers that are CURRENTLY being shared on the CDN,
     # as opposed to the default behavior which is to show all containers that have EVER been public.
     #
     #   cf.public_containers
     #   => ["video", "webpics"]
     def public_containers(enabled_only = false)
       paramstr = enabled_only == true ? "enabled_only=true" : ""
-      response = cfreq("GET",@cdnmgmthost,"#{@cdnmgmtpath}?#{paramstr}",@cdnmgmtport,@cdnmgmtscheme)
+      response = cfreq("GET", @cdnmgmthost, "#{@cdnmgmtpath}?#{paramstr}", @cdnmgmtport, @cdnmgmtscheme)
       return [] if (response.code == "204")
-      raise InvalidResponseException, "Invalid response code #{response.code}" unless (response.code == "200")
+      raise CloudFiles::Exception::InvalidResponse, "Invalid response code #{response.code}" unless (response.code == "200")
       CloudFiles.lines(response.body)
     end
 
     # This method actually makes the HTTP calls out to the server
-    def cfreq(method,server,path,port,scheme,headers = {},data = nil,attempts = 0,&block) # :nodoc:
+    def cfreq(method, server, path, port, scheme, headers = {}, data = nil, attempts = 0, &block) # :nodoc:
       start = Time.now
       headers['Transfer-Encoding'] = "chunked" if data.is_a?(IO)
       hdrhash = headerprep(headers)
-      start_http(server,path,port,scheme,hdrhash)
-      request = Net::HTTP.const_get(method.to_s.capitalize).new(path,hdrhash)
+      start_http(server, path, port, scheme, hdrhash)
+      request = Net::HTTP.const_get(method.to_s.capitalize).new(path, hdrhash)
       if data
         if data.respond_to?(:read)
           request.body_stream = data
@@ -276,24 +282,24 @@ module CloudFiles
       else
         request.content_length = 0
       end
-      response = @http[server].request(request,&block)
-      raise ExpiredAuthTokenException if response.code == "401"
+      response = @http[server].request(request, &block)
+      raise CloudFiles::Exception::ExpiredAuthToken if response.code == "401"
       response
     rescue Errno::EPIPE, Timeout::Error, Errno::EINVAL, EOFError
       # Server closed the connection, retry
-      raise ConnectionException, "Unable to reconnect to #{server} after #{count} attempts" if attempts >= 5
+      raise CloudFiles::Exception::Connection, "Unable to reconnect to #{server} after #{count} attempts" if attempts >= 5
       attempts += 1
       @http[server].finish
-      start_http(server,path,port,scheme,headers)
+      start_http(server, path, port, scheme, headers)
       retry
     rescue ExpiredAuthTokenException
-      raise ConnectionException, "Authentication token expired and you have requested not to retry" if @retry_auth == false
+      raise CloudFiles::Exception::Connection, "Authentication token expired and you have requested not to retry" if @retry_auth == false
       CloudFiles::Authentication.new(self)
       retry
     end
-    
+
     private
-    
+
     # Sets up standard HTTP headers
     def headerprep(headers = {}) # :nodoc:
       default_headers = {}
@@ -303,19 +309,19 @@ module CloudFiles
       default_headers["User-Agent"] = "CloudFiles Ruby API #{VERSION}"
       default_headers.merge(headers)
     end
-    
+
     # Starts (or restarts) the HTTP connection
-    def start_http(server,path,port,scheme,headers) # :nodoc:
+    def start_http(server, path, port, scheme, headers) # :nodoc:
       if (@http[server].nil?)
         begin
-          @http[server] = Net::HTTP::Proxy(self.proxy_host, self.proxy_port).new(server,port)
+          @http[server] = Net::HTTP::Proxy(self.proxy_host, self.proxy_port).new(server, port)
           if scheme == "https"
             @http[server].use_ssl = true
             @http[server].verify_mode = OpenSSL::SSL::VERIFY_NONE
           end
           @http[server].start
         rescue
-          raise ConnectionException, "Unable to connect to #{server}"
+          raise CloudFiles::Exception::Connection, "Unable to connect to #{server}"
         end
       end
     end