@@ -71,12 +71,12 @@ module RForce def self.parser(name) RForce.const_get(name) rescue nil end - - SoapResponse = + + SoapResponse = parser(:SoapResponseExpat) || parser(:SoapResponseHpricot) || SoapResponseRexml - + # Expand Ruby data structures into XML. def expand(builder, args, xmlns = nil) # Nest arrays: [:a, 1, :b, 2] => [[:a, 1], [:b, 2]] @@ -111,5 +111,5 @@ module RForce end end end - + end lib/rforce.rb @@ -8,8 +8,8 @@ module RForce def initialize(content) @content = content end - - def parse + + def parse @current_value = nil @stack = [] @parsed = OpenHash.new({}) @@ -25,7 +25,7 @@ module RForce when XML::Parser::END_ELEM then tag_end name end - + break if @done end lib/rforce/soap_response_expat.rb @@ -14,7 +14,7 @@ module RForce node = document % 'soapenv:Body' self.class.node_to_ruby node end - + private def self.node_to_ruby(node) @@ -26,7 +26,7 @@ module RForce if node.is_a?(Hpricot::Text) return node.inner_text.to_s end - + if children.first.is_a?(Hpricot::Text) return children.first.to_s end @@ -38,11 +38,11 @@ module RForce children.each do |e| next if e.is_a?(Hpricot::Text) && e.to_s.strip.empty? name = e.name - + if name.include? ':' name = name.split(':').last end - + name = name.to_sym case elements[name] lib/rforce/soap_response_hpricot.rb @@ -84,4 +84,3 @@ CreateXml = <<HERE.gsub(/\n\s*/, '') </partner:sObjects> </partner:create> HERE - spec/rforce_spec.rb 4562c49df55c1c1add7b6aa7eb7a58f68fe09e67 Ian Dees undees@gmail.com http://github.com/undees/rforce/commit/98b463e9f8a9d82cbece3c44ecc63cdacba0b850 98b463e9f8a9d82cbece3c44ecc63cdacba0b850 2009-05-29T11:34:46-07:00 2009-05-29T11:34:46-07:00 I hate whitespace --HG-- branch : trunk 26ca05e5fe136033d54be87b199a55e1b4860e73 Ian Dees undees@gmail.com