cloudfiles 1.4.10 → 1.4.11

data/test/cloudfiles_container_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 class CloudfilesContainerTest < Test::Unit::TestCase
   
   def test_object_creation
-    connection = mock(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
+    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
     response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5'}
     response.stubs(:code).returns('204')
     connection.stubs(:cfreq => response)
@@ -12,22 +12,22 @@ 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
+    assert_equal @container.cdn_url, nil
+    assert_equal @container.cdn_ttl, nil
   end
   
   def test_object_creation_no_such_container
-    connection = mock(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
+    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
     response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5'}
     response.stubs(:code).returns('999')
     connection.stubs(:cfreq => response)
-    assert_raise(NoSuchContainerException) do
+    assert_raise(CloudFiles::Exception::NoSuchContainer) do
       @container = CloudFiles::Container.new(connection, 'test_container')
     end
   end
   
   def test_object_creation_with_cdn
-    connection = mock(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
+    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
     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)
@@ -53,7 +53,7 @@ class CloudfilesContainerTest < Test::Unit::TestCase
   
   def test_make_private_fails
     build_net_http_object(:code => '999')
-    assert_raises(NoSuchContainerException) do
+    assert_raises(CloudFiles::Exception::NoSuchContainer) do
       @container.make_private
     end
   end
@@ -67,13 +67,13 @@ class CloudfilesContainerTest < Test::Unit::TestCase
   
   def test_make_public_fails
     build_net_http_object(:code => '999')
-    assert_raises(NoSuchContainerException) do
+    assert_raises(CloudFiles::Exception::NoSuchContainer) do
       @container.make_public
     end
   end
   
   def test_empty_is_false
-    connection = mock(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
+    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
     response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5'}
     response.stubs(:code).returns('204')
     connection.stubs(:cfreq => response)
@@ -82,7 +82,7 @@ class CloudfilesContainerTest < Test::Unit::TestCase
   end
   
   def test_empty_is_true
-    connection = mock(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
+    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
     response = {'x-container-bytes-used' => '0', 'x-container-object-count' => '0'}
     response.stubs(:code).returns('204')
     connection.stubs(:cfreq => response)
@@ -91,7 +91,7 @@ class CloudfilesContainerTest < Test::Unit::TestCase
   end
   
   def test_log_retention_is_true
-    connection = mock(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
+    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
     response = {'x-container-bytes-used' => '0', 'x-container-object-count' => '0', 'x-cdn-enabled' => 'True', 'x-log-retention' => 'True'}
     response.stubs(:code).returns('204')
     connection.stubs(:cfreq => response)
@@ -130,14 +130,14 @@ class CloudfilesContainerTest < Test::Unit::TestCase
   
   def test_delete_invalid_object_fails
     build_net_http_object(:code => '404')
-    assert_raise(NoSuchObjectException) do
+    assert_raise(CloudFiles::Exception::NoSuchObject) do
       @container.delete_object('nonexistent_object')
     end
   end
   
   def test_delete_invalid_response_code_fails
     build_net_http_object(:code => '999')
-    assert_raise(InvalidResponseException) do
+    assert_raise(CloudFiles::Exception::InvalidResponse) do
       @container.delete_object('broken_object')
     end
   end
@@ -230,7 +230,7 @@ class CloudfilesContainerTest < Test::Unit::TestCase
   
   def test_fetch_object_detail_error
     build_net_http_object(:code => '999')
-    assert_raise(InvalidResponseException) do
+    assert_raise(CloudFiles::Exception::InvalidResponse) do
       details = @container.objects_detail
     end
   end
@@ -244,6 +244,7 @@ class CloudfilesContainerTest < Test::Unit::TestCase
   
   def build_net_http_object(args={:code => '204' }, cfreq_expectations={})
     CloudFiles::Container.any_instance.stubs(:populate).returns(true)
+    CloudFiles::Container.any_instance.stubs(:metadata).returns({})
     connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
     args[:response] = {} unless args[:response]
     response = {'x-cdn-management-url' => 'http://cdn.example.com/path', 'x-storage-url' => 'http://cdn.example.com/storage', 'authtoken' => 'dummy_token', 'last-modified' => Time.now.to_s}.merge(args[:response])

data/test/cloudfiles_storage_object_test.rb

@@ -21,7 +21,7 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
     response.stubs(:code).returns('204')
     connection.stubs(:cfreq => response)
     container = CloudFiles::Container.new(connection, 'test_container')
-    assert_raises SyntaxException do
+    assert_raises CloudFiles::Exception::Syntax do
       @object = CloudFiles::StorageObject.new(container, 'test_object?')
     end
   end
@@ -49,7 +49,7 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   
   def test_data_fails
     build_net_http_object(:code => '999', :body => 'This is bad data')
-    assert_raise(NoSuchObjectException) do
+    assert_raise(CloudFiles::Exception::NoSuchObject) do
       @object.data
     end
   end
@@ -78,7 +78,7 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   def data_stream_fails
     build_net_http_object(:code => '999', :body => 'This is bad data')
     data = ""
-    assert_raise(NoSuchObjectException) do
+    assert_raise(CloudFiles::Exception::NoSuchObject) do
       @object.data_stream { |chunk|
         data += chunk
       }
@@ -95,14 +95,14 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   
   def test_set_metadata_invalid_object
     build_net_http_object(:code => '404')
-    assert_raise(NoSuchObjectException) do
+    assert_raise(CloudFiles::Exception::NoSuchObject) do
       @object.set_metadata({'Foo' =>'bar'})
     end
   end
   
   def test_set_metadata_fails
     build_net_http_object(:code => '999')
-    assert_raise(InvalidResponseException) do
+    assert_raise(CloudFiles::Exception::InvalidResponse) do
       @object.set_metadata({'Foo' =>'bar'})
     end
   end
@@ -163,28 +163,28 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   
   def test_write_with_no_data_dies
     build_net_http_object
-    assert_raise(SyntaxException) do
+    assert_raise(CloudFiles::Exception::Syntax) do
       @object.write
     end
   end
   
   def test_write_with_invalid_content_length_dies
     build_net_http_object(:code => '412')
-    assert_raise(InvalidResponseException) do
+    assert_raise(CloudFiles::Exception::InvalidResponse) do
       @object.write('Test Data')
     end
   end
   
   def test_write_with_mismatched_md5_dies
     build_net_http_object(:code => '422')
-    assert_raise(MisMatchedChecksumException) do
+    assert_raise(CloudFiles::Exception::MisMatchedChecksum) do
       @object.write('Test Data')
     end
   end
   
   def test_write_with_invalid_response_dies
     build_net_http_object(:code => '999')
-    assert_raise(InvalidResponseException) do
+    assert_raise(CloudFiles::Exception::InvalidResponse) do
       @object.write('Test Data')
     end
   end
@@ -192,6 +192,7 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   private
   
   def build_net_http_object(args={:code => '204' })
+    CloudFiles::Container.any_instance.stubs(:metadata).returns({})
     CloudFiles::Container.any_instance.stubs(:populate).returns(true)
     connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https')
     args[:response] = {} unless args[:response]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudfiles
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 17
+  prerelease: 
   segments: 
   - 1
   - 4
-  - 10
-  version: 1.4.10
+  - 11
+  version: 1.4.11
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -05:00
+date: 2011-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,8 +61,9 @@ extra_rdoc_files:
 - TODO
 files: 
 - .gitignore
+- CHANGELOG
+- CONTRIBUTORS
 - COPYING
-- Manifest
 - README.rdoc
 - Rakefile
 - TODO
@@ -72,6 +73,7 @@ files:
 - 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
@@ -109,7 +111,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A Ruby API into Rackspace Cloud Files

data/Manifest

@@ -1,16 +0,0 @@
-cloudfiles.gemspec
-lib/cloudfiles/authentication.rb
-lib/cloudfiles/connection.rb
-lib/cloudfiles/container.rb
-lib/cloudfiles/storage_object.rb
-lib/cloudfiles.rb
-Manifest
-Rakefile
-README.rdoc
-test/cf-testunit.rb
-test/cloudfiles_authentication_test.rb
-test/cloudfiles_connection_test.rb
-test/cloudfiles_container_test.rb
-test/cloudfiles_storage_object_test.rb
-test/test_helper.rb
-TODO