aws-s3 0.4.0 → 0.5.0

data/COPYING

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2006 Marcel Molina Jr. <marcel@vernix.org>
+# Copyright (c) 2006-2008 Marcel Molina Jr. <marcel@vernix.org>
 # 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in the
@@ -16,4 +16,4 @@
 # FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 # COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README

@@ -128,7 +128,7 @@ You can store an object on S3 by specifying a key, its data and the name of the
   S3Object.store('me.jpg', open('headshot.jpg'), 'photos')
 
 The content type of the object will be inferred by its extension. If the appropriate content type can not be inferred, S3 defaults
-to <tt>binary/octect-stream</tt>.
+to <tt>binary/octet-stream</tt>.
 
 If you want to override this, you can explicitly indicate what content type the object should have with the <tt>:content_type</tt> option:
 
@@ -202,7 +202,7 @@ A bevie of information about an object can be had using the <tt>about</tt> metho
 
   pp song.about
   {"last-modified"    => "Sat, 28 Oct 2006 21:29:26 GMT",
-   "content-type"     => "binary/octect-stream",
+   "content-type"     => "binary/octet-stream",
    "etag"             => "\"dc629038ffc674bee6f62eb64ff3a\"",
    "date"             => "Sat, 28 Oct 2006 21:30:41 GMT",
    "x-amz-request-id" => "B7BC68F55495B1C8",

data/Rakefile

@@ -111,22 +111,23 @@ namespace :dist do
   
   desc 'Tag release'
   task :tag do
-    svn_root = 'svn+ssh://marcel@rubyforge.org/var/svn/amazon/s3'
-    sh %(svn cp #{svn_root}/trunk #{svn_root}/tags/rel-#{spec.version} -m "Tag #{spec.name} release #{spec.version}")
+    sh %(git tag -a '#{spec.version}-release' -m 'Tagging #{spec.version} release')
+    sh 'git push --tags'
   end
   
   desc 'Update changelog to include a release marker'
   task :add_release_marker_to_changelog do
     changelog = IO.read('CHANGELOG')
-    changelog.sub!(/^trunk:/, "#{spec.version}:")
+    changelog.sub!(/^head:/, "#{spec.version}:")
     
     open('CHANGELOG', 'w') do |file|
-      file.write "trunk:\n\n#{changelog}"
+      file.write "head:\n\n#{changelog}"
     end
   end
   
   task :commit_changelog do
-    sh %(svn ci CHANGELOG -m "Bump changelog version marker for release")
+    sh %(git commit CHANGELOG -m "Bump changelog version marker for release")
+    sh 'git push'
   end
   
   package_name = lambda {|specification| File.join('pkg', "#{specification.name}-#{specification.version}")}
@@ -136,20 +137,25 @@ namespace :dist do
     require 'rubyforge'
     package = package_name[spec]
 
-    rubyforge = RubyForge.new
+    rubyforge = RubyForge.new.configure
     rubyforge.login
-
+    
+    user_config = rubyforge.userconfig
+    user_config['release_changes'] = YAML.load_file('CHANGELOG')[spec.version.to_s].join("\n")
+  
     version_already_released = lambda do
-      releases = rubyforge.userconfig['rubyforge']['release_ids']
-      releases.has_key?(spec.name) && releases[spec.name][spec.version]
+      releases = rubyforge.autoconfig['release_ids']
+      releases.has_key?(spec.name) && releases[spec.name][spec.version.to_s]
     end
     
     abort("Release #{spec.version} already exists!") if version_already_released.call
     
-    if release_id = rubyforge.add_release(spec.rubyforge_project, spec.name, spec.version, "#{package}.tar.gz")
-      rubyforge.add_file(spec.rubyforge_project, spec.name, release_id, "#{package}.gem")
-    else
+    begin
+      rubyforge.add_release(spec.rubyforge_project, spec.name, spec.version, "#{package}.tar.gz", "#{package}.gem")
+      puts "Version #{spec.version} released!"
+    rescue Exception => exception
       puts 'Release failed!'
+      raise
     end
   end
   

data/lib/aws/s3/authentication.rb

@@ -50,7 +50,7 @@ module AWS
       # parameterize these computations and arrange them in a string form appropriate to how they are used, in one case a http request
       # header value, and in the other case key/value query string parameter pairs.
       class Signature < String #:nodoc:
-        attr_reader :request, :access_key_id, :secret_access_key
+        attr_reader :request, :access_key_id, :secret_access_key, :options
   
         def initialize(request, access_key_id, secret_access_key, options = {})
           super()
@@ -99,10 +99,9 @@ module AWS
       # More details about the various authentication schemes can be found in the docs for its containing module, Authentication.
       class QueryString < Signature #:nodoc:
         constant :DEFAULT_EXPIRY, 300 # 5 minutes
-        
         def initialize(*args)
           super
-          @options[:url_encode] = true
+          options[:url_encode] = true
           self << build
         end
         
@@ -115,8 +114,12 @@ module AWS
           #      the +:expires_in+ option
           #   3) The current time in seconds since the epoch plus the default number of seconds (60 seconds)
           def expires
-            return @options[:expires] if @options[:expires]
-            date.to_i + (@options[:expires_in] || DEFAULT_EXPIRY)
+            return options[:expires] if options[:expires]
+            date.to_i + expires_in
+          end
+          
+          def expires_in
+            options.has_key?(:expires_in) ? Integer(options[:expires_in]) : DEFAULT_EXPIRY
           end
           
           # Keep in alphabetical order

data/lib/aws/s3/base.rb

@@ -225,7 +225,11 @@ module AWS #:nodoc:
         end
         
         def method_missing(method, *args, &block)
-          attributes[method.to_s] || attributes[method] || super
+          case
+          when attributes.has_key?(method.to_s): attributes[method.to_s]
+          when attributes.has_key?(method):      attributes[method]
+          else super
+          end
         end
     end
   end

data/lib/aws/s3/bucket.rb

@@ -157,11 +157,10 @@ module AWS
         #
         # Only the owner of a bucket can delete a bucket, regardless of the bucket's access control policy.
         def delete(name = nil, options = {})
-          name = path(name)
           find(name).delete_all if options[:force]
-          # A bit confusing. Calling super actually makes makes an HTTP DELETE request. The delete method is
-          # defined in the Base class. It happens to have the same name.
-          super(name).success?
+          
+          name = path(name)
+          Base.delete(name).success?
         end
         
         # List all your buckets. This is a convenient wrapper around AWS::S3::Service.buckets.

data/lib/aws/s3/connection.rb

@@ -27,18 +27,20 @@ module AWS
         body.rewind if body.respond_to?(:rewind) unless attempts.zero?      
         
         requester = Proc.new do 
-          path    = self.class.prepare_path(path)
+          path    = self.class.prepare_path(path) if attempts.zero? # Only escape the path once
           request = request_method(verb).new(path, headers)
           ensure_content_type!(request)
           add_user_agent!(request)
           authenticate!(request)
           if body
             if body.respond_to?(:read)                                                                
-              request.body_stream    = body                                                           
-              request.content_length = body.respond_to?(:lstat) ? body.lstat.size : body.size         
+              request.body_stream = body                                                           
             else                                                                                      
               request.body = body                                                                     
-            end                                                                                       
+            end
+            request.content_length = body.respond_to?(:lstat) ? body.stat.size : body.size         
+          else
+            request.content_length = 0                                                                                       
           end
           http.request(request, &block)
         end
@@ -49,7 +51,7 @@ module AWS
         else
           http.start(&requester)
         end
-      rescue Errno::EPIPE, Timeout::Error, Errno::EPIPE, Errno::EINVAL
+      rescue Errno::EPIPE, Timeout::Error, Errno::EINVAL, EOFError
         @http = create_connection
         attempts == 3 ? raise : (attempts += 1; retry)
       end
@@ -75,7 +77,14 @@ module AWS
       end
       
       def protocol(options = {})
-        (options[:use_ssl] || http.use_ssl?) ? 'https://' : 'http://'
+        # This always trumps http.use_ssl?
+        if options[:use_ssl] == false 
+          'http://'
+        elsif options[:use_ssl] || http.use_ssl?
+          'https://'
+        else
+          'http://'
+        end
       end
       
       private
@@ -178,7 +187,7 @@ module AWS
           # will be implicitly set to 443, unless specified otherwise. Defaults to false.
           # * <tt>:persistent</tt> - Whether to use a persistent connection to the server. Having this on provides around a two fold 
           # performance increase but for long running processes some firewalls may find the long lived connection suspicious and close the connection.
-          # If you run into connection errors, try setting <tt>:persistent</tt> to false. Defaults to true.
+          # If you run into connection errors, try setting <tt>:persistent</tt> to false. Defaults to false.
           # * <tt>:proxy</tt> - If you need to connect through a proxy, you can specify your proxy settings by specifying a <tt>:host</tt>, <tt>:port</tt>, <tt>:user</tt>, and <tt>:password</tt>
           # with the <tt>:proxy</tt> option.
           # The <tt>:host</tt> setting is required if specifying a <tt>:proxy</tt>. 
@@ -278,7 +287,7 @@ module AWS
           end
           
           def extract_persistent!
-            self[:persistent] = options.has_key?(:persitent) ? options[:persitent] : true
+            self[:persistent] = options.has_key?(:persitent) ? options[:persitent] : false
           end
           
           def extract_proxy_settings!
@@ -311,4 +320,4 @@ module AWS
       end
     end
   end
-end
+end

data/lib/aws/s3/extensions.rb

@@ -42,9 +42,10 @@ class String
   # ActiveSupport adds an underscore method to String so let's just use that one if
   # we find that the method is already defined
   def underscore
-    gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
-    gsub(/([a-z\d])([A-Z])/,'\1_\2').
-    downcase
+    gsub(/::/, '/').
+      gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+      gsub(/([a-z\d])([A-Z])/,'\1_\2').
+      tr("-", "_").downcase
   end unless public_method_defined? :underscore
 
   def utf8?
@@ -102,7 +103,7 @@ end
 module Kernel
   def __method__(depth = 0)
     caller[depth][/`([^']+)'/, 1]
-  end if RUBY_VERSION < '1.9'
+  end if RUBY_VERSION < '1.8.7'
   
   def memoize(reload = false, storage = nil)
     storage = "@#{storage || __method__(1)}"

data/lib/aws/s3/logging.rb

@@ -102,8 +102,12 @@ module AWS
         end
         memoized :lines
         
+        def path
+          log.path
+        end
+        
         def inspect #:nodoc:
-          "#<%s:0x%s '%s'>" % [self.class.name, object_id, log.path]
+          "#<%s:0x%s '%s'>" % [self.class.name, object_id, path]
         end
         
         private
@@ -154,9 +158,10 @@ module AWS
             
             # Time.parse doesn't like %d/%B/%Y:%H:%M:%S %z so we have to transform it unfortunately
             def typecast_time(datetime) #:nodoc:
-              month = datetime[/[a-z]+/i]
+              month       = datetime[/[a-z]+/i]
+              month_names = [nil, "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"]
               datetime.sub!(%r|^(\w{2})/(\w{3})|, '\2/\1')
-              datetime.sub!(month, Date::ABBR_MONTHS[month.downcase].to_s)
+              datetime.sub!(month, month_names.index(month).to_s)
               datetime.sub!(':', ' ')
               Time.parse(datetime)
             end

data/lib/aws/s3/object.rb

@@ -8,7 +8,7 @@ module AWS
     #   S3Object.store('me.jpg', open('headshot.jpg'), 'photos')
     #
     # The content type of the object will be inferred by its extension. If the appropriate content type can not be inferred, S3 defaults
-    # to <tt>binary/octect-stream</tt>.
+    # to <tt>binary/octet-stream</tt>.
     #
     # If you want to override this, you can explicitly indicate what content type the object should have with the <tt>:content_type</tt> option:
     # 
@@ -82,7 +82,7 @@ module AWS
     # 
     #   pp song.about
     #   {"last-modified"    => "Sat, 28 Oct 2006 21:29:26 GMT",
-    #    "content-type"     => "binary/octect-stream",
+    #    "content-type"     => "binary/octet-stream",
     #    "etag"             => "\"dc629038ffc674bee6f62eb64ff3a\"",
     #    "date"             => "Sat, 28 Oct 2006 21:30:41 GMT",
     #    "x-amz-request-id" => "B7BC68F55495B1C8",
@@ -178,13 +178,15 @@ module AWS
           end
         end
         
-        # Makes a copy of the object with <tt>key</tt> to <tt>copy_name</tt>.
+        # Makes a copy of the object with <tt>key</tt> to <tt>copy_key</tt>, preserving the ACL of the existing object if the <tt>:copy_acl</tt> option is true (default false).
         def copy(key, copy_key, bucket = nil, options = {})
           bucket          = bucket_name(bucket)
-          original        = open(url_for(key, bucket))
-          default_options = {:content_type => original.content_type}
-          store(copy_key, original, bucket, default_options.merge(options))
-          acl(copy_key, bucket, acl(key, bucket))
+          source_key      = path!(bucket, key)
+          default_options = {'x-amz-copy-source' => source_key}
+          target_key      = path!(bucket, copy_key)
+          returning put(target_key, default_options) do
+            acl(copy_key, bucket, acl(key, bucket)) if options[:copy_acl]
+          end
         end
         
         # Rename the object with key <tt>from</tt> to have key in <tt>to</tt>.
@@ -494,7 +496,7 @@ module AWS
       #   pp some_object.about
       #     {"last-modified"    => "Sat, 28 Oct 2006 21:29:26 GMT",
       #      "x-amz-id-2"       =>  "LdcQRk5qLwxJQiZ8OH50HhoyKuqyWoJ67B6i+rOE5MxpjJTWh1kCkL+I0NQzbVQn",
-      #      "content-type"     => "binary/octect-stream",
+      #      "content-type"     => "binary/octet-stream",
       #      "etag"             => "\"dc629038ffc674bee6f62eb68454ff3a\"",
       #      "date"             => "Sat, 28 Oct 2006 21:30:41 GMT",
       #      "x-amz-request-id" => "B7BC68F55495B1C8",
@@ -502,7 +504,7 @@ module AWS
       #      "content-length"   => "3418766"}
       #
       #  some_object.content_type
-      #  # => "binary/octect-stream"
+      #  # => "binary/octet-stream"
       #  some_object.content_type = 'audio/mpeg'
       #  some_object.content_type
       #  # => 'audio/mpeg'

data/lib/aws/s3/version.rb

@@ -2,7 +2,7 @@ module AWS
   module S3
     module VERSION #:nodoc:
       MAJOR    = '0'
-      MINOR    = '4'
+      MINOR    = '5'
       TINY     = '0' 
       BETA     = nil # Time.now.to_i.to_s
     end

data/test/authentication_test.rb

@@ -30,7 +30,25 @@ class QueryStringAuthenticationTest < Test::Unit::TestCase
     query_string = Authentication::QueryString.new(request, key_id, secret, :expires => expires)
     assert_equal expires, query_string.send(:canonical_string).instance_variable_get(:@options)[:expires]
     assert_equal AmazonDocExampleData::Example3.query_string, query_string
-  end    
+  end
+  
+  def test_expires_in_is_coerced_to_being_an_integer_in_case_it_is_a_special_integer_proxy
+    # References bug: http://rubyforge.org/tracker/index.php?func=detail&aid=17458&group_id=2409&atid=9356
+    integer_proxy = Class.new do
+      attr_reader :integer
+      def initialize(integer)
+        @integer = integer
+      end
+      
+      def to_int
+        integer
+      end
+    end
+    
+    actual_integer = 25
+    query_string = Authentication::QueryString.new(request, key_id, secret, :expires_in => integer_proxy.new(actual_integer))
+    assert_equal actual_integer, query_string.send(:expires_in)
+  end
   
   private
     def request; AmazonDocExampleData::Example3.request end

data/test/base_test.rb

@@ -23,58 +23,52 @@ class BaseTest < Test::Unit::TestCase
   end
   
   def test_request_tries_again_when_encountering_an_internal_error
-    Bucket.in_test_mode do
-      Bucket.request_returns [
-        # First request is an internal error
-        {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
-        # Second request is a success
-        {:body => Fixtures::Buckets.empty_bucket,  :code => 200}
-      ]
-      bucket = nil # Block scope hack
-      assert_nothing_raised do
-        bucket = Bucket.find('marcel')
-      end
-      # Don't call objects 'cause we don't want to make another request
-      assert bucket.object_cache.empty?
-    end    
+    mock_connection_for(Bucket, :returns => [
+      # First request is an internal error
+      {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
+      # Second request is a success
+      {:body => Fixtures::Buckets.empty_bucket,  :code => 200}
+    ])
+    bucket = nil # Block scope hack
+    assert_nothing_raised do
+      bucket = Bucket.find('marcel')
+    end
+    # Don't call objects 'cause we don't want to make another request
+    assert bucket.object_cache.empty?
   end
   
   def test_request_tries_up_to_three_times
-    Bucket.in_test_mode do
-      Bucket.request_returns [
-        # First request is an internal error
-        {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
-        # Second request is also an internal error
-        {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
-        # Ditto third
-        {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
-        # Fourth works
-        {:body => Fixtures::Buckets.empty_bucket,  :code => 200}      
-      ]
-      bucket = nil # Block scope hack
-      assert_nothing_raised do
-        bucket = Bucket.find('marcel')
-      end
-      # Don't call objects 'cause we don't want to make another request
-      assert bucket.object_cache.empty?
+    mock_connection_for(Bucket, :returns => [
+      # First request is an internal error
+      {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
+      # Second request is also an internal error
+      {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
+      # Ditto third
+      {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
+      # Fourth works
+      {:body => Fixtures::Buckets.empty_bucket,  :code => 200}
+    ])
+    bucket = nil # Block scope hack
+    assert_nothing_raised do
+      bucket = Bucket.find('marcel')
     end
+    # Don't call objects 'cause we don't want to make another request
+    assert bucket.object_cache.empty?
   end
   
   def test_request_tries_again_three_times_and_gives_up
-    Bucket.in_test_mode do
-      Bucket.request_returns [
-        # First request is an internal error
-        {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
-        # Second request is also an internal error
-        {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
-        # Ditto third
-        {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
-        # Ditto fourth
-        {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
-      ]
-      assert_raises(InternalError) do
-        Bucket.find('marcel')
-      end
+    mock_connection_for(Bucket, :returns => [
+      # First request is an internal error
+      {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
+      # Second request is also an internal error
+      {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
+      # Ditto third
+      {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
+      # Ditto fourth
+      {:body => Fixtures::Errors.internal_error, :code => 500, :error => true},
+    ])
+    assert_raises(InternalError) do
+      Bucket.find('marcel')
     end
   end
 end
@@ -87,9 +81,8 @@ class MultiConnectionsTest < Test::Unit::TestCase
   def setup
     Base.send(:connections).clear
   end
-  alias_method :teardown, :setup
   
-  def test_default_connection_options_are_used_for_subsequent_connections
+  def test_default_connection_options_are_used_for_subsequent_connections    
     assert !Base.connected?
     
     assert_raises(MissingAccessKey) do
@@ -113,7 +106,7 @@ class MultiConnectionsTest < Test::Unit::TestCase
     end
     
     # All subclasses are currently using the default connection
-    assert Base.connection == Bucket.connection
+    assert_equal Base.connection, Bucket.connection
     
     # No need to pass in the required options. The default connection will supply them
     assert_nothing_raised do