lib/bagit/valid.rb in bagit-0.2.0 vs lib/bagit/valid.rb in bagit-0.3.0.pre

@@ -19,55 +19,54 @@
       end
 
       empty_manifests.each do |file|
         errors.add :completeness, "#{file} is manifested but not present"
       end
-
+      tag_empty_manifests.each do |file|
+        errors.add :completeness, "#{file} is a manifested tag but not present"
+      end
+      
       errors.on(:completeness).nil?
     end
 
     # Return true if all manifested files message digests match.
     def consistent?
-
-      manifest_files.each do |mf|
-
+      (manifest_files|tagmanifest_files).each do |mf|
         # get the algorithm implementation
-        File.basename(mf) =~ /^manifest-(.+).txt$/
-
+        File.basename(mf) =~ /manifest-(.+).txt$/
         algo = case $1
                when /sha1/i
                  Digest::SHA1
                when /md5/i
                  Digest::MD5
                else
                  :unknown
                end
-
         # Check every file in the manifest
         open(mf) do |io|
-
           io.each_line do |line|
             expected, path = line.chomp.split /\s+/, 2
             file = File.join(bag_dir, path)
-
             if File.exist? file
-              actual = open(file) { |fio| algo.hexdigest(fio.read) }
-
+              actual = algo.file(file).hexdigest
               if expected != actual
                 errors.add :consistency, "expected #{file} to have #{algo}: #{expected}, actual is #{actual}"
               end
-
             end
           end
-
         end
-
       end
+      
 
       errors.on(:consistency).nil?
     end
 
+    # Checks for validity against Payload-Oxum
+    def valid_oxum?
+      bag_info["Payload-Oxum"] == payload_oxum
+    end
+
     protected
 
     # Returns all files in the instance that are not manifested
     def unmanifested_files
       mfs = manifested_files.map { |f| File.join bag_dir, f }
@@ -77,11 +76,20 @@
     # Returns a list of manifested files that are not present
     def empty_manifests
       bfs = bag_files
       manifested_files.reject { |f| bfs.member? File.join(bag_dir, f) }
     end
-
+    # Returns a list of tag manifested files that are not present
+    def tag_empty_manifests
+      empty = []
+      tag_manifested_files.each do |f|
+        if !File.exists?(File.join(bag_dir,f))
+          empty.push f
+        end
+      end
+      return empty
+    end
     # Returns a list of all files present in the manifest files
     def manifested_files
 
       manifest_files.inject([]) do |acc, mf|
 
@@ -95,9 +103,21 @@
         end
 
         (acc + files).uniq
       end
 
+    end
+    # Returns a list of all files in the tag manifest files
+    def tag_manifested_files
+      tagmanifest_files.inject([]) do |acc, mf|
+        files = open(mf) do |io|
+          io.readlines.map do |line|
+            digest, path = line.chomp.split /\s+/, 2
+            path
+          end
+        end
+        (acc+files).uniq
+      end
     end
 
   end
 
 end