cloudfiles 1.4.7 → 1.4.8

data/README.rdoc

@@ -4,6 +4,16 @@
 
 This is a Ruby interface into the Rackspace[http://rackspace.com/] {Cloud Files}[http://www.rackspacecloud.com/cloud_hosting_products/files] service. Cloud Files is reliable, scalable and affordable web-based storage hosting for backing up and archiving all your static content.  Cloud Files is the first and only cloud service that leverages a tier one CDN provider to create such an easy and complete storage-to-delivery solution for media content.
 
+== Upgrade Gotchas
+
+As of gem version 1.4.8, the connection method has changed from positional arguments to a hash of options.  This is the new style:
+
+   cf = CloudFiles::Connection.new(:username => "MY_USERNAME", :api_key => "MY_API_KEY")
+   
+This is the old style, which still works but is deprecated:
+
+   cf = CloudFiles::Connection.new("MY_USERNAME","MY_API_KEY")
+
 == Installation
 
 This source is available on Github[http://github.com/rackspace/ruby-cloudfiles/] and the gem is available on Gemcutter[http://gemcutter.org/].  To install it, do
@@ -25,7 +35,7 @@ See the class definitions for documentation on specific methods and operations.
   require 'cloudfiles'
 
   # Log into the Cloud Files system
-  cf = CloudFiles::Connection.new(USERNAME, API_KEY)
+  cf = CloudFiles::Connection.new(:username => "MY_USERNAME", :api_key => "MY_API_KEY")
 
   # Get a listing of all containers under this account
   cf.containers
@@ -53,7 +63,7 @@ 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 <wade.minter@rackspace.com>
+Subsequent work by H. Wade Minter <minter@lunenburg.org>
 
 == License
 

data/Rakefile

@@ -6,7 +6,7 @@ begin
     gemspec.name = "cloudfiles"
     gemspec.summary = "A Ruby API into Rackspace Cloud Files"
     gemspec.description = "A Ruby version of the Rackspace Cloud Files API."
-    gemspec.email = "wade.minter@rackspace.com"
+    gemspec.email = "minter@lunenburg.org"
     gemspec.homepage = "http://www.rackspacecloud.com/cloud_hosting_products/files"
     gemspec.authors = ["H. Wade Minter", "Rackspace Hosting"]
     gemspec.add_dependency('mime-types', '>= 1.16')

data/VERSION

@@ -1 +1 @@
-1.4.7
+1.4.8

data/cloudfiles.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudfiles}
-  s.version = "1.4.7"
+  s.version = "1.4.8"
 
   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-03-05}
+  s.date = %q{2010-08-02}
   s.description = %q{A Ruby version of the Rackspace Cloud Files API.}
-  s.email = %q{wade.minter@rackspace.com}
+  s.email = %q{minter@lunenburg.org}
   s.extra_rdoc_files = [
     "README.rdoc",
      "TODO"
@@ -40,7 +40,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.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Ruby API into Rackspace Cloud Files}
   s.test_files = [
     "test/cf-testunit.rb",
@@ -55,7 +55,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mime-types>, [">= 1.16"])
     else
       s.add_dependency(%q<mime-types>, [">= 1.16"])

data/lib/cloudfiles.rb

@@ -4,7 +4,7 @@
 # ==== 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 <wade.minter@rackspace.com>
+# Subsequent work by H. Wade Minter <minter@lunenburg.org>
 #
 # See COPYING for license information.
 # Copyright (c) 2009, Rackspace US, Inc.

data/lib/cloudfiles/authentication.rb

@@ -13,7 +13,7 @@ module CloudFiles
       path = '/v1.0'
       hdrhash = { "X-Auth-User" => connection.authuser, "X-Auth-Key" => connection.authkey }
       begin
-        server = Net::HTTP.new('auth.api.rackspacecloud.com',443)
+        server = Net::HTTP::Proxy(connection.proxy_host, connection.proxy_port).new('auth.api.rackspacecloud.com',443)
         server.use_ssl = true
         server.verify_mode = OpenSSL::SSL::VERIFY_NONE
         server.start

data/lib/cloudfiles/connection.rb

@@ -45,6 +45,10 @@ module CloudFiles
     # 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.
     #
@@ -58,13 +62,30 @@ module CloudFiles
     # the public network, and the bandwidth is not billed.
     #
     # 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", :retry_auth => true, :snet => false, :proxy_host => "localhost", :proxy_port => "1234")
     #
-    #   cf = CloudFiles::Connection.new(MY_USERNAME, MY_API_KEY)
-    def initialize(authuser,authkey,retry_auth = true,snet=false) 
-      @authuser = authuser
-      @authkey = authkey
-      @retry_auth = retry_auth
-      @snet = (ENV['RACKSPACE_SERVICENET'] || snet) ? true : false
+    # 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")
+        @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")
+        @retry_auth = args[2] || true
+        @snet = (ENV['RACKSPACE_SERVICENET'] || args[3]) ? true : false
+      end
       @authok = false
       @http = {}
       CloudFiles::Authentication.new(self)
@@ -279,7 +300,7 @@ module CloudFiles
     def start_http(server,path,port,scheme,headers) # :nodoc:
       if (@http[server].nil?)
         begin
-          @http[server] = Net::HTTP.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

data/lib/cloudfiles/container.rb

@@ -133,8 +133,8 @@ module CloudFiles
     # if the request fails.
     def objects(params = {})
       paramarr = []
-      paramarr << ["limit=#{URI.encode(params[:limit].to_i.to_s).gsub(/&/,'%26')}"] if params[:limit]
-      paramarr << ["offset=#{URI.encode(params[:offset].to_i.to_s).gsub(/&/,'%26')}"] if params[:offset]
+      paramarr << ["limit=#{URI.encode(params[:limit].to_s).gsub(/&/,'%26')}"] if params[:limit]
+      paramarr << ["offset=#{URI.encode(params[:offset].to_s).gsub(/&/,'%26')}"] if params[:offset]
       paramarr << ["prefix=#{URI.encode(params[:prefix]).gsub(/&/,'%26')}"] if params[:prefix]
       paramarr << ["path=#{URI.encode(params[:path]).gsub(/&/,'%26')}"] if params[:path]
       paramstr = (paramarr.size > 0)? paramarr.join("&") : "" ;
@@ -164,8 +164,8 @@ module CloudFiles
     def objects_detail(params = {})
       paramarr = []
       paramarr << ["format=xml"]
-      paramarr << ["limit=#{URI.encode(params[:limit].to_i).gsub(/&/,'%26')}"] if params[:limit]
-      paramarr << ["offset=#{URI.encode(params[:offset].to_i).gsub(/&/,'%26')}"] if params[:offset]
+      paramarr << ["limit=#{URI.encode(params[:limit].to_s).gsub(/&/,'%26')}"] if params[:limit]
+      paramarr << ["offset=#{URI.encode(params[:offset].to_s).gsub(/&/,'%26')}"] if params[:offset]
       paramarr << ["prefix=#{URI.encode(params[:prefix]).gsub(/&/,'%26')}"] if params[:prefix]
       paramarr << ["path=#{URI.encode(params[:path]).gsub(/&/,'%26')}"] if params[:path]
       paramstr = (paramarr.size > 0)? paramarr.join("&") : "" ;
@@ -262,12 +262,6 @@ module CloudFiles
         ttl = options
         options = {:ttl => ttl}
       end
-      if options[:ttl] < 3600
-        options[:ttl] = 3600
-      end
-      if options[:ttl] > 259200
-        options[:ttl] = 259200
-      end
       
       response = self.connection.cfreq("PUT",@cdnmgmthost,@cdnmgmtpath,@cdnmgmtport,@cdnmgmtscheme)
       raise NoSuchContainerException, "Container #{@name} does not exist" unless (response.code == "201" || response.code == "202")

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudfiles
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 4
-  - 7
-  version: 1.4.7
+  - 8
+  version: 1.4.8
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 -06:00
+date: 2010-08-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 1
         - 16
@@ -32,7 +35,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 description: A Ruby version of the Rackspace Cloud Files API.
-email: wade.minter@rackspace.com
+email: minter@lunenburg.org
 executables: []
 
 extensions: []
@@ -70,23 +73,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby API into Rackspace Cloud Files