Merge pull request #1931 from freeCodeCamp/fix-options

Fix **options

Simon Legner committed 3 years ago

Commit d07771e2 parents 7fd7b0e 26ea2422 files · +7 −7Browse files

Unified · Split

2 files

@@ -13,7 +13,7 @@ module Docs · 12 unmodified lines
13	13	request.run
14	14	end
15	15
16		− def initialize(url, **options)
	16	+ def initialize(url, options = {})
17	17	super url.to_s, DEFAULT_OPTIONS.merge(options)
18	18	end
19	19

@@ -4,9 +4,9 @@ module Docs · 3 unmodified lines
4	4
5	5	attr_reader :request_options
6	6
7		− def self.run(urls, **options, &block)
	7	+ def self.run(urls, options = {}, &block)
8	8	urls = urls.dup
9		− requester = new(**options)
	9	+ requester = new(options)
10	10	requester.on_response(&block) if block_given?
11	11	requester.on_response do # cheap hack to ensure root page is processed first
12	12	if urls
@@ -19,16 +19,16 @@ module Docs · 6 unmodified lines
19	19	requester
20	20	end
21	21
22		− def initialize(**options)
	22	+ def initialize(options = {})
23	23	@request_options = options.extract!(:request_options)[:request_options].try(:dup) \|\| {}
24	24	options[:max_concurrency] \|\|= 20
25	25	options[:pipelining] = 0
26	26	super
27	27	end
28	28
29		− def request(urls, **options, &block)
	29	+ def request(urls, options = {}, &block)
30	30	requests = [urls].flatten.map do \|url\|
31		− build_and_queue_request(url, **options, &block)
	31	+ build_and_queue_request(url, options, &block)
32	32	end
33	33	requests.length == 1 ? requests.first : requests
34	34	end
@@ -46,7 +46,7 @@ module Docs · 11 unmodified lines
46	46
47	47	private
48	48
49		− def build_and_queue_request(url, **options, &block)
	49	+ def build_and_queue_request(url, options = {}, &block)
50	50	request = Request.new(url, **request_options.merge(options))
51	51	request.on_complete(&block) if block
52	52	queue(request)