[Fog|Core] Move fog/core/parser to fog-xml gem

lib/fog.rb

@@ -10,7 +10,6 @@ require 'fog/core'
 # data exchange specific (to be extracted and used on a per provider basis)
 require 'fog/xml'
 require 'fog/json'
-require 'fog/core/parser'
 
 # deprecation wrappers (XML wrapped version)
 require 'fog/core/deprecated/connection'

lib/fog/aws/auto_scaling.rb

@@ -86,8 +86,6 @@ module Fog
         # * AutoScaling object with connection to AWS.
 
         def initialize(options={})
-          require 'fog/core/parser'
-
           @use_iam_profile = options[:use_iam_profile]
 
           @connection_options = options[:connection_options] || {}

lib/fog/aws/beanstalk.rb

@@ -64,7 +64,6 @@ module Fog
       class Real
         include Fog::AWS::CredentialFetcher::ConnectionMethods
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
 

lib/fog/aws/cdn.rb

@@ -142,7 +142,6 @@ EOF
         # ==== Returns
         # * cdn object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)

lib/fog/aws/cloud_formation.rb

@@ -46,7 +46,6 @@ module Fog
         # ==== Returns
         # * CloudFormation object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
 

lib/fog/aws/compute.rb

@@ -449,7 +449,6 @@ module Fog
         attr_accessor :region
 
         def initialize(options={})
-          require 'fog/core/parser'
 
           @connection_options     = options[:connection_options] || {}
           @region                 = options[:region] ||= 'us-east-1'

lib/fog/aws/dns.rb

@@ -90,7 +90,6 @@ module Fog
         # ==== Returns
         # * dns object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)

lib/fog/aws/elb.rb

@@ -131,7 +131,6 @@ module Fog
         # ==== Returns
         # * ELB object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           @connection_options     = options[:connection_options] || {}

lib/fog/aws/iam.rb

@@ -173,7 +173,6 @@ module Fog
         # ==== Returns
         # * IAM object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           @connection_options     = options[:connection_options] || {}

lib/fog/aws/ses.rb

@@ -48,7 +48,6 @@ module Fog
         # ==== Returns
         # * SES object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)

lib/fog/aws/simpledb.rb

@@ -70,7 +70,6 @@ module Fog
         # ==== Returns
         # * SimpleDB object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)

lib/fog/aws/storage.rb

@@ -415,7 +415,6 @@ module Fog
         # ==== Returns
         # * S3 object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           @instrumentor       = options[:instrumentor]

lib/fog/aws/sts.rb

@@ -72,7 +72,6 @@ module Fog
         # ==== Returns
         # * STS object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)

lib/fog/bare_metal_cloud/compute.rb

@@ -45,7 +45,6 @@ module Fog
 
       class Real
         def initialize(options={})
-          require 'fog/core/parser'
 
           @bare_metal_cloud_password = options[:bare_metal_cloud_password]
           @bare_metal_cloud_username = options[:bare_metal_cloud_username]

lib/fog/core/parser.rb

@@ -1,112 +1,2 @@
-require "nokogiri"
-
-module Fog
-  module Parsers
-    class Base < Nokogiri::XML::SAX::Document
-      attr_reader :response
-
-      def initialize
-        reset
-      end
-
-      def attr_value(name, attrs)
-        (entry = attrs.find {|a, v| a == name }) && entry.last
-      end
-
-      def reset
-        @response = {}
-      end
-
-      def characters(string)
-        @value ||= ''
-        @value << string
-      end
-
-      # ###############################################################################
-      # This is a workaround. Original implementation from Nokogiri is overwritten with
-      # one that does not join namespace prefix with local name.
-      def start_element_namespace name, attrs = [], prefix = nil, uri = nil, ns = []
-        start_element name, attrs
-      end
-
-      def end_element_namespace name, prefix = nil, uri = nil
-        end_element name
-      end
-
-      # ###############################################################################
-
-      def start_element(name, attrs = [])
-        @value = nil
-      end
-
-      def value
-        @value && @value.dup
-      end
-    end
-  end
-end
-
-module Fog
-  class ToHashDocument < Nokogiri::XML::SAX::Document
-    def initialize
-      @stack = []
-    end
-
-    def characters(string)
-      @value ||= ''
-      @value << string.strip
-    end
-
-    def end_element(name)
-      last = @stack.pop
-      if last.empty? && @value.empty?
-        @stack.last[name.to_sym] = ''
-      elsif last == {:i_nil=>"true"}
-        @stack.last[name.to_sym] = nil
-      elsif !@value.empty?
-        @stack.last[name.to_sym] = @value
-      end
-      @value = ''
-    end
-
-    def body
-      @stack.first
-    end
-
-    def response
-      body
-    end
-
-    def start_element(name, attributes = [])
-      @value = ''
-      parsed_attributes = {}
-      until attributes.empty?
-        if attributes.first.is_a?(Array)
-          key, value = attributes.shift
-        else
-          key, value = attributes.shift, attributes.shift
-        end
-        parsed_attributes[key.gsub(':','_').to_sym] = value
-      end
-      if @stack.last.is_a?(Array)
-        @stack.last << {name.to_sym => parsed_attributes}
-      else
-        data = if @stack.empty?
-          @stack.push(parsed_attributes)
-          parsed_attributes
-        elsif @stack.last[name.to_sym]
-          unless @stack.last[name.to_sym].is_a?(Array)
-            @stack.last[name.to_sym] = [@stack.last[name.to_sym]]
-          end
-          @stack.last[name.to_sym] << parsed_attributes
-          @stack.last[name.to_sym].last
-        else
-          @stack.last[name.to_sym] = {}
-          @stack.last[name.to_sym].merge!(parsed_attributes)
-          @stack.last[name.to_sym]
-        end
-        @stack.push(data)
-      end
-    end
-  end
-end
+Fog::Logger.deprecation("fog/core/parser is deprecated use fog/xml instead [light_black](#{caller.first})[/]")
+require 'fog/xml'

lib/fog/dnsmadeeasy/dns.rb

@@ -76,7 +76,6 @@ module Fog
         # ==== Returns
         # * dns object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @dnsmadeeasy_api_key = options[:dnsmadeeasy_api_key]
           @dnsmadeeasy_secret_key = options[:dnsmadeeasy_secret_key]

lib/fog/dynect/core.rb

@@ -2,7 +2,6 @@ require 'nokogiri'
 
 require 'fog/core'
 require 'fog/xml'
-require 'fog/core/parser'
 
 module Fog
   module Dynect

lib/fog/ecloud/compute.rb

@@ -284,7 +284,6 @@ module Fog
         end
 
         def initialize(options = {})
-          require 'fog/core/parser'
           @base_path               = options[:base_path] || '/cloudapi/ecloud'
           @connections             = {}
           @connection_options      = options[:connection_options] || {}

lib/fog/ecloud/core.rb

@@ -1,5 +1,5 @@
 require 'fog/core'
-
+require 'fog/xml'
 module Fog
   module Ecloud
     ECLOUD_OPTIONS = [:ecloud_authentication_method]

lib/fog/google/storage.rb

@@ -211,7 +211,6 @@ module Fog
         # ==== Returns
         # * Storage object with connection to google.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @google_storage_access_key_id = options[:google_storage_access_key_id]
           @google_storage_secret_access_key = options[:google_storage_secret_access_key]

lib/fog/internet_archive/storage.rb

@@ -240,7 +240,6 @@ module Fog
         # ==== Returns
         # * S3 object with connection to aws.
         def initialize(options={})
-          require 'fog/core/parser'
 
           setup_credentials(options)
           @connection_options     = options[:connection_options] || {}

lib/fog/vcloud/compute.rb

@@ -179,7 +179,6 @@ module Fog
 
         def initialize(options = {})
           require 'builder'
-          require 'fog/core/parser'
 
           @connections = {}
           @connection_options = options[:connection_options] || {}

lib/fog/vcloud/core.rb

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

lib/fog/zerigo/dns.rb

@@ -67,7 +67,6 @@ module Fog
 
       class Real
         def initialize(options={})
-          require 'fog/core/parser'
 
           @zerigo_email  = options[:zerigo_email]
           @zerigo_token  = options[:zerigo_token]