nocebo/diaspora_federation
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use Faraday.default_adapter

Browse source 
fixes #7
This commit is contained in:
Benjamin Neff 2015-11-01 04:05:35 +01:00
parent cc63cfe285
commit eaedc3473a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/diaspora_federation/fetcher.rb
View file

@ -1,6 +1,5 @@
require "faraday" require "faraday"
require "faraday_middleware/response/follow_redirects" require "faraday_middleware/response/follow_redirects"
require "typhoeus/adapters/faraday"
module DiasporaFederation module DiasporaFederation
# A wrapper for {https://github.com/lostisland/faraday Faraday} used for # A wrapper for {https://github.com/lostisland/faraday Faraday} used for
@ -32,7 +31,7 @@ module DiasporaFederation
@connection = Faraday::Connection.new(options) do |builder| @connection = Faraday::Connection.new(options) do |builder|
builder.use FaradayMiddleware::FollowRedirects, limit: 4 builder.use FaradayMiddleware::FollowRedirects, limit: 4
builder.adapter :typhoeus builder.adapter Faraday.default_adapter
end end
@connection.headers["User-Agent"] = "DiasporaFederation/#{DiasporaFederation::VERSION}" @connection.headers["User-Agent"] = "DiasporaFederation/#{DiasporaFederation::VERSION}"

5
test/dummy/config/initializers/faraday.rb Normal file
View file

@ -0,0 +1,5 @@
# Use net_http in test, that's better supported by webmock
unless Rails.env.test?
require "typhoeus/adapters/faraday"
Faraday.default_adapter = :typhoeus
end