Skip to content

Commit e082fa4

Browse files
committed
Fix rubocop warnings
1 parent ec5ec51 commit e082fa4

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

lib/ferrum/browser/client.rb

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

3-
require "concurrent-ruby"
43
require "ferrum/browser/subscriber"
54
require "ferrum/browser/web_socket"
65

@@ -14,15 +13,18 @@ def initialize(browser, ws_url, id_starts_with: 0)
1413
@command_id = id_starts_with
1514
@pendings = Concurrent::Hash.new
1615
@ws = WebSocket.new(ws_url, @browser.ws_max_receive_size, @browser.logger)
17-
@subscriber, @interruptor = Subscriber.build(2)
16+
@subscriber, @interrupter = Subscriber.build(2)
1817

1918
@thread = Thread.new do
2019
Thread.current.abort_on_exception = true
2120
Thread.current.report_on_exception = true if Thread.current.respond_to?(:report_on_exception=)
2221

23-
while message = @ws.messages.pop
22+
loop do
23+
message = @ws.messages.pop
24+
break unless message
25+
2426
if INTERRUPTIONS.include?(message["method"])
25-
@interruptor.async.call(message)
27+
@interrupter.async.call(message)
2628
elsif message.key?("method")
2729
@subscriber.async.call(message)
2830
else
@@ -51,14 +53,14 @@ def command(method, params = {})
5153
def on(event, &block)
5254
case event
5355
when *INTERRUPTIONS
54-
@interruptor.on(event, &block)
56+
@interrupter.on(event, &block)
5557
else
5658
@subscriber.on(event, &block)
5759
end
5860
end
5961

6062
def subscribed?(event)
61-
[@interruptor, @subscriber].any? { |s| s.subscribed?(event) }
63+
[@interrupter, @subscriber].any? { |s| s.subscribed?(event) }
6264
end
6365

6466
def close

lib/ferrum/browser/subscriber.rb

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
# frozen_string_literal: true
22

3-
require "concurrent-ruby"
4-
53
module Ferrum
64
class Browser
75
class Subscriber

lib/ferrum/browser/web_socket.rb

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@ def initialize(url, max_receive_size, logger)
3232
Thread.current.report_on_exception = true if Thread.current.respond_to?(:report_on_exception=)
3333

3434
begin
35-
while data = @sock.readpartial(512)
35+
loop do
36+
data = @sock.readpartial(512)
37+
break unless data
38+
3639
@driver.parse(data)
3740
end
3841
rescue EOFError, Errno::ECONNRESET, Errno::EPIPE

0 commit comments

Comments
 (0)