fog 0.1.8 → 0.1.9

data/lib/fog/aws/requests/elb/describe_load_balancers.rb

@@ -3,6 +3,8 @@ module Fog
     module ELB
       class Real
 
+        require 'fog/aws/parsers/elb/describe_load_balancers'
+
         # Describe all or specified load balancers
         #
         # ==== Parameters

data/lib/fog/aws/requests/elb/disable_availability_zones_for_load_balancer.rb

@@ -3,6 +3,8 @@ module Fog
     module ELB
       class Real
 
+        require 'fog/aws/parsers/elb/disable_availability_zones_for_load_balancer'
+
         # Disable an availability zone for an existing ELB
         #
         # ==== Parameters

data/lib/fog/aws/requests/elb/enable_availability_zones_for_load_balancer.rb

@@ -3,6 +3,8 @@ module Fog
     module ELB
       class Real
 
+        require 'fog/aws/parsers/elb/enable_availability_zones_for_load_balancer'
+
         # Enable an availability zone for an existing ELB
         #
         # ==== Parameters

data/lib/fog/aws/requests/elb/register_instances_with_load_balancer.rb

@@ -3,6 +3,8 @@ module Fog
     module ELB
       class Real
 
+        require 'fog/aws/parsers/elb/register_instances_with_load_balancer'
+
         # Register an instance with an existing ELB
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/copy_object.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/copy_object'
+
         # Copy an object from one S3 bucket to another
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_bucket.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/get_bucket'
+
         # List information about objects in an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_bucket_acl.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/access_control_list'
+
         # Get access control list for an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_bucket_location.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/get_bucket_location'
+
         # Get location constraint for an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_bucket_logging.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/get_bucket_logging'
+
         # Get logging status for an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_bucket_object_versions.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/get_bucket_object_versions'
+
         # List information about object versions in an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_bucket_versioning.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/get_bucket_versioning'
+
         # Get versioning status for an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_object_acl.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/access_control_list'
+
         # Get access control list for an S3 object
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_request_payment.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/get_request_payment'
+
         # Get configured payer for an S3 bucket
         #
         # ==== Parameters

data/lib/fog/aws/requests/s3/get_service.rb

@@ -3,6 +3,8 @@ module Fog
     module S3
       class Real
 
+        require 'fog/aws/parsers/s3/get_service'
+
         # List information about S3 buckets for authorized user
         #
         # ==== Returns

data/lib/fog/aws/requests/s3/put_object.rb

@@ -24,7 +24,7 @@ module Fog
         #   * headers<~Hash>:
         #     * 'ETag'<~String> - etag of new object
         def put_object(bucket_name, object_name, data, options = {})
-          data = Fog::AWS::S3.parse_data(data)
+          data = parse_data(data)
           headers = data[:headers].merge!(options)
           request({
             :body       => data[:body],
@@ -42,7 +42,7 @@ module Fog
       class Mock
 
         def put_object(bucket_name, object_name, data, options = {})
-          data = Fog::AWS::S3.parse_data(data)
+          data = parse_data(data)
           unless data[:body].is_a?(String)
             data[:body] = data[:body].read
           end

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

@@ -3,6 +3,8 @@ module Fog
     module SimpleDB
       class Real
 
+        require 'fog/aws/parsers/simpledb/domain_metadata'
+
         # List metadata for SimpleDB domain
         #
         # ==== Parameters

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

@@ -3,6 +3,8 @@ module Fog
     module SimpleDB
       class Real
 
+        require 'fog/aws/parsers/simpledb/get_attributes'
+
         # List metadata for SimpleDB domain
         #
         # ==== Parameters

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

@@ -3,6 +3,8 @@ module Fog
     module SimpleDB
       class Real
 
+        require 'fog/aws/parsers/simpledb/list_domains'
+
         # List SimpleDB domains
         #
         # ==== Parameters

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

@@ -3,6 +3,8 @@ module Fog
     module SimpleDB
       class Real
 
+        require 'fog/aws/parsers/simpledb/select'
+
         # Select item data from SimpleDB
         #
         # ==== Parameters

data/lib/fog/aws/s3.rb

@@ -1,82 +1,64 @@
 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'
 
-      def self.new(options={})
-
-        unless @required
-          require 'fog/aws/models/s3/directories'
-          require 'fog/aws/models/s3/directory'
-          require 'fog/aws/models/s3/files'
-          require 'fog/aws/models/s3/file'
-          require 'fog/aws/parsers/s3/access_control_list'
-          require 'fog/aws/parsers/s3/copy_object'
-          require 'fog/aws/parsers/s3/get_bucket'
-          require 'fog/aws/parsers/s3/get_bucket_location'
-          require 'fog/aws/parsers/s3/get_bucket_logging'
-          require 'fog/aws/parsers/s3/get_bucket_object_versions'
-          require 'fog/aws/parsers/s3/get_bucket_versioning'
-          require 'fog/aws/parsers/s3/get_request_payment'
-          require 'fog/aws/parsers/s3/get_service'
-          require 'fog/aws/requests/s3/copy_object'
-          require 'fog/aws/requests/s3/delete_bucket'
-          require 'fog/aws/requests/s3/delete_object'
-          require 'fog/aws/requests/s3/get_bucket'
-          require 'fog/aws/requests/s3/get_bucket_acl'
-          require 'fog/aws/requests/s3/get_bucket_location'
-          require 'fog/aws/requests/s3/get_bucket_logging'
-          require 'fog/aws/requests/s3/get_bucket_object_versions'
-          require 'fog/aws/requests/s3/get_bucket_versioning'
-          require 'fog/aws/requests/s3/get_object'
-          require 'fog/aws/requests/s3/get_object_acl'
-          require 'fog/aws/requests/s3/get_object_torrent'
-          require 'fog/aws/requests/s3/get_object_url'
-          require 'fog/aws/requests/s3/get_request_payment'
-          require 'fog/aws/requests/s3/get_service'
-          require 'fog/aws/requests/s3/head_object'
-          require 'fog/aws/requests/s3/put_bucket'
-          require 'fog/aws/requests/s3/put_bucket_acl'
-          require 'fog/aws/requests/s3/put_bucket_logging'
-          require 'fog/aws/requests/s3/put_bucket_versioning'
-          require 'fog/aws/requests/s3/put_object'
-          require 'fog/aws/requests/s3/put_object_url'
-          require 'fog/aws/requests/s3/put_request_payment'
-          @required = true
-        end
-
-        if Fog.mocking?
-          Fog::AWS::S3::Mock.new(options)
-        else
-          Fog::AWS::S3::Real.new(options)
-        end
-      end
+      module Utils
 
-      def self.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
+        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[:body] = data
-          metadata[:headers]['Content-Length'] = ::File.size(data.path).to_s
+          # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
+          metadata
         end
-        # metadata[:headers]['Content-MD5'] = Base64.encode64(Digest::MD5.digest(metadata[:body])).strip
-        metadata
-      end
 
-      def self.reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
-      end
-
-      module Utils
         def url(params, expires)
           params[:headers]['Date'] = expires.to_i
           query = [params[:query]].compact
@@ -85,9 +67,11 @@ module Fog
           query << "Expires=#{params[:headers]['Date']}"
           "http://#{params[:host]}/#{params[:path]}?#{query.join('&')}"
         end
+
       end
 
       class Mock
+        include Collections
         include Utils
 
         def self.data
@@ -115,7 +99,10 @@ module Fog
       end
 
       class Real
+        include Collections
         include Utils
+        extend Fog::Deprecation
+        deprecate(:reset, :reload)
 
         # Initialize connection to S3
         #
@@ -135,14 +122,10 @@ module Fog
         # ==== Returns
         # * S3 object with connection to aws.
         def initialize(options={})
-          unless @aws_access_key_id = options[:aws_access_key_id]
-            raise ArgumentError.new('aws_access_key_id is required to access ec2')
-          end
-          unless @aws_secret_access_key = options[:aws_secret_access_key]
-            raise ArgumentError.new('aws_secret_access_key is required to access ec2')
-          end
-          @hmac       = HMAC::SHA1.new(@aws_secret_access_key)
-          @host       = options[:host] || case options[:region]
+          @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)
+          @host = options[:host] || case options[:region]
             when 'ap-southeast-1'
               's3-ap-southeast-1.amazonaws.com'
             when 'us-west-1'
@@ -150,12 +133,12 @@ module Fog
             else
               's3.amazonaws.com'
             end
-          @port       = options[:port]      || 443
-          @scheme     = options[:scheme]    || 'https'
-          reset
+          @port   = options[:port]      || 443
+          @scheme = options[:scheme]    || 'https'
+          reload
         end
 
-        def reset
+        def reload
           @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}")
         end
 
@@ -217,8 +200,8 @@ DATA
           canonical_resource.chop!
           string_to_sign << "#{canonical_resource}"
 
-          hmac = @hmac.update(string_to_sign)
-          signature = Base64.encode64(hmac.digest).chomp!
+          signed_string = @hmac.sign(string_to_sign)
+          signature = Base64.encode64(signed_string).chomp!
         end
       end
     end

data/lib/fog/aws/simpledb.rb

@@ -1,38 +1,23 @@
 module Fog
   module AWS
     module SimpleDB
+      extend Fog::Service
 
-      def self.new(options={})
-
-        unless @required
-          require 'fog/aws/parsers/simpledb/domain_metadata'
-          require 'fog/aws/parsers/simpledb/get_attributes'
-          require 'fog/aws/parsers/simpledb/list_domains'
-          require 'fog/aws/parsers/simpledb/select'
-          require 'fog/aws/requests/simpledb/batch_put_attributes'
-          require 'fog/aws/requests/simpledb/create_domain'
-          require 'fog/aws/requests/simpledb/delete_attributes'
-          require 'fog/aws/requests/simpledb/delete_domain'
-          require 'fog/aws/requests/simpledb/domain_metadata'
-          require 'fog/aws/requests/simpledb/get_attributes'
-          require 'fog/aws/requests/simpledb/list_domains'
-          require 'fog/aws/requests/simpledb/put_attributes'
-          require 'fog/aws/requests/simpledb/select'
-          @required = true
-        end
+      requires :aws_access_key_id, :aws_secret_access_key
 
-        if Fog.mocking?
-          Fog::AWS::SimpleDB::Mock.new(options)
-        else
-          Fog::AWS::SimpleDB::Real.new(options)
-        end
-      end
-
-      def self.reset_data(keys=Mock.data.keys)
-        Mock.reset_data(keys)
-      end
+      request_path 'fog/aws/requests/simpledb'
+      request 'batch_put_attributes'
+      request 'create_domain'
+      request 'delete_attributes'
+      request 'delete_domain'
+      request 'domain_metadata'
+      request 'get_attributes'
+      request 'list_domains'
+      request 'put_attributes'
+      request 'select'
 
       class Mock
+        include Collections
 
         def self.data
           @data ||= Hash.new do |hash, key|
@@ -56,6 +41,7 @@ module Fog
       end
 
       class Real
+        include Collections
 
         # Initialize connection to SimpleDB
         #
@@ -77,7 +63,7 @@ module Fog
         def initialize(options={})
           @aws_access_key_id      = options[:aws_access_key_id]
           @aws_secret_access_key  = options[:aws_secret_access_key]
-          @hmac       = HMAC::SHA256.new(@aws_secret_access_key)
+          @hmac       = Fog::HMAC.new('sha256', @aws_secret_access_key)
           @host       = options[:host]      || 'sdb.amazonaws.com'
           @nil_string = options[:nil_string]|| 'nil'
           @port       = options[:port]      || 443