root
/
rubyzip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PROPER case insensitivity handling

This commit is contained in:
weshatheleopard 2015-03-08 13:38:57 -05:00
parent 070411ef5c
commit cfc38b30a1
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/zip.rb
View File

@ -37,7 +37,7 @@ end
module Zip module Zip
extend self extend self
attr_accessor :unicode_names, :on_exists_proc, :continue_on_exists_proc, :sort_entries, :default_compression, :write_zip64_support, :warn_invalid_date attr_accessor :unicode_names, :on_exists_proc, :continue_on_exists_proc, :sort_entries, :default_compression, :write_zip64_support, :warn_invalid_date, :case_insensitive_match
def reset! def reset!
@_ran_once = false @_ran_once = false
@ -48,6 +48,7 @@ module Zip
@default_compression = ::Zlib::DEFAULT_COMPRESSION @default_compression = ::Zlib::DEFAULT_COMPRESSION
@write_zip64_support = false @write_zip64_support = false
@warn_invalid_date = true @warn_invalid_date = true
@case_insensitive_match = false
end end
def setup def setup

4
lib/zip/entry_set.rb
View File

@ -78,7 +78,9 @@ module Zip
private private
def to_key(entry) def to_key(entry)
entry.to_s.chomp('/') k = entry.to_s.chomp('/')
k.downcase! if ::Zip.case_insensitive_match
k
end end
end end
end end

14
test/entry_set_test.rb
View File

@ -66,9 +66,17 @@ class ZipEntrySetTest < MiniTest::Test
end end
def test_find_entry def test_find_entry
# by default, #find_entry is case-sensitive entries = [::Zip::Entry.new("zipfile.zip", "MiXeDcAsEnAmE", "comment1")]
assert_equal(ZIP_ENTRIES[0], @zipEntrySet.find_entry('name1'))
assert_equal(ZIP_ENTRIES[0], @zipEntrySet.find_entry('NaMe1', false)) ::Zip.case_insensitive_match = true
zipEntrySet = ::Zip::EntrySet.new(entries)
assert_equal(entries[0], zipEntrySet.find_entry('MiXeDcAsEnAmE'))
assert_equal(entries[0], zipEntrySet.find_entry('mixedcasename'))
::Zip.case_insensitive_match = false
zipEntrySet = ::Zip::EntrySet.new(entries)
assert_equal(entries[0], zipEntrySet.find_entry('MiXeDcAsEnAmE'))
assert_equal(nil, zipEntrySet.find_entry('mixedcasename'))
end end
def test_entries_with_sort def test_entries_with_sort