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

remove legacy split for parser input and s3 basic parser

Browse source
This commit is contained in:
Wesley Beary 2009-07-09 23:07:16 -07:00
parent ebe02b874d
commit 2e699d502a
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/fog/aws/ec2.rb
View file

@ -391,7 +391,7 @@ module Fog
}) })
if parser && !response.body.empty? if parser && !response.body.empty?
Nokogiri::XML::SAX::Parser.new(parser).parse(response.body.split(/<\?xml.*\?>/)[1]) Nokogiri::XML::SAX::Parser.new(parser).parse(response.body)
response.body = parser.response response.body = parser.response
end end

6
lib/fog/aws/s3.rb
View file

@ -73,8 +73,7 @@ DATA
:body => data, :body => data,
:headers => {}, :headers => {},
:host => "#{bucket_name}.#{@host}", :host => "#{bucket_name}.#{@host}",
:method => 'PUT', :method => 'PUT'
:parser => Fog::Parsers::AWS::S3::BasicParser.new
}) })
end end
@ -95,7 +94,6 @@ DATA
:headers => {}, :headers => {},
:host => "#{bucket_name}.#{@host}", :host => "#{bucket_name}.#{@host}",
:method => 'PUT', :method => 'PUT',
:parser => Fog::Parsers::AWS::S3::BasicParser.new,
:query => "requestPayment" :query => "requestPayment"
}) })
end end
@ -302,7 +300,7 @@ DATA
}) })
if params[:parser] && !response.body.empty? if params[:parser] && !response.body.empty?
Nokogiri::XML::SAX::Parser.new(params[:parser]).parse(response.body.split(/<\?xml.*\?>/)[1]) Nokogiri::XML::SAX::Parser.new(params[:parser]).parse(response.body)
response.body = params[:parser].response response.body = params[:parser].response
end end

2
lib/fog/aws/simpledb.rb
View file

@ -333,7 +333,7 @@ module Fog
}) })
if parser && !response.body.empty? if parser && !response.body.empty?
Nokogiri::XML::SAX::Parser.new(parser).parse(response.body.split(/<\?xml.*\?>/)[1]) Nokogiri::XML::SAX::Parser.new(parser).parse(response.body)
response.body = parser.response response.body = parser.response
end end