Use faraday_middleware

.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/

README.md

@@ -92,7 +92,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/dwolla.
 
-
 ## License
 
-The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
+The gem is available as open source under the terms of the [Unlicense License](http://unlicense.org/).

dwolla.gemspec

@@ -32,5 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "webmock", "~> 1.22"
 
-  spec.add_dependency "faraday", "~> 0.9.2"
+  spec.add_dependency "faraday", "~> 0.9"
+  spec.add_dependency "faraday_middleware", "~> 0.10"
 end

lib/dwolla.rb

@@ -3,6 +3,7 @@
 require "json"
 
 require "faraday"
+require "faraday_middleware"
 
 require "dwolla/version"
 require "dwolla/client"

lib/dwolla/auth.rb

@@ -43,7 +43,7 @@ def query
 
     def self.request_token client, params
       res = client.conn.post client.token_url, params
-      res_body = Util.parse_json res.body
+      res_body = Util.deep_symbolize_keys res.body
       if res.status == 200
         Token.new client, res_body
       else

lib/dwolla/client.rb

@@ -46,9 +46,9 @@ def faraday &block
 
     def conn
       @conn ||= Faraday.new do |f|
-        f.request :multipart
-        f.request :url_encoded
         f.request :basic_auth, id, secret
+        f.request :url_encoded
+        f.response :json, :content_type => /\bjson$/
         faraday.call(f) if faraday
         f.adapter Faraday.default_adapter unless faraday
       end

lib/dwolla/token.rb

@@ -9,6 +9,7 @@ def initialize client, params
       @expires_in = params[:expires_in]
       @scope = params[:scope]
       @account_id = params[:account_id]
+      conn
       freeze
     end
 
@@ -21,5 +22,19 @@ def stringify_keys
         "account_id"    => account_id
       }.reject {|k,v| v.nil? }
     end
+
+    private
+
+    def conn
+      @conn ||= Faraday.new do |f|
+        f.authorization :Bearer, access_token if access_token
+        f.headers["Accept"] = "application/vnd.dwolla.v1.hal+json"
+        f.request :multipart
+        f.request :json
+        f.response :json, :content_type => /\bjson$/
+        client.faraday.call(f) if client.faraday
+        f.adapter Faraday.default_adapter unless client.faraday
+      end
+    end
   end
 end

lib/dwolla/util.rb

@@ -1,9 +1,5 @@
 module Dwolla
   module Util
-    def self.parse_json string
-      deep_symbolize_keys JSON.parse(string)
-    end
-
     def self.deep_symbolize_keys obj
       if obj.is_a? Hash
         Hash[obj.map{|k,v| [k.to_sym, deep_symbolize_keys(v)] }]

spec/dwolla/auth_spec.rb

@@ -239,6 +239,7 @@ def stub_token_request client, params, response
       .with(:headers => {"Content-Type" => "application/x-www-form-urlencoded"},
             :body => params)
       .to_return(:status => response[:status],
+                 :headers => {"Content-Type" => "application/json"},
                  :body => JSON.generate(response[:body]))
   end