Implemented ZipEntry.file?

This commit is contained in:
thomas 2002-07-26 15:06:42 +00:00
parent bfa6b6328a
commit d80db649df
2 changed files with 19 additions and 1 deletions

6
zip.rb
View File

@ -331,7 +331,11 @@ module Zip
return (%r{\/$} =~ @name) != nil return (%r{\/$} =~ @name) != nil
end end
alias :isDirectory :directory? alias :isDirectory :directory?
def file?
! directory?
end
def localEntryOffset #:nodoc:all def localEntryOffset #:nodoc:all
localHeaderOffset + localHeaderSize localHeaderOffset + localHeaderSize
end end

View File

@ -111,6 +111,20 @@ class ZipEntryTest < RUNIT::TestCase
assert_equals(TEST_ISDIRECTORY, entry.isDirectory) assert_equals(TEST_ISDIRECTORY, entry.isDirectory)
end end
def test_isDirectoryAndIsFile
assert(ZipEntry.new(TEST_ZIPFILE, "hello").file?)
assert(! ZipEntry.new(TEST_ZIPFILE, "hello").directory?)
assert(ZipEntry.new(TEST_ZIPFILE, "dir/hello").file?)
assert(! ZipEntry.new(TEST_ZIPFILE, "dir/hello").directory?)
assert(ZipEntry.new(TEST_ZIPFILE, "hello/").directory?)
assert(! ZipEntry.new(TEST_ZIPFILE, "hello/").file?)
assert(ZipEntry.new(TEST_ZIPFILE, "dir/hello/").directory?)
assert(! ZipEntry.new(TEST_ZIPFILE, "dir/hello/").file?)
end
def test_equality def test_equality
entry1 = ZipEntry.new("file.zip", "name", "isNotCompared", entry1 = ZipEntry.new("file.zip", "name", "isNotCompared",
"something extra", 123, 1234, "something extra", 123, 1234,