zip-container 3.0.0 → 3.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmQ3NGUzNmM1NmRlMDE4ZmRjY2NlODQyYTc4Zjc5NDRjYWI3NGJmOA==
+    ZTBkMWFlOWRkMDIxOGJmZGZkYzhkNjI4YjJhZjBmOWUwNGU5Nzk4MQ==
   data.tar.gz: !binary |-
-    MTAwMjhkMjZhOTRhZjAwNThhMDg5OTM0ZjE4MmQyNGNjNjJlYzdmYQ==
+    OTYxOWZhZmIxNzFiZjM4Zjg4NDAyZWU2MzJhNGJkODBmMjI5OTA2NQ==
 SHA512:
   metadata.gz: !binary |-
-    NThkZjFkYzkyMThkYjg3OGY5YThiYzBjNmU4YTRkYjY0M2MwYzg0NmEwYjdj
-    MTEzMDY0NTY1YmYyNmY3Nzk2YmUwNzcyNDAxMWUyMjUzZDZlMDQ0ZmFlNDVm
-    MDI0Zjc1ZTAxMWUzZTE5NWI0Y2YwNjc2MDBlYjljNjExZDllZTk=
+    NTkwN2NkZGY1NDliMWUwNzM3NzQ1M2FiYjc0NDU3NDUxOTQ2YzY2YzQ5ZDI0
+    OTU0MmU1OTNiYTRjNDk1NDhiNWJkNWVlODEzOGFkMjg5NGRhZGZhM2IwZWZm
+    NThhMzJhZTU4ZjMxNWYyYWUxZWExMDhiYzEzMmU5NDc3NzkyODg=
   data.tar.gz: !binary |-
-    Yzk0OTM5NDY2NzViYjJjZjlhNDk1NGRjNDE2OGU5MzM5ZjMzMTM0NDY1ZDFj
-    M2FmNmQ5ZmI2MWZhODM2ZGYwMTFkOGQzNTdjNzNiYjU3YjY4NDlmYjBiMmUx
-    YWZkZDI4ZjYzZmRiNTk0M2M5NTA1N2U4NGQ4NjBhODcxZTQ0NTE=
+    NGQ2MGZkNDkyNzFhNTdmNDMzMDAwYjcxOTI4MjMzZTE1MmY3ZTU5MTY0Mzll
+    OTk2OWJjMmI2ZGJjZGFjMjMxNjRiYzE3MmIxOTQ0Yjk1M2VkYmViZDc0MDQz
+    YzQ4YWUzZTE2YTcxN2RhMzZiZDAwZTJkMmVlMTg2NGYxZmZjODA=

data/Changes.rdoc

@@ -1,5 +1,9 @@
 = Changes log for the ZIP Container Ruby Gem
 
+== Version 3.0.1
+
+* Fix deep content verification bug.
+
 == Version 3.0.0
 
 * Refactor the malformed container error constructor.

data/lib/zip-container/entries/directory.rb

@@ -76,7 +76,7 @@ module ZipContainer
     def verify
       messages = super
 
-      @files.values.each { |f| messages + f.verify }
+      @files.values.each { |f| messages += f.verify }
 
       messages
     end

data/test/tc_managed_entries.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2013, 2014 The University of Manchester, UK.
+# Copyright (c) 2013-2015 The University of Manchester, UK.
 #
 # All rights reserved.
 #
@@ -77,6 +77,11 @@ class ExampleZipContainer2 < ZipContainer::File
     valid = Proc.new { |contents| contents.match(/[Hh]ello/) }
     register_managed_entry(ZipContainer::ManagedFile.new("greeting.txt",
       :required => true, :validation_proc => valid))
+
+    deep_greet = ZipContainer::ManagedFile.new("greet.txt",
+      :validation_proc => valid)
+    register_managed_entry(ZipContainer::ManagedDirectory.new("dir",
+      :entries => [deep_greet]))
   end
 
   def ExampleZipContainer2.create(filename, &block)
@@ -101,10 +106,6 @@ class ExampleDirContainer < ZipContainer::Dir
       :required => true, :validation_proc => valid))
   end
 
-  #def ExampleDirContainer.create(filename, &block)
-  #  super(filename, "application/example+zip", &block)
-  #end
-
 end
 
 class TestManagedEntries < Test::Unit::TestCase
@@ -359,7 +360,7 @@ class TestManagedEntries < Test::Unit::TestCase
     end
   end
 
-  # Check that a ExampleZipContainer2 will only verify when required objects
+  # Check that an ExampleZipContainer2 will only verify when required objects
   # are added with the correct contents.
   def test_create_subclassed_container_with_content_verification
     Dir.mktmpdir do |dir|
@@ -396,4 +397,50 @@ class TestManagedEntries < Test::Unit::TestCase
     end
   end
 
+  # Check that an ExampleZipContainer2 will verify when deep objects are added
+  # with the correct contents.
+  def test_create_subclassed_container_with_deep_content_verification
+    Dir.mktmpdir do |dir|
+      filename = File.join(dir, "test.container")
+
+      assert_nothing_raised do
+        ExampleZipContainer2.create(filename) do |c|
+          assert_raises(ZipContainer::MalformedContainerError) do
+            c.verify!
+          end
+
+          c.file.open("greeting.txt", "w") do |f|
+            f.puts "Hello, Y'All!"
+          end
+
+          assert_nothing_raised(ZipContainer::MalformedContainerError) do
+            c.verify!
+          end
+
+          c.mkdir("dir")
+          c.file.open("dir/greet.txt", "w") do |f|
+            f.puts "Goodbye!"
+          end
+
+          assert_raises(ZipContainer::MalformedContainerError) do
+            c.verify!
+          end
+
+          c.file.open("dir/greet.txt", "w") do |f|
+            f.puts "hello everyone."
+          end
+
+          assert_nothing_raised(ZipContainer::MalformedContainerError) do
+            c.verify!
+          end
+        end
+      end
+
+      assert(ExampleZipContainer2.verify?(filename))
+      assert_nothing_raised(ZipContainer::MalformedContainerError) do
+        ExampleZipContainer2.verify!(filename)
+      end
+    end
+  end
+
 end

data/version.yml

@@ -1,4 +1,4 @@
 ---
   :major: 3
   :minor: 0
-  :patch: 0
+  :patch: 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zip-container
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Robert Haines
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler