moab-versioning 4.4.1 → 4.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07f40b9d0310571b007d21bd9a0f08572b02d4f1396c79cdf2e6b96d616ae13
-  data.tar.gz: 56d0ea7fa3f43bf1c38e283b46028858163d47fa4432614e4a8ced40e7105de2
+  metadata.gz: 4b576c73187205ae4548c6460bac2b68cedab5dc7c3b94a66a5d8ec13729c6ae
+  data.tar.gz: e714a158d2e1388dec94482c1fa858a2ee29a6eca6e0f9004658446801088476
 SHA512:
-  metadata.gz: 1a809dc2e8f57cc405843bd49116368a9ae7c1db3fda35b053ea4267b148e7f4fea792c601bbb3c52370e4df1cd3d9d51c02af6023e6fa1d9ce885671ad4284a
-  data.tar.gz: 13c2954fe8e666bb8366a4c9b871fa6114e069ba90f6d6e2536f3fc9a7ce6bf576842045b735d2913599301d43940365c5cbd20978bec27ab91ff689d9e00943
+  metadata.gz: 251925f9e4c45f20f6ae4270fc73adfe9f4645689bda08ebd42c2b707909177ab575e0427c83e321c2ebc039c735f9bc141b29037f28cb65249c25bd9e76d520
+  data.tar.gz: '053391d53a3a3a46bbfedce8e7a04ea0f28a7f5c43689c2bde3c1901f9303eae7356d507904ec1892d9da61f2d4c9c6e58ed3fec894985e19b9ab85dd5fa65fd'

data/lib/moab/deposit_bag_validator.rb

@@ -191,7 +191,7 @@ module Moab
       home_dir_pathnames = deposit_bag_pathname.children.reject { |file| file.basename.to_s.start_with?(TAGMANIFEST) }
       hash_with_full_pathnames = generate_checksums_hash(home_dir_pathnames, types_to_generate)
       # return hash keys as basenames only
-      hash_with_full_pathnames.map { |k, v| [Pathname.new(k).basename.to_s, v] }.to_h
+      hash_with_full_pathnames.transform_keys { |k| Pathname.new(k).basename.to_s }
     end
 
     # generate hash of checksums by file name for bag data dir files
@@ -199,7 +199,7 @@ module Moab
       data_pathnames = deposit_bag_pathname.join(DATA_DIR_BASENAME).find
       hash_with_full_pathnames = generate_checksums_hash(data_pathnames, types_to_generate)
       # return hash keys beginning with 'data/'
-      hash_with_full_pathnames.map { |k, v| [Pathname.new(k).relative_path_from(deposit_bag_pathname).to_s, v] }.to_h
+      hash_with_full_pathnames.transform_keys { |k| Pathname.new(k).relative_path_from(deposit_bag_pathname).to_s }
     end
 
     def generate_checksums_hash(pathnames, types_to_generate)

data/lib/moab/exceptions.rb

@@ -2,10 +2,14 @@
 
 module Moab
   class MoabRuntimeError < RuntimeError; end
+
   class MoabStandardError < StandardError; end
 
   class FileNotFoundException < MoabRuntimeError; end
+
   class InvalidMetadataException < MoabRuntimeError; end
+
   class InvalidSuriSyntaxError < MoabRuntimeError; end
+
   class ObjectNotFoundException < MoabRuntimeError; end
 end

data/lib/moab/file_group.rb

@@ -30,15 +30,15 @@ module Moab
 
     # @attribute
     # @return [String] The name of the file group
-    attribute :group_id, String, :tag => 'groupId', :key => true
+    attribute :group_id, String, tag: 'groupId', key: true
 
     # @attribute
     # @return [String] The directory location or other source of this groups file data
-    attribute :data_source, String, :tag => 'dataSource'
+    attribute :data_source, String, tag: 'dataSource'
 
     # @attribute
     # @return [Integer] The total number of data files (dynamically calculated)
-    attribute :file_count, Integer, :tag => 'fileCount', :on_save => proc { |i| i.to_s }
+    attribute :file_count, Integer, tag: 'fileCount', on_save: proc { |i| i.to_s }
 
     def file_count
       files.inject(0) { |sum, manifestation| sum + manifestation.file_count }
@@ -46,7 +46,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total size (in bytes) of all data files (dynamically calculated)
-    attribute :byte_count, Integer, :tag => 'byteCount', :on_save => proc { |i| i.to_s }
+    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc { |i| i.to_s }
 
     def byte_count
       files.inject(0) { |sum, manifestation| sum + manifestation.byte_count }
@@ -54,7 +54,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total disk usage (in 1 kB blocks) of all data files (estimating du -k result) (dynamically calculated)
-    attribute :block_count, Integer, :tag => 'blockCount', :on_save => proc { |i| i.to_s }
+    attribute :block_count, Integer, tag: 'blockCount', on_save: proc { |i| i.to_s }
 
     def block_count
       files.inject(0) { |sum, manifestation| sum + manifestation.block_count }
@@ -67,7 +67,7 @@ module Moab
 
     # @attribute
     # @return [Array<FileManifestation>] The set of files comprising the group
-    has_many :files, FileManifestation, :tag => 'file'
+    has_many :files, FileManifestation, tag: 'file'
 
     def files
       signature_hash.values

data/lib/moab/file_group_difference.rb

@@ -53,18 +53,18 @@ module Moab
 
     # (see Serializable#initialize)
     def initialize(opts = {})
-      @subset_hash = Hash.new { |hash, key| hash[key] = FileGroupDifferenceSubset.new(:change => key.to_s) }
+      @subset_hash = Hash.new { |hash, key| hash[key] = FileGroupDifferenceSubset.new(change: key.to_s) }
       super(opts)
     end
 
     # @attribute
     # @return [String] The name of the file group
-    attribute :group_id, String, :tag => 'groupId', :key => true
+    attribute :group_id, String, tag: 'groupId', key: true
 
     # @attribute
     # @return [Integer] the total number of differences found between the two inventories that were
     #   compared  (dynamically calculated)
-    attribute :difference_count, Integer, :tag => 'differenceCount', :on_save => proc { |i| i.to_s }
+    attribute :difference_count, Integer, tag: 'differenceCount', on_save: proc { |i| i.to_s }
 
     def difference_count
       count = 0
@@ -76,49 +76,49 @@ module Moab
 
     # @attribute
     # @return [Integer] How many files were unchanged
-    attribute :identical, Integer, :on_save => proc { |n| n.to_s }
+    attribute :identical, Integer, on_save: proc { |n| n.to_s }
     def identical
       subset_hash[:identical].count
     end
 
     # @attribute
     # @return [Integer] How many duplicate copies of files were added
-    attribute :copyadded, Integer, :on_save => proc { |n| n.to_s }
+    attribute :copyadded, Integer, on_save: proc { |n| n.to_s }
     def copyadded
       subset_hash[:copyadded].count
     end
 
     # @attribute
     # @return [Integer] How many duplicate copies of files were deleted
-    attribute :copydeleted, Integer, :on_save => proc { |n| n.to_s }
+    attribute :copydeleted, Integer, on_save: proc { |n| n.to_s }
     def copydeleted
       subset_hash[:copydeleted].count
     end
 
     # @attribute
     # @return [Integer] How many files were renamed
-    attribute :renamed, Integer, :on_save => proc { |n| n.to_s }
+    attribute :renamed, Integer, on_save: proc { |n| n.to_s }
     def renamed
       subset_hash[:renamed].count
     end
 
     # @attribute
     # @return [Integer] How many files were modified
-    attribute :modified, Integer, :on_save => proc { |n| n.to_s }
+    attribute :modified, Integer, on_save: proc { |n| n.to_s }
     def modified
       subset_hash[:modified].count
     end
 
     # @attribute
     # @return [Integer] How many files were added
-    attribute :added, Integer, :on_save => proc { |n| n.to_s }
+    attribute :added, Integer, on_save: proc { |n| n.to_s }
     def added
       subset_hash[:added].count
     end
 
     # @attribute
     # @return [Integer] How many files were deleted
-    attribute :deleted, Integer, :on_save => proc { |n| n.to_s }
+    attribute :deleted, Integer, on_save: proc { |n| n.to_s }
     def deleted
       subset_hash[:deleted].count
     end
@@ -126,7 +126,7 @@ module Moab
     # @attribute
     # @return [Array<FileGroupDifferenceSubset>] A set of Arrays (one for each change type),
     #    each of which contains an collection of file-level differences having that change type.
-    has_many :subsets, FileGroupDifferenceSubset, :tag => 'subset'
+    has_many :subsets, FileGroupDifferenceSubset, tag: 'subset'
 
     def subsets
       subset_hash.values
@@ -147,14 +147,14 @@ module Moab
     # @return [FileGroupDifference] Clone just this element for inclusion in a versionMetadata structure
     def summary
       FileGroupDifference.new(
-        :group_id => group_id,
-        :identical => identical,
-        :copyadded => copyadded,
-        :copydeleted => copydeleted,
-        :renamed => renamed,
-        :modified => modified,
-        :added => added,
-        :deleted => deleted
+        group_id: group_id,
+        identical: identical,
+        copyadded: copyadded,
+        copydeleted: copydeleted,
+        renamed: renamed,
+        modified: modified,
+        added: added,
+        deleted: deleted
       )
     end
 
@@ -231,7 +231,7 @@ module Moab
         other_paths = other_signature_hash[signature].paths
         matching_paths = basis_paths & other_paths
         matching_paths.each do |path|
-          fid = FileInstanceDifference.new(:change => 'identical')
+          fid = FileInstanceDifference.new(change: 'identical')
           fid.basis_path = path
           fid.other_path = "same"
           fid.signatures << signature
@@ -284,7 +284,7 @@ module Moab
     #   Container for reporting the set of file-level differences of type 'modified'
     def tabulate_modified_files(basis_path_hash, other_path_hash)
       matching_keys(basis_path_hash, other_path_hash).each do |path|
-        fid = FileInstanceDifference.new(:change => 'modified')
+        fid = FileInstanceDifference.new(change: 'modified')
         fid.basis_path = path
         fid.other_path = "same"
         fid.signatures << basis_path_hash[path]
@@ -303,7 +303,7 @@ module Moab
     #   Container for reporting the set of file-level differences of type 'added'
     def tabulate_added_files(basis_path_hash, other_path_hash)
       other_only_keys(basis_path_hash, other_path_hash).each do |path|
-        fid = FileInstanceDifference.new(:change => 'added')
+        fid = FileInstanceDifference.new(change: 'added')
         fid.basis_path = ""
         fid.other_path = path
         fid.signatures << other_path_hash[path]
@@ -321,7 +321,7 @@ module Moab
     #   Container for reporting the set of file-level differences of type 'deleted'
     def tabulate_deleted_files(basis_path_hash, other_path_hash)
       basis_only_keys(basis_path_hash, other_path_hash).each do |path|
-        fid = FileInstanceDifference.new(:change => 'deleted')
+        fid = FileInstanceDifference.new(change: 'deleted')
         fid.basis_path = path
         fid.other_path = ""
         fid.signatures << basis_path_hash[path]

data/lib/moab/file_group_difference_subset.rb

@@ -26,11 +26,11 @@ module Moab
 
     # @attribute
     # @return [String] The type of change (identical|renamed|modified|deleted|added)
-    attribute :change, String, :key => true
+    attribute :change, String, key: true
 
     # @attribute
     # @return [Integer] How many files were changed
-    attribute :count, Integer, :on_save => proc { |n| n.to_s }
+    attribute :count, Integer, on_save: proc { |n| n.to_s }
 
     def count
       files.size
@@ -38,6 +38,6 @@ module Moab
 
     # @attribute
     # @return [Array<FileInstanceDifference>] The set of file instances having this type of change
-    has_many :files, FileInstanceDifference, :tag => 'file'
+    has_many :files, FileInstanceDifference, tag: 'file'
   end
 end

data/lib/moab/file_instance.rb

@@ -25,7 +25,7 @@ module Moab
 
     # @attribute
     # @return [String] The id is the filename path, relative to the file group's base directory
-    attribute :path, String, :key => true
+    attribute :path, String, key: true
 
     # @attribute
     # @return [String] gsub(/\n/,' ')

data/lib/moab/file_instance_difference.rb

@@ -38,14 +38,14 @@ module Moab
 
     # @attribute
     # @return [String] The file's path in the basis inventory (usually for an old version)
-    attribute :basis_path, String, :tag => 'basisPath', :on_save => proc { |s| s.to_s }
+    attribute :basis_path, String, tag: 'basisPath', on_save: proc { |s| s.to_s }
 
     # @attribute
     # @return [String] The file's path in the other inventory (usually for an new version) compared against the basis
-    attribute :other_path, String, :tag => 'otherPath', :on_save => proc { |s| s.to_s }
+    attribute :other_path, String, tag: 'otherPath', on_save: proc { |s| s.to_s }
 
     # @attribute
     # @return [Array<FileSignature>] The fixity data of the file manifestation(s) (plural if change was a content modification)
-    has_many :signatures, FileSignature, :tag => 'fileSignature'
+    has_many :signatures, FileSignature, tag: 'fileSignature'
   end
 end

data/lib/moab/file_inventory.rb

@@ -46,20 +46,20 @@ module Moab
 
     # @attribute
     # @return [String] The digital object identifier (druid)
-    attribute :digital_object_id, String, :tag => 'objectId'
+    attribute :digital_object_id, String, tag: 'objectId'
 
     # @attribute
     # @return [Integer] The ordinal version number
-    attribute :version_id, Integer, :tag => 'versionId', :key => true, :on_save => proc { |n| n.to_s }
+    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc { |n| n.to_s }
 
     # @return [String] The unique identifier concatenating digital object id with version id
     def composite_key
-      digital_object_id + '-' + StorageObject.version_dirname(version_id)
+      "#{digital_object_id}-#{StorageObject.version_dirname(version_id)}"
     end
 
     # @attribute
     # @return [String] The datetime at which the inventory was created
-    attribute :inventory_datetime, String, :tag => 'inventoryDatetime'
+    attribute :inventory_datetime, String, tag: 'inventoryDatetime'
 
     def inventory_datetime=(datetime)
       @inventory_datetime = Moab::UtcTime.input(datetime)
@@ -71,7 +71,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total number of data files in the inventory (dynamically calculated)
-    attribute :file_count, Integer, :tag => 'fileCount', :on_save => proc { |t| t.to_s }
+    attribute :file_count, Integer, tag: 'fileCount', on_save: proc { |t| t.to_s }
 
     def file_count
       groups.inject(0) { |sum, group| sum + group.file_count }
@@ -79,7 +79,7 @@ module Moab
 
      # @attribute
     # @return [Integer] The total size (in bytes) in all files of all files in the inventory (dynamically calculated)
-    attribute :byte_count, Integer, :tag => 'byteCount', :on_save => proc { |t| t.to_s }
+    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc { |t| t.to_s }
 
     def byte_count
       groups.inject(0) { |sum, group| sum + group.byte_count }
@@ -87,7 +87,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total disk usage (in 1 kB blocks) of all data files (estimating du -k result) (dynamically calculated)
-    attribute :block_count, Integer, :tag => 'blockCount', :on_save => proc { |t| t.to_s }
+    attribute :block_count, Integer, tag: 'blockCount', on_save: proc { |t| t.to_s }
 
     def block_count
       groups.inject(0) { |sum, group| sum + group.block_count }
@@ -95,7 +95,7 @@ module Moab
 
     # @attribute
     # @return [Array<FileGroup>] The set of data groups comprising the version
-    has_many :groups, FileGroup, :tag => 'fileGroup'
+    has_many :groups, FileGroup, tag: 'fileGroup'
 
     # @return [Array<FileGroup] The set of data groups that contain files
     def non_empty_groups
@@ -194,7 +194,7 @@ module Moab
       signatures_from_bag = signatures_from_bagit_manifests(bag_pathname)
       bag_data_subdirs = bag_pathname.join('data').children
       bag_data_subdirs.each do |subdir|
-        groups << FileGroup.new(:group_id => subdir.basename.to_s).group_from_bagit_subdir(subdir, signatures_from_bag)
+        groups << FileGroup.new(group_id: subdir.basename.to_s).group_from_bagit_subdir(subdir, signatures_from_bag)
       end
       self
     end

data/lib/moab/file_inventory_difference.rb

@@ -30,11 +30,11 @@ module Moab
 
     # @attribute
     # @return [String] The digital object ID (druid)
-    attribute :digital_object_id, String, :tag => 'objectId'
+    attribute :digital_object_id, String, tag: 'objectId'
 
     # @attribute
     # @return [Integer] the number of differences found between the two inventories that were compared (dynamically calculated)
-    attribute :difference_count, Integer, :tag => 'differenceCount', :on_save => proc { |i| i.to_s }
+    attribute :difference_count, Integer, tag: 'differenceCount', on_save: proc { |i| i.to_s }
 
     def difference_count
       @group_differences.inject(0) { |sum, group| sum + group.difference_count }
@@ -50,7 +50,7 @@ module Moab
 
     # @attribute
     # @return [String] The datetime at which the report was run
-    attribute :report_datetime, String, :tag => 'reportDatetime'
+    attribute :report_datetime, String, tag: 'reportDatetime'
 
     def report_datetime=(datetime)
       @report_datetime = Moab::UtcTime.input(datetime)
@@ -62,7 +62,7 @@ module Moab
 
     # @attribute
     # @return [Array<FileGroupDifference>] The set of data groups comprising the version
-    has_many :group_differences, FileGroupDifference, :tag => 'fileGroupDifference'
+    has_many :group_differences, FileGroupDifference, tag: 'fileGroupDifference'
 
     # @return [Array<String>] The data fields to include in summary reports
     def summary_fields
@@ -89,8 +89,8 @@ module Moab
       group_ids = basis_inventory.group_ids | other_inventory.group_ids
       group_ids.each do |group_id|
         # get a pair of groups to compare, creating a empty group if not present in the inventory
-        basis_group = basis_inventory.group(group_id) || FileGroup.new(:group_id => group_id)
-        other_group = other_inventory.group(group_id) || FileGroup.new(:group_id => group_id)
+        basis_group = basis_inventory.group(group_id) || FileGroup.new(group_id: group_id)
+        other_group = other_inventory.group(group_id) || FileGroup.new(group_id: group_id)
         @group_differences << FileGroupDifference.new.compare_file_groups(basis_group, other_group)
       end
       self

data/lib/moab/file_manifestation.rb

@@ -30,7 +30,7 @@ module Moab
 
     # @attribute
     # @return [FileSignature] The fixity data of the file instance
-    element :signature, FileSignature, :tag => 'fileSignature'
+    element :signature, FileSignature, tag: 'fileSignature'
 
     def signature
       @signature.is_a?(Array) ? @signature[0] : @signature
@@ -42,7 +42,7 @@ module Moab
 
     # @attribute
     # @return [Array<FileInstance>] The location(s) of the file manifestation's file instances
-    has_many :instances, FileInstance, :tag => 'fileInstance'
+    has_many :instances, FileInstance, tag: 'fileInstance'
 
     # @api internal
     # @return [Array<String>] Create an array from all the file paths of the child {FileInstance} objects

data/lib/moab/file_signature.rb

@@ -46,19 +46,19 @@ module Moab
 
     # @attribute
     # @return [Integer] The size of the file in bytes
-    attribute :size, Integer, :on_save => proc { |n| n.to_s }
+    attribute :size, Integer, on_save: proc { |n| n.to_s }
 
     # @attribute
     # @return [String] The MD5 checksum value of the file
-    attribute :md5, String, :on_save => proc { |n| n.nil? ? "" : n.to_s }
+    attribute :md5, String, on_save: proc { |n| n.nil? ? "" : n.to_s }
 
     # @attribute
     # @return [String] The SHA1 checksum value of the file
-    attribute :sha1, String, :on_save => proc { |n| n.nil? ? "" : n.to_s }
+    attribute :sha1, String, on_save: proc { |n| n.nil? ? "" : n.to_s }
 
     # @attribute
     # @return [String] The SHA256 checksum value of the file
-    attribute :sha256, String, :on_save => proc { |n| n.nil? ? "" : n.to_s }
+    attribute :sha256, String, on_save: proc { |n| n.nil? ? "" : n.to_s }
 
     KNOWN_ALGOS = {
       md5: proc { Digest::MD5.new },
@@ -85,7 +85,7 @@ module Moab
         end
       end
 
-      new(signatures.map { |k, digest| [k, digest.hexdigest] }.to_h.merge(size: pathname.size))
+      new(signatures.transform_values(&:hexdigest).merge(size: pathname.size))
     end
 
     # @param type [Symbol,String] The type of checksum

data/lib/moab/signature_catalog.rb

@@ -39,20 +39,20 @@ module Moab
 
     # @attribute
     # @return [String] The object ID (druid)
-    attribute :digital_object_id, String, :tag => 'objectId'
+    attribute :digital_object_id, String, tag: 'objectId'
 
     # @attribute
     # @return [Integer] The ordinal version number
-    attribute :version_id, Integer, :tag => 'versionId', :key => true, :on_save => proc { |n| n.to_s }
+    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc { |n| n.to_s }
 
     # @return [String] The unique identifier concatenating digital object id with version id
     def composite_key
-      @digital_object_id + '-' + StorageObject.version_dirname(@version_id)
+      "#{@digital_object_id}-#{StorageObject.version_dirname(@version_id)}"
     end
 
     # @attribute
     # @return [String] The datetime at which the catalog was updated
-    attribute :catalog_datetime, Time, :tag => 'catalogDatetime'
+    attribute :catalog_datetime, Time, tag: 'catalogDatetime'
 
     def catalog_datetime=(datetime)
       @catalog_datetime = Moab::UtcTime.input(datetime)
@@ -64,7 +64,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total number of data files (dynamically calculated)
-    attribute :file_count, Integer, :tag => 'fileCount', :on_save => proc { |t| t.to_s }
+    attribute :file_count, Integer, tag: 'fileCount', on_save: proc { |t| t.to_s }
 
     def file_count
       entries.size
@@ -72,7 +72,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total size (in bytes) of all data files (dynamically calculated)
-    attribute :byte_count, Integer, :tag => 'byteCount', :on_save => proc { |t| t.to_s }
+    attribute :byte_count, Integer, tag: 'byteCount', on_save: proc { |t| t.to_s }
 
     def byte_count
       entries.inject(0) { |sum, entry| sum + entry.signature.size.to_i }
@@ -80,7 +80,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The total disk usage (in 1 kB blocks) of all data files (estimating du -k result) (dynamically calculated)
-    attribute :block_count, Integer, :tag => 'blockCount', :on_save => proc { |t| t.to_s }
+    attribute :block_count, Integer, tag: 'blockCount', on_save: proc { |t| t.to_s }
 
     def block_count
       block_size = 1024
@@ -94,7 +94,7 @@ module Moab
 
     # @attribute
     # @return [Array<SignatureCatalogEntry>] The set of data groups comprising the version
-    has_many :entries, SignatureCatalogEntry, :tag => 'entry'
+    has_many :entries, SignatureCatalogEntry, tag: 'entry'
 
     def entries=(entry_array)
       entry_array.each do |entry|
@@ -178,10 +178,10 @@ module Moab
     #   containing only those files that were added in this version
     # @example {include:file:spec/features/catalog/version_additions_spec.rb}
     def version_additions(version_inventory)
-      version_additions = FileInventory.new(:type => 'additions')
+      version_additions = FileInventory.new(type: 'additions')
       version_additions.copy_ids(version_inventory)
       version_inventory.groups.each do |group|
-        group_addtions = FileGroup.new(:group_id => group.group_id)
+        group_addtions = FileGroup.new(group_id: group.group_id)
         group.files.each do |file|
           group_addtions.add_file_instance(file.signature, file.instances[0]) unless @signature_hash.key?(file.signature)
         end

data/lib/moab/signature_catalog_entry.rb

@@ -25,19 +25,19 @@ module Moab
 
     # @attribute
     # @return [Integer] The ordinal version number
-    attribute :version_id, Integer, :tag => 'originalVersion', :key => true, :on_save => proc { |n| n.to_s }
+    attribute :version_id, Integer, tag: 'originalVersion', key: true, on_save: proc { |n| n.to_s }
 
     # @attribute
     # @return [String] The name of the file group
-    attribute :group_id, String, :tag => 'groupId', :key => true
+    attribute :group_id, String, tag: 'groupId', key: true
 
     # @attribute
     # @return [String] The id is the filename path, relative to the file group's base directory
-    attribute :path, String, :key => true, :tag => 'storagePath'
+    attribute :path, String, key: true, tag: 'storagePath'
 
     # @attribute
     # @return [FileSignature] The fixity data of the file instance
-    element :signature, FileSignature, :tag => 'fileSignature'
+    element :signature, FileSignature, tag: 'fileSignature'
 
     def signature
       # HappyMapper's parser tries to put an array of signatures in the signature field

data/lib/moab/storage_object.rb

@@ -84,10 +84,10 @@ module Moab
     # @return [FileInventory] The file inventory of the specified type for this version
     def versionize_bag(bag_dir, current_version, new_version)
       new_inventory = FileInventory.new(
-        :type => 'version',
-        :digital_object_id => @digital_object_id,
-        :version_id => new_version.version_id,
-        :inventory_datetime => Time.now
+        type: 'version',
+        digital_object_id: @digital_object_id,
+        version_id: new_version.version_id,
+        inventory_datetime: Time.now
       )
       new_inventory.inventory_from_bagit_bag(bag_dir)
       new_inventory.write_xml_file(bag_dir)
@@ -133,7 +133,7 @@ module Moab
 
       @object_pathname.children.each do |dirname|
         vnum = dirname.basename.to_s
-        list << vnum[1..-1].to_i if vnum =~ /^v(\d+)$/
+        list << vnum[1..].to_i if vnum =~ /^v(\d+)$/
       end
       list.sort
     end

data/lib/moab/storage_object_validator.rb

@@ -85,13 +85,13 @@ module Moab
     end
 
     def version_dir_format?(dirname)
-      dirname =~ /^[v]\d{4}$/
+      dirname =~ /^v\d{4}$/
     end
 
     # call only if the version directories are "correctly named" vdddd
     def check_sequential_version_dirs
       version_directories.each_with_index do |dir_name, index|
-        next if dir_name[1..-1].to_i == index + 1 # version numbering starts at 1, array indexing at 0
+        next if dir_name[1..].to_i == index + 1 # version numbering starts at 1, array indexing at 0
 
         return [result_hash(VERSIONS_NOT_IN_ORDER, version_directories)]
       end

data/lib/moab/storage_object_version.rb

@@ -45,7 +45,7 @@ module Moab
 
     # @return [String] The unique identifier concatenating digital object id with version id
     def composite_key
-      @storage_object.digital_object_id + '-' + StorageObject.version_dirname(@version_id)
+      "#{@storage_object.digital_object_id}-#{StorageObject.version_dirname(@version_id)}"
     end
 
     # @return [Boolean] true if the object version directory exists
@@ -115,12 +115,12 @@ module Moab
 
         @inventory_cache[type] = FileInventory.read_xml_file(@version_pathname.join('manifests'), type)
       else
-        groups = %w[content metadata].collect { |id| FileGroup.new(:group_id => id) }
+        groups = %w[content metadata].collect { |id| FileGroup.new(group_id: id) }
         FileInventory.new(
-          :type => 'version',
-          :digital_object_id => @storage_object.digital_object_id,
-          :version_id => @version_id,
-          :groups => groups
+          type: 'version',
+          digital_object_id: @storage_object.digital_object_id,
+          version_id: @version_id,
+          groups: groups
         )
       end
     end
@@ -131,7 +131,7 @@ module Moab
       if version_id > 0
         SignatureCatalog.read_xml_file(@version_pathname.join('manifests'))
       else
-        SignatureCatalog.new(:digital_object_id => @storage_object.digital_object_id)
+        SignatureCatalog.new(digital_object_id: @storage_object.digital_object_id)
       end
     end
 
@@ -202,12 +202,12 @@ module Moab
     # @return [void] examine the version's directory and create/serialize a {FileInventory} containing the manifest files
     def generate_manifest_inventory
       manifest_inventory = FileInventory.new(
-        :type => 'manifests',
-        :digital_object_id => @storage_object.digital_object_id,
-        :version_id => @version_id
+        type: 'manifests',
+        digital_object_id: @storage_object.digital_object_id,
+        version_id: @version_id
       )
       pathname = @version_pathname.join('manifests')
-      manifest_inventory.groups << FileGroup.new(:group_id => 'manifests').group_from_directory(pathname, false)
+      manifest_inventory.groups << FileGroup.new(group_id: 'manifests').group_from_directory(pathname, false)
       manifest_inventory.write_xml_file(pathname)
     end
 
@@ -312,7 +312,7 @@ module Moab
       version_additions = file_inventory('additions')
       result.subentities << VerificationResult.verify_value('composite_key', composite_key, version_additions.composite_key)
       data_directory = @version_pathname.join('data')
-      directory_inventory = FileInventory.new(:type => 'directory').inventory_from_directory(data_directory)
+      directory_inventory = FileInventory.new(type: 'directory').inventory_from_directory(data_directory)
       diff = FileInventoryDifference.new
       diff.compare(version_additions, directory_inventory)
       compare_result = VerificationResult.new('file_differences')

data/lib/moab/storage_repository.rb

@@ -160,7 +160,7 @@ module Moab
     # @param druid [String] The object identifier
     # @return [void] transfer the object to the preservation repository
     def store_new_object_version(druid, bag_pathname)
-      storage_object(druid, create = true).ingest_bag(bag_pathname)
+      storage_object(druid, true).ingest_bag(bag_pathname)
     end
 
     private

data/lib/moab/storage_services.rb

@@ -110,7 +110,7 @@ module Moab
     # @return [Pathname] Pathname object containing the full path for the specified file
     def self.retrieve_file(file_category, file_id, object_id, version_id = nil)
       storage_object_version = @@repository.storage_object(object_id).find_object_version(version_id)
-      file_pathname = storage_object_version.find_filepath(file_category, file_id)
+      storage_object_version.find_filepath(file_category, file_id)
     end
 
     # @param [String] file_category The category of file ('content', 'metdata', or 'manifest')
@@ -120,7 +120,7 @@ module Moab
     # @return [Pathname] Pathname object containing the full path for the specified file
     def self.retrieve_file_using_signature(file_category, file_signature, object_id, version_id = nil)
       storage_object_version = @@repository.storage_object(object_id).find_object_version(version_id)
-      file_pathname = storage_object_version.find_filepath_using_signature(file_category, file_signature)
+      storage_object_version.find_filepath_using_signature(file_category, file_signature)
     end
 
     # @param [String] file_category The category of file ('content', 'metdata', or 'manifest')
@@ -130,7 +130,7 @@ module Moab
     # @return [FileSignature] The signature of the file
     def self.retrieve_file_signature(file_category, file_id, object_id, version_id = nil)
       storage_object_version = @@repository.storage_object(object_id).find_object_version(version_id)
-      file_pathname = storage_object_version.find_signature(file_category, file_id)
+      storage_object_version.find_signature(file_category, file_id)
     end
 
     # @param [String] object_id The digital object identifier of the object

data/lib/moab/version_metadata.rb

@@ -25,10 +25,10 @@ module Moab
 
     # @attribute
     # @return [String] The digital object identifier
-    attribute :digital_object_id, String, :tag => 'objectId'
+    attribute :digital_object_id, String, tag: 'objectId'
 
     # @attribute
     # @return [Array<VersionMetadataEntry>] An array of version metadata entries, one per version
-    has_many :versions, VersionMetadataEntry, :tag => 'version'
+    has_many :versions, VersionMetadataEntry, tag: 'version'
   end
 end

data/lib/moab/version_metadata_entry.rb

@@ -24,7 +24,7 @@ module Moab
 
     # @attribute
     # @return [Integer] The object version number (A sequential integer)
-    attribute :version_id, Integer, :tag => 'versionId', :key => true, :on_save => proc { |n| n.to_s }
+    attribute :version_id, Integer, tag: 'versionId', key: true, on_save: proc { |n| n.to_s }
 
     # @attribute
     # @return [String] "an external version label that increments the most significant digit for major revisions,
@@ -46,14 +46,14 @@ module Moab
 
     # @attribute
     # @return [FileGroupDifference] Summary of content file differences since previous version
-    element :content_changes, FileGroupDifference, :tag => 'fileGroupDifference'
+    element :content_changes, FileGroupDifference, tag: 'fileGroupDifference'
 
     # @attribute
     # @return [FileGroupDifference]   Summary of metadata file differences since previous version
-    element :metadata_changes, FileGroupDifference, :tag => 'fileGroupDifference'
+    element :metadata_changes, FileGroupDifference, tag: 'fileGroupDifference'
 
     # @attribute
     # @return [Array<VersionMetadataEvent>] Array of events with timestamps that track lifecycle stages
-    has_many :events, VersionMetadataEvent, :tag => 'event'
+    has_many :events, VersionMetadataEvent, tag: 'event'
   end
 end

data/lib/serializer/manifest.rb

@@ -22,7 +22,7 @@ module Serializer
         filename
       else
         cname = name.split(/::/).last
-        cname[0, 1].downcase + cname[1..-1] + '.xml'
+        "#{cname[0, 1].downcase}#{cname[1..]}.xml"
       end
     end
 
@@ -59,7 +59,7 @@ module Serializer
     def self.write_xml_file(xml_object, parent_dir, filename = nil)
       parent_dir.mkpath
       xml_pathname(parent_dir, filename).open('w') do |f|
-        xmlBuilder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8')
+        xmlBuilder = Nokogiri::XML::Builder.new(encoding: 'UTF-8')
         xmlBuilder = xml_object.to_xml(xmlBuilder)
         f << xmlBuilder.to_xml
       end

data/lib/serializer/serializable.rb

@@ -113,7 +113,7 @@ module Serializer
 
     # @return [Hash] Calls to_hash(summary=true)
     def summary
-      to_hash(summary = true)
+      to_hash(true)
     end
 
     # @api internal

data/lib/stanford/content_inventory.rb

@@ -23,7 +23,7 @@ module Stanford
       # Many of these objects have contentMetadata with no child elements, such as this:
       #    <contentMetadata objectId="bd608mj3166" type="file"/>
       # but there are also objects that have no datasteam of this name at all
-      cm_inventory = Moab::FileInventory.new(:type => "version", :digital_object_id => object_id, :version_id => version_id)
+      cm_inventory = Moab::FileInventory.new(type: "version", digital_object_id: object_id, version_id: version_id)
       content_group = group_from_cm(content_metadata, subset)
       cm_inventory.groups << content_group
       cm_inventory
@@ -49,7 +49,7 @@ module Stanford
                 else
                   raise(Moab::MoabRuntimeError, "Unknown disposition subset (#{subset})")
                 end
-      content_group = Moab::FileGroup.new(:group_id => 'content', :data_source => "contentMetadata-#{subset}")
+      content_group = Moab::FileGroup.new(group_id: 'content', data_source: "contentMetadata-#{subset}")
       nodeset.each do |file_node|
         signature = generate_signature(file_node)
         instance = generate_instance(file_node)
@@ -85,10 +85,10 @@ module Stanford
       instance = Moab::FileInstance.new
       instance.path = node.attributes['id'].content
       instance.datetime = begin
-                            node.attributes['datetime'].content
-                          rescue
-                            nil
-                          end
+        node.attributes['datetime'].content
+      rescue
+        nil
+      end
       instance
     end
 
@@ -98,23 +98,23 @@ module Stanford
     # @example {include:file:spec/features/stanford/content_metadata_write_spec.rb}
     def generate_content_metadata(file_group, object_id, version_id)
       cm = Nokogiri::XML::Builder.new do |xml|
-        xml.contentMetadata(:type => "sample", :objectId => object_id) do
-          xml.resource(:type => "version", :sequence => "1", :id => "version-#{version_id}") do
+        xml.contentMetadata(type: "sample", objectId: object_id) do
+          xml.resource(type: "version", sequence: "1", id: "version-#{version_id}") do
             file_group.files.each do |file_manifestation|
               signature = file_manifestation.signature
               file_manifestation.instances.each do |instance|
                 xml.file(
-                  :id => instance.path,
-                  :size => signature.size,
-                  :datetime => instance.datetime,
-                  :shelve => 'yes',
-                  :publish => 'yes',
-                  :preserve => 'yes'
+                  id: instance.path,
+                  size: signature.size,
+                  datetime: instance.datetime,
+                  shelve: 'yes',
+                  publish: 'yes',
+                  preserve: 'yes'
                 ) do
                   fixity = signature.fixity
-                  xml.checksum(:type => "MD5") { xml.text signature.md5 } if fixity[:md5]
-                  xml.checksum(:type => "SHA-1") { xml.text signature.sha1 } if fixity[:sha1]
-                  xml.checksum(:type => "SHA-256") { xml.text signature.sha256 } if fixity[:sha256]
+                  xml.checksum(type: "MD5") { xml.text signature.md5 } if fixity[:md5]
+                  xml.checksum(type: "SHA-1") { xml.text signature.sha1 } if fixity[:sha1]
+                  xml.checksum(type: "SHA-256") { xml.text signature.sha256 } if fixity[:sha256]
                 end
               end
             end
@@ -128,7 +128,7 @@ module Stanford
     # @return [Boolean] True if contentMetadata has essential file attributes, else raise exception
     def validate_content_metadata(content_metadata)
       result = validate_content_metadata_details(content_metadata)
-      raise Moab::InvalidMetadataException, result[0] + " ..." unless result.empty?
+      raise Moab::InvalidMetadataException, "#{result[0]} ..." unless result.empty?
 
       true
     end
@@ -191,7 +191,7 @@ module Stanford
         remediate_file_size(file_node, signature)
         remediate_checksum_nodes(file_node, signature)
       end
-      ng_doc.to_xml(:indent => 2)
+      ng_doc.to_xml(indent: 2)
     end
 
     # @param [Nokogiri::XML::Element] file_node the File stanza being remediated

data/lib/stanford/dor_metadata.rb

@@ -31,11 +31,12 @@ module Stanford
     # @return [FileInventory]  Inventory of the files under the specified directory
     def inventory_from_directory(directory, version_id = nil)
       version_id ||= @version_id
-      version_inventory = Moab::FileInventory.new(type: 'version', digital_object_id: @digital_object_id, version_id: version_id)
+      version_inventory = Moab::FileInventory.new(type: 'version', digital_object_id: @digital_object_id,
+                                                  version_id: version_id)
       content_metadata = IO.read(File.join(directory, 'contentMetadata.xml'))
       content_group = Stanford::ContentInventory.new.group_from_cm(content_metadata, 'preserve')
       version_inventory.groups << content_group
-      metadata_group = Moab::FileGroup.new(:group_id => 'metadata').group_from_directory(directory)
+      metadata_group = Moab::FileGroup.new(group_id: 'metadata').group_from_directory(directory)
       version_inventory.groups << metadata_group
       version_inventory
     end

data/lib/stanford/storage_repository.rb

@@ -31,9 +31,9 @@ module Stanford
     # @param object_id [String] The identifier of the digital object whose path is requested
     # @return [String] the druid tree directory path based on the given object identifier.
     def druid_tree(object_id)
-      # Note: this seems an odd place to do druid validation, but leaving it here for now
+      # NOTE: this seems an odd place to do druid validation, but leaving it here for now
       syntax_msg = "Identifier has invalid suri syntax: #{object_id}"
-      raise(Moab::InvalidSuriSyntaxError, syntax_msg + " nil or empty") if object_id.to_s.empty?
+      raise(Moab::InvalidSuriSyntaxError, "#{syntax_msg} nil or empty") if object_id.to_s.empty?
 
       identifier = object_id.split(':')[-1]
       raise(Moab::InvalidSuriSyntaxError, syntax_msg) if identifier.to_s.empty?

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 4.4.2
 platform: ruby
 authors:
 - Darren Weber
 - Richard Anderson
 - Lynn McRae
 - Hannah Frost
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-22 00:00:00.000000000 Z
+date: 2021-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: druid-tools
@@ -145,28 +145,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.37.1
+        version: '2.1'
 description: Contains classes to process digital object version content and metadata
 email:
 - darren.weber@stanford.edu
@@ -215,23 +215,23 @@ homepage: https://github.com/sul-dlss/moab-versioning
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Ruby implementation of digital object versioning toolkit used by the SULAIR
   Digital Library