Merge pull request fog#2711 from fog/connection_deprecation_warning

[core] Deprecate Fog::Connection
TranscendComputing · Feb 27, 2014 · 7a152a2 · 7a152a2
2 parents 573ae32 + 0e1daf3
commit 7a152a2
Show file tree

Hide file tree

Showing 94 changed files with 156 additions and 112 deletions.
diff --git a/lib/fog/atmos/storage.rb b/lib/fog/atmos/storage.rb
@@ -83,7 +83,7 @@ def initialize(options={})
           @hmac               = Fog::HMAC.new('sha1', @storage_secret_decoded)
           @persistent = options.fetch(:persistent, false)
 
-          @connection = Fog::Connection.new("#{@prefix}://#{@storage_host}:#{@storage_port}",
+          @connection = Fog::XML::Connection.new("#{@prefix}://#{@storage_host}:#{@storage_port}",
               @persistent, @connection_options)
         end
 

diff --git a/lib/fog/aws/auto_scaling.rb b/lib/fog/aws/auto_scaling.rb
@@ -104,7 +104,7 @@ def initialize(options={})
           @port       = options[:port]        || 443
           @persistent = options[:persistent]  || false
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/beanstalk.rb b/lib/fog/aws/beanstalk.rb
@@ -78,7 +78,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/cdn.rb b/lib/fog/aws/cdn.rb
@@ -154,7 +154,7 @@ def initialize(options={})
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
           @version    = options[:version]  || '2010-11-01'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/cloud_formation.rb b/lib/fog/aws/cloud_formation.rb
@@ -60,7 +60,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/cloud_watch.rb b/lib/fog/aws/cloud_watch.rb
@@ -104,7 +104,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/compute.rb b/lib/fog/aws/compute.rb
@@ -399,7 +399,7 @@ def initialize(options={})
             @port       = options[:port]        || 443
             @scheme     = options[:scheme]      || 'https'
           end
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/data_pipeline.rb b/lib/fog/aws/data_pipeline.rb
@@ -62,7 +62,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
 
           setup_credentials(options)
         end

diff --git a/lib/fog/aws/dns.rb b/lib/fog/aws/dns.rb
@@ -99,7 +99,7 @@ def initialize(options={})
           @scheme     = options[:scheme]      || 'https'
           @version    = options[:version]     || '2012-02-29'
 
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/dynamodb.rb b/lib/fog/aws/dynamodb.rb
@@ -88,7 +88,7 @@ def initialize(options={})
           @port       = options[:port]        || '443'
           @scheme     = options[:scheme]      || 'https'
 
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         private

diff --git a/lib/fog/aws/elasticache.rb b/lib/fog/aws/elasticache.rb
@@ -62,7 +62,7 @@ def initialize(options={})
           @path       = options[:path]      || '/'
           @port       = options[:port]      || 443
           @scheme     = options[:scheme]    || 'https'
-          @connection = Fog::Connection.new(
+          @connection = Fog::XML::Connection.new(
             "#{@scheme}://#{@host}:#{@port}#{@path}", options[:persistent]
           )
         end

diff --git a/lib/fog/aws/elb.rb b/lib/fog/aws/elb.rb
@@ -139,7 +139,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/emr.rb b/lib/fog/aws/emr.rb
@@ -73,7 +73,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
           @region = options[:region]
         end
 

diff --git a/lib/fog/aws/glacier.rb b/lib/fog/aws/glacier.rb
@@ -134,7 +134,7 @@ def initialize(options={})
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
 
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
 

diff --git a/lib/fog/aws/iam.rb b/lib/fog/aws/iam.rb
@@ -170,7 +170,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/rds.rb b/lib/fog/aws/rds.rb
@@ -168,7 +168,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
           @version    = options[:version] || '2013-05-15'
         end
 

diff --git a/lib/fog/aws/redshift.rb b/lib/fog/aws/redshift.rb
@@ -90,7 +90,7 @@ def initialize(options={})
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
 
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
        end
 
 

diff --git a/lib/fog/aws/ses.rb b/lib/fog/aws/ses.rb
@@ -62,7 +62,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/simpledb.rb b/lib/fog/aws/simpledb.rb
@@ -89,7 +89,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         private

diff --git a/lib/fog/aws/sns.rb b/lib/fog/aws/sns.rb
@@ -61,7 +61,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/sqs.rb b/lib/fog/aws/sqs.rb
@@ -89,7 +89,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/aws/storage.rb b/lib/fog/aws/storage.rb
@@ -523,7 +523,7 @@ def connection(scheme, host, port)
           else
             @connection = nil
           end
-          @connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
+          @connection ||= Fog::XML::Connection.new(uri, @persistent, @connection_options)
         end
 
         def request(params, &block)
@@ -550,7 +550,7 @@ def request(params, &block)
             headers = (error.response.is_a?(Hash) ? error.response[:headers] : error.response.headers)
             uri = URI.parse(headers['Location'])
             Fog::Logger.warning("fog: followed redirect to #{uri.host}, connecting to the matching region will be more performant")
-            response = Fog::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request(original_params, &block)
+            response = Fog::XML::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, @connection_options).request(original_params, &block)
           end
 
           response

diff --git a/lib/fog/aws/sts.rb b/lib/fog/aws/sts.rb
@@ -83,7 +83,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/bare_metal_cloud/compute.rb b/lib/fog/bare_metal_cloud/compute.rb
@@ -58,7 +58,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/bluebox/blb.rb b/lib/fog/bluebox/blb.rb
@@ -50,7 +50,7 @@ def initialize(options={})
           @persistent = options[:persistent]      || false
           @port       = options[:bluebox_port]    || 443
           @scheme     = options[:bluebox_scheme]  || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/bluebox/compute.rb b/lib/fog/bluebox/compute.rb
@@ -68,7 +68,7 @@ def initialize(options={})
           @persistent = options[:persistent]      || false
           @port       = options[:bluebox_port]    || 443
           @scheme     = options[:bluebox_scheme]  || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/bluebox/dns.rb b/lib/fog/bluebox/dns.rb
@@ -59,7 +59,7 @@ def initialize(options ={})
           @persistent = options[:persistent]      || false
           @port       = options[:bluebox_port]    || 443
           @scheme     = options[:bluebox_scheme]  || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/clodo/compute.rb b/lib/fog/clodo/compute.rb
@@ -84,7 +84,7 @@ def initialize(options={})
           @clodo_must_reauthenticate = false
           authenticate
           Excon.ssl_verify_peer = false if options[:clodo_servicenet] == true
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", options[:persistent])
         end
 
         def reload

diff --git a/lib/fog/clodo/core.rb b/lib/fog/clodo/core.rb
@@ -13,7 +13,7 @@ def self.authenticate(options)
       url = clodo_auth_url.match(/^https?:/) ? \
                 clodo_auth_url : 'https://' + clodo_auth_url
       uri = URI.parse(url)
-      connection = Fog::Connection.new(url)
+      connection = Fog::XML::Connection.new(url)
       @clodo_api_key  = options[:clodo_api_key]
       @clodo_username = options[:clodo_username]
       response = connection.request({

diff --git a/lib/fog/cloudsigma/connection.rb b/lib/fog/cloudsigma/connection.rb
@@ -37,7 +37,7 @@ def setup_connection(options)
           @api_version = options[:cloudsigma_api_version] || '2.0'
           @path_prefix = "#{@api_path_prefix}/#{@api_version}/"
 
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def request(params)

diff --git a/lib/fog/cloudstack/compute.rb b/lib/fog/cloudstack/compute.rb
@@ -149,7 +149,7 @@ def initialize(options={})
           @path                         = options[:cloudstack_path]    || '/client/api'
           @port                         = options[:cloudstack_port]    || 443
           @scheme                       = options[:cloudstack_scheme]  || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:cloudstack_persistent], {:ssl_verify_peer => false})
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", options[:cloudstack_persistent], {:ssl_verify_peer => false})
         end
 
         def reload

diff --git a/lib/fog/core/deprecated/connection.rb b/lib/fog/core/deprecated/connection.rb
@@ -12,13 +12,14 @@ module Fog
   #
   # @see https://github.com/geemus/excon/blob/master/lib/excon/connection.rb
   #
-  class Connection < Fog::XML::SAXParserConnection
+  class Connection < Fog::XML::Connection
     def request(params, &block)
-      if (parser = params.delete(:parser))
-        super(parser, params)
+      if params.key?(:parser)
+        Fog::Logger.deprecation("Fog::XML::Connection is deprecated use Fog::XML::Connection instead [light_black](#{caller.first})[/]")
       else
-        original_request(params)
+        Fog::Logger.deprecation("Fog::XML::Connection is deprecated use Fog::Core::Connection instead [light_black](#{caller.first})[/]")
       end
+      super(params)
     end
   end
 end
diff --git a/lib/fog/digitalocean/compute.rb b/lib/fog/digitalocean/compute.rb
@@ -77,7 +77,7 @@ def initialize(options={})
           @digitalocean_client_id = options[:digitalocean_client_id]
           @digitalocean_api_url   = options[:digitalocean_api_url] || \
                                             "https://api.digitalocean.com"
-          @connection             = Fog::Connection.new(@digitalocean_api_url)
+          @connection             = Fog::XML::Connection.new(@digitalocean_api_url)
         end
 
         def reload

diff --git a/lib/fog/dnsimple/dns.rb b/lib/fog/dnsimple/dns.rb
@@ -70,7 +70,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/dnsmadeeasy/dns.rb b/lib/fog/dnsmadeeasy/dns.rb
@@ -87,7 +87,7 @@ def initialize(options={})
           @persistent = options.fetch(:persistent, true)
           @port       = options[:port]        || 80 #443 Not yet
           @scheme     = options[:scheme]      || 'http' #'https Not yet
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/dreamhost/dns.rb b/lib/fog/dreamhost/dns.rb
@@ -57,7 +57,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent)
         end
 
         def reload

diff --git a/lib/fog/dynect/dns.rb b/lib/fog/dynect/dns.rb
@@ -72,7 +72,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @scheme     = options[:scheme]      || 'https'
           @version    = options[:version]     || '3.5.2'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def auth_token

diff --git a/lib/fog/ecloud/compute.rb b/lib/fog/ecloud/compute.rb
@@ -317,7 +317,7 @@ def request(params)
 
           # Hash connections on the host_url ... There's nothing to say we won't get URI's that go to
           # different hosts.
-          @connections[host_url] ||= Fog::Connection.new(host_url, @persistent, @connection_options)
+          @connections[host_url] ||= Fog::XML::Connection.new(host_url, @persistent, @connection_options)
 
           # Set headers to an empty hash if none are set.
           headers = set_extra_headers_for(params) || set_extra_headers_for({})

diff --git a/lib/fog/glesys/compute.rb b/lib/fog/glesys/compute.rb
@@ -79,7 +79,7 @@ def initialize(options)
           @glesys_api_key     = options[:glesys_api_key] || Fog.credentials[:glesys_api_key]
           @connection_options = options[:connection_options] || {}
           @persistent         = options[:persistent] || false
-          @connection = Fog::Connection.new(@api_url, @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new(@api_url, @persistent, @connection_options)
         end
 
         def request(method_name, options = {})

diff --git a/lib/fog/go_grid/compute.rb b/lib/fog/go_grid/compute.rb
@@ -68,7 +68,7 @@ def initialize(options={})
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
-          @connection = Fog::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
         end
 
         def reload

diff --git a/lib/fog/google/storage.rb b/lib/fog/google/storage.rb
@@ -283,7 +283,7 @@ def connection(scheme, host, port)
           else
             @connection = nil
           end
-          @connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
+          @connection ||= Fog::XML::Connection.new(uri, @persistent, @connection_options)
         end
 
         private
-Original file line number
+Diff line change
@@ Expand Up / @@ -283,7 +283,7 @@ def connection(scheme, host, port) @@
               else
                 @connection = nil
               end
-              @connection ||= Fog::Connection.new(uri, @persistent, @connection_options)
+              @connection ||= Fog::XML::Connection.new(uri, @persistent, @connection_options)
             end
             private
@@ Expand Down @@