RubyGems - fog - Versions diffs - 0.5.1 → 0.5.2 - Mend

@@ -286,26 +286,6 @@ module Fog
           @connection.reset
         end
-        private
-        def request(params, &block)
-          params[:headers]['Date'] = Fog::Time.now.to_date_header
-          params[:headers]['Authorization'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
-          params[:expects] = [307, *params[:expects]].flatten
-          # FIXME: ToHashParser should make this not needed
-          original_params = params.dup
-          response = @connection.request(params, &block)
-          if response.status == 307
-            uri = URI.parse(response.headers['Location'])
-            Formatador.display_line("[yellow][WARN] fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant[/]")
-            response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false).request(original_params, &block)
-          end
-          response
-        end
         def signature(params)
           string_to_sign =
 <<-DATA
@@ -345,7 +325,7 @@ DATA
           end
           canonical_resource << params[:path].to_s
           canonical_resource << '?'
-          for key in (params[:query] || {}).keys
+          for key in (params[:query] || {}).keys.sort
             if %w{acl location logging notification partNumber policy requestPayment torrent uploadId uploads versionId versioning versions}.include?(key)
               canonical_resource << "#{key}#{"=#{params[:query][key]}" unless params[:query][key].nil?}&"
             end
@@ -356,6 +336,26 @@ 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'] = "AWS #{@aws_access_key_id}:#{signature(params)}"
+          # FIXME: ToHashParser should make this not needed
+          original_params = params.dup
+          begin
+            response = @connection.request(params, &block)
+          rescue Excon::Errors::TemporaryRedirect => error
+            uri = URI.parse(error.response.headers['Location'])
+            Formatador.display_line("[yellow][WARN] fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant[/]")
+            response = Fog::Connection.new("#{@scheme}://#{uri.host}:#{@port}", false).request(original_params, &block)
+          end
+          response
+        end
       end
     end
   end

@@ -38,14 +38,6 @@ module Fog
         end
       end
-      class Mock
-        def domain_resource_list(domain_id, resource_id = nil)
-          Fog::Mock.not_implemented
-        end
-      end
     end
   end
 end

@@ -41,14 +41,6 @@ module Fog
         end
       end
-      class Mock
-        def domain_resource_update(domain_id, resource_id, options = {})
-          Fog::Mock.not_implemented
-        end
-      end
     end
   end
 end

@@ -35,14 +35,6 @@ module Fog
         end
       end
-      class Mock
-        def domain_update(domain_id, options = {})
-          Fog::Mock.not_implemented
-        end
-      end
     end
   end
 end

@@ -47,14 +47,6 @@ module Fog
         end
       end
-      class Mock
-        def create_record(record_type, zone_id, name, data)
-          Fog::Mock.not_implemented
-        end
-      end
     end
   end
 end

@@ -41,14 +41,6 @@ module Fog
         end
       end
-      class Mock
-        def create_zone(origin, ttl, active)
-          Fog::Mock.not_implemented
-        end
-      end
     end
   end
 end

@@ -1,3 +1,11 @@
+module Fog
+  def self.providers
+    @providers ||= []
+  end
+end
 require 'fog/providers/aws'
 require 'fog/providers/bluebox'
 require 'fog/providers/brightbox'

fog 0.5.1 → 0.5.2