Skip to content

Commit a8c8478

Browse files
committed
Formatting change: {...} should have spaces inside the braces
1 parent 242f007 commit a8c8478

File tree

5 files changed

+33
-33
lines changed

5 files changed

+33
-33
lines changed

README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ then the `permessage-deflate` extension will receive the call:
227227

228228
```rb
229229
ext.create_server_session([
230-
{'server_no_context_takeover' => true, 'server_max_window_bits' => 8},
231-
{'server_max_window_bits' => 15}
230+
{ 'server_no_context_takeover' => true, 'server_max_window_bits' => 8 },
231+
{ 'server_max_window_bits' => 15 }
232232
])
233233
```
234234

@@ -244,8 +244,8 @@ implement the following methods, as well as the *Session* API listed below.
244244
```rb
245245
client_session.generate_offer
246246
# e.g. -> [
247-
# {'server_no_context_takeover' => true, 'server_max_window_bits' => 8},
248-
# {'server_max_window_bits' => 15}
247+
# { 'server_no_context_takeover' => true, 'server_max_window_bits' => 8 },
248+
# { 'server_max_window_bits' => 15 }
249249
# ]
250250
```
251251

@@ -270,7 +270,7 @@ must implement the following methods, as well as the *Session* API listed below.
270270

271271
```rb
272272
server_session.generate_response
273-
# e.g. -> {'server_max_window_bits' => 8}
273+
# e.g. -> { 'server_max_window_bits' => 8 }
274274
```
275275

276276
This returns the set of parameters the server session wants to send in its

lib/websocket/extensions.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def add(ext)
3838
end
3939

4040
if @by_name.has_key?(ext.name)
41-
raise TypeError, %Q{An extension with name "#{ext.name}" is already registered}
41+
raise TypeError, %Q{An extension with name "#{ ext.name }" is already registered}
4242
end
4343

4444
@by_name[ext.name] = ext
@@ -78,18 +78,18 @@ def activate(header)
7878

7979
responses.each_offer do |name, params|
8080
unless record = @index[name]
81-
raise ExtensionError, %Q{Server sent am extension response for unknown extension "#{name}"}
81+
raise ExtensionError, %Q{Server sent am extension response for unknown extension "#{ name } }
8282
end
8383

8484
ext, session = *record
8585

8686
if reserved = reserved?(ext)
87-
raise ExtensionError, %Q{Server sent two extension responses that use the RSV#{reserved[0]} } +
88-
%Q{ bit: "#{reserved[1]}" and "#{ext.name}"}
87+
raise ExtensionError, %Q{Server sent two extension responses that use the RSV#{ reserved[0] }} +
88+
%Q{bit: "#{ reserved[1] }" and "#{ ext.name }"}
8989
end
9090

9191
unless session.activate(params) == true
92-
raise ExtensionError, %Q{Server send unacceptable extension parameters: #{Parser.serialize_params(name, params)}}
92+
raise ExtensionError, %Q{Server send unacceptable extension parameters: #{ Parser.serialize_params(name, params) }}
9393
end
9494

9595
reserve(ext)
@@ -118,7 +118,7 @@ def generate_response(header)
118118
end
119119

120120
def valid_frame_rsv(frame)
121-
allowed = {:rsv1 => false, :rsv2 => false, :rsv3 => false}
121+
allowed = { :rsv1 => false, :rsv2 => false, :rsv3 => false }
122122

123123
if MESSAGE_OPCODES.include?(frame.opcode)
124124
@sessions.each do |ext, session|

lib/websocket/extensions/parser.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ class Parser
77
TOKEN = /([!#\$%&'\*\+\-\.\^_`\|~0-9A-Za-z]+)/
88
NOTOKEN = /([^!#\$%&'\*\+\-\.\^_`\|~0-9A-Za-z])/
99
QUOTED = /"((?:\\[\x00-\x7f]|[^\x00-\x08\x0a-\x1f\x7f"])*)"/
10-
PARAM = %r{#{TOKEN.source}(?:=(?:#{TOKEN.source}|#{QUOTED.source}))?}
11-
EXT = %r{#{TOKEN.source}(?: *; *#{PARAM.source})*}
12-
EXT_LIST = %r{^#{EXT.source}(?: *, *#{EXT.source})*$}
10+
PARAM = %r{#{ TOKEN.source }(?:=(?:#{ TOKEN.source }|#{ QUOTED.source }))?}
11+
EXT = %r{#{ TOKEN.source }(?: *; *#{ PARAM.source })*}
12+
EXT_LIST = %r{^#{ EXT.source }(?: *, *#{ EXT.source })*$}
1313
NUMBER = /^-?(0|[1-9][0-9]*)(\.[0-9]+)?$/
1414

1515
ParseError = Class.new(ArgumentError)
@@ -19,7 +19,7 @@ def self.parse_header(header)
1919
return offers if header == '' or header.nil?
2020

2121
unless header =~ EXT_LIST
22-
raise ParseError, "Invalid Sec-WebSocket-Extensions header: #{header}"
22+
raise ParseError, "Invalid Sec-WebSocket-Extensions header: #{ header }"
2323
end
2424

2525
scanner = StringScanner.new(header)

spec/websocket/extensions/parser_spec.rb

+14-14
Original file line numberDiff line numberDiff line change
@@ -20,60 +20,60 @@ def parse(string)
2020

2121
it "parses one offer with no params" do
2222
expect(parse 'a').to eq [
23-
{:name => "a", :params => {}}
23+
{ :name => "a", :params => {} }
2424
]
2525
end
2626

2727
it "parses two offers with no params" do
2828
expect(parse 'a, b').to eq [
29-
{:name => "a", :params => {}}, {:name => "b", :params => {}}
29+
{ :name => "a", :params => {} }, { :name => "b", :params => {} }
3030
]
3131
end
3232

3333
it "parses a duplicate offer name" do
3434
expect(parse 'a, a').to eq [
35-
{:name => "a", :params => {}},
36-
{:name => "a", :params => {}}
35+
{ :name => "a", :params => {} },
36+
{ :name => "a", :params => {} }
3737
]
3838
end
3939

4040
it "parses a flag" do
4141
expect(parse 'a; b').to eq [
42-
{:name => "a", :params => {"b" => true}}
42+
{ :name => "a", :params => { "b" => true } }
4343
]
4444
end
4545

4646
it "parses an unquoted param" do
4747
expect(parse 'a; b=1').to eq [
48-
{:name => "a", :params => {"b" => 1}}
48+
{ :name => "a", :params => { "b" => 1 } }
4949
]
5050
end
5151

5252
it "parses a quoted param" do
5353
expect(parse 'a; b="hi, \"there"').to eq [
54-
{:name => "a", :params => {"b" => 'hi, "there'}}
54+
{ :name => "a", :params => { "b" => 'hi, "there' } }
5555
]
5656
end
5757

5858
it "parses multiple params" do
5959
expect(parse 'a; b; c=1; d="hi"').to eq [
60-
{:name => "a", :params => {"b" => true, "c" => 1, "d" => "hi"}}
60+
{ :name => "a", :params => { "b" => true, "c" => 1, "d" => "hi" } }
6161
]
6262
end
6363

6464
it "parses duplicate params" do
6565
expect(parse 'a; b; c=1; b="hi"').to eq [
66-
{:name => "a", :params => {"b" => [true, "hi"], "c" => 1}}
66+
{ :name => "a", :params => { "b" => [true, "hi"], "c" => 1 } }
6767
]
6868
end
6969

7070
it "parses multiple complex offers" do
7171
expect(parse 'a; b=1, c, b; d, c; e="hi, there"; e, a; b').to eq [
72-
{:name => "a", :params => {"b" => 1}},
73-
{:name => "c", :params => {}},
74-
{:name => "b", :params => {"d" => true}},
75-
{:name => "c", :params => {"e" => ['hi, there', true]}},
76-
{:name => "a", :params => {"b" => true}}
72+
{ :name => "a", :params => { "b" => 1 } },
73+
{ :name => "c", :params => {} },
74+
{ :name => "b", :params => { "d" => true } },
75+
{ :name => "c", :params => { "e" => ['hi, there', true] } },
76+
{ :name => "a", :params => { "b" => true } }
7777
]
7878
end
7979
end

spec/websocket/extensions_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
describe "client sessions" do
4141
before do
42-
@offer = {"mode" => "compress"}
42+
@offer = { "mode" => "compress" }
4343
allow(@ext).to receive(:create_client_session).and_return(@session)
4444
allow(@session).to receive(:generate_offer).and_return(@offer)
4545
@extensions.add(@ext)
@@ -248,7 +248,7 @@
248248

249249
describe "server sessions" do
250250
before do
251-
@response = {"mode" => "compress"}
251+
@response = { "mode" => "compress" }
252252
allow(@ext).to receive(:create_server_session).and_return(@session)
253253
allow(@session).to receive(:generate_response).and_return(@response)
254254

@@ -269,12 +269,12 @@
269269

270270
describe :generate_response do
271271
it "asks the extension for a server session with the offer" do
272-
expect(@ext).to receive(:create_server_session).with([{"flag" => true}]).exactly(1).and_return(@session)
272+
expect(@ext).to receive(:create_server_session).with([{ "flag" => true }]).exactly(1).and_return(@session)
273273
@extensions.generate_response("deflate; flag")
274274
end
275275

276276
it "asks the extension for a server session with multiple offers" do
277-
expect(@ext).to receive(:create_server_session).with([{"a" => true}, {"b" => true}]).exactly(1).and_return(@session)
277+
expect(@ext).to receive(:create_server_session).with([{ "a" => true }, { "b" => true }]).exactly(1).and_return(@session)
278278
@extensions.generate_response("deflate; a, deflate; b")
279279
end
280280

0 commit comments

Comments
 (0)