isaacfeliu-aws-s3 0.4.0 → 0.4.1

data/README

@@ -1,5 +1,5 @@
 This Fork is to provide support to European Buckets of Amazon S3, which changes concepts like the "Host" header (from s3.amazonaws.com to bucket_name.amazonaws.com)
-With this fork, you can connect to US Buckets as well as EU Buckets.
+With this fork, you can connect to/create US Buckets as well as EU Buckets.
 
 = AWS::S3
 
@@ -66,6 +66,9 @@ Buckets are containers for objects (the files you store on S3). To create a new
   # Pick a unique name, or else you'll get an error 
   # if the name is already taken.
   Bucket.create('jukebox')
+  
+  # To create an European bucket.
+  Bucket.create('jukebox', :location => :eu)
 
 Bucket names must be unique across the entire S3 system, sort of like domain names across the internet. If you try
 to create a bucket with a name that is already taken, you will get an error.

data/lib/aws/s3/authentication.rb

@@ -50,11 +50,11 @@ 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, :current_host
   
-        def initialize(request, access_key_id, secret_access_key, options = {})
+        def initialize(request, access_key_id, secret_access_key, current_host = nil, options = {})
           super()
-          @request, @access_key_id, @secret_access_key = request, access_key_id, secret_access_key
+          @request, @access_key_id, @secret_access_key, @current_host = request, access_key_id, secret_access_key, current_host
           @options = options
         end
   
@@ -63,7 +63,7 @@ module AWS
           def canonical_string            
             options = {}
             options[:expires] = expires if expires?
-            CanonicalString.new(request, options)
+            CanonicalString.new(request, current_host, options)
           end
           memoized :canonical_string
     
@@ -135,7 +135,7 @@ module AWS
           end
 
           def interesting_headers
-            ['content-md5', 'content-type', 'date', amazon_header_prefix]
+            ['content-md5', 'content-type', 'date', 'Host', amazon_header_prefix]
           end
           
           def amazon_header_prefix
@@ -143,11 +143,12 @@ module AWS
           end
         end
         
-        attr_reader :request, :headers
+        attr_reader :request, :headers, :current_host
         
-        def initialize(request, options = {})
+        def initialize(request, current_host, options = {})
           super()
           @request = request
+          @current_host = current_host
           @headers = {}
           @options = options
           # "For non-authenticated or anonymous requests. A NotImplemented error result code will be returned if 
@@ -210,7 +211,7 @@ module AWS
           end
           
           def only_path
-            ("/" + request['Host'].gsub("#{DEFAULT_HOST}","").gsub(/\.$/,'') + request.path[/^[^?]*/]).gsub("//","/")
+            (current_host.nil? ? '' : "/#{current_host}") << request.path[/^[^?]*/]
           end
       end
     end

data/lib/aws/s3/base.rb

@@ -55,7 +55,10 @@ module AWS #:nodoc:
     # details can be found in the docs for Connection::Management::ClassMethods.
     #
     # Extensive examples can be found in the README[link:files/README.html].
-    class Base      
+    class Base
+      
+      cattr_accessor :current_host
+      
       class << self
         # Wraps the current connection's request method and picks the appropriate response class to wrap the response in.
         # If the response is an error, it will raise that error as an exception. All such exceptions can be caught by rescuing
@@ -66,16 +69,26 @@ module AWS #:nodoc:
         def request(verb, path, options = {}, body = nil, attempts = 0, &block)
           Service.response = nil
           process_options!(options, verb)
-          response = response_class.new(connection.request(verb, path, options, body, attempts, &block))
+          response = response_class.new(connection.request(verb, path, options, body, attempts, current_host, &block))
           Service.response = response
 
           Error::Response.new(response.response).error.raise if response.error?
+          if attempts > 0 && !current_host.match(".#{DEFAULT_HOST}")
+            establish_connection!(:server => DEFAULT_HOST)
+          end
           response
         # Once in a while, a request to S3 returns an internal error. A glitch in the matrix I presume. Since these 
         # errors are few and far between the request method will rescue InternalErrors the first three times they encouter them
         # and will retry the request again. Most of the time the second attempt will work.
         rescue *retry_exceptions
           attempts == 3 ? raise : (attempts += 1; retry)
+        rescue 
+          raise unless response
+          if response.redirect?
+            new_host = response.parsed['endpoint']
+            establish_connection!(:server => new_host)
+          end
+          attempts == 3 || !response.redirect? ? raise : (attempts += 1; retry)
         end
 
         [:get, :post, :put, :delete, :head].each do |verb|
@@ -98,10 +111,19 @@ module AWS #:nodoc:
         #
         # Rather than infering the current bucket from the subdomain, the current class' bucket can be explicitly set with
         # set_current_bucket_to.
+        
+        def current_host
+          @@current_host
+        end
+        
+        def current_host=(host)
+          @@current_host = host
+        end
+        
         def current_bucket
           connection.subdomain or raise CurrentBucketNotSpecified.new(connection.http.address)
         end
-        
+
         # If you plan on always using a specific bucket for certain files, you can skip always having to specify the bucket by creating 
         # a subclass of Bucket or S3Object and telling it what bucket to use:
         # 
@@ -208,10 +230,18 @@ module AWS #:nodoc:
       def initialize(attributes = {}) #:nodoc:
         @attributes = attributes
       end
-      
+
       private
         attr_reader :attributes
         
+        def current_host
+          self.class.current_host
+        end
+        
+        def current_host=(host)
+          self.class.current_host = host
+        end
+        
         def connection
           self.class.connection
         end

data/lib/aws/s3/bucket.rb

@@ -72,13 +72,38 @@ module AWS
         #
         #   Bucket.create('internet_drop_box', :access => :public_read_write)
         #
+        # By default new buckets will be created in US. You can override this using the <tt>:location</tt> option.
+        #
+        #   Bucket.create('internet_drop_box', :location => :eu)
+        #
         # The full list of access levels that you can set on Bucket and S3Object creation are listed in the README[link:files/README.html] 
         # in the section called 'Setting access levels'.
         def create(name, options = {})
           validate_name!(name)
-          put("/#{name}", options).success?
+          self.current_host = name
+
+          put("/", options, BucketConfiguration.new(options[:location]).to_s).success?
         end
         
+        class BucketConfiguration < XmlGenerator
+          attr_reader :location
+          
+          def initialize(location)
+            @location = location
+            super()
+          end
+          
+          def build
+            return nil unless location == :eu
+            
+            xml.tag!('CreateBucketConfiguration') do
+              xml.LocationConstraint 'EU'
+            end
+          end
+          
+        end
+        
+        
         # Fetches the bucket named <tt>name</tt>. 
         #
         #   Bucket.find('jukebox')
@@ -166,6 +191,7 @@ module AWS
         
         # List all your buckets. This is a convenient wrapper around AWS::S3::Service.buckets.
         def list(reload = false)
+          self.current_host = nil
           Service.buckets(reload)
         end
         
@@ -179,7 +205,8 @@ module AWS
               options = name
               name    = nil
             end
-            "/#{bucket_name(name)}#{RequestOptions.process(options).to_query_string}"
+            self.current_host = bucket_name(name)
+            "/#{RequestOptions.process(options).to_query_string}"
           end
       end
       

data/lib/aws/s3/connection.rb

@@ -23,7 +23,7 @@ module AWS
         connect
       end
           
-      def request(verb, path, headers = {}, body = nil, attempts = 0, &block)
+      def request(verb, path, headers = {}, body = nil, attempts = 0, current_host = nil, &block)
         body.rewind if body.respond_to?(:rewind) unless attempts.zero?      
         
         requester = Proc.new do 
@@ -31,8 +31,8 @@ module AWS
           request = request_method(verb).new(path, headers)
           ensure_content_type!(request)
           add_user_agent!(request)
-          set_host!(request)
-          authenticate!(request)
+          set_host!(request, current_host)
+          authenticate!(request, current_host)
           if body
             if body.respond_to?(:read)                                                                
               request.body_stream    = body                                                           
@@ -41,6 +41,7 @@ module AWS
               request.body = body                                                                     
             end                                                                                       
           end
+
           http.request(request, &block)
         end
         
@@ -119,16 +120,16 @@ module AWS
         end
         
         # Just do Header authentication for now
-        def authenticate!(request)
-          request['Authorization'] = Authentication::Header.new(request, access_key_id, secret_access_key)
+        def authenticate!(request, current_host)
+          request['Authorization'] = Authentication::Header.new(request, access_key_id, secret_access_key, current_host)
         end
         
         def add_user_agent!(request)
           request['User-Agent'] ||= "AWS::S3/#{Version}"
         end
         
-        def set_host!(request)
-          request['Host'] = http.address
+        def set_host!(request, host)
+          request['Host'] = (host && http.address.match(host)) ? http.address : host.nil? ? http.address : host.match(/amazonaws.com/) ? host : "#{host}.#{http.address}"
         end
         
         def query_string_authentication(request, options = {})

data/lib/aws/s3/object.rb

@@ -295,6 +295,7 @@ module AWS
             options.replace(bucket)
             bucket = nil
           end
+          self.current_host = bucket_name(bucket)
           "/#{name}"
         end
     

data/lib/aws/s3/response.rb

@@ -44,7 +44,7 @@ module AWS
         def error?
           !success? && response['content-type'] == 'application/xml' && parsed.root == 'error'
         end
-    
+
         def error
           Error.new(parsed, self)
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: isaacfeliu-aws-s3
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - Marcel Molina Jr.