cloudfiles 1.4.16 → 1.4.17

data/.gitignore

@@ -4,3 +4,4 @@ doc/*
 pkg/*
 *.gem
 .idea
+Gemfile.lock

data/CHANGELOG

@@ -1,3 +1,10 @@
+================================================================================
+1.4.17 (2011/05/27)
+================================================================================
+ o Added Manifest support for Large Objects
+ o Add support for container metadata
+ o Option to check the MD5 of a file uploaded via the load_from_filename method
+
 ================================================================================
 1.4.16 (2011/03/17)
 ================================================================================

data/CONTRIBUTORS

@@ -29,3 +29,5 @@ megaphone
 Nugroho Herucahyono
 CvX
 Topper Bowers
+Xavier Shay
+Dillon Amburgey

data/Gemfile

@@ -0,0 +1,3 @@
+source :gemcutter
+
+gemspec

data/Rakefile

@@ -1,22 +1,3 @@
-require './lib/cloudfiles.rb'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "cloudfiles"
-    gemspec.summary = "A Ruby API into Rackspace Cloud Files"
-    gemspec.description = "A Ruby version of the Rackspace Cloud Files API."
-    gemspec.email = "minter@lunenburg.org"
-    gemspec.homepage = "http://www.rackspacecloud.com/cloud_hosting_products/files"
-    gemspec.authors = ["H. Wade Minter", "Rackspace Hosting"]
-    gemspec.add_dependency('mime-types', '>= 1.16')
-    gemspec.add_development_dependency "mocha", "~> 0.9.8"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install jeweler"
-end 
-
 namespace :test do
   desc 'Check test coverage'
   task :coverage do

data/cloudfiles.gemspec

@@ -1,15 +1,11 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require 'lib/cloudfiles/version'
 
 Gem::Specification.new do |s|
   s.name = %q{cloudfiles}
-  s.version = "1.4.16"
+  s.version = CloudFiles::VERSION
 
   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{2011-03-17}
   s.description = %q{A Ruby version of the Rackspace Cloud Files API.}
   s.email = %q{minter@lunenburg.org}
   s.extra_rdoc_files = [
@@ -21,10 +17,10 @@ Gem::Specification.new do |s|
      "CHANGELOG",
      "CONTRIBUTORS",
      "COPYING",
+     "Gemfile",
      "README.rdoc",
      "Rakefile",
      "TODO",
-     "VERSION",
      "cloudfiles.gemspec",
      "lib/cloudfiles.rb",
      "lib/cloudfiles/authentication.rb",
@@ -32,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/cloudfiles/container.rb",
      "lib/cloudfiles/exception.rb",
      "lib/cloudfiles/storage_object.rb",
+     "lib/cloudfiles/version.rb",
      "test/cf-testunit.rb",
      "test/cloudfiles_authentication_test.rb",
      "test/cloudfiles_connection_test.rb",

data/lib/cloudfiles.rb

@@ -22,7 +22,6 @@ module CloudFiles
   AUTH_USA = "https://auth.api.rackspacecloud.com/v1.0"
   AUTH_UK = "https://lon.auth.api.rackspacecloud.com/v1.0"
 
-  VERSION = IO.read(File.dirname(__FILE__) + '/../VERSION')
   require 'net/http'
   require 'net/https'
   require 'rexml/document'
@@ -39,6 +38,7 @@ module CloudFiles
   end
 
   $:.unshift(File.dirname(__FILE__))
+  require 'cloudfiles/version'
   require 'cloudfiles/exception'
   require 'cloudfiles/authentication'
   require 'cloudfiles/connection'

data/lib/cloudfiles/authentication.rb

@@ -22,7 +22,7 @@ module CloudFiles
         end
         server.start
       rescue
-        raise CloudFiles::Exception::Connection, "Unable to connect to #{server}"
+        raise CloudFiles::Exception::Connection, "Unable to connect to #{server.address}"
       end
       response = server.get(path, hdrhash)
       if (response.code =~ /^20./)

data/lib/cloudfiles/connection.rb

@@ -270,10 +270,11 @@ module CloudFiles
     # This method actually makes the HTTP calls out to the server
     def cfreq(method, server, path, port, scheme, headers = {}, data = nil, attempts = 0, &block) # :nodoc:
       start = Time.now
-      headers['Transfer-Encoding'] = "chunked" if data.is_a?(IO)
+      headers['Transfer-Encoding'] = "chunked" if data.respond_to?(:read)
       hdrhash = headerprep(headers)
       start_http(server, path, port, scheme, hdrhash)
       request = Net::HTTP.const_get(method.to_s.capitalize).new(path, hdrhash)
+      data.rewind if data.respond_to?(:rewind)
       if data
         if data.respond_to?(:read)
           request.body_stream = data
@@ -291,7 +292,7 @@ module CloudFiles
       response
     rescue Errno::EPIPE, Timeout::Error, Errno::EINVAL, EOFError, IOError
       # Server closed the connection, retry
-      raise CloudFiles::Exception::Connection, "Unable to reconnect to #{server} after #{count} attempts" if attempts >= 5
+      raise CloudFiles::Exception::Connection, "Unable to reconnect to #{server.address} after #{attempts} attempts" if attempts >= 5
       attempts += 1
       begin
         @http[server].finish
@@ -329,7 +330,7 @@ module CloudFiles
           end
           @http[server].start
         rescue
-          raise CloudFiles::Exception::Connection, "Unable to connect to #{server}"
+          raise CloudFiles::Exception::Connection, "Unable to connect to #{server.address}"
         end
       end
     end

data/lib/cloudfiles/container.rb

@@ -28,9 +28,9 @@ module CloudFiles
       end
       # Load the metadata now, so we'll get a CloudFiles::Exception::NoSuchContainer exception should the container
       # not exist.
-      self.metadata
+      self.container_metadata
     end
-
+    
     # Refreshes data about the container and populates class variables. Items are otherwise
     # loaded in a lazy loaded fashion.
     #
@@ -49,11 +49,13 @@ module CloudFiles
     alias :populate :refresh
 
     # Retrieves Metadata for the container
-    def metadata
+    def container_metadata
       @metadata ||= (
         response = self.connection.cfreq("HEAD", @storagehost, @storagepath + "/", @storageport, @storagescheme)
         raise CloudFiles::Exception::NoSuchContainer, "Container #{@name} does not exist" unless (response.code =~ /^20/)
-        {:bytes => response["x-container-bytes-used"].to_i, :count => response["x-container-object-count"].to_i}
+        resphash = {}
+        response.to_hash.select { |k,v| k.match(/^x-container-meta/) }.each { |x| resphash[x[0]] = x[1].to_s }
+        {:bytes => response["x-container-bytes-used"].to_i, :count => response["x-container-object-count"].to_i, :metadata => resphash}
       )
     end
 
@@ -78,7 +80,32 @@ module CloudFiles
         @cdn_metadata = {}
       end
     end
+    
+    # Returns the container's metadata as a nicely formatted hash, stripping off the X-Meta-Object- prefix that the system prepends to the
+    # key name.
+    #
+    #    object.metadata
+    #    => {"ruby"=>"cool", "foo"=>"bar"}
+    def metadata
+      metahash = {}
+      self.container_metadata[:metadata].each{ |key, value| metahash[key.gsub(/x-container-meta-/, '').gsub(/%20/, ' ')] = URI.decode(value).gsub(/\+\-/, ' ') }
+      metahash
+    end
 
+    # Sets the metadata for an object.  By passing a hash as an argument, you can set the metadata for an object.
+    # New calls to set metadata are additive.  To remove metadata, set the value of the key to nil.  
+    #
+    # Throws NoSuchObjectException if the container doesn't exist.  Throws InvalidResponseException if the request
+    # fails.
+    def set_metadata(metadatahash)
+      headers = {}
+      metadatahash.each{ |key, value| headers['X-Container-Meta-' + CloudFiles.escape(key.to_s.capitalize)] = value.to_s }
+      response = self.connection.cfreq("POST", @storagehost, @storagepath, @storageport, @storagescheme, headers)
+      raise CloudFiles::Exception::NoSuchObject, "Container #{@name} does not exist" if (response.code == "404")
+      raise CloudFiles::Exception::InvalidResponse, "Invalid response code #{response.code}" unless (response.code =~ /^20/)
+      true
+    end
+    
     # Size of the container (in bytes)
     def bytes
       self.metadata[:bytes]
@@ -200,6 +227,8 @@ module CloudFiles
     # If no objects exist, an empty hash is returned.  Throws an InvalidResponseException if the request fails.  Takes a
     # parameter hash as an argument, in the same form as the objects method.
     #
+    # Accepts the same options as objects to limit the returned set.
+    #
     # Returns a hash in the same format as the containers_detail from the CloudFiles class.
     #
     #   container.objects_detail
@@ -241,7 +270,7 @@ module CloudFiles
     #   full_container.empty?
     #   => false
     def empty?
-      return (metadata[:count].to_i == 0)? true : false
+      return (container_metadata[:count].to_i == 0)? true : false
     end
 
     # Returns true if object exists and returns false otherwise.

data/lib/cloudfiles/storage_object.rb

@@ -13,9 +13,6 @@ module CloudFiles
     # CloudFiles::Exception::NoSuchObject Exception will be raised.  If not, an "empty" CloudFiles::StorageObject will be returned, ready for data
     # via CloudFiles::StorageObject.write
     def initialize(container, objectname, force_exists = false, make_path = false)
-      if objectname.match(/\?/)
-        raise CloudFiles::Exception::Syntax, "Object #{objectname} contains an invalid character in the name (? not allowed)"
-      end
       @container = container
       @containername = container.name
       @name = objectname
@@ -50,6 +47,7 @@ module CloudFiles
         resphash = {}
         response.to_hash.select { |k,v| k.match(/^x-object-meta/) }.each { |x| resphash[x[0]] = x[1].to_s }
         {
+          :manifest => response["x-object-manifest"],
           :bytes => response["content-length"],
           :last_modified => Time.parse(response["last-modified"]),
           :etag => response["etag"],
@@ -78,7 +76,7 @@ module CloudFiles
     def content_type
       self.object_metadata[:content_type]
     end
-
+ 
     # Retrieves the data from an object and stores the data in memory.  The data is returned as a string.
     # Throws a NoSuchObjectException if the object doesn't exist.
     #
@@ -96,6 +94,7 @@ module CloudFiles
       raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" unless (response.code =~ /^20/)
       response.body
     end
+    alias :read :data
 
     # Retrieves the data from an object and returns a stream that must be passed to a block.  Throws a
     # NoSuchObjectException if the object doesn't exist.
@@ -145,6 +144,30 @@ module CloudFiles
       raise CloudFiles::Exception::InvalidResponse, "Invalid response code #{response.code}" unless (response.code == "202")
       true
     end
+    
+
+    # Returns the object's manifest.
+    #
+    #    object.manifest
+    #    => "container/prefix"
+    def manifest
+      self.object_metadata[:manifest]
+    end
+
+
+    # Sets the manifest for an object.  By passing a string as an argument, you can set the manifest for an object.
+    # However, setting manifest will overwrite any existing manifest for the object.
+    #
+    # Throws NoSuchObjectException if the object doesn't exist.  Throws InvalidResponseException if the request
+    # fails.
+    def set_manifest(manifest)
+      headers = {'X-Object-Manifest' => manifest}
+      response = self.container.connection.cfreq("PUT", @storagehost, @storagepath, @storageport, @storagescheme, headers)
+      raise CloudFiles::Exception::NoSuchObject, "Object #{@name} does not exist" if (response.code == "404")
+      raise CloudFiles::Exception::InvalidResponse, "Invalid response code #{response.code}" unless (response.code =~ /^20/)
+      true
+    end
+
 
     # Takes supplied data and writes it to the object, saving it.  You can supply an optional hash of headers, including
     # Content-Type and ETag, that will be applied to the object.
@@ -244,8 +267,13 @@ module CloudFiles
     #
     #   object.load_from_filename("/tmp/nonexistent.txt")
     #   => Errno::ENOENT: No such file or directory - /tmp/nonexistent.txt
-    def load_from_filename(filename, headers = {})
+    def load_from_filename(filename, headers = {}, check_md5 = false)
       f = open(filename)
+      if check_md5
+          require 'digest/md5'
+          md5_hash = Digest::MD5.file(filename)
+          headers["Etag"] = md5_hash.to_s()
+      end
       self.write(f, headers)
       f.close
       true

data/lib/cloudfiles/version.rb

@@ -0,0 +1,3 @@
+module CloudFiles
+  VERSION = '1.4.17'
+end

data/test/cloudfiles_connection_test.rb

@@ -220,7 +220,7 @@ class CloudfilesConnectionTest < Test::Unit::TestCase
   end
   
   def test_fetch_nonexistent_container
-    CloudFiles::Container.any_instance.stubs(:metadata).raises(CloudFiles::Exception::NoSuchContainer)
+    CloudFiles::Container.any_instance.stubs(:container_metadata).raises(CloudFiles::Exception::NoSuchContainer)
     build_net_http_object
     assert_raise(CloudFiles::Exception::NoSuchContainer) do
       container = @connection.container('bad_container')

data/test/cloudfiles_container_test.rb

@@ -263,7 +263,8 @@ 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({})
+    CloudFiles::Container.any_instance.stubs(:metadata).returns()
+    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[: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

@@ -27,18 +27,6 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
     assert_equal @object.to_s, 'test_object'
   end
   
-  def test_object_creation_with_invalid_name
-    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(:cfreq => response)
-    container = CloudFiles::Container.new(connection, 'test_container')
-    assert_raises CloudFiles::Exception::Syntax do
-      @object = CloudFiles::StorageObject.new(container, 'test_object?')
-    end
-  end
-  
-  
   def test_public_url_exists
     build_net_http_object(:public => true, :name => 'test object')
     assert_equal @object.public_url, "http://cdn.test.example/test%20object"
@@ -214,6 +202,7 @@ class CloudfilesStorageObjectTest < Test::Unit::TestCase
   def build_net_http_object(args={:code => '204' })
     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[: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])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cloudfiles
 version: !ruby/object:Gem::Version 
-  hash: 39
+  hash: 37
   prerelease: 
   segments: 
   - 1
   - 4
-  - 16
-  version: 1.4.16
+  - 17
+  version: 1.4.17
 platform: ruby
 authors: 
 - H. Wade Minter
@@ -16,8 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-17 00:00:00 -04:00
-default_executable: 
+date: 2011-05-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mime-types
@@ -64,10 +63,10 @@ files:
 - CHANGELOG
 - CONTRIBUTORS
 - COPYING
+- Gemfile
 - README.rdoc
 - Rakefile
 - TODO
-- VERSION
 - cloudfiles.gemspec
 - lib/cloudfiles.rb
 - lib/cloudfiles/authentication.rb
@@ -75,13 +74,13 @@ files:
 - lib/cloudfiles/container.rb
 - lib/cloudfiles/exception.rb
 - lib/cloudfiles/storage_object.rb
+- lib/cloudfiles/version.rb
 - 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
-has_rdoc: true
 homepage: http://www.rackspacecloud.com/cloud_hosting_products/files
 licenses: []
 
@@ -111,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: A Ruby API into Rackspace Cloud Files

data/VERSION

@@ -1 +0,0 @@
-1.4.16