Merge branch 'master' of https://github.com/bfrydl/httparty into bfrydl-master

httparty.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
   s.description = %q{Makes http fun! Also, makes consuming restful web services dead easy.}
 
   s.add_dependency 'crack', HTTParty::CRACK_DEPENDENCY
+  s.add_dependency 'multi_json'
+  s.add_dependency 'multi_xml'
 
   s.add_development_dependency "activesupport", "~> 2.3"
   s.add_development_dependency "cucumber",      "~> 0.7"

lib/httparty.rb

@@ -4,6 +4,8 @@ require 'net/https'
 require 'uri'
 require 'zlib'
 require 'crack'
+require 'multi_xml'
+require 'multi_json'
 
 require 'httparty/module_inheritable_attributes'
 require 'httparty/cookie_hash'

lib/httparty/parser.rb

@@ -109,11 +109,11 @@ module HTTParty
     protected
 
     def xml
-      Crack::XML.parse(body)
+      MultiXml.parse(body)
     end
 
     def json
-      Crack::JSON.parse(body)
+      MultiJson.decode(body)
     end
 
     def yaml

spec/httparty/parser_spec.rb

@@ -129,13 +129,13 @@ describe HTTParty::Parser do
       HTTParty::Parser.new('body', nil)
     end
 
-    it "parses xml with Crack" do
+    it "parses xml with MultiXml" do
-      Crack::XML.should_receive(:parse).with('body')
+      MultiXml.should_receive(:parse).with('body')
       subject.send(:xml)
     end
 
-    it "parses json with Crack" do
+    it "parses json with MultiJson" do
-      Crack::JSON.should_receive(:parse).with('body')
+      MultiJson.should_receive(:decode).with('body')
       subject.send(:json)
     end