cloudfiles 1.4.0 → 1.4.1

data/README.rdoc

@@ -8,7 +8,7 @@ This is a Ruby interface into the Rackspace[http://rackspace.com/] {Cloud Files}
 
 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
 
-  gem sources -a http://gems.rubyforge.org/
+  gem sources -a http://gemcutter.org/
   
   sudo gem install cloudfiles
   

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.1

data/cloudfiles.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{cloudfiles}
-  s.version = "1.4.0"
+  s.version = "1.4.1"
 
   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{2009-10-08}
+  s.date = %q{2009-10-20}
   s.description = %q{A Ruby version of the Rackspace Cloud Files API.}
   s.email = %q{wade.minter@rackspace.com}
   s.extra_rdoc_files = [
@@ -60,3 +60,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/lib/cloudfiles.rb

@@ -18,7 +18,7 @@
 # To create a new CloudFiles connection, use the CloudFiles::Connection.new('user_name', 'api_key') method.
 module CloudFiles
 
-  VERSION = '1.4.0.0'
+  VERSION = IO.read(File.dirname(__FILE__) + '/../VERSION')
   require 'net/http'
   require 'net/https'
   require 'rexml/document'

data/lib/cloudfiles/authentication.rb

@@ -26,7 +26,7 @@ module CloudFiles
         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 = URI.parse(response["x-storage-url"]).host
+        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
@@ -38,5 +38,15 @@ module CloudFiles
       end
       server.finish
     end
+    
+    private
+    
+    def set_snet(connection,hostname)
+      if connection.snet?
+        "snet-#{hostname}"
+      else
+        hostname
+      end
+    end
   end
 end

data/lib/cloudfiles/connection.rb

@@ -44,20 +44,27 @@ module CloudFiles
     
     # The total number of containers under this connection
     attr_reader :count
-
+    
     # 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.
     # 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.  
+    #
+    # 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.
+    #
     # This will likely be the base class for most operations.
     #
     #   cf = CloudFiles::Connection.new(MY_USERNAME, MY_API_KEY)
-    def initialize(authuser,authkey,retry_auth = true) 
+    def initialize(authuser,authkey,retry_auth = true,snet=false) 
       @authuser = authuser
       @authkey = authkey
       @retry_auth = retry_auth
+      @snet = (ENV['RACKSPACE_SERVICENET'] || snet) ? true : false
       @authok = false
       @http = {}
       CloudFiles::Authentication.new(self)
@@ -70,6 +77,11 @@ module CloudFiles
     def authok?
       @authok
     end
+    
+    # Returns true if the library is requesting the use of the Rackspace service network
+    def snet?
+      @snet
+    end
 
     # Returns an CloudFiles::Container object that can be manipulated easily.  Throws a NoSuchContainerException if
     # the container doesn't exist.

data/lib/cloudfiles/container.rb

@@ -167,7 +167,7 @@ module CloudFiles
       doc = REXML::Document.new(response.body)
       detailhash = {}
       doc.elements.each("container/object") { |o|
-        detailhash[o.elements["name"].text] = { :bytes => o.elements["bytes"].text, :hash => o.elements["hash"].text, :content_type => o.elements["content_type"].text, :last_modified => Time.parse(o.elements["last_modified"].text) }
+        detailhash[o.elements["name"].text] = { :bytes => o.elements["bytes"].text, :hash => o.elements["hash"].text, :content_type => o.elements["content_type"].text, :last_modified => DateTime.parse(o.elements["last_modified"].text) }
       }
       doc = nil
       return detailhash

data/test/cloudfiles_authentication_test.rb

@@ -9,7 +9,18 @@ class CloudfilesAuthenticationTest < Test::Unit::TestCase
     server = mock(:use_ssl= => true, :verify_mode= => true, :start => true, :finish => true)
     server.stubs(:get).returns(response)
     Net::HTTP.stubs(:new).returns(server)
-    @connection = stub(:authuser => 'dummy_user', :authkey => 'dummy_key', :cdnmgmthost= => true, :cdnmgmtpath= => true, :cdnmgmtport= => true, :cdnmgmtscheme= => true, :storagehost= => true, :storagepath= => true, :storageport= => true, :storagescheme= => true, :authtoken= => true, :authok= => true)
+    @connection = stub(:authuser => 'dummy_user', :authkey => 'dummy_key', :cdnmgmthost= => true, :cdnmgmtpath= => true, :cdnmgmtport= => true, :cdnmgmtscheme= => true, :storagehost= => true, :storagepath= => true, :storageport= => true, :storagescheme= => true, :authtoken= => true, :authok= => true, :snet? => false)
+    result = CloudFiles::Authentication.new(@connection)
+    assert_equal result.class, CloudFiles::Authentication
+  end
+  
+  def test_snet_authentication
+    response = {'x-cdn-management-url' => 'http://cdn.example.com/path', 'x-storage-url' => 'http://cdn.example.com/storage', 'authtoken' => 'dummy_token'}
+    response.stubs(:code).returns('204')
+    server = mock(:use_ssl= => true, :verify_mode= => true, :start => true, :finish => true)
+    server.stubs(:get).returns(response)
+    Net::HTTP.stubs(:new).returns(server)
+    @connection = stub(:authuser => 'dummy_user', :authkey => 'dummy_key', :cdnmgmthost= => true, :cdnmgmtpath= => true, :cdnmgmtport= => true, :cdnmgmtscheme= => true, :storagehost= => true, :storagepath= => true, :storageport= => true, :storagescheme= => true, :authtoken= => true, :authok= => true, :snet? => true)
     result = CloudFiles::Authentication.new(@connection)
     assert_equal result.class, CloudFiles::Authentication
   end

data/test/cloudfiles_connection_test.rb

@@ -22,7 +22,14 @@ class CloudfilesConnectionTest < Test::Unit::TestCase
     @connection.expects(:authok?).returns(true)
     assert_equal @connection.authok?, true
   end
-    
+  
+  def test_snet
+    # This would normally be set in CloudFiles::Authentication
+    assert_equal @connection.snet?, false
+    @connection.expects(:snet?).returns(true)
+    assert_equal @connection.snet?, true
+  end
+      
   def test_cfreq_get
     build_net_http_object
     assert_nothing_raised do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cloudfiles
 version: !ruby/object:Gem::Version 
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-08 00:00:00 -05:00
+date: 2009-10-20 00:00:00 -05:00
 default_executable: 
 dependencies: []