fog 1.20.0 → 1.21.0

data/lib/fog/hp/requests/network/list_ports.rb

@@ -49,4 +49,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/hp/requests/network/list_routers.rb

@@ -42,4 +42,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/hp/requests/network/list_subnets.rb

@@ -48,4 +48,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/hp/requests/network/remove_router_interface.rb

@@ -64,4 +64,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/hp/requests/network/update_port.rb

@@ -72,4 +72,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/hp/requests/network/update_router.rb

@@ -59,4 +59,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/hp/requests/network/update_subnet.rb

@@ -69,4 +69,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/hp/requests/storage/get_object_temp_url.rb

@@ -28,4 +28,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/hp/simple_http_instrumentor.rb

@@ -56,4 +56,4 @@ module Excon
 
     end
   end
-end
+end

data/lib/fog/hp/storage.rb

@@ -1,5 +1,4 @@
 require 'fog/hp/core'
-require 'fog/storage'
 
 module Fog
   module Storage
@@ -149,7 +148,7 @@ module Fog
           write_h = write_header.split(',') unless write_header.nil?
           return read_h, write_h
         end
-        
+
         # Get an expiring object https url
         #
         # ==== Parameters
@@ -163,7 +162,7 @@ module Fog
         def get_object_https_url(container, object, expires, options = {})
           create_temp_url(container, object, expires, "GET", options.merge(:scheme => "https"))
         end
-        
+
         # Get an expiring object http url
         #
         # ==== Parameters
@@ -192,8 +191,8 @@ module Fog
           expiration_time = (Time.now + expires_secs.to_i).to_i
           create_temp_url(container, object, expiration_time, method, {})
         end
-        
-        # creates a temporary url 
+
+        # creates a temporary url
         #
         # ==== Parameters
         # * container<~String> - Name of container containing object
@@ -218,7 +217,7 @@ module Fog
 
           expires        = expires.to_i
           scheme = options[:scheme] || @scheme
-          
+
           # do not encode before signature generation, encode after
           sig_path = "#{@path}/#{container}/#{object}"
           encoded_path = "#{@path}/#{Fog::HP.escape(container)}/#{Fog::HP.escape(object)}"
@@ -236,17 +235,17 @@ module Fog
           else
             # Only works with 1.9+ Not compatible with 1.8.7
             #signed_string = Digest::HMAC.hexdigest(string_to_sign, @hp_secret_key, Digest::SHA1)
-          
-            # Compatible with 1.8.7 onwards          
+
+            # Compatible with 1.8.7 onwards
             hmac = OpenSSL::HMAC.new(@hp_secret_key, OpenSSL::Digest::SHA1.new)
             signed_string = hmac.update(string_to_sign).hexdigest
-            
+
             signature     = @hp_tenant_id.to_s + ":" + @hp_access_key.to_s + ":" + signed_string
             signature     = Fog::HP.escape(signature)
           end
-          
+
           # generate the temp url using the signature and expiry
-          "#{scheme}://#{@host}#{encoded_path}?temp_url_sig=#{signature}&temp_url_expires=#{expires}"          
+          "#{scheme}://#{@host}#{encoded_path}?temp_url_sig=#{signature}&temp_url_expires=#{expires}"
         end
       end
 
@@ -284,7 +283,7 @@ module Fog
           end
           @hp_secret_key = options[:hp_secret_key]
           @hp_tenant_id = options[:hp_tenant_id]
-          @os_account_meta_temp_url_key = options[:os_account_meta_temp_url_key]        
+          @os_account_meta_temp_url_key = options[:os_account_meta_temp_url_key]
         end
 
         def data
@@ -320,7 +319,7 @@ module Fog
           ### A symbol is required, we should ensure that the value is loaded as a symbol
           auth_version = options[:hp_auth_version] || :v2
           auth_version = auth_version.to_s.downcase.to_sym
-          
+
           ### Pass the service name for object storage to the authentication call
           options[:hp_service_type] ||= "Object Storage"
           @hp_tenant_id = options[:hp_tenant_id]
@@ -352,7 +351,7 @@ module Fog
           @port   = uri.port
           @scheme = uri.scheme
 
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

data/lib/fog/ibm/compute.rb

@@ -1,5 +1,4 @@
 require 'fog/ibm/core'
-require 'fog/compute'
 
 module Fog
   module Compute

data/lib/fog/ibm/core.rb

@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/json'
 
 module Fog
   module IBM
@@ -15,7 +16,7 @@ module Fog
       1800
     end
 
-    class Connection < Fog::Connection
+    class Connection < Fog::XML::Connection
 
       def initialize(user, password)
         @user = user

data/lib/fog/ibm/requests/compute/create_instance.rb

@@ -48,7 +48,7 @@ module Fog
           if options[:secondary_ip]
             options[:secondary_ip].split(',').map(&:strip).each_with_index do |n, idx|
               body_data.merge!({"secondary.ip.#{idx}" => n})
-            end 
+            end
           end
           request(
             :method   => 'POST',

data/lib/fog/ibm/storage.rb

@@ -1,5 +1,4 @@
 require 'fog/ibm/core'
-require 'fog/storage'
 
 module Fog
   module Storage

data/lib/fog/internet_archive/core.rb

@@ -1,4 +1,5 @@
 require 'fog/core'
+require 'fog/xml'
 require 'fog/internet_archive/signaturev4'
 
 module Fog

data/lib/fog/internet_archive/models/storage/file.rb

@@ -10,7 +10,7 @@ module Fog
         extend Fog::Storage::IAAttributes::ClassMethods
         include Fog::Storage::IAAttributes::InstanceMethods
 
-        # @see AWS Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html 
+        # @see AWS Object docs http://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectOps.html
 
         # @note Chunk size to use for multipart uploads.
         #     Use small chunk sizes to minimize memory. E.g. 5242880 = 5mb
@@ -55,9 +55,9 @@ module Fog
         end
 
         # Get file's body if exists, else ' '.
-        # 
+        #
         # @return [File]
-        # 
+        #
         def body
           attributes[:body] ||= if last_modified && (file = collection.get(identity))
             file.body
@@ -68,33 +68,33 @@ module Fog
 
 
         # Set body attribute.
-        # 
+        #
         # @param [File] new_body
         # @return [File] attributes[:body]
-        # 
+        #
         def body=(new_body)
           attributes[:body] = new_body
         end
 
 
         # Get the file instance's directory.
-        # 
+        #
         # @return [Fog::InternetArchive::Storage::Directory]
-        # 
+        #
         def directory
           @directory
         end
 
 
         # Copy object from one bucket to other bucket.
-        # 
+        #
         #     required attributes: directory, key
-        # 
+        #
         # @param target_directory_key [String]
         # @param target_file_key [String]
         # @param options [Hash] options for copy_object method
         # @return [String] Fog::InternetArchive::Files#head status of directory contents
-        # 
+        #
         def copy(target_directory_key, target_file_key, options = {})
           requires :directory, :key
           service.copy_object(directory.key, key, target_directory_key, target_file_key, options)
@@ -104,12 +104,12 @@ module Fog
 
 
         # Destroy file via http DELETE.
-        # 
+        #
         #     required attributes: directory, key
-        # 
+        #
         # @param options [Hash]
         # @return [Boolean] true if successful
-        # 
+        #
         def destroy(options = {})
           requires :directory, :key
           options['x-archive-cascade-delete'] = cascade_delete if cascade_delete
@@ -140,12 +140,12 @@ module Fog
 
 
         # Set Access-Control-List permissions.
-        #   
+        #
         #     valid new_publics: public_read, private
-        # 
+        #
         # @param [String] new_public
-        # @return [String] new_public 
-        # 
+        # @return [String] new_public
+        #
         def public=(new_public)
           'public-read'
         end
@@ -154,19 +154,19 @@ module Fog
         # Get publicly acessible url via http GET.
         #
         #     required attributes: directory, key
-        # 
+        #
         # @return [String] public url
-        # 
+        #
         def public_url
           requires :directory, :key
           "http://#{Fog::InternetArchive::DOMAIN_NAME}/download/#{directory.key}/#{Fog::InternetArchive.escape(key)}".gsub('%2F','/')
         end
 
         # Save file with body as contents to directory.key with name key via http PUT
-        # 
+        #
         #   required attributes: body, directory, key
-        # 
-        # @param [Hash] options  
+        #
+        # @param [Hash] options
         # @option options [String] cache_control sets Cache-Control header. For example, 'No-cache'
         # @option options [String] content_disposition sets Content-Disposition HTTP header. For exampple, 'attachment; filename=testing.txt'
         # @option options [String] content_encoding sets Content-Encoding HTTP header. For example, 'x-gzip'
@@ -176,7 +176,7 @@ module Fog
         # @option options [String] storage_class sets x-amz-storage-class HTTP header. Defaults to 'STANDARD'. Or, 'REDUCED_REDUNDANCY'
         # @option options [String] encryption sets HTTP encryption header. Set to 'AES256' to encrypt files at rest on S3
         # @return [Boolean] true if no errors
-        # 
+        #
         def save(options = {})
           requires :body, :directory, :key
           if options != {}
@@ -214,13 +214,13 @@ module Fog
 
 
         # Get a url for file.
-        # 
+        #
         #     required attributes: key
-        # 
+        #
         # @param expires [String] number of seconds before url expires
         # @param options [Hash]
         # @return [String] url
-        # 
+        #
         def url(expires, options = {})
           requires :key
           collection.get_url(key, expires, options)

data/lib/fog/internet_archive/models/storage/ia_attributes.rb

@@ -18,7 +18,7 @@ module Fog
 				# set_metadata_array_headers(:collections, options)
 				def set_metadata_array_headers(array_attribute, options={})
 				  attr_values = Array(self.send(array_attribute))
-				  opt_values = options.collect do |key,value| 
+				  opt_values = options.collect do |key,value|
 				    options.delete(key) if (key.to_s =~ /^x-(amz||archive)-meta(\d*)-#{array_attribute.to_s[0..-2]}/)
 				  end
 				  values = (attr_values + opt_values).compact.sort.uniq

data/lib/fog/internet_archive/parsers/storage/get_bucket_lifecycle.rb

@@ -36,7 +36,7 @@ module Fog
               end
             elsif @in_transition
               case name
-              when 'StorageClass', 
+              when 'StorageClass',
                 @transition['StorageClass'] = value
               when 'Date'
                 @transition[name] = value
@@ -56,7 +56,7 @@ module Fog
               when 'Rule'
                 @response['Rules'] << @rule
                 @rule = {}
-              end 
+              end
             end
           end
         end

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

@@ -2,7 +2,7 @@ module Fog
   module Storage
     class InternetArchive
       class Real
-        # 
+        #
         # Abort a multipart upload
         #
         # @param [String] bucket_name Name of bucket to abort multipart upload on
@@ -25,4 +25,4 @@ module Fog
       end # Real
     end # Storage
   end # InternetArchive
-end # Fog
+end # Fog

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

@@ -11,7 +11,7 @@ module Fog
         # @param source_object_name [String] Name of source object
         # @param target_bucket_name [String] Name of bucket to create copy in
         # @param target_object_name [String] Name for new copy of object
-        # 
+        #
         # @param options [Hash]:
         # @option options [String] x-amz-metadata-directive Specifies whether to copy metadata from source or replace with data in request.  Must be in ['COPY', 'REPLACE']
         # @option options [String] x-amz-copy_source-if-match Copies object if its etag matches this value
@@ -20,14 +20,14 @@ module Fog
         # @option options [Time] x-amz-copy_source-if-unmodified-since Copies object it it has not been modified since this time
         # @option options [String] x-amz-storage-class Default is 'STANDARD', set to 'REDUCED_REDUNDANCY' for non-critical, reproducable data
         #
-        # 
+        #
         # @return [Excon::Response]
         #   * body [Hash]:
         #     * ETag [String] - etag of new object
         #     * LastModified [Time] - date object was last modified
         #
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectCOPY.html
-        # 
+        #
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
           headers = { 'x-amz-copy-source' => "/#{source_bucket_name}/#{CGI.escape(source_object_name)}" }.merge!(options)
           request({

data/lib/fog/internet_archive/requests/storage/delete_bucket_policy.rb

@@ -9,7 +9,7 @@ module Fog
         #
         # @return [Excon::Response] response:
         #   * status [Integer] - 204
-        # 
+        #
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTBucketDELETEpolicy.html
 
         def delete_bucket_policy(bucket_name)

data/lib/fog/internet_archive/requests/storage/delete_multiple_objects.rb

@@ -30,7 +30,7 @@ module Fog
         #         * Message [String] - Error description
         #
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/multiobjectdeleteapi.html
-        
+
         def delete_multiple_objects(bucket_name, object_names, options = {})
           data = "<Delete>"
           data << "<Quiet>true</Quiet>" if options.delete(:quiet)

data/lib/fog/internet_archive/requests/storage/get_bucket_website.rb

@@ -7,7 +7,7 @@ module Fog
 
         # Get website configuration for an S3 bucket
         #
-        # 
+        #
         # @param bucket_name [String] name of bucket to get website configuration for
         #
         # @return [Excon::Response] response:

data/lib/fog/internet_archive/requests/storage/head_object.rb

@@ -7,21 +7,21 @@ module Fog
         #
         # @param bucket_name [String] Name of bucket to read from
         # @param object_name [String] Name of object to read
-        # @param options [Hash]: 
+        # @param options [Hash]:
         # @option options [String] If-Match Returns object only if its etag matches this value, otherwise returns 412 (Precondition Failed).
         # @option options [Time]   If-Modified-Since Returns object only if it has been modified since this time, otherwise returns 304 (Not Modified).
         # @option options [String] If-None-Match Returns object only if its etag differs from this value, otherwise returns 304 (Not Modified)
         # @option options [Time]   If-Unmodified-Since Returns object only if it has not been modified since this time, otherwise returns 412 (Precodition Failed).
         # @option options [String] Range Range of object to download
         #
-        # @return [Excon::Response] response: 
+        # @return [Excon::Response] response:
         #   * body [String] Contents of object
-        #   * headers [Hash]: 
+        #   * headers [Hash]:
         #     * Content-Length [String] - Size of object contents
         #     * Content-Type [String] - MIME type of object
         #     * ETag [String] - Etag of object
         #     * Last-Modified - [String] Last modified timestamp for object
-        # 
+        #
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectHEAD.html
         #
         def head_object(bucket_name, object_name, options={})
@@ -58,4 +58,4 @@ module Fog
       end
     end
   end
-end
+end