fog 0.5.1 → 0.5.2

data/lib/fog/storage/google.rb

@@ -209,17 +209,6 @@ module Fog
           @connection.reset
         end
 
-        private
-
-        def request(params, &block)
-          params[:headers]['Date'] = Fog::Time.now.to_date_header
-          params[:headers]['Authorization'] = "GOOG1 #{@google_storage_access_key_id}:#{signature(params)}"
-
-          response = @connection.request(params, &block)
-
-          response
-        end
-
         def signature(params)
           string_to_sign =
 <<-DATA
@@ -271,6 +260,18 @@ DATA
           signed_string = @hmac.sign(string_to_sign)
           signature = Base64.encode64(signed_string).chomp!
         end
+
+
+        private
+
+        def request(params, &block)
+          params[:headers]['Date'] = Fog::Time.now.to_date_header
+          params[:headers]['Authorization'] = "GOOG1 #{@google_storage_access_key_id}:#{signature(params)}"
+
+          response = @connection.request(params, &block)
+
+          response
+        end
       end
     end
   end

data/lib/fog/storage/requests/aws/abort_multipart_upload.rb

@@ -25,14 +25,6 @@ module Fog
         end
 
       end # Real
-
-      class Mock # :nodoc:all
-
-        def abort_multipart_upload(bucket_name, object_name, upload_id)
-          Fog::Mock.not_implemented
-        end
-
-      end # Mock
     end # Storage
   end # AWS
 end # Fog

data/lib/fog/storage/requests/aws/complete_multipart_upload.rb

@@ -47,14 +47,6 @@ module Fog
         end
 
       end # Real
-
-      class Mock # :nodoc:all
-
-        def complete_multipart_upload(bucket_name, object_name, upload_id, parts)
-          Fog::Mock.not_implemented
-        end
-
-      end # Mock
     end # Storage
   end # AWS
 end # Fog

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

@@ -18,6 +18,7 @@ module Fog
         #   * 'x-amz-copy_source-if-modified_since'<~Time> - Copies object it it has been modified since this time
         #   * 'x-amz-copy_source-if-none-match'<~String> - Copies object if its etag does not match this value
         #   * 'x-amz-copy_source-if-unmodified-since'<~Time> - Copies object it it has not been modified since this time
+        #   * 'x-amz-storage-class'<~String> - Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -59,7 +60,7 @@ module Fog
             target_bucket[:objects][target_object_name] = target_object
             response.body = {
               'ETag'          => target_object['ETag'],
-              'LastModified'  => Time.parse(target_object['LastModified'])
+              'LastModified'  => Time.parse(target_object['Last-Modified'])
             }
           else
             response.status = 404

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

@@ -72,11 +72,11 @@ module Fog
                 (options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
                 (options['marker'] && object['Key'] <= options['marker'])
               end.map do |object|
-                data = object.reject {|key, value| !['ETag', 'Key', 'LastModified', 'Size', 'StorageClass'].include?(key)}
+                data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
                 data.merge!({
-                  'LastModified' => Time.parse(data['LastModified']),
+                  'LastModified' => Time.parse(object['Last-Modified']),
                   'Owner'        => bucket['Owner'],
-                  'Size'         => data['Size'].to_i
+                  'Size'         => object['Content-Length'].to_i
                 })
               data
             end

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

@@ -45,14 +45,6 @@ module Fog
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def get_bucket_logging(bucket_name)
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

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

@@ -70,14 +70,6 @@ module Fog
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def get_bucket_object_versions(bucket_name, options = {})
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

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

@@ -35,14 +35,6 @@ module Fog
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def get_bucket_versioning(bucket_name)
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

data/lib/fog/storage/requests/aws/get_object.rb

@@ -68,20 +68,20 @@ module Fog
           if (bucket = @data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
             if options['If-Match'] && options['If-Match'] != object['ETag']
               response.status = 412
-            elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['LastModified'])
+            elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified'])
               response.status = 304
             elsif options['If-None-Match'] && options['If-None-Match'] == object['ETag']
               response.status = 304
-            elsif options['If-Unmodified-Since'] && options['If-Unmodified-Since'] < Time.parse(object['LastModified'])
+            elsif options['If-Unmodified-Since'] && options['If-Unmodified-Since'] < Time.parse(object['Last-Modified'])
               response.status = 412
             else
               response.status = 200
-              response.headers = {
-                'Content-Length'  => object['Size'],
-                'Content-Type'    => object['Content-Type'],
-                'ETag'            => object['ETag'],
-                'Last-Modified'   => object['LastModified']
-              }
+              for key, value in object
+                case key
+                when 'Cache-Control', 'Content-Disposition', 'Content-Encoding', 'Content-Length', 'Content-MD5', 'Content-Type', 'ETag', 'Expires', 'Last-Modified', /^x-amz-meta-/
+                  response.headers[key] = value
+                end
+              end
               unless block_given?
                 response.body = object[:body]
               else

data/lib/fog/storage/requests/aws/get_object_torrent.rb

@@ -45,14 +45,6 @@ module Fog
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def get_object_object(bucket_name, object_name)
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

data/lib/fog/storage/requests/aws/initiate_multipart_upload.rb

@@ -42,14 +42,6 @@ module Fog
         end
 
       end # Real
-
-      class Mock # :nodoc:all
-
-        def initiate_multipart_upload(bucket_name, object_name, options = {})
-          Fog::Mock.not_implemented
-        end
-
-      end # Mock
     end # Storage
   end # AWS
 end # Fog

data/lib/fog/storage/requests/aws/list_multipart_uploads.rb

@@ -55,14 +55,6 @@ module Fog
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def list_multipart_uploads(bucket_name, options = {})
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

data/lib/fog/storage/requests/aws/list_parts.rb

@@ -54,14 +54,6 @@ module Fog
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def list_parts(bucket_name, object_name, upload_id, options = {})
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

data/lib/fog/storage/requests/aws/post_object_hidden_fields.rb

@@ -37,14 +37,6 @@ module Fog
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def post_object_hidden_fields(options = {})
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

data/lib/fog/storage/requests/aws/put_bucket_acl.rb

@@ -71,14 +71,6 @@ DATA
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def put_bucket_acl(bucket_name, acl)
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

data/lib/fog/storage/requests/aws/put_bucket_logging.rb

@@ -78,14 +78,6 @@ DATA
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def put_bucket_logging(bucket_name, logging_status)
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

data/lib/fog/storage/requests/aws/put_bucket_versioning.rb

@@ -31,14 +31,6 @@ DATA
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def put_bucket_versioning(bucket_name, status)
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

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

@@ -18,6 +18,7 @@ module Fog
         #   * 'Content-Type'<~String> - Standard MIME type describing contents (defaults to MIME::Types.of.first)
         #   * 'Expires'<~String> - Cache expiry
         #   * 'x-amz-acl'<~String> - Permissions, must be in ['private', 'public-read', 'public-read-write', 'authenticated-read']
+        #   * 'x-amz-storage-class'<~String> - Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
         #   * "x-amz-meta-#{name}" - Headers to be returned with object, note total size of request without body must be less than 8 KB.
         #
         # ==== Returns
@@ -63,20 +64,28 @@ module Fog
           if (bucket = @data[:buckets][bucket_name])
             response.status = 200
             object = {
-              :body           => data[:body],
-              'Content-Type'  => data[:headers]['Content-Type'],
-              'ETag'          => Fog::AWS::Mock.etag,
-              'Key'           => object_name,
-              'LastModified'  => Fog::Time.now.to_date_header,
-              'Size'          => data[:headers]['Content-Length'],
-              'StorageClass'  => 'STANDARD'
+              :body             => data[:body],
+              'Content-Type'    => options['Content-Type'] || data[:headers]['Content-Type'],
+              'ETag'            => Fog::AWS::Mock.etag,
+              'Key'             => object_name,
+              'Last-Modified'   => Fog::Time.now.to_date_header,
+              'Content-Length'  => options['Content-Length'] || data[:headers]['Content-Length'],
+              'StorageClass'    => options['x-amz-storage-class'] || 'STANDARD'
             }
+
+            for key, value in options
+              case key
+              when 'Cache-Control', 'Content-Disposition', 'Content-Encoding', 'Content-MD5', 'Expires', /^x-amz-meta-/
+                object[key] = value
+              end
+            end
+
             bucket[:objects][object_name] = object
             response.headers = {
-              'Content-Length'  => object['Size'],
+              'Content-Length'  => object['Content-Length'],
               'Content-Type'    => object['Content-Type'],
               'ETag'            => object['ETag'],
-              'Last-Modified'   => object['LastModified']
+              'Last-Modified'   => object['Last-Modified']
             }
           else
             response.status = 404

data/lib/fog/storage/requests/aws/put_object_acl.rb

@@ -80,14 +80,6 @@ DATA
         end
 
       end
-
-      class Mock # :nodoc:all
-
-        def put_object_acl(bucket_name, object_name, options, acl)
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end

data/lib/fog/storage/requests/aws/upload_part.rb

@@ -38,14 +38,6 @@ module Fog
         end
 
       end # Real
-
-      class Mock # :nodoc:all
-
-        def upload_part(bucket_name, object_name, upload_id, part_number, data, options = {})
-          Fog::Mock.not_implemented
-        end
-
-      end # Mock
     end # Storage
   end # AWS
 end # Fog

data/lib/fog/storage/requests/google/copy_object.rb

@@ -56,7 +56,7 @@ module Fog
             target_bucket[:objects][target_object_name] = target_object
             response.body = {
               'ETag'          => target_object['ETag'],
-              'LastModified'  => Time.parse(target_object['LastModified'])
+              'LastModified'  => Time.parse(target_object['Last-Modified'])
             }
           else
             response.status = 404

data/lib/fog/storage/requests/google/get_bucket.rb

@@ -69,11 +69,11 @@ module Fog
                   (options['prefix'] && object['Key'][0...options['prefix'].length] != options['prefix']) ||
                   (options['marker'] && object['Key'] <= options['marker'])
                 end.map do |object|
-                  data = object.reject {|key, value| !['ETag', 'Key', 'LastModified', 'Size', 'StorageClass'].include?(key)}
+                  data = object.reject {|key, value| !['ETag', 'Key', 'StorageClass'].include?(key)}
                   data.merge!({
-                    'LastModified' => Time.parse(data['LastModified']),
+                    'LastModified' => Time.parse(object['Last-Modified']),
                     'Owner'        => bucket['Owner'],
-                    'Size'         => data['Size'].to_i
+                    'Size'         => object['Content-Length'].to_i
                   })
                 data
               end

data/lib/fog/storage/requests/google/get_object.rb

@@ -65,20 +65,20 @@ module Fog
           if (bucket = @data[:buckets][bucket_name]) && (object = bucket[:objects][object_name])
             if options['If-Match'] && options['If-Match'] != object['ETag']
               response.status = 412
-            elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['LastModified'])
+            elsif options['If-Modified-Since'] && options['If-Modified-Since'] > Time.parse(object['Last-Modified'])
               response.status = 304
             elsif options['If-None-Match'] && options['If-None-Match'] == object['ETag']
               response.status = 304
-            elsif options['If-Unmodified-Since'] && options['If-Unmodified-Since'] < Time.parse(object['LastModified'])
+            elsif options['If-Unmodified-Since'] && options['If-Unmodified-Since'] < Time.parse(object['Last-Modified'])
               response.status = 412
             else
               response.status = 200
-              response.headers = {
-                'Content-Length'  => object['Size'],
-                'Content-Type'    => object['Content-Type'],
-                'ETag'            => object['ETag'],
-                'Last-Modified'   => object['LastModified']
-              }
+              for key, value in object
+                case key
+                when 'Cache-Control', 'Content-Disposition', 'Content-Encoding', 'Content-Length', 'Content-MD5', 'Content-Type', 'ETag', 'Expires', 'Last-Modified', /^x-goog-meta-/
+                  response.headers[key] = value
+                end
+              end
               unless block_given?
                 response.body = object[:body]
               else

data/lib/fog/storage/requests/google/get_object_torrent.rb

@@ -42,14 +42,6 @@ module Fog
         end
 
       end
-
-      class Mock
-
-        def get_object_object(bucket_name, object_name)
-          Fog::Mock.not_implemented
-        end
-
-      end
     end
   end
 end