lib/panda/adapters/faraday.rb in panda-1.4.3 vs lib/panda/adapters/faraday.rb in panda-1.4.4

@@ -1,7 +1,8 @@
 require 'faraday'
 require 'yajl/json_gem'
+require 'typhoeus'
 
 module Panda
   module Adapter
     class Faraday
       
@@ -49,19 +50,19 @@
       end
       
       private
       
       def connection
-        @conn ||= ::Faraday::Connection.new(:url => @api_url) do |builder|
-          builder.adapter :net_http
-          builder.response :yajl
+        @conn ||= ::Faraday.new(:url => @api_url) do |builder|
+          builder.request  :url_encoded
+          builder.adapter :typhoeus
         end
       end
       
       def rescue_json_parsing(&block)
         begin
-          yield || raise(ServiceNotAvailable)
-        rescue ::Faraday::Error::ParsingError => e
+          Yajl::Parser.parse(yield)
+        rescue Yajl::ParseError => e
           raise(ServiceNotAvailable)
         end
       end
       
     end
\ No newline at end of file