support the most recent httparty gem

Author: dcunning

Gemfile.lock

@@ -8,11 +8,14 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    crack (0.1.8)
+    crack (0.3.2)
     diff-lcs (1.1.2)
     fakeweb (1.3.0)
-    httparty (0.7.4)
-      crack (= 0.1.8)
+    httparty (0.10.2)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
+    multi_json (1.6.1)
+    multi_xml (0.5.3)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
       rspec-expectations (~> 2.5.0)
@@ -27,8 +30,6 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.0.0)
-  crack
   fakeweb
-  httparty
   rspec
   ruby-pardot!

lib/pardot/http.rb

@@ -47,8 +47,9 @@ def check_response http_response
 
       error = rsp["err"] if rsp
       error ||= "Unknown Failure: #{rsp.inspect}" if rsp && rsp["stat"] == "fail"
+      content = error['__content__'] if error.is_a?(Hash)
 
-      if error == "Invalid API key or user key" && @api_key
+      if [error, content].include?("Invalid API key or user key") && @api_key
         raise ExpiredApiKeyError.new @api_key
       end
 

spec/spec_helper.rb

@@ -8,4 +8,4 @@
 
 require 'ruby-pardot'
 
-Dir[File.join("spec/support/**/*.rb")].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }