ucf 0.5.0 → 0.6.0

data/lib/ucf/meta-inf.rb

@@ -30,12 +30,13 @@
 #
 # Author: Robert Haines
 
-#
+require 'zip-container'
+
 module UCF
 
   # This is a subclass of ManagedDirectory to represent the META-INF directory
   # in a basic UCF Document.
-  class MetaInf < ManagedDirectory
+  class MetaInf < ZipContainer::ManagedDirectory
 
     # :call-seq:
     #   new -> MetaInf
@@ -43,9 +44,12 @@ module UCF
     # Create a standard META-INF ManagedDirectory.
     def initialize
       super("META-INF", false,
-        [ManagedFile.new("container.xml"), ManagedFile.new("manifest.xml"),
-          ManagedFile.new("metadata.xml"), ManagedFile.new("signatures.xml"),
-          ManagedFile.new("encryption.xml"), ManagedFile.new("rights.xml")])
+        [ZipContainer::ManagedFile.new("container.xml"),
+          ZipContainer::ManagedFile.new("manifest.xml"),
+          ZipContainer::ManagedFile.new("metadata.xml"),
+          ZipContainer::ManagedFile.new("signatures.xml"),
+          ZipContainer::ManagedFile.new("encryption.xml"),
+          ZipContainer::ManagedFile.new("rights.xml")])
     end
 
   end

data/test/tc_create.rb

@@ -30,6 +30,7 @@
 #
 # Author: Robert Haines
 
+require 'test/unit'
 require 'tmpdir'
 require 'ucf'
 
@@ -49,7 +50,7 @@ class TestCreation < Test::Unit::TestCase
         end
       end
 
-      assert_nothing_raised(UCF::MalformedUCFError, Zip::ZipError) do
+      assert_nothing_raised(ZipContainer::MalformedContainerError, Zip::ZipError) do
         UCF::Container.verify!(filename)
       end
     end
@@ -57,8 +58,6 @@ class TestCreation < Test::Unit::TestCase
 
   # Check creation of empty ucf files with a different mimetype.
   def test_create_mimetype_file
-    mimetype = "application/x-something-really-odd"
-
     Dir.mktmpdir do |dir|
       filename = File.join(dir, "test.ucf")
 
@@ -71,7 +70,7 @@ class TestCreation < Test::Unit::TestCase
         end
       end
 
-      assert_nothing_raised(UCF::MalformedUCFError, Zip::ZipError) do
+      assert_nothing_raised(ZipContainer::MalformedContainerError, Zip::ZipError) do
         UCF::Container.verify!(filename)
       end
     end
@@ -114,7 +113,7 @@ class TestCreation < Test::Unit::TestCase
         end
       end
 
-      assert_nothing_raised(UCF::MalformedUCFError, Zip::ZipError) do
+      assert_nothing_raised(ZipContainer::MalformedContainerError, Zip::ZipError) do
         UCF::Container.open(filename) do |ucf|
           assert(ucf.on_disk?)
           refute(ucf.in_memory?)

data/test/tc_managed_entries.rb

@@ -30,6 +30,7 @@
 #
 # Author: Robert Haines
 
+require 'test/unit'
 require 'tmpdir'
 require 'ucf'
 
@@ -40,10 +41,10 @@ class ManagedUCF < UCF::Container
 
   def initialize(filename)
     super(filename)
-    register_managed_entry(UCF::ManagedDirectory.new("src", true))
-    register_managed_entry(UCF::ManagedDirectory.new("test"))
-    register_managed_entry(UCF::ManagedDirectory.new("lib"))
-    register_managed_entry(UCF::ManagedFile.new("index.html", true))
+    register_managed_entry(ZipContainer::ManagedDirectory.new("src", true))
+    register_managed_entry(ZipContainer::ManagedDirectory.new("test"))
+    register_managed_entry(ZipContainer::ManagedDirectory.new("lib"))
+    register_managed_entry(ZipContainer::ManagedFile.new("index.html", true))
   end
 
 end
@@ -54,8 +55,8 @@ class ExampleUCF < UCF::Container
 
   def initialize(filename)
     super(filename)
-    register_managed_entry(UCF::ManagedDirectory.new("dir", true))
-    register_managed_entry(UCF::ManagedFile.new("greeting.txt", true))
+    register_managed_entry(ZipContainer::ManagedDirectory.new("dir", true))
+    register_managed_entry(ZipContainer::ManagedFile.new("greeting.txt", true))
   end
 
 end
@@ -68,7 +69,8 @@ class ExampleUCF2 < UCF::Container
     super(filename)
 
     valid = Proc.new { |contents| contents.match(/[Hh]ello/) }
-    register_managed_entry(UCF::ManagedFile.new("greeting.txt", true, valid))
+    register_managed_entry(ZipContainer::ManagedFile.new("greeting.txt",
+      true, valid))
   end
 
 end
@@ -79,7 +81,7 @@ class TestManagedEntries < Test::Unit::TestCase
   def test_fail_verification
     refute(ManagedUCF.verify($ucf_example))
 
-    assert_raises(UCF::MalformedUCFError) do
+    assert_raises(ZipContainer::MalformedContainerError) do
       ManagedUCF.verify!($ucf_example)
     end
   end
@@ -88,7 +90,7 @@ class TestManagedEntries < Test::Unit::TestCase
   def test_pass_verification
     assert(ExampleUCF.verify($ucf_example))
 
-    assert_nothing_raised(UCF::MalformedUCFError) do
+    assert_nothing_raised(ZipContainer::MalformedContainerError) do
       ExampleUCF.verify!($ucf_example)
     end
   end
@@ -97,7 +99,7 @@ class TestManagedEntries < Test::Unit::TestCase
   def test_pass_verification_2
     assert(ExampleUCF2.verify($ucf_example))
 
-    assert_nothing_raised(UCF::MalformedUCFError) do
+    assert_nothing_raised(ZipContainer::MalformedContainerError) do
       ExampleUCF2.verify!($ucf_example)
     end
   end
@@ -119,7 +121,7 @@ class TestManagedEntries < Test::Unit::TestCase
         end
       end
 
-      assert_nothing_raised(UCF::MalformedUCFError) do
+      assert_nothing_raised(ZipContainer::MalformedContainerError) do
         UCF::Container.verify!(filename)
       end
     end
@@ -132,14 +134,14 @@ class TestManagedEntries < Test::Unit::TestCase
 
       assert_nothing_raised do
         ManagedUCF.create(filename) do |c|
-          assert_raises(UCF::MalformedUCFError) do
+          assert_raises(ZipContainer::MalformedContainerError) do
             c.verify!
           end
         end
       end
 
       refute(ManagedUCF.verify(filename))
-      assert_raises(UCF::MalformedUCFError) do
+      assert_raises(ZipContainer::MalformedContainerError) do
         ManagedUCF.verify!(filename)
       end
     end
@@ -160,7 +162,7 @@ class TestManagedEntries < Test::Unit::TestCase
       end
 
       assert(ManagedUCF.verify(filename))
-      assert_nothing_raised(UCF::MalformedUCFError) do
+      assert_nothing_raised(ZipContainer::MalformedContainerError) do
         ManagedUCF.verify!(filename)
       end
     end
@@ -174,7 +176,7 @@ class TestManagedEntries < Test::Unit::TestCase
 
       assert_nothing_raised do
         ExampleUCF2.create(filename) do |c|
-          assert_raises(UCF::MalformedUCFError) do
+          assert_raises(ZipContainer::MalformedContainerError) do
             c.verify!
           end
 
@@ -182,7 +184,7 @@ class TestManagedEntries < Test::Unit::TestCase
             f.puts "Goodbye!"
           end
 
-          assert_raises(UCF::MalformedUCFError) do
+          assert_raises(ZipContainer::MalformedContainerError) do
             c.verify!
           end
 
@@ -190,14 +192,14 @@ class TestManagedEntries < Test::Unit::TestCase
             f.puts "Hello, Y'All!"
           end
 
-          assert_nothing_raised(UCF::MalformedUCFError) do
+          assert_nothing_raised(ZipContainer::MalformedContainerError) do
             c.verify!
           end
         end
       end
 
       assert(ExampleUCF2.verify(filename))
-      assert_nothing_raised(UCF::MalformedUCFError) do
+      assert_nothing_raised(ZipContainer::MalformedContainerError) do
         ExampleUCF2.verify!(filename)
       end
     end

data/test/tc_read.rb

@@ -30,6 +30,7 @@
 #
 # Author: Robert Haines
 
+require 'test/unit'
 require 'ucf'
 
 class TestRead < Test::Unit::TestCase
@@ -45,7 +46,7 @@ class TestRead < Test::Unit::TestCase
 
   # Check that the empty ucf file does verify.
   def test_verify_empty_ucf
-    assert_nothing_raised(UCF::MalformedUCFError, Zip::ZipError) do
+    assert_nothing_raised(ZipContainer::MalformedContainerError, Zip::ZipError) do
       UCF::Container.verify!($ucf_empty)
     end
 
@@ -54,7 +55,7 @@ class TestRead < Test::Unit::TestCase
 
   # Check that the empty zip file does not verify.
   def test_verify_empty_zip
-    assert_raise(UCF::MalformedUCFError) do
+    assert_raise(ZipContainer::MalformedContainerError) do
       UCF::Container.verify!($zip_empty)
     end
 
@@ -63,7 +64,7 @@ class TestRead < Test::Unit::TestCase
 
   # Check that a compressed mimetype file is detected.
   def test_verify_compressed_mimetype
-    assert_raise(UCF::MalformedUCFError) do
+    assert_raise(ZipContainer::MalformedContainerError) do
       UCF::Container.verify!($ucf_compressed_mimetype)
     end
 
@@ -81,7 +82,7 @@ class TestRead < Test::Unit::TestCase
 
   # Check reading files out of a ucf file and make sure we don't change it.
   def test_read_files_from_ucf
-    assert_nothing_raised(UCF::MalformedUCFError, Zip::ZipError) do
+    assert_nothing_raised(ZipContainer::MalformedContainerError, Zip::ZipError) do
       UCF::Container.open($ucf_example) do |ucf|
         assert(ucf.on_disk?)
         refute(ucf.in_memory?)

data/test/tc_reserved_names.rb

@@ -30,6 +30,7 @@
 #
 # Author: Robert Haines
 
+require 'test/unit'
 require 'ucf'
 
 # A class to test the overriding of reserved and managed names.
@@ -39,10 +40,10 @@ class NewUCF < UCF::Container
 
   def initialize(filename)
     super(filename)
-    register_managed_entry(UCF::ManagedDirectory.new("src"))
-    register_managed_entry(UCF::ManagedDirectory.new("test"))
-    register_managed_entry(UCF::ManagedDirectory.new("lib"))
-    register_managed_entry(UCF::ManagedFile.new("index.html"))
+    register_managed_entry(ZipContainer::ManagedDirectory.new("src"))
+    register_managed_entry(ZipContainer::ManagedDirectory.new("test"))
+    register_managed_entry(ZipContainer::ManagedDirectory.new("lib"))
+    register_managed_entry(ZipContainer::ManagedFile.new("index.html"))
 
     register_reserved_name("reserved_dir")
   end
@@ -55,7 +56,7 @@ class TestReservedNames < Test::Unit::TestCase
   def test_verify_reserved_name
     assert(NewUCF.verify($ucf_example))
 
-    assert_nothing_raised(UCF::MalformedUCFError) do
+    assert_nothing_raised(ZipContainer::MalformedContainerError) do
       NewUCF.verify!($ucf_example)
     end
   end
@@ -178,7 +179,7 @@ class TestReservedNames < Test::Unit::TestCase
   # name.
   def test_add_reserved
     UCF::Container.open($ucf_empty) do |ucf|
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.add("META-INF", $zip_empty)
       end
     end
@@ -188,19 +189,19 @@ class TestReservedNames < Test::Unit::TestCase
   # name to a subclassed container.
   def test_subclass_add_reserved
     NewUCF.open($ucf_empty) do |ucf|
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.add("mimetype", $zip_empty)
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.add("reserved_dir", $zip_empty)
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.add("MimeType", $zip_empty)
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.add("Reserved_Dir", $zip_empty)
       end
     end
@@ -230,11 +231,11 @@ class TestReservedNames < Test::Unit::TestCase
   # reserved name.
   def test_mkdir_reserved
     UCF::Container.open($ucf_empty) do |ucf|
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.mkdir("mimetype")
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.mkdir("META-INF/container.xml")
       end
     end
@@ -244,23 +245,23 @@ class TestReservedNames < Test::Unit::TestCase
   # reserved name in a subclassed container.
   def test_subclass_mkdir_reserved
     NewUCF.open($ucf_empty) do |ucf|
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.mkdir("mimetype")
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.mkdir("index.html")
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.mkdir("reserved_dir")
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.mkdir("Reserved_Dir")
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.mkdir("META-INF/container.xml")
       end
     end
@@ -269,7 +270,7 @@ class TestReservedNames < Test::Unit::TestCase
   # Check that a file cannot be renamed to one of the reserved names.
   def test_rename_to_reserved
     UCF::Container.open($ucf_example) do |ucf|
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.rename("dir/code.rb", "mimetype")
       end
     end
@@ -279,11 +280,11 @@ class TestReservedNames < Test::Unit::TestCase
   # subclassed container.
   def test_subclass_rename_to_reserved
     NewUCF.open($ucf_example) do |ucf|
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.rename("dir/code.rb", "mimetype")
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.rename("dir", "reserved_dir")
       end
     end
@@ -293,19 +294,19 @@ class TestReservedNames < Test::Unit::TestCase
   # names.
   def test_file_dir_ops_reserved
     UCF::Container.open($ucf_empty) do |ucf|
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.file.open("META-INF", "w") do |f|
           f.puts "TESTING"
         end
       end
 
-      assert_nothing_raised(UCF::ReservedNameClashError) do
+      assert_nothing_raised(ZipContainer::ReservedNameClashError) do
         ucf.file.open("mimetype") do |f|
           assert_equal("application/epub+zip", f.read)
         end
       end
 
-      assert_nothing_raised(UCF::ReservedNameClashError) do
+      assert_nothing_raised(ZipContainer::ReservedNameClashError) do
         ucf.file.delete("mimetype")
         assert(ucf.file.exists?("mimetype"))
       end
@@ -316,38 +317,38 @@ class TestReservedNames < Test::Unit::TestCase
   # subclassed container.
   def test_subclass_file_dir_ops_reserved
     NewUCF.open($ucf_empty) do |ucf|
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.file.open("META-INF", "w") do |f|
           f.puts "TESTING"
         end
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.file.open("TEST", "w") do |f|
           f.puts "TESTING"
         end
       end
 
-      assert_nothing_raised(UCF::ReservedNameClashError) do
+      assert_nothing_raised(ZipContainer::ReservedNameClashError) do
         ucf.file.open("mimetype") do |f|
           assert_equal("application/epub+zip", f.read)
         end
       end
 
-      assert_nothing_raised(UCF::ReservedNameClashError) do
+      assert_nothing_raised(ZipContainer::ReservedNameClashError) do
         ucf.file.delete("mimetype")
         assert(ucf.file.exists?("mimetype"))
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.dir.mkdir("index.html")
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.dir.mkdir("reserved_dir")
       end
 
-      assert_raises(UCF::ReservedNameClashError) do
+      assert_raises(ZipContainer::ReservedNameClashError) do
         ucf.dir.mkdir("Reserved_Dir")
       end
     end

data/test/ts_ucf.rb

@@ -30,9 +30,7 @@
 #
 # Author: Robert Haines
 
-require 'test/unit'
-require 'ucf'
-
+# Example data files.
 $file_null = "test/data/null.file"
 $ucf_empty = "test/data/empty.ucf"
 $zip_empty = "test/data/empty.zip"