mirror of
https://github.com/lostisland/faraday.git
synced 2025-10-08 00:03:41 -04:00
add ability to set default connection options for all connections
This commit is contained in:
parent
e27df4e915
commit
f9eead9552
@ -29,6 +29,9 @@ module Faraday
|
|||||||
# Faraday.get "https://faraday.com"
|
# Faraday.get "https://faraday.com"
|
||||||
attr_writer :default_connection
|
attr_writer :default_connection
|
||||||
|
|
||||||
|
# Public: Sets the default options used when calling Faraday#new.
|
||||||
|
attr_writer :default_connection_options
|
||||||
|
|
||||||
# Public: Initializes a new Faraday::Connection.
|
# Public: Initializes a new Faraday::Connection.
|
||||||
#
|
#
|
||||||
# url - The optional String base URL to use as a prefix for all
|
# url - The optional String base URL to use as a prefix for all
|
||||||
@ -58,6 +61,7 @@ module Faraday
|
|||||||
# Returns a Faraday::Connection.
|
# Returns a Faraday::Connection.
|
||||||
def new(url = nil, options = {})
|
def new(url = nil, options = {})
|
||||||
block = block_given? ? Proc.new : nil
|
block = block_given? ? Proc.new : nil
|
||||||
|
options = Faraday::Utils.deep_merge(default_connection_options, options)
|
||||||
Faraday::Connection.new(url, options, &block)
|
Faraday::Connection.new(url, options, &block)
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -93,6 +97,13 @@ module Faraday
|
|||||||
@default_connection ||= Connection.new
|
@default_connection ||= Connection.new
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Gets the default connection options used when calling Faraday#new.
|
||||||
|
#
|
||||||
|
# Returns an options Hash.
|
||||||
|
def self.default_connection_options
|
||||||
|
@default_connection_options ||= {}
|
||||||
|
end
|
||||||
|
|
||||||
if (!defined?(RUBY_ENGINE) || "ruby" == RUBY_ENGINE) && RUBY_VERSION < '1.9'
|
if (!defined?(RUBY_ENGINE) || "ruby" == RUBY_ENGINE) && RUBY_VERSION < '1.9'
|
||||||
begin
|
begin
|
||||||
require 'system_timer'
|
require 'system_timer'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user