lib/flattr/connection.rb in flattr-0.2.1 vs lib/flattr/connection.rb in flattr-0.2.2
- old
+ new
@@ -4,25 +4,25 @@
require 'flattr/request/oauth2'
module Flattr
module Connection
private
- def connection(options={})
+ def connection(connection_options={})
default_options = {
:headers => {
:accept => 'application/json',
:user_agent => user_agent,
},
:proxy => proxy,
:ssl => {:verify => false},
- :url => options.fetch(:endpoint, endpoint),
+ :url => endpoint,
}
Faraday.new(default_options.deep_merge(connection_options)) do |builder|
#builder.use Faraday::Request::Multipart
builder.use Faraday::Request::JSON
builder.use Faraday::Request::UrlEncoded
builder.use Flattr::Request::FlattrOAuth2, credentials if credentials?
- builder.use Flattr::Response::ParseJson unless options[:raw]
+ builder.use Flattr::Response::ParseJson unless connection_options[:raw]
builder.adapter(adapter)
end
end
end
end