History

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
  1. lib/docs/core/request.rb +1 −1
  2. lib/docs/core/requester.rb +6 −6
lib/docs/core/request.rb+1−1
@@ -13,7 +13,7 @@ module Docs · 12 unmodified lines
13 request.run13 request.run
14 end14 end
15 15
16 def initialize(url, **options)16 def initialize(url, options = {})
17 super url.to_s, DEFAULT_OPTIONS.merge(options)17 super url.to_s, DEFAULT_OPTIONS.merge(options)
18 end18 end
19 19
lib/docs/core/requester.rb+6−6
@@ -4,9 +4,9 @@ module Docs · 3 unmodified lines
4 4
5 attr_reader :request_options5 attr_reader :request_options
6 6
7 def self.run(urls, **options, &block)7 def self.run(urls, options = {}, &block)
8 urls = urls.dup8 urls = urls.dup
9 requester = new(**options)9 requester = new(options)
10 requester.on_response(&block) if block_given?10 requester.on_response(&block) if block_given?
11 requester.on_response do # cheap hack to ensure root page is processed first11 requester.on_response do # cheap hack to ensure root page is processed first
12 if urls12 if urls
@@ -19,16 +19,16 @@ module Docs · 6 unmodified lines
19 requester19 requester
20 end20 end
21 21
22 def initialize(**options)22 def initialize(options = {})
23 @request_options = options.extract!(:request_options)[:request_options].try(:dup) || {}23 @request_options = options.extract!(:request_options)[:request_options].try(:dup) || {}
24 options[:max_concurrency] ||= 2024 options[:max_concurrency] ||= 20
25 options[:pipelining] = 025 options[:pipelining] = 0
26 super26 super
27 end27 end
28 28
29 def request(urls, **options, &block)29 def request(urls, options = {}, &block)
30 requests = [urls].flatten.map do |url|30 requests = [urls].flatten.map do |url|
31 build_and_queue_request(url, **options, &block)31 build_and_queue_request(url, options, &block)
32 end32 end
33 requests.length == 1 ? requests.first : requests33 requests.length == 1 ? requests.first : requests
34 end34 end
@@ -46,7 +46,7 @@ module Docs · 11 unmodified lines
46 46
47 private47 private
48 48
49 def build_and_queue_request(url, **options, &block)49 def build_and_queue_request(url, options = {}, &block)
50 request = Request.new(url, **request_options.merge(options))50 request = Request.new(url, **request_options.merge(options))
51 request.on_complete(&block) if block51 request.on_complete(&block) if block
52 queue(request)52 queue(request)