Skip to content

Commit ccfe744

Browse files
committed
Fix Style/FileRead Rubocop offences.
1 parent 1113149 commit ccfe744

6 files changed

+9
-19
lines changed

.rubocop_todo.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,3 @@ Layout/LeadingCommentSpace:
1212
- 'lib/zip/bzip2/errors.rb'
1313
- 'lib/zip/bzip2/ffi/libbz2.rb'
1414
- 'lib/zip/bzip2/libbz2.rb'
15-
16-
# Offense count: 9
17-
# This cop supports safe autocorrection (--autocorrect).
18-
Style/FileRead:
19-
Exclude:
20-
- 'test/integration/zip_file_bzip2_support_test.rb'
21-
- 'test/integration/zip_input_stream_bzip2_support_test.rb'
22-
- 'test/models/zip/bzip2/decompress_test.rb'
23-
- 'test/models/zip/bzip2/decompressor_test.rb'
24-
- 'test/models/zip/bzip2/libbz2_test.rb'

test/integration/zip_file_bzip2_support_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ def test_file_read
1717
private
1818

1919
def file1_text
20-
@file1_text ||= File.open(FILE1, 'r').read
20+
@file1_text ||= File.read(FILE1)
2121
end
2222

2323
def file2_text
24-
@file2_text ||= File.open(FILE2, 'r').read
24+
@file2_text ||= File.read(FILE2)
2525
end
2626
end

test/integration/zip_input_stream_bzip2_support_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ def test_input_stream_encrypted_read
3434
private
3535

3636
def file1_text
37-
@file1_text ||= File.open(FILE1, 'r').read
37+
@file1_text ||= File.read(FILE1)
3838
end
3939

4040
def file2_text
41-
@file2_text ||= File.open(FILE2, 'r').read
41+
@file2_text ||= File.read(FILE2)
4242
end
4343
end

test/models/zip/bzip2/decompress_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ def test_decompress_with_corrupted_input
4343
private
4444

4545
def file_text
46-
@file_text ||= File.open(FILE, &:read)
46+
@file_text ||= File.read(FILE)
4747
end
4848

4949
def compressed_data
50-
@compressed_data ||= File.open(BZIP2_FILE, 'rb', &:read)
50+
@compressed_data ||= File.binread(BZIP2_FILE)
5151
end
5252
end

test/models/zip/bzip2/decompressor_test.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ def test_data_error
3939
private
4040

4141
def test_text
42-
@test_text ||= File.open(FILE1, &:read)
42+
@test_text ||= File.read(FILE1)
4343
end
4444
end

test/models/zip/bzip2/libbz2_test.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ def decompress(data)
7474
end
7575

7676
def file_text
77-
@file_text ||= File.open(FILE, &:read)
77+
@file_text ||= File.read(FILE)
7878
end
7979

8080
def compressed_data
81-
@compressed_data ||= File.open(BZIP2_FILE, 'rb', &:read)
81+
@compressed_data ||= File.binread(BZIP2_FILE)
8282
end
8383
end

0 commit comments

Comments
 (0)