sdr-replication 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11801a3c77b94dd4ef2c8af7992a033f8d9856c9
-  data.tar.gz: d8f5d7e38d26f467d6ce3304d5ddff0b8b2aff88
+  metadata.gz: 8268fa7de43231b2863bff96d22b22bbf8b877a7
+  data.tar.gz: 6b16fd8fdc370dc7478427a325464b72f06f8002
 SHA512:
-  metadata.gz: 44e904744f21d27d7ee036181964230b96fbcee1c3a65c21db9aac2678bf0b3e2f7c72a6b19220ba2f6411f60d0ea4a0d5f3df504c7b3b872e5095b313fc8c75
-  data.tar.gz: 92fe706d2524991354ef61d2b9e63580754f8dd66c33939b62eac634e83cceaae55e225f67f304ded997acfb2a783537c195b2186dbeb7ffb417268306162809
+  metadata.gz: 95a66da7f71b2f1ab066d302db2224a5f0e45527902b6eaf4f969a8461df51a139a0a60c20fa34c782fdf05ca96e2ff90d7cafec2fb8e8458e7d2b7ea576132f
+  data.tar.gz: ce4c6952cd508364a15846c374d66f9ec84510010732d8ee970313bc544d07219a154c8b51a32160df77835a3adb2ab319ad43b399d6934ac1d88cd371c016d0

data/lib/replication/bagit_bag.rb

@@ -82,11 +82,11 @@ module Replication
     end
 
     # @param [Symbol] link_mode Specifies whether to :copy, :link, or :symlink the files to the payload directory
-    # @param [Pathname] source_dir The source location of the directory whose contents are to be ingested
-    # @return [Pathname] Generate file_fixity_hash and send it to #add_payload_files
-    def add_payload_dir (link_mode, source_dir)
-      file_fixity_hash = Fixity.generate_checksums(source_dir, nil ,bag_checksum_types)
-      add_payload_files(link_mode, source_dir, file_fixity_hash)
+    # @param [Pathname] source_dir The source location of the directory whose contents are to be bagged
+    # @return [Pathname] Generate file_fixity_hash and send it to #add_files_to_payload
+    def add_dir_to_payload (link_mode, source_dir)
+      file_fixity_hash = Fixity.generate_checksums(source_dir, source_dir.find ,bag_checksum_types)
+      add_files_to_payload(link_mode, source_dir, file_fixity_hash)
       payload_pathname
     end
 
@@ -95,16 +95,27 @@ module Replication
     # @param [Hash<String,FileFixity>] file_fixity_hash The list of files (with fixity data) to be added to the payload
     # @return [Pathname] Copy or link the files specified in the file_fixity_hash to the payload directory,
     #   then update the payload manifest files
-    def add_payload_files(link_mode, source_basepath, file_fixity_hash)
+    def add_files_to_payload(link_mode, source_basepath, file_fixity_hash)
       file_fixity_hash.keys.each do |file_id|
         source_pathname = source_basepath.join(file_id)
         target_pathname = payload_pathname.join(file_id)
         copy_file(link_mode, source_pathname, target_pathname)
       end
-      write_manifest_checksums('manifest', file_fixity_hash)
+      write_manifest_checksums('manifest', add_data_prefix(file_fixity_hash))
       payload_pathname
     end
 
+    # @param [Hash<String,FileFixity>] file_fixity_hash key is file_id, values are Fixity objects containing checksums
+    # @return [Hash<String,FileFixity>] A revised hash with file_id paths prefixed with 'data/'
+    def add_data_prefix(file_fixity_hash)
+      new_hash = Hash.new
+      file_fixity_hash.values.each do |fixity|
+        fixity.file_id = "data/#{fixity.file_id}"
+        new_hash[fixity.file_id] = fixity
+      end
+      new_hash
+    end
+
     # @param [Symbol] link_mode Specifies whether to :copy, :link, or :symlink the files to the payload directory
     # @param [Pathname] source_pathname The source location of the file to be ingested
     # @param [Pathname] target_pathname The location of the directory in which to place the file
@@ -135,7 +146,7 @@ module Replication
       tarfile.tarfile_basepath = payload_pathname
       tarfile.tarfile_fullpath = payload_pathname.join("#{tarfile_id}")
       tarfile.create_tarfile
-      file_fixity_hash = Fixity.generate_checksums(tarfile.tarfile_basepath,[tarfile.tarfile_fullpath],bag_checksum_types)
+      file_fixity_hash = Fixity.generate_checksums(payload_pathname,[tarfile.tarfile_fullpath],bag_checksum_types)
       write_manifest_checksums('manifest', file_fixity_hash)
       tarfile
     end
@@ -211,13 +222,18 @@ module Replication
 
     # @return [Hash<String,FileFixity>] create hash containing ids and checksums for all files in the bag's root directory
     def generate_tagfile_checksums
+      # get list of all files in the bag home dir, except those starting with 'tagmanifest'
       tagfiles = bag_pathname.children.reject{|file| file.basename.to_s.start_with?('tagmanifest')}
+      # generate checksums, using bag home dir as the base directory for file ids (per bagit spec)
       Fixity.generate_checksums(bag_pathname, tagfiles, bag_checksum_types )
     end
 
     # @return [Hash<String,FileFixity>] create hash containing ids and checksums for all files in the bag's payload
     def generate_payload_checksums
-      Fixity.generate_checksums(payload_pathname, nil, bag_checksum_types)
+      # get list of all files in the data directory
+      path_list = payload_pathname.find
+      # generate checksums, but use bag home dir as the base directory for file ids (per bagit spec)
+      Fixity.generate_checksums(bag_pathname, path_list, bag_checksum_types)
     end
 
     # @param [String] manifest_type The type of manifest file ('manifest' or 'tagmanifest') to be updated

data/lib/replication/fixity.rb

@@ -99,7 +99,7 @@ module Replication
       path_list = base_pathname.find  if path_list.nil?
       file_fixity_hash = Hash.new
       path_list.select{|pathname| pathname.file?}.each  do |file|
-        file_fixity = Fixity.fixity_from_file(file, base_pathname)
+        file_fixity = Fixity.fixity_from_file(file, base_pathname, checksum_types)
         file_fixity_hash[file_fixity.file_id] = file_fixity
       end
       file_fixity_hash

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sdr-replication
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Richard Anderson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_pure