rackspace-cloudfiles 1.3.0.3 → 1.3.0.5

data/cloudfiles.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudfiles}
-  s.version = "1.3.0.3"
+  s.version = "1.3.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["H. Wade Minter, Rackspace Hosting"]
-  s.date = %q{2009-05-16}
+  s.date = %q{2009-07-28}
   s.description = %q{A Ruby version of the Mosso Cloud Files API.}
   s.email = %q{wade.minter@rackspace.com}
   s.extra_rdoc_files = ["lib/cloudfiles/authentication.rb", "lib/cloudfiles/connection.rb", "lib/cloudfiles/container.rb", "lib/cloudfiles/storage_object.rb", "lib/cloudfiles.rb", "README.rdoc", "TODO"]
@@ -26,13 +26,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mime-types>, [">= 1.0"])
-      s.add_development_dependency(%q<echoe>, [">= 0"])
     else
       s.add_dependency(%q<mime-types>, [">= 1.0"])
-      s.add_dependency(%q<echoe>, [">= 0"])
     end
   else
     s.add_dependency(%q<mime-types>, [">= 1.0"])
-    s.add_dependency(%q<echoe>, [">= 0"])
   end
 end

data/lib/cloudfiles.rb

@@ -18,18 +18,20 @@
 # To create a new CloudFiles connection, use the CloudFiles::Connection.new('user_name', 'api_key') method.
 module CloudFiles
 
-  VERSION = '1.3.0.3'
+  VERSION = '1.3.0.5'
   require 'net/http'
   require 'net/https'
   require 'rexml/document'
   require 'uri'
   require 'digest/md5'
-  require 'jcode' 
   require 'time'
   require 'rubygems'
   require 'mime/types'
 
-  $KCODE = 'u'
+  unless "".respond_to? :each_char
+    require "jcode"
+    $KCODE = 'u'
+  end
 
   $:.unshift(File.dirname(__FILE__))
   require 'cloudfiles/authentication'
@@ -37,6 +39,9 @@ module CloudFiles
   require 'cloudfiles/container'
   require 'cloudfiles/storage_object'
 
+  def self.lines(str)
+    (str.respond_to?(:lines) ? str.lines : str).to_a.map { |x| x.chomp }
+  end
 end
 
 
@@ -66,4 +71,4 @@ end
 class ObjectExistsException       < StandardError # :nodoc:
 end
 class ExpiredAuthTokenException   < StandardError # :nodoc:
-end
+end

data/lib/cloudfiles/connection.rb

@@ -18,9 +18,6 @@ module CloudFiles
     # Path for managing containers on the CDN management server
     attr_accessor :cdnmgmtpath
 
-    # Array of requests that have been made so far
-    attr_reader :reqlog
-
     # Hostname of the storage server
     attr_accessor :storagehost
 
@@ -51,7 +48,6 @@ module CloudFiles
       @retry_auth = retry_auth
       @authok = false
       @http = {}
-      @reqlog = []
       CloudFiles::Authentication.new(self)
     end
 
@@ -109,7 +105,7 @@ module CloudFiles
       response = cfreq("GET",@storagehost,"#{@storagepath}?#{paramstr}")
       return [] if (response.code == "204")
       raise InvalidResponseException, "Invalid response code #{response.code}" unless (response.code == "200")
-      response.body.to_a.map { |x| x.chomp }
+      CloudFiles.lines(response.body)
     end
     alias :list_containers :containers
 
@@ -205,7 +201,7 @@ module CloudFiles
       response = cfreq("GET",@cdnmgmthost,"#{@cdnmgmtpath}?#{paramstr}")
       return [] if (response.code == "204")
       raise InvalidResponseException, "Invalid response code #{response.code}" unless (response.code == "200")
-      response.body.to_a.map { |x| x.chomp }
+      CloudFiles.lines(response.body)
     end
 
     # This method actually makes the HTTP calls out to the server
@@ -271,4 +267,4 @@ module CloudFiles
 
   end
 
-end
+end

data/lib/cloudfiles/container.rb

@@ -59,15 +59,11 @@ module CloudFiles
 
       # Get the CDN-related details
       response = self.connection.cfreq("HEAD",@cdnmgmthost,@cdnmgmtpath)
-      if (response.code == "204")
-        @cdn_enabled = true
-        @cdn_ttl = response["x-ttl"]
-        @cdn_url = response["x-cdn-uri"]
-      else
-        @cdn_enabled = false
-        @cdn_ttl = false
-        @cdn_url = false
-      end
+      raise NoSuchContainerException, "Container #{@name} does not exist" unless (response.code == "204")
+      @cdn_enabled = ((response["x-cdn-enabled"] || "").downcase == "true") ? true : false
+      @cdn_ttl = @cdn_enable ? response["x-ttl"] : false
+      @cdn_url = @cdn_enable ? response["x-cdn-uri"] : false
+
       true
     end
     alias :refresh :populate
@@ -113,7 +109,7 @@ module CloudFiles
       response = self.connection.cfreq("GET",@storagehost,"#{@storagepath}?#{paramstr}")
       return [] if (response.code == "204")
       raise InvalidResponseException, "Invalid response code #{response.code}" unless (response.code == "200")
-      return response.body.to_a.map { |x| x.chomp }
+      return CloudFiles.lines(response.body)
     end
     alias :list_objects :objects
 
@@ -218,13 +214,16 @@ module CloudFiles
     # Makes a container publicly available via the Cloud Files CDN and returns true upon success.  Throws NoSuchContainerException
     # if the container doesn't exist or if the request fails.
     # 
-    # Takes an optional argument, which is the CDN cache TTL in seconds (default 86400 seconds or 1 day)
+    # Takes an optional argument, which is the CDN cache TTL in seconds (default 86400 seconds or 1 day, maximum 259200 or 3 days)
     #
     #   container.make_public(432000)
     #   => true
     def make_public(ttl = 86400)
-      headers = { "X-CDN-Enabled" => "True", "X-TTL" => ttl.to_s }
-      response = self.connection.cfreq("PUT",@cdnmgmthost,@cdnmgmtpath,headers)
+      response = self.connection.cfreq("PUT",@cdnmgmthost,@cdnmgmtpath)
+      raise NoSuchContainerException, "Container #{@name} does not exist" unless (response.code == "201" || response.code == "202")
+
+      headers = { "X-TTL" => ttl.to_s }
+      response = self.connection.cfreq("POST",@cdnmgmthost,@cdnmgmtpath,headers)
       raise NoSuchContainerException, "Container #{@name} does not exist" unless (response.code == "201" || response.code == "202")
       true
     end
@@ -238,7 +237,7 @@ module CloudFiles
     #   => true
     def make_private
       headers = { "X-CDN-Enabled" => "False" }
-      response = self.connection.cfreq("PUT",@cdnmgmthost,@cdnmgmtpath,headers)
+      response = self.connection.cfreq("POST",@cdnmgmthost,@cdnmgmtpath,headers)
       raise NoSuchContainerException, "Container #{@name} does not exist" unless (response.code == "201" || response.code == "202")
       true
     end
@@ -249,4 +248,4 @@ module CloudFiles
 
   end
 
-end
+end

data/lib/cloudfiles/storage_object.rb

@@ -71,7 +71,6 @@ module CloudFiles
         headers['Range'] = range
       end
       response = self.container.connection.cfreq("GET",@storagehost,@storagepath,headers)
-      print "DEBUG: Code is #{response.code}\n"
       raise NoSuchObjectException, "Object #{@name} does not exist" unless (response.code =~ /^20/)
       response.body.chomp
     end
@@ -252,4 +251,4 @@ module CloudFiles
 
   end
 
-end
+end

data/test/cloudfiles_container_test.rb

@@ -10,7 +10,7 @@ class CloudfilesContainerTest < Test::Unit::TestCase
     @container = CloudFiles::Container.new(connection, 'test_container')
     assert_equal @container.name, 'test_container'
     assert_equal @container.class, CloudFiles::Container
-    assert_equal @container.public?, true
+    assert_equal @container.public?, false
   end
   
   def test_object_creation_no_such_container
@@ -23,15 +23,15 @@ class CloudfilesContainerTest < Test::Unit::TestCase
     end
   end
   
-  def test_object_creation_no_cdn
+  def test_object_creation_with_cdn
     connection = mock(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path')
-    response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5'}
-    response.stubs(:code).returns('204').then.returns('999')
+    response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5', 'x-cdn-enabled' => 'True'}
+    response.stubs(:code).returns('204')
     connection.stubs(:cfreq => response)
     @container = CloudFiles::Container.new(connection, 'test_container')
     assert_equal @container.name, 'test_container'
-    assert_equal @container.cdn_enabled, false
-    assert_equal @container.public?, false
+    assert_equal @container.cdn_enabled, true
+    assert_equal @container.public?, true
   end
   
   def test_to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rackspace-cloudfiles
 version: !ruby/object:Gem::Version 
-  version: 1.3.0.3
+  version: 1.3.0.5
 platform: ruby
 authors: 
 - H. Wade Minter, Rackspace Hosting
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-16 00:00:00 -07:00
+date: 2009-07-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,16 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: echoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: A Ruby version of the Mosso Cloud Files API.
 email: wade.minter@rackspace.com
 executables: []
@@ -65,6 +55,7 @@ files:
 - TODO
 has_rdoc: true
 homepage: http://www.mosso.com/cloudfiles.jsp
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -90,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: cloudfiles
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 2
 summary: A Ruby API into Mosso Cloud Files