rackspace-cloudfiles 1.3.0.5 → 1.3.0.6

data/cloudfiles.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cloudfiles}
-  s.version = "1.3.0.5"
+  s.version = "1.3.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["H. Wade Minter, Rackspace Hosting"]

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.3.0.5'
+  VERSION = '1.3.0.6'
   require 'net/http'
   require 'net/https'
   require 'rexml/document'

data/lib/cloudfiles/container.rb

@@ -61,8 +61,8 @@ module CloudFiles
       response = self.connection.cfreq("HEAD",@cdnmgmthost,@cdnmgmtpath)
       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
+      @cdn_ttl = @cdn_enabled ? response["x-ttl"] : false
+      @cdn_url = @cdn_enabled ? response["x-cdn-uri"] : false
 
       true
     end

data/test/cloudfiles_container_test.rb

@@ -11,6 +11,8 @@ class CloudfilesContainerTest < Test::Unit::TestCase
     assert_equal @container.name, 'test_container'
     assert_equal @container.class, CloudFiles::Container
     assert_equal @container.public?, false
+    assert_equal @container.cdn_url, false
+    assert_equal @container.cdn_ttl, false
   end
   
   def test_object_creation_no_such_container
@@ -25,13 +27,15 @@ class CloudfilesContainerTest < Test::Unit::TestCase
   
   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', 'x-cdn-enabled' => 'True'}
+    response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5', 'x-cdn-enabled' => 'True', 'x-cdn-uri' => 'http://cdn.test.example/container', 'x-ttl' => '86400'}
     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, true
     assert_equal @container.public?, true
+    assert_equal @container.cdn_url, 'http://cdn.test.example/container'
+    assert_equal @container.cdn_ttl, '86400'
   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.5
+  version: 1.3.0.6
 platform: ruby
 authors: 
 - H. Wade Minter, Rackspace Hosting