fog 0.9.0 → 0.10.0

data/lib/fog/storage/rackspace.rb

@@ -22,6 +22,7 @@ module Fog
       request :head_object
       request :put_container
       request :put_object
+      request :put_object_manifest
 
       module Utils
 
@@ -29,8 +30,12 @@ module Fog
           @cdn ||= Fog::CDN.new(
             :provider           => 'Rackspace',
             :rackspace_api_key  => @rackspace_api_key,
+            :rackspace_auth_url => @rackspace_auth_url,
             :rackspace_username => @rackspace_username
           )
+          if @cdn.enabled?
+            @cdn
+          end
         end
 
       end
@@ -70,10 +75,11 @@ module Fog
 
         def initialize(options={})
           require 'mime/types'
-          require 'json'
+          require 'multi_json'
           @rackspace_api_key = options[:rackspace_api_key]
           @rackspace_username = options[:rackspace_username]
           @rackspace_cdn_ssl = options[:rackspace_cdn_ssl]
+          @rackspace_auth_url = options[:rackspace_auth_url]
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']
 
@@ -109,7 +115,7 @@ module Fog
             end
           end
           if !response.body.empty? && parse_json && response.headers['Content-Type'] =~ %r{application/json}
-            response.body = JSON.parse(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

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

@@ -27,7 +27,7 @@ module Fog
             :method     => 'GET',
             :query      => {'policy' => nil}
           })
-          response.body = JSON.parse(response.body) unless response.body.nil?
+          response.body = MultiJson.decode(response.body) unless response.body.nil?
         end
 
       end

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

@@ -39,9 +39,13 @@ module Fog
             query = {'versionId' => version_id}
           end
           headers = {}
-          headers['If-Modified-Since'] = Fog::Time.at(options['If-Modified-Since'].to_i).to_date_header if options['If-Modified-Since']
-          headers['If-Unmodified-Since'] = Fog::Time.at(options['If-Unmodified-Since'].to_i).to_date_header if options['If-Modified-Since']
           headers.merge!(options)
+          if headers['If-Modified-Since']
+            headers['If-Modified-Since'] = Fog::Time.at(headers['If-Modified-Since'].to_i).to_date_header
+          end
+          if headers['If-Unmodified-Since']
+            headers['If-Unmodified-Since'] = Fog::Time.at(headers['If-Unmodified-Since'].to_i).to_date_header
+          end
           request({
             :expects  => [ 200, 206 ],
             :headers  => headers,

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

@@ -0,0 +1,51 @@
+module Fog
+  module Storage
+    class AWS
+
+      module GetObjectHttpUrl
+
+        def get_object_http_url(bucket_name, object_name, expires)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          http_url({
+            :headers  => {},
+            :host     => @host,
+            :method   => 'GET',
+            :path     => "#{bucket_name}/#{object_name}"
+          }, expires)
+        end
+
+      end
+
+      class Real
+
+        # Get an expiring object http url from S3
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - Name of bucket containing object
+        # * object_name<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+
+        include GetObjectHttpUrl
+
+      end
+
+      class Mock # :nodoc:all
+
+        include GetObjectHttpUrl
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module Fog
+  module Storage
+    class AWS
+
+      module GetObjectHttpsUrl
+
+        def get_object_https_url(bucket_name, object_name, expires)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          https_url({
+            :headers  => {},
+            :host     => @host,
+            :method   => 'GET',
+            :path     => "#{bucket_name}/#{object_name}"
+          }, expires)
+        end
+
+      end
+
+      class Real
+
+        # Get an expiring object https url from S3
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - Name of bucket containing object
+        # * object_name<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+
+        include GetObjectHttpsUrl
+
+      end
+
+      class Mock # :nodoc:all
+
+        include GetObjectHttpsUrl
+
+      end
+    end
+  end
+end

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

@@ -18,18 +18,8 @@ module Fog
         # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         def get_object_url(bucket_name, object_name, expires)
-          unless bucket_name
-            raise ArgumentError.new('bucket_name is required')
-          end
-          unless object_name
-            raise ArgumentError.new('object_name is required')
-          end
-          url({
-            :headers  => {},
-            :host     => @host,
-            :method   => 'GET',
-            :path     => "#{bucket_name}/#{object_name}"
-          }, expires)
+          Formatador.display_line("[yellow][WARN] Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller.first})[/]")
+          get_object_https_url(bucket_name, object_name, expires)
         end
 
       end
@@ -37,18 +27,8 @@ module Fog
       class Mock # :nodoc:all
 
         def get_object_url(bucket_name, object_name, expires)
-          unless bucket_name
-            raise ArgumentError.new('bucket_name is required')
-          end
-          unless object_name
-            raise ArgumentError.new('object_name is required')
-          end
-          url({
-            :headers  => {},
-            :host     => @host,
-            :method   => 'GET',
-            :path     => "#{bucket_name}/#{object_name}"
-          }, expires)
+          Formatador.display_line("[yellow][WARN] Fog::Storage::AWS => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller.first})[/]")
+          get_object_https_url(bucket_name, object_name, expires)
         end
 
       end

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

@@ -27,7 +27,7 @@ module Fog
 
         def post_object_hidden_fields(options = {})
           if options['policy']
-            options['policy'] = options['policy'].to_json
+            options['policy'] = MultiJson.encode(options['policy'])
             options['AWSAccessKeyId'] = @aws_access_key_id
             string_to_sign = Base64.encode64(options['policy']).chomp!
             signed_string = @hmac.sign(string_to_sign)

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

@@ -14,7 +14,7 @@ module Fog
 
         def put_bucket_policy(bucket_name, policy)
           request({
-            :body     => policy.to_json,
+            :body     => MultiJson.encode(policy),
             :expects  => 204,
             :headers  => {},
             :host     => "#{bucket_name}.#{@host}",

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

@@ -0,0 +1,51 @@
+module Fog
+  module Storage
+    class Google
+
+      module GetObjectHttpUrl
+
+        def get_object_http_url(bucket_name, object_name, expires)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          http_url({
+            :headers  => {},
+            :host     => @host,
+            :method   => 'GET',
+            :path     => "#{bucket_name}/#{object_name}"
+          }, expires)
+        end
+
+      end
+
+      class Real
+
+        # Get an expiring object http url from S3
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - Name of bucket containing object
+        # * object_name<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+
+        include GetObjectHttpUrl
+
+      end
+
+      class Mock # :nodoc:all
+
+        include GetObjectHttpUrl
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+module Fog
+  module Storage
+    class Google
+
+      module GetObjectHttpsUrl
+
+        def get_object_https_url(bucket_name, object_name, expires)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          unless object_name
+            raise ArgumentError.new('object_name is required')
+          end
+          https_url({
+            :headers  => {},
+            :host     => @host,
+            :method   => 'GET',
+            :path     => "#{bucket_name}/#{object_name}"
+          }, expires)
+        end
+
+      end
+
+      class Real
+
+        # Get an expiring object https url from Google Storage
+        #
+        # ==== Parameters
+        # * bucket_name<~String> - Name of bucket containing object
+        # * object_name<~String> - Name of object to get expiring url for
+        # * expires<~Time> - An expiry time for this url
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~String> - url for object
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+
+        include GetObjectHttpsUrl
+
+      end
+
+      class Mock # :nodoc:all
+
+        include GetObjectHttpsUrl
+
+      end
+    end
+  end
+end

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

@@ -14,38 +14,21 @@ module Fog
         # * response<~Excon::Response>:
         #   * body<~String> - url for object
         #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+
         def get_object_url(bucket_name, object_name, expires)
-          unless bucket_name
-            raise ArgumentError.new('bucket_name is required')
-          end
-          unless object_name
-            raise ArgumentError.new('object_name is required')
-          end
-          url({
-            :headers  => {},
-            :host     => @host,
-            :method   => 'GET',
-            :path     => "#{bucket_name}/#{object_name}"
-          }, expires)
+          Formatador.display_line("[yellow][WARN] Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})[/]")
+          get_object_https_url(bucket_name, object_name, expires)
         end
 
       end
 
-      class Mock
+      class Mock # :nodoc:all
 
         def get_object_url(bucket_name, object_name, expires)
-          unless bucket_name
-            raise ArgumentError.new('bucket_name is required')
-          end
-          unless object_name
-            raise ArgumentError.new('object_name is required')
-          end
-          url({
-            :headers  => {},
-            :host     => @host,
-            :method   => 'GET',
-            :path     => "#{bucket_name}/#{object_name}"
-          }, expires)
+          Formatador.display_line("[yellow][WARN] Fog::Storage::Google => ##{get_object_url} is deprecated, use ##{get_object_https_url} instead[/] [light_black](#{caller.first})[/]")
+          get_object_https_url(bucket_name, object_name, expires)
         end
 
       end

data/lib/fog/storage/requests/ninefold/delete_namespace.rb

@@ -0,0 +1,19 @@
+module Fog
+  module Storage
+    class Ninefold
+      class Real
+
+        def delete_namespace(namespace = '', options = {})
+          options = options.reject {|key, value| value.nil?}
+          request({
+                    :expects  => 204,
+                    :method   => 'DELETE',
+                    :path     => "namespace/" + namespace,
+                    :query    => options
+                  }.merge(options))
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/storage/requests/ninefold/get_namespace.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Storage
+    class Ninefold
+      class Real
+
+        def get_namespace(namespace = '', options = {})
+          options = options.reject {|key, value| value.nil?}
+          request({
+                    :expects  => 200,
+                    :method   => 'GET',
+                    :path     => "namespace/" + namespace,
+                    :query    => {},
+                    :parse => true
+                  }.merge(options))
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/storage/requests/ninefold/post_namespace.rb

@@ -0,0 +1,20 @@
+module Fog
+  module Storage
+    class Ninefold
+      class Real
+
+        def post_namespace(namespace = '', options = {})
+          options = options.reject {|key, value| value.nil?}
+          request({
+                    :expects  => 201,
+                    :method   => 'POST',
+                    :path     => "namespace/" + namespace,
+                    :query    => {},
+                    :parse => true
+                  }.merge(options))
+        end
+
+      end
+    end
+  end
+end