RubyGems - fog - Versions diffs - 0.8.2 → 0.9.0 - Mend

fog 0.8.2 → 0.9.0

Files changed (913) hide show

data/lib/fog/storage/parsers/google/get_bucket_logging.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Google
-      module Storage
+    module Storage
+      module Google
         class AccessControlList < Fog::Parsers::Base

data/lib/fog/storage/parsers/google/get_bucket_object_versions.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Google
-      module Storage
+    module Storage
+      module Google
         class GetBucketObjectVersions < Fog::Parsers::Base

data/lib/fog/storage/parsers/google/get_bucket_versioning.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Google
-      module Storage
+    module Storage
+      module Google
         class GetBucketVersioning < Fog::Parsers::Base

data/lib/fog/storage/parsers/google/get_request_payment.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Google
-      module Storage
+    module Storage
+      module Google
         class GetRequestPayment < Fog::Parsers::Base

data/lib/fog/storage/parsers/google/get_service.rb CHANGED

@@ -1,7 +1,7 @@
 module Fog
   module Parsers
-    module Google
-      module Storage
+    module Storage
+      module Google
         class GetService < Fog::Parsers::Base

data/lib/fog/storage/rackspace.rb CHANGED

@@ -1,10 +1,9 @@
 module Fog
-  module Rackspace
-    class Storage < Fog::Service
+  module Storage
+    class Rackspace < Fog::Service
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :rackspace_servicenet, :rackspace_cdn_ssl, :persistent
-      recognizes :provider # remove post deprecation
       model_path 'fog/storage/models/rackspace'
       model       :directory
@@ -50,13 +49,6 @@ module Fog
         end
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Rackspace::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Rackspace') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
           require 'mime/types'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
@@ -77,13 +69,6 @@ module Fog
         attr_reader :rackspace_cdn_ssl
         def initialize(options={})
-          unless options.delete(:provider)
-            location = caller.first
-            warning = "[yellow][WARN] Fog::Rackspace::Storage.new is deprecated, use Fog::Storage.new(:provider => 'Rackspace') instead[/]"
-            warning << " [light_black](" << location << ")[/] "
-            Formatador.display_line(warning)
-          end
           require 'mime/types'
           require 'json'
           @rackspace_api_key = options[:rackspace_api_key]
@@ -102,7 +87,7 @@ module Fog
         end
         def reload
-          @storage_connection.reset
+          @connection.reset
         end
         def request(params, parse_json = true, &block)
@@ -118,7 +103,7 @@ module Fog
           rescue Excon::Errors::HTTPStatusError => error
             raise case error
             when Excon::Errors::NotFound
-              Fog::Rackspace::Storage::NotFound.slurp(error)
+              Fog::Storage::Rackspace::NotFound.slurp(error)
             else
               error
             end

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         # Abort a multipart upload

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/complete_multipart_upload'
@@ -40,7 +40,7 @@ module Fog
             :headers    => { 'Content-Length' => data.length },
             :host       => "#{bucket_name}.#{@host}",
             :method     => 'POST',
-            :parser     => Fog::Parsers::AWS::Storage::CompleteMultipartUpload.new,
+            :parser     => Fog::Parsers::Storage::AWS::CompleteMultipartUpload.new,
             :path       => CGI.escape(object_name),
             :query      => {'uploadId' => upload_id}
           })

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/copy_object'
@@ -36,7 +36,7 @@ module Fog
             :headers  => headers,
             :host     => "#{target_bucket_name}.#{@host}",
             :method   => 'PUT',
-            :parser   => Fog::Parsers::AWS::Storage::CopyObject.new,
+            :parser   => Fog::Parsers::Storage::AWS::CopyObject.new,
             :path     => CGI.escape(target_object_name)
           })
         end

data/lib/fog/storage/requests/aws/delete_bucket.rb CHANGED

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

data/lib/fog/storage/requests/aws/delete_bucket_policy.rb ADDED

@@ -0,0 +1,32 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+        # Delete policy for a bucket
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to delete policy from
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * status<~Integer> - 204
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEpolicy.html
+        def delete_bucket_policy(bucket_name)
+          request({
+            :expects  => 204,
+            :headers  => {},
+            :host     => "#{bucket_name}.#{@host}",
+            :method   => 'DELETE',
+            :query    => {'policy' => nil}
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/storage/requests/aws/delete_bucket_website.rb CHANGED

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         # Delete website configuration for a bucket

data/lib/fog/storage/requests/aws/delete_object.rb CHANGED

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         # Delete an object from S3
@@ -16,10 +16,11 @@ module Fog
         # ==== See Also
         # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectDELETE.html
-        def delete_object(bucket_name, object_name)
+        def delete_object(bucket_name, object_name, options = {})
+          headers = options
           request({
             :expects    => 204,
-            :headers    => {},
+            :headers    => headers,
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'DELETE',
@@ -31,7 +32,7 @@ module Fog
       class Mock # :nodoc:all
-        def delete_object(bucket_name, object_name)
+        def delete_object(bucket_name, object_name, options = {})
           response = Excon::Response.new
           if bucket = self.data[:buckets][bucket_name]
             response.status = 204

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/get_bucket'
@@ -50,7 +50,7 @@ module Fog
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::Storage::GetBucket.new,
+            :parser   => Fog::Parsers::Storage::AWS::GetBucket.new,
             :query    => options
           })
         end

data/lib/fog/storage/requests/aws/get_bucket_acl.rb CHANGED

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/access_control_list'
@@ -39,7 +39,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::Storage::AccessControlList.new,
+            :parser     => Fog::Parsers::Storage::AWS::AccessControlList.new,
             :query      => {'acl' => nil}
           })
         end

data/lib/fog/storage/requests/aws/get_bucket_location.rb CHANGED

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/get_bucket_location'
@@ -25,7 +25,7 @@ module Fog
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::Storage::GetBucketLocation.new,
+            :parser   => Fog::Parsers::Storage::AWS::GetBucketLocation.new,
             :query    => {'location' => nil}
           })
         end

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/get_bucket_logging'
@@ -39,7 +39,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::Storage::GetBucketLogging.new,
+            :parser     => Fog::Parsers::Storage::AWS::GetBucketLogging.new,
             :query      => {'logging' => nil}
           })
         end

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/get_bucket_object_versions'
@@ -64,7 +64,7 @@ module Fog
             :host     => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method   => 'GET',
-            :parser   => Fog::Parsers::AWS::Storage::GetBucketObjectVersions.new,
+            :parser   => Fog::Parsers::Storage::AWS::GetBucketObjectVersions.new,
             :query    => {'versions' => nil}.merge!(options)
           })
         end

data/lib/fog/storage/requests/aws/get_bucket_policy.rb ADDED

@@ -0,0 +1,37 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+        # Get bucket policy for an S3 bucket
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - name of bucket to get policy for
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash> - policy document
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketGETpolicy.html
+        def get_bucket_policy(bucket_name)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          response = request({
+            :expects    => 200,
+            :headers    => {},
+            :host       => "#{bucket_name}.#{@host}",
+            :idempotent => true,
+            :method     => 'GET',
+            :query      => {'policy' => nil}
+          })
+          response.body = JSON.parse(response.body) unless response.body.nil?
+        end
+      end
+    end
+  end
+end

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/get_bucket_versioning'
@@ -29,7 +29,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::Storage::GetBucketVersioning.new,
+            :parser     => Fog::Parsers::Storage::AWS::GetBucketVersioning.new,
             :query      => {'versioning' => nil}
           })
         end

data/lib/fog/storage/requests/aws/get_bucket_website.rb CHANGED

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         require 'fog/storage/parsers/aws/get_bucket_website'
@@ -31,7 +31,7 @@ module Fog
             :host       => "#{bucket_name}.#{@host}",
             :idempotent => true,
             :method     => 'GET',
-            :parser     => Fog::Parsers::AWS::Storage::GetBucketWebsite.new,
+            :parser     => Fog::Parsers::Storage::AWS::GetBucketWebsite.new,
             :query      => {'website' => nil}
           })
         end

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

@@ -1,6 +1,6 @@
 module Fog
-  module AWS
-    class Storage
+  module Storage
+    class AWS
       class Real
         # Get an object from S3
@@ -65,37 +65,44 @@ module Fog
             raise ArgumentError.new('object_name is required')
           end
           response = Excon::Response.new
-          if (bucket = self.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['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['Last-Modified'])
-              response.status = 412
-            else
-              response.status = 200
-              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]
+          if (bucket = self.data[:buckets][bucket_name])
+            if (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['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['Last-Modified'])
+                response.status = 412
               else
-                data = StringIO.new(object[:body])
-                remaining = data.length
-                while remaining > 0
-                  chunk = data.read([remaining, Excon::CHUNK_SIZE].min)
-                  block.call(chunk)
-                  remaining -= Excon::CHUNK_SIZE
+                response.status = 200
+                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 = StringIO.new(object[:body])
+                  remaining = data.length
+                  while remaining > 0
+                    chunk = data.read([remaining, Excon::CHUNK_SIZE].min)
+                    block.call(chunk)
+                    remaining -= Excon::CHUNK_SIZE
+                  end
                 end
               end
+            else
+              response.status = 404
+              response.body = "...<Code>NoSuchKey<\/Code>..."
+              raise(Excon::Errors.status_error({:expects => 200}, response))
             end
           else
             response.status = 404
+            response.body = "...<Code>NoSuchBucket</Code>..."
             raise(Excon::Errors.status_error({:expects => 200}, response))
           end
           response