cloudfiles 1.4.18 → 1.5.0

data/test/cloudfiles_storage_object_test.rb

@@ -2,60 +2,54 @@ $:.unshift File.dirname(__FILE__)
 require 'test_helper'
 
 class CloudfilesStorageObjectTest < Test::Unit::TestCase
-  
+
   def test_object_creation
-    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https', :cdn_available? => true)
-    response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5', 'last-modified' => Time.now.to_s}
-    response.stubs(:code).returns('204')
-    connection.stubs(:storage_request => response)
-    container = CloudFiles::Container.new(connection, 'test_container')
-    @object = CloudFiles::StorageObject.new(container, 'test_object')
+    build_swift_client_object
     assert_equal @object.name, 'test_object'
     assert_equal @object.class, CloudFiles::StorageObject
     assert_equal @object.to_s, 'test_object'
   end
 
   def test_object_creation_with_no_cdn_available
-    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https', :cdn_available? => false)
-    response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5', 'last-modified' => Time.now.to_s}
-    response.stubs(:code).returns('204')
-    connection.stubs(:storage_request => response)
-    container = CloudFiles::Container.new(connection, 'test_container')
-    @object = CloudFiles::StorageObject.new(container, 'test_object')
+    build_swift_client_object(:connection=>{:cdn_available? => false})
     assert_equal @object.name, 'test_object'
     assert_equal @object.class, CloudFiles::StorageObject
     assert_equal @object.to_s, 'test_object'
   end
   
   def test_public_url_exists
-    build_net_http_object(:public => true, :name => 'test object', :cdn_request => true)
+    build_swift_client_object(:name => 'test object', :public => true)
     assert_equal @object.public_url, "http://cdn.test.example/test%20object"
   end
   
   def test_public_url_does_not_exist
-    build_net_http_object
+    build_swift_client_object(:connection => {:cdn_available? => false})
     assert_equal @object.public_url, nil
   end
   
   def test_data_succeeds
-    build_net_http_object(:code => '200', :body => 'This is good data')
+    SwiftClient.stubs(:get_object).returns([{"etag"=>"foo", "last-modified"=>"Tue, 21 Jun 2011 19:54:36 GMT", "content-type"=>"text/html", "date"=>"Thu, 15 Sep 2011 22:12:19 GMT", "content-length"=>"17", "accept-ranges"=>"bytes", "x-trans-id"=>"foo"}, "This is good data"])
+    build_swift_client_object
     assert_equal @object.data, 'This is good data'
   end
   
   def test_data_with_offset_succeeds
-    build_net_http_object(:code => '200', :body => 'Thi')
+    SwiftClient.stubs(:get_object).returns([{"etag"=>"foo", "last-modified"=>"Tue, 21 Jun 2011 19:54:36 GMT", "content-type"=>"text/html", "date"=>"Thu, 15 Sep 2011 22:12:19 GMT", "content-length"=>"17", "accept-ranges"=>"bytes", "x-trans-id"=>"foo"}, "Thi"])
+    build_swift_client_object
     assert_equal @object.data(3), 'Thi'
   end
   
   def test_data_fails
-    build_net_http_object(:code => '999', :body => 'This is bad data')
+    SwiftClient.stubs(:get_object).raises(ClientException.new("test_data_fails", :http_status => 999))
+    build_swift_client_object
     assert_raise(CloudFiles::Exception::NoSuchObject) do
       @object.data
     end
   end
   
   def test_data_stream_succeeds
-    build_net_http_object(:code => '200', :body => 'This is good data')
+    SwiftClient.stubs(:get_object).returns([{"etag"=>"foo", "last-modified"=>"Tue, 21 Jun 2011 19:54:36 GMT", "content-type"=>"text/html", "date"=>"Thu, 15 Sep 2011 22:12:19 GMT", "content-length"=>"17", "accept-ranges"=>"bytes", "x-trans-id"=>"foo"}, "This is good data"])
+    build_swift_client_object
     data = ""
     assert_nothing_raised do
       @object.data_stream { |chunk|
@@ -65,7 +59,8 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   end
   
   def test_data_stream_with_offset_succeeds
-    build_net_http_object(:code => '200', :body => 'This ')
+    SwiftClient.stubs(:get_object).returns([{"etag"=>"foo", "last-modified"=>"Tue, 21 Jun 2011 19:54:36 GMT", "content-type"=>"text/html", "date"=>"Thu, 15 Sep 2011 22:12:19 GMT", "content-length"=>"5", "accept-ranges"=>"bytes", "x-trans-id"=>"foo"}, "This "])
+    build_swift_client_object
     data = ""
     assert_nothing_raised do
       @object.data_stream(5) { |chunk|
@@ -76,7 +71,8 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   
   # Need to find a way to simulate this properly
   def data_stream_fails
-    build_net_http_object(:code => '999', :body => 'This is bad data')
+    SwiftClient.stubs(:get_object).raises(ClientException.new("test_data_stream_fails", :http_status => 404))
+    build_swift_client_object
     data = ""
     assert_raise(CloudFiles::Exception::NoSuchObject) do
       @object.data_stream { |chunk|
@@ -86,54 +82,48 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   end
   
   def test_set_metadata_succeeds
-    CloudFiles::StorageObject.any_instance.stubs(:populate).returns(true)
-    build_net_http_object(:code => '202')
+    SwiftClient.stubs(:post_object).returns(nil)
+    build_swift_client_object
     assert_nothing_raised do
       @object.set_metadata({'Foo' =>'bar'})
     end
   end
   
   def test_set_metadata_invalid_object
-    build_net_http_object(:code => '404')
+    SwiftClient.stubs(:post_object).raises(ClientException.new("test_set_metadata_invalid_object", :http_status => 404))
+    build_swift_client_object
     assert_raise(CloudFiles::Exception::NoSuchObject) do
       @object.set_metadata({'Foo' =>'bar'})
     end
   end
   
   def test_set_metadata_fails
-    build_net_http_object(:code => '999')
+    SwiftClient.stubs(:post_object).raises(ClientException.new("test_set_metadata_fails", :http_status => 999))
+    build_swift_client_object
     assert_raise(CloudFiles::Exception::InvalidResponse) do
       @object.set_metadata({'Foo' =>'bar'})
     end
   end
   
   def test_read_metadata_succeeds
-    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https', :cdn_available? => true)
     response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5', 'x-object-meta-foo' => 'Bar', 'x-object-meta-spam' => ['peanut', 'butter'], 'last-modified' => Time.now.to_s}
-    response.stubs(:code).returns('204')
-    connection.stubs(:storage_request => response)
-    container = CloudFiles::Container.new(connection, 'test_container')
-    @object = CloudFiles::StorageObject.new(container, 'test_object')
+    build_swift_client_object
+    SwiftClient.stubs(:head_object).returns(response)
     assert_equal @object.metadata, {'foo' => 'Bar', 'spam' => 'peanutbutter'}
   end
   
   def test_write_succeeds
-    CloudFiles::StorageObject.any_instance.stubs(:populate).returns(true)
-    CloudFiles::Container.any_instance.stubs(:populate).returns(true)
-    build_net_http_object(:code => '201')
+    build_swift_client_object
+    SwiftClient.stubs(:put_object).returns("foobarbazquu")
     assert_nothing_raised do
       @object.write("This is test data")
     end
   end
   
   def test_write_with_make_path
-    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https', :cdn_available? => true)
-    response = {'x-container-bytes-used' => '42', 'x-container-object-count' => '5', 'last-modified' => Time.now.to_s}
-    response.stubs(:code).returns('204').then.returns('204').then.returns('201').then.returns('204')
-    connection.stubs(:storage_request => response)
-    CloudFiles::Container.any_instance.stubs(:populate).returns(true)
-    container = CloudFiles::Container.new(connection, 'test_container')
-    @object = CloudFiles::StorageObject.new(container, 'path/to/my/test_object', false, true)
+    SwiftClient.stubs(:put_object).returns("foobarbazquu")
+    SwiftClient.stubs(:head_object).returns({"etag"=>"foo", "last-modified"=>"Tue, 21 Jun 2011 19:54:36 GMT", "content-type"=>"text/html", "date"=>"Thu, 15 Sep 2011 22:12:19 GMT", "content-length"=>"17", "accept-ranges"=>"bytes", "x-trans-id"=>"foo"})
+    build_swift_client_object(:name => "path/to/my/test_object", :obj => [false, true])
     assert_nothing_raised do
       @object.write("This is path test data")
     end
@@ -144,25 +134,24 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
     out = Tempfile.new('test')
     out.write("This is test data")
     out.close
-    CloudFiles::StorageObject.any_instance.stubs(:populate).returns(true)
-    CloudFiles::Container.any_instance.stubs(:populate).returns(true)
-    build_net_http_object(:code => '201')
+    SwiftClient.stubs(:put_object).returns("foobarbazquu")
+    build_swift_client_object
     assert_nothing_raised do
       @object.load_from_filename(out.path)
     end
   end
   
   def test_write_sets_mime_type
-    CloudFiles::StorageObject.any_instance.stubs(:populate).returns(true)
-    CloudFiles::Container.any_instance.stubs(:populate).returns(true)
-    build_net_http_object(:name => 'myfile.xml', :code => '201')
+    SwiftClient.stubs(:put_object).returns('foobarbazquu')
+    build_swift_client_object(:name => 'myfile.xml')
     assert_nothing_raised do
       @object.write("This is test data")
     end
   end
   
   def test_purge_from_cdn_succeeds
-    build_net_http_object(:cdn_request => true)
+    SwiftClient.stubs(:delete_object).returns(true)
+    build_swift_client_object(:connection => {:cdn_available? => true})
     assert_nothing_raised do
       @object.purge_from_cdn
       @object.purge_from_cdn("small.fox@hole.org")
@@ -170,56 +159,53 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   end
   
   def test_write_with_no_data_dies
-    build_net_http_object
+    build_swift_client_object
+    $stdin.stubs(:tty?).returns(true)
     assert_raise(CloudFiles::Exception::Syntax) do
-      @object.write
+      @object.write(nil)
     end
   end
   
   def test_write_with_invalid_content_length_dies
-    build_net_http_object(:code => '412')
+    SwiftClient.stubs(:put_object).raises(ClientException.new("test_write_with_invalid_content_length_dies", :http_status => '412'))
+    build_swift_client_object
     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')
+    SwiftClient.stubs(:put_object).raises(ClientException.new("test_write_with_mismatched_md5_dies", :http_status => '422'))
+    build_swift_client_object    
     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')
+    SwiftClient.stubs(:put_object).raises(ClientException.new("test_write_with_invalid_response_dies", :http_status => '999'))
+    build_swift_client_object
     assert_raise(CloudFiles::Exception::InvalidResponse) do
       @object.write('Test Data')
     end
   end
   
   private
-
-  def build_net_http_object(args={})
-    args.merge!(:code => '204' ) unless args[:code]
+  
+  def build_swift_client_object(args = {})
     CloudFiles::Container.any_instance.stubs(:metadata).returns({})
     CloudFiles::Container.any_instance.stubs(:populate).returns(true)
     CloudFiles::Container.any_instance.stubs(:container_metadata).returns({:bytes => 99, :count => 2})
-    connection = stub(:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https', :cdn_available? => true)
+    args[:connection] = {} unless args[:connection]
+    connection = stub({:storagehost => 'test.storage.example', :storagepath => '/dummy/path', :storageport => 443, :storagescheme => 'https', :cdnmgmthost => 'cdm.test.example', :cdnmgmtpath => '/dummy/path', :cdnmgmtport => 443, :cdnmgmtscheme => 'https', :cdn_available? => true, :cdnurl => 'http://foo.test.example/container', :storageurl => 'http://foo.test.example/container', :authtoken => "dummy token"}.merge!(args[:connection]))
     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])
-    response.stubs(:code).returns(args[:code])
-    response.stubs(:body).returns args[:body] || nil
-
-    connection.stubs(:cdn_request => response) if args[:cdn_request]
-
-    connection.stubs(:storage_request => response)
-
     container = CloudFiles::Container.new(connection, 'test_container')
     container.stubs(:connection).returns(connection)
     container.stubs(:public?).returns(args[:public] || false)
     container.stubs(:cdn_url).returns('http://cdn.test.example')
-    @object = CloudFiles::StorageObject.new(container, args[:name] || 'test_object')
+    args[:obj] = [] unless args[:obj]
+    @object = CloudFiles::StorageObject.new(container, args[:name] || 'test_object', *args[:obj] )
   end
   
-  
 end

data/test/test_helper.rb

@@ -3,3 +3,4 @@ $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'cloudfiles'
 require 'rubygems'
 require 'mocha'
+require 'client'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudfiles
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 4
-  - 18
-  version: 1.4.18
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -16,22 +16,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-28 00:00:00 -04:00
+date: 2011-11-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mime-types
+  name: json
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 3
         segments: 
-        - 1
-        - 16
-        version: "1.16"
+        - 0
+        version: "0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -70,6 +69,7 @@ files:
 - TODO
 - cloudfiles.gemspec
 - lib/cloudfiles.rb
+- lib/client.rb
 - lib/cloudfiles/authentication.rb
 - lib/cloudfiles/connection.rb
 - lib/cloudfiles/container.rb
@@ -81,6 +81,7 @@ files:
 - test/cloudfiles_connection_test.rb
 - test/cloudfiles_container_test.rb
 - test/cloudfiles_storage_object_test.rb
+- test/cloudfiles_client_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://www.rackspacecloud.com/cloud_hosting_products/files
@@ -122,4 +123,5 @@ test_files:
 - test/cloudfiles_connection_test.rb
 - test/cloudfiles_container_test.rb
 - test/cloudfiles_storage_object_test.rb
+- test/cloudfiles_client_test.rb
 - test/test_helper.rb