Merge pull request postrank-labs#45 from gregwebs/xml

more configurable to_xml, remove post-rankisms

Author: dj2

lib/goliath/rack/formatters/xml.rb

@@ -11,63 +11,70 @@ module Formatters
 classXML
 includeGoliath::Rack::AsyncMiddleware
 
+definitialize(app,opts={})
+@app=app
+@opts=opts
+@opts[:root] ||= 'results'
+@opts[:item] ||= 'item'
+end
+
 defpost_process(env,status,headers,body)
-body=[to_xml(body,false)]ifxml_response?(headers)
+ifxml_response?(headers)
+body=[to_xml(body)]
+end
 [status,headers,body]
 end
 
 defxml_response?(headers)
 headers['Content-Type'] =~ %r{^application/xml}
 end
 
-defto_xml(content,fragment=true,root='results',item='item')
+defto_xml(content,fragment=false)
 xml_string=''
-xml_string+=xml_header(root)unlessfragment
+xml_string<<xml_header(@opts[:root])unlessfragment
 
-xml_string+=case(content.class.to_s)
-when"Hash"thenhash_to_xml(content,root,item)
-when"Array"thenarray_to_xml(content,root,item)
+xml_string<<case(content.class.to_s)
+when"Hash"thenhash_to_xml(content)
+when"Array"thenarray_to_xml(content,@opts[:item])
 when"String"thenstring_to_xml(content)
 elsestring_to_xml(content)
 end
 
-xml_string+=xml_footer(root)unlessfragment
+xml_string<<xml_footer(@opts[:root])unlessfragment
 xml_string
 end
 
 defstring_to_xml(content)
  ::Rack::Utils.escape_html(content.to_s)
 end
 
-defhash_to_xml(content,root='results',item='item')
+defhash_to_xml(content)
 xml_string=''
 ifcontent.key?('meta')
-xml_string += xml_item('meta',content['meta'],root)
+xml_string += xml_item('meta',content['meta'])
 content.delete('meta')
 end
 
-content.each_pair{ |key,value| xml_string+=xml_item(key,value,root)}
+content.each_pair{ |key,value| xml_string<<xml_item(key,value)}
 xml_string
 end
 
-defarray_to_xml(content,root='results',item='item')
+defarray_to_xml(content,item='item')
 xml_string=''
-content.each{ |value| xml_string+=xml_item(item,value,root)}
+content.each{ |value| xml_string<<xml_item(item,value)}
 xml_string
 end
 
 defxml_header(root)
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
-"<#{root} xmlns:opensearch='http://a9.com/-/spec/opensearch/1.1/'\n" +
-" xmlns:postrank='http://www.postrank.com/xsd/2007-11-30/postrank'>\n"
+"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<#{root}>"
 end
 
 defxml_footer(root)
 "</#{root}>"
 end
 
-defxml_item(key,value,root)
-"<#{key}>#{to_xml(value,true,root)}</#{key}>\n"
+defxml_item(key,value)
+"<#{key}>#{to_xml(value,true)}</#{key}>\n"
 end
 end
 end