8000 Merge pull request #224 from weshatheleopard/master · rubyzip/rubyzip@4698e57 · GitHub
[go: up one dir, main page]

Skip to content

Commit 4698e57

Browse files
committed
Merge pull request #224 from weshatheleopard/master
Less sloppy implementation of case insensitive matching
2 parents daf3c28 + 360636c commit 4698e57

File tree

4 files changed

+88
-9
lines changed

4 files changed

+88
-9
lines changed

lib/zip.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
module Zip
3939
extend self
40-
attr_accessor :unicode_names, :on_exists_proc, :continue_on_exists_proc, :sort_entries, :default_compression, :write_zip64_support, :warn_invalid_date
40+
attr_accessor :unicode_names, :on_exists_proc, :continue_on_exists_proc, :sort_entries, :default_compression, :write_zip64_support, :warn_invalid_date, :case_insensitive_match
4141

4242
def reset!
4343
@_ran_once = false
@@ -48,6 +48,7 @@ def reset!
4848
@default_compression = ::Zlib::DEFAULT_COMPRESSION
4949
@write_zip64_support = false
5050
@warn_invalid_date = true
51+
@case_insensitive_match = false
5152
end
5253

5354
def setup

lib/zip/entry_set.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,8 @@ def include?(entry)
1313
@entry_set.include?(to_key(entry))
1414
end
1515

16-
def find_entry(entry, case_sensitively = true)
17-
return @entry_set[to_key(entry)] if case_sensitively
18-
entry = @entry_set.find { |k, _| k.downcase == to_key(entry).downcase }
19-
entry.last if entry
16+
def find_entry(entry)
17+
@entry_set[to_key(entry)]
2018
end
2119

2220
def <<(entry)
@@ -78,7 +76,9 @@ def sorted_entries
7876

7977
private
8078
def to_key(entry)
81-
entry.to_s.chomp('/')
79+
8000 k = entry.to_s.chomp('/')
80+
k.downcase! if ::Zip.case_insensitive_match
81+
k
8282
end
8383
end
8484
end

test/case_sensitivity_test.rb

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
require 'test_helper'
2+
3+
4+
class ZipFileTest < MiniTest::Test
5+
include CommonZipFileFixture
6+
7+
SRC_FILES = [ [ "test/data/file1.txt", "testfile.rb" ],
8+
[ "test/data/file2.txt", "testFILE.rb" ] ]
9+
10+
def teardown
11+
::Zip.case_insensitive_match = false
12+
end
13+
14+
# Ensure that everything functions normally when +case_insensitive_match = false+
15+
def test_add_case_sensitive
16+
::Zip.case_insensitive_match = false
17+
18+
SRC_FILES.each { |fn, en| assert(::File.exist?(fn)) }
19+
zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
20+
21+
SRC_FILES.each { |fn, en| zf.add(en, fn) }
22+
zf.close
23+
24+
zfRead = ::Zip::File.new(EMPTY_FILENAME)
25+
assert_equal(SRC_FILES.size, zfRead.entries.length)
26+
SRC_FILES.each_with_index { |a, i|
27+
assert_equal(a.last, zfRead.entries[i].name)
28+
AssertEntry.assert_contents(a.first,
29+
zfRead.get_input_stream(a.last) { |zis| zis.read })
30+
}
31+
end
32+
33+
# Ensure that names are treated case insensitively when adding files and +case_insensitive_match = false+
34+
def test_add_case_insensitive
35+
::Zip.case_insensitive_match = true
36+
37+
SRC_FILES.each { |fn, en| assert(::File.exist?(fn)) }
38+
zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
39+
40+
assert_raises Zip::EntryExistsError do
41+
SRC_FILES.each { |fn, en| zf.add(en, fn) }
42+
end
43+
44+
end
45+
46+
# Ensure that names are treated case insensitively when reading files and +case_insensitive_match = true+
47+
def test_add_case_sensitive_read_case_insensitive
48+
::Zip.case_insensitive_match = false
49+
50+
SRC_FILES.each { |fn, en| assert(::File.exist?(fn)) }
51+
zf = ::Zip::File.new(EMPTY_FILENAME, ::Zip::File::CREATE)
52+
53+
SRC_FILES.each { |fn, en| zf.add(en, fn) }
54+
zf.close
55+
56+
::Zip.case_insensitive_match = true
57+
58+
zfRead = ::Zip::File.new(EMPTY_FILENAME)
59+
assert_equal(SRC_FILES.collect{ |fn, en| en.downcase}.uniq.size, zfRead.entries.length)
60+
assert_equal(SRC_FILES.last.last.downcase, zfRead.entries.first.name.downcase)
61+
AssertEntry.assert_contents(SRC_FILES.last.first,
62+
zfRead.get_input_stream(SRC_FILES.last.last) { |zis| zis.read })
63+
end
64+
65+
private
66+
def assert_contains(zf, entryName, filename = entryName)
67+
assert(zf.entries.detect { |e| e.name == entryName } != nil, "entry #{entryName} not in #{zf.entries.join(', ')} in zip file #{zf}")
68+
assert_entryContents(zf, entryName, filename) if File.exist?(filename)
69+
end
70+
end

test/entry_set_test.rb

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,17 @@ def test_entries
6666
end
6767

6868
def test_find_entry
69-
# by default, #find_entry is case-sensitive
70-
assert_equal(ZIP_ENTRIES[0], @zipEntrySet.find_entry('name1'))
71-
assert_equal(ZIP_ENTRIES[0], @zipEntrySet.find_entry('NaMe1', false))
69+
entries = [::Zip::Entry.new("zipfile.zip", "MiXeDcAsEnAmE", "comment1")]
70+
71+
::Zip.case_insensitive_match = true
72+
zipEntrySet = ::Zip::EntrySet.new(entries)
73+
assert_equal(entries[0], zipEntrySet.find_entry('MiXeDcAsEnAmE'))
74+
assert_equal(entries[0], zipEntrySet.find_entry('mixedcasename'))
75+
76+
::Zip.case_insensitive_match = false
77+
zipEntrySet = ::Zip::EntrySet.new(entries)
78+
assert_equal(entries[0], zipEntrySet.find_entry('MiXeDcAsEnAmE'))
79+
assert_equal(nil, zipEntrySet.find_entry('mixedcasename'))
7280
end
7381

7482
def test_entries_with_sort

0 commit comments

Comments
 (0)
0