Skip to content

Commit be4cfee

Browse files
committed
Let missing brotli raise
1 parent 519b7ad commit be4cfee

File tree

3 files changed

+3
-34
lines changed

3 files changed

+3
-34
lines changed

spec/compressed_socket_spec.rb

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22

33
require 'datastar'
44
require 'datastar/compressor/gzip'
5-
require 'datastar/compressor/brotli' rescue nil
6-
require 'zlib'
5+
require 'datastar/compressor/brotli'
76

87
RSpec.describe 'Compressor compressed sockets' do
98
let(:raw_socket) { StringSocket.new }
@@ -80,12 +79,8 @@ def bytes
8079
end
8180
end
8281

83-
describe 'Datastar::Compressor::Brotli::CompressedSocket' do
84-
before do
85-
skip 'brotli gem not available' unless brotli_available?
86-
end
87-
88-
subject(:socket) { Datastar::Compressor::Brotli::CompressedSocket.new(raw_socket) }
82+
describe Datastar::Compressor::Brotli::CompressedSocket do
83+
subject(:socket) { described_class.new(raw_socket) }
8984

9085
it 'compresses data and decompresses to original' do
9186
socket << sse_data
@@ -119,12 +114,4 @@ def bytes
119114
end
120115
end
121116

122-
private
123-
124-
def brotli_available?
125-
require 'brotli'
126-
true
127-
rescue LoadError
128-
false
129-
end
130117
end

spec/compression_config_spec.rb

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,6 @@
8787
end
8888

8989
it 'returns first compressor (preferred) when client supports both' do
90-
begin
91-
require 'brotli'
92-
rescue LoadError
93-
skip 'brotli gem not available'
94-
end
95-
9690
config = described_class.build([:br, :gzip])
9791
request = build_request('Accept-Encoding' => 'br, gzip')
9892
compressor = config.negotiate(request)
@@ -181,14 +175,6 @@
181175
end
182176

183177
describe 'Compressor::Brotli' do
184-
before do
185-
begin
186-
require 'brotli'
187-
rescue LoadError
188-
skip 'brotli gem not available'
189-
end
190-
end
191-
192178
subject(:compressor) { Datastar::Compressor::Brotli.new({}) }
193179

194180
it 'has :br encoding' do

spec/dispatcher_spec.rb

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,6 @@ def self.render_in(view_context) = %(<div id="foo">\n<span>#{view_context}</span
612612

613613
describe 'compression' do
614614
it 'sets Content-Encoding: br when compression enabled and client accepts br' do
615-
begin; require 'brotli'; rescue LoadError; skip 'brotli gem not available'; end
616-
617615
request = build_request('/events', headers: { 'HTTP_ACCEPT_ENCODING' => 'br, gzip' })
618616
dispatcher = Datastar.new(request:, response:, view_context:, compression: true)
619617

@@ -659,8 +657,6 @@ def self.render_in(view_context) = %(<div id="foo">\n<span>#{view_context}</span
659657
end
660658

661659
it 'streams brotli-compressed data that decompresses correctly' do
662-
begin; require 'brotli'; rescue LoadError; skip 'brotli gem not available'; end
663-
664660
request = build_request('/events', headers: { 'HTTP_ACCEPT_ENCODING' => 'br' })
665661
dispatcher = Datastar.new(request:, response:, view_context:, compression: true, heartbeat: false)
666662

0 commit comments

Comments
 (0)