fog 0.2.30 → 0.3.0

data/lib/fog/aws/requests/simpledb/batch_put_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # Put items attributes into a SimpleDB domain

data/lib/fog/aws/requests/simpledb/create_domain.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # Create a SimpleDB domain

data/lib/fog/aws/requests/simpledb/delete_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # List metadata for SimpleDB domain

data/lib/fog/aws/requests/simpledb/delete_domain.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # Delete a SimpleDB domain

data/lib/fog/aws/requests/simpledb/domain_metadata.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         require 'fog/aws/parsers/simpledb/domain_metadata'

data/lib/fog/aws/requests/simpledb/get_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         require 'fog/aws/parsers/simpledb/get_attributes'

data/lib/fog/aws/requests/simpledb/list_domains.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         require 'fog/aws/parsers/simpledb/list_domains'

data/lib/fog/aws/requests/simpledb/put_attributes.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         # Put item attributes into a SimpleDB domain

data/lib/fog/aws/requests/simpledb/select.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module SimpleDB
+    class SimpleDB
       class Real
 
         require 'fog/aws/parsers/simpledb/select'

data/lib/fog/aws/requests/{s3 → storage}/copy_object.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/copy_object'
+        require 'fog/aws/parsers/storage/copy_object'
 
         # Copy an object from one S3 bucket to another
         #
@@ -32,7 +32,7 @@ module Fog
             :headers  => headers,
             :host     => "#{target_bucket_name}.#{@host}",
             :method   => 'PUT',
-            :parser   => Fog::Parsers::AWS::S3::CopyObject.new,
+            :parser   => Fog::Parsers::AWS::Storage::CopyObject.new,
             :path     => CGI.escape(target_object_name)
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/delete_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Delete an S3 bucket

data/lib/fog/aws/requests/{s3 → storage}/delete_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Delete an object from S3
@@ -42,4 +42,4 @@ module Fog
       end
     end
   end
-end
+end

data/lib/fog/aws/requests/{s3 → storage}/get_bucket.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket'
+        require 'fog/aws/parsers/storage/get_bucket'
 
         # List information about objects in an S3 bucket
         #
@@ -46,7 +46,7 @@ module Fog
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::S3::GetBucket.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetBucket.new,
             :query    => options
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/get_bucket_acl.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/access_control_list'
+        require 'fog/aws/parsers/storage/access_control_list'
 
         # Get access control list for an S3 bucket
         #
@@ -36,7 +36,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::S3::AccessControlList.new,
+            :parser     => Fog::Parsers::AWS::Storage::AccessControlList.new,
             :query      => {'acl' => nil}
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/get_bucket_location.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket_location'
+        require 'fog/aws/parsers/storage/get_bucket_location'
 
         # Get location constraint for an S3 bucket
         #
@@ -21,7 +21,7 @@ module Fog
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::S3::GetBucketLocation.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetBucketLocation.new,
             :query    => {'location' => nil}
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/get_bucket_logging.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket_logging'
+        require 'fog/aws/parsers/storage/get_bucket_logging'
 
         # Get logging status for an S3 bucket
         #
@@ -36,7 +36,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::S3::GetBucketLogging.new,
+            :parser     => Fog::Parsers::AWS::Storage::GetBucketLogging.new,
             :query      => {'logging' => nil}
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/get_bucket_object_versions.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket_object_versions'
+        require 'fog/aws/parsers/storage/get_bucket_object_versions'
 
         # List information about object versions in an S3 bucket
         #
@@ -61,7 +61,7 @@ module Fog
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::S3::GetBucketObjectVersions.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetBucketObjectVersions.new,
             :query    => {'versions' => nil}.merge!(options)
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/get_bucket_versioning.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/get_bucket_versioning'
+        require 'fog/aws/parsers/storage/get_bucket_versioning'
 
         # Get versioning status for an S3 bucket
         #
@@ -26,7 +26,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::S3::GetBucketVersioning.new,
+            :parser     => Fog::Parsers::AWS::Storage::GetBucketVersioning.new,
             :query      => {'versioning' => nil}
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/get_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Get an object from S3

data/lib/fog/aws/requests/{s3 → storage}/get_object_acl.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/access_control_list'
+        require 'fog/aws/parsers/storage/access_control_list'
 
         # Get access control list for an S3 object
         #
@@ -46,7 +46,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::S3::AccessControlList.new,
+            :parser     => Fog::Parsers::AWS::Storage::AccessControlList.new,
             :path       => CGI.escape(object_name),
             :query      => query
           })

data/lib/fog/aws/requests/{s3 → storage}/get_object_torrent.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Get torrent for an S3 object

data/lib/fog/aws/requests/{s3 → storage}/get_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Get an expiring object url from S3

data/lib/fog/aws/requests/{s3 → storage}/get_request_payment.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/get_request_payment'
+        require 'fog/aws/parsers/storage/get_request_payment'
 
         # Get configured payer for an S3 bucket
         #
@@ -21,7 +21,7 @@ module Fog
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::S3::GetRequestPayment.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetRequestPayment.new,
             :query    => {'requestPayment' => nil}
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/get_service.rb

@@ -1,9 +1,9 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
-        require 'fog/aws/parsers/s3/get_service'
+        require 'fog/aws/parsers/storage/get_service'
 
         # List information about S3 buckets for authorized user
         #
@@ -23,7 +23,7 @@ module Fog
             :host     => @host,
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::S3::GetService.new,
+            :parser   => Fog::Parsers::AWS::Storage::GetService.new,
             :url      => @host
           })
         end

data/lib/fog/aws/requests/{s3 → storage}/head_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Get headers for an object from S3

data/lib/fog/aws/requests/{s3 → storage}/put_bucket.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Create an S3 bucket

data/lib/fog/aws/requests/{s3 → storage}/put_bucket_acl.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Change access control list for an S3 bucket

data/lib/fog/aws/requests/{s3 → storage}/put_bucket_logging.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Change logging status for an S3 bucket

data/lib/fog/aws/requests/{s3 → storage}/put_bucket_versioning.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Change versioning status for an S3 bucket

data/lib/fog/aws/requests/{s3 → storage}/put_object.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Create an object in an S3 bucket

data/lib/fog/aws/requests/{s3 → storage}/put_object_url.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Get an expiring object url from S3 for putting an object

data/lib/fog/aws/requests/{s3 → storage}/put_request_payment.rb

@@ -1,6 +1,6 @@
 module Fog
   module AWS
-    module S3
+    class Storage
       class Real
 
         # Change who pays for requests to an S3 bucket

data/lib/fog/aws/s3.rb

@@ -1,212 +1,15 @@
 module Fog
   module AWS
-    module S3
-      extend Fog::Service
-
-      requires :aws_access_key_id, :aws_secret_access_key
-
-      model_path 'fog/aws/models/s3'
-      model 'directories'
-      model 'directory'
-      model 'files'
-      model 'file'
-
-      request_path 'fog/aws/requests/s3'
-      request 'copy_object'
-      request 'delete_bucket'
-      request 'delete_object'
-      request 'get_bucket'
-      request 'get_bucket_acl'
-      request 'get_bucket_location'
-      request 'get_bucket_logging'
-      request 'get_bucket_object_versions'
-      request 'get_bucket_versioning'
-      request 'get_object'
-      request 'get_object_acl'
-      request 'get_object_torrent'
-      request 'get_object_url'
-      request 'get_request_payment'
-      request 'get_service'
-      request 'head_object'
-      request 'put_bucket'
-      request 'put_bucket_acl'
-      request 'put_bucket_logging'
-      request 'put_bucket_versioning'
-      request 'put_object'
-      request 'put_object_url'
-      request 'put_request_payment'
-
-      module Utils
-
-        def parse_data(data)
-          metadata = {
-            :body => nil,
-            :headers => {}
-          }
-
-          if data.is_a?(String)
-            metadata[:body] = data
-            metadata[:headers]['Content-Length'] = metadata[:body].size.to_s
-          else
-            filename = ::File.basename(data.path)
-            unless (mime_types = MIME::Types.of(filename)).empty?
-              metadata[:headers]['Content-Type'] = mime_types.first.content_type
-            end
-            metadata[:body] = data
-            metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
-          end
-          # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
-          metadata
-        end
-
-        def url(params, expires)
-          params[:headers]['Date'] = expires.to_i
-          query = [params[:query]].compact
-          query << "AWSAccessKeyId=#{@aws_access_key_id}"
-          query << "Signature=#{CGI.escape(signature(params))}"
-          query << "Expires=#{params[:headers]['Date']}"
-          "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
-        end
-
-      end
-
-      class Mock
-        include Collections
-        include Utils
-
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {
-              :buckets => {}
-            }
-          end
-        end
-
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
-        def initialize(options={})
-          @aws_access_key_id = options[:aws_access_key_id]
-          @data = self.class.data[@aws_access_key_id]
-        end
-
-        def signature(params)
-          "foo"
-        end
+    class S3
+
+      def self.new(attributes = {})
+        location = caller.first
+        warning = "[yellow][WARN] Fog::AWS::S3#new is deprecated, use Fog::AWS::Storage#new instead[/]"
+        warning << " [light_black](" << location << ")[/] "
+        Formatador.display_line(warning)
+        Fog::AWS::Storage.new(attributes)
       end
 
-      class Real
-        include Collections
-        include Utils
-        extend Fog::Deprecation
-        deprecate(:reset, :reload)
-
-        # Initialize connection to S3
-        #
-        # ==== Notes
-        # options parameter must include values for :aws_access_key_id and 
-        # :aws_secret_access_key in order to create a connection
-        #
-        # ==== Examples
-        #   s3 = S3.new(
-        #     :aws_access_key_id => your_aws_access_key_id,
-        #     :aws_secret_access_key => your_aws_secret_access_key
-        #   )
-        #
-        # ==== Parameters
-        # * options<~Hash> - config arguments for connection.  Defaults to {}.
-        #
-        # ==== Returns
-        # * S3 object with connection to aws.
-        def initialize(options={})
-          @aws_access_key_id = options[:aws_access_key_id]
-          @aws_secret_access_key = options[:aws_secret_access_key]
-          @hmac = Fog::HMAC.new('sha1', @aws_secret_access_key)
-          options[:region] ||= 'us-east-1'
-          @host = options[:host] || case options[:region]
-            when 'us-east-1'
-              's3.amazonaws.com'
-            when 'ap-southeast-1'
-              's3-ap-southeast-1.amazonaws.com'
-            when 'us-west-1'
-              's3-us-west-1.amazonaws.com'
-            else
-              raise ArgumentError, "Unknown region: #{options[:region].inspect}"
-            end
-          @port   = options[:port]      || 443
-          @scheme = options[:scheme]    || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent] || true)
-        end
-
-        def reload
-          @connection.reset
-        end
-
-        private
-
-        def request(params, &block)
-          params[:headers]['Date'] = Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S +0000")
-          params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
-
-          response = @connection.request(params, &block)
-
-          response
-        end
-
-        def signature(params)
-          string_to_sign =
-<<-DATA
-#{params[:method]}
-#{params[:headers]['Content-MD5']}
-#{params[:headers]['Content-Type']}
-#{params[:headers]['Date']}
-DATA
-
-          amz_headers, canonical_amz_headers = {}, ''
-          for key, value in params[:headers]
-            if key[0..5] == 'x-amz-'
-              amz_headers[key] = value
-            end
-          end
-          amz_headers = amz_headers.sort {|x, y| x[0] <=> y[0]}
-          for key, value in amz_headers
-            canonical_amz_headers << "#{key}:#{value}\n"
-          end
-          string_to_sign << "#{canonical_amz_headers}"
-
-          subdomain = params[:host].split(".#{@host}").first
-          unless subdomain =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\.(?![\.\-])|\-(?![\.])){1,61}[a-z0-9]$/
-            Formatador.display_line("[yellow][WARN] fog: the specified s3 bucket name(#{subdomain}) is not a valid dns name.  See: http://docs.amazonwebservices.com/AmazonS3/latest/dev/index.html?Introduction.html[/]")
-            params[:host] = params[:host].split("#{subdomain}.")[-1]
-            if params[:path]
-              params[:path] = "#{subdomain}/#{params[:path]}"
-            else
-              params[:path] = "#{subdomain}"
-            end
-            subdomain = nil
-          end
-
-          canonical_resource  = "/"
-          unless subdomain.nil? || subdomain == @host
-            canonical_resource << "#{CGI.escape(subdomain).downcase}/"
-          end
-          canonical_resource << "#{params[:path]}"
-          canonical_resource << '?'
-          for key in (params[:query] || {}).keys
-            if ['acl', 'location', 'logging', 'requestPayment', 'torrent', 'versions', 'versioning'].include?(key)
-              canonical_resource << "#{key}&"
-            end
-          end
-          canonical_resource.chop!
-          string_to_sign << "#{canonical_resource}"
-
-          signed_string = @hmac.sign(string_to_sign)
-          signature = Base64.encode64(signed_string).chomp!
-        end
-      end
     end
   end
 end