@@ -3,6 +3,8 @@ $:.unshift(File.dirname(__FILE__)) require 'net/http' require 'net/https' require 'rubygems' +gem 'json', '>= 1.1.3' +require 'json' require 'active_support' require 'module_level_inheritable_attributes' @@ -96,4 +98,5 @@ module HTTParty end require 'httparty/exceptions' -require 'httparty/request' \ No newline at end of file +require 'httparty/request' +require 'httparty/xml' \ No newline at end of file lib/httparty.rb @@ -104,9 +104,9 @@ module HTTParty return nil if body.nil? or body.empty? case format when :xml - Hash.from_xml(body) + ToHashParser.from_xml(body) when :json - ActiveSupport::JSON.decode(body) + JSON.parse(body) else body end lib/httparty/request.rb @@ -198,8 +198,8 @@ class REXMLUtilityNode end end -class HashFromXml - def self.create(xml) +class ToHashParser + def self.from_xml(xml) stack = [] parser = REXML::Parsers::BaseParser.new(xml) lib/httparty/xml.rb 057e3f1a19426a61913f59fac7189e0a47b6dfa5 John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/httparty/commit/c0ad5dece3d15f8549f5292ad678c7b18a939ccb c0ad5dece3d15f8549f5292ad678c7b18a939ccb 2008-12-06T19:16:21-08:00 2008-12-06T19:16:21-08:00 Switched json and xml deserializers to json gem and included ToHashParser#from_xml 151daeef7b4a7e0d072d533bddf3e890b107163a John Nunemaker nunemaker@gmail.com