1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00

Merge pull request #3207 from plribeiro3000/using-fog-xml

Using fog/xml gem
This commit is contained in:
Wesley Beary 2014-10-20 09:49:18 -05:00
commit 3355bca1b7
4 changed files with 1 additions and 73 deletions

View file

@ -48,6 +48,7 @@ Gem::Specification.new do |s|
## that are needed for an end user to actually USE your code.
s.add_dependency("fog-core", "~> 1.24")
s.add_dependency("fog-json")
s.add_dependency("fog-xml")
s.add_dependency('nokogiri', '~> 1.5', '>= 1.5.11')
s.add_dependency('ipaddress', '~>0.5')

View file

@ -1,4 +0,0 @@
require "nokogiri"
require "fog/core/parser"
require "fog/xml/sax_parser_connection"
require "fog/xml/connection"

View file

@ -1,24 +0,0 @@
module Fog
# @note Extracting XML components out of core is a work in progress.
#
# The {XML} module includes functionality that is common between APIs using
# XML to send and receive data.
#
# The intent is to provide common code for provider APIs using XML but not
# require it for those using JSON.
#
# @todo Add +require "fog/xml"+ and/or +include Fog::XML+ to providers using
# its services
#
module XML
class Connection < Fog::XML::SAXParserConnection
def request(params, &block)
if (parser = params.delete(:parser))
super(parser, params)
else
original_request(params)
end
end
end
end
end

View file

@ -1,45 +0,0 @@
module Fog
module XML
class SAXParserConnection < Fog::Core::Connection
# Makes a request using the connection using Excon
#
# @param [Hash] params
# @option params [String] :body text to be sent over a socket
# @option params [Hash<Symbol, String>] :headers The default headers to supply in a request
# @option params [String] :host The destination host's reachable DNS name or IP, in the form of a String
# @option params [String] :path appears after 'scheme://host:port/'
# @option params [Fixnum] :port The port on which to connect, to the destination host
# @option params [Hash] :query appended to the 'scheme://host:port/path/' in the form of '?key=value'
# @option params [String] :scheme The protocol; 'https' causes OpenSSL to be used
# @option params [Proc] :response_block
# @option params [Nokogiri::XML::SAX::Document] :parser
#
# @return [Excon::Response]
#
# @raise [Excon::Errors::StubNotFound]
# @raise [Excon::Errors::Timeout]
# @raise [Excon::Errors::SocketError]
#
def request(parser, params)
reset unless @persistent
# Prepare the SAX parser
data_stream = Nokogiri::XML::SAX::PushParser.new(parser)
response_string = ""
params[:response_block] = lambda do |chunk, remaining, total|
response_string << chunk if ENV['DEBUG_RESPONSE']
data_stream << chunk
end
# Make request which read chunks into parser
response = @excon.request(params)
Fog::Logger.debug "\n#{response_string}" if ENV['DEBUG_RESPONSE']
# Cease parsing and override response.body with parsed data
data_stream.finish
response.body = parser.response
response
end
end
end
end