moab-versioning 4.3.0 → 5.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd9a6b4c49a9ab93e011a23004c0c21b74878ff7dc46c29b022c56b83627c3bb
-  data.tar.gz: 065bb99748c0e06d5f3fafebc9b75552e1585709e170d27b27a5f14cb7b1db85
+  metadata.gz: 1d109f89af3228b70fe8e8b8cf394830b9397f4815a8c2324bb7e09e849432d6
+  data.tar.gz: 9695c1dfb048663ff1b56084597b8ece2973966704a07d610dd7e537da8be61b
 SHA512:
-  metadata.gz: 2efdbe79de69d26b41de7de0052ade6e3c8cf1a8651e6e05d093b889cb0de0ac47061663951bef33082012719b3f5774ff37ced11ef210a8f7a67cfbc7bbb7b2
-  data.tar.gz: cd9518df71844ea61f4b036d08d51e2c86456c28492404265b8bd68d8510db1556ac359abd3ae95736011431ebab6bbe4a804530875e060b278dd54a9e57aff5
+  metadata.gz: 85be7b541e0056fd50296092448b01c4d83195529c00bd4aaa244cce6596336b0ae7b41ba855f54b618666bf265a9986844eaf6a0f7a78eb811b6ccdaf1329ae
+  data.tar.gz: 72dc3ada7f22d891e883ce08fe55c7c783689f73b8868e6c29bb5040c2bcc45197c044a3b5823a94f3e8ade7de6b16ccc291902ee142ab0e68036824623c6695

data/lib/moab/bagger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # A class used to create a BagIt package from a version inventory and a set of source files.
   # The {#fill_bag} method is called with a package_mode parameter that specifies
@@ -141,6 +143,7 @@ module Moab
     def deposit_group(group_id, source_dir)
       group = bag_inventory.group(group_id)
       return nil? if group.nil? || group.files.empty?
+
       target_dir = bag_pathname.join('data', group_id)
       group.path_list.each do |relative_path|
         source = source_dir.join(relative_path)
@@ -158,6 +161,7 @@ module Moab
     def reconstuct_group(group_id, storage_object_dir)
       group = bag_inventory.group(group_id)
       return nil? if group.nil? || group.files.empty?
+
       target_dir = bag_pathname.join('data', group_id)
       group.files.each do |file|
         catalog_entry = signature_catalog.signature_hash[file.signature]
@@ -165,7 +169,7 @@ module Moab
         file.instances.each do |instance|
           target = target_dir.join(instance.path)
           target.parent.mkpath
-          FileUtils.symlink source, target
+          FileUtils.symlink source, target unless target.exist?
         end
       end
       true
@@ -260,6 +264,7 @@ module Moab
         shell_execute(tar_cmd.sub('--force-local', ''))
       end
       raise(MoabRuntimeError, "Unable to create tarfile #{tar_pathname}") unless tar_pathname.exist?
+
       true
     end
 
@@ -273,7 +278,7 @@ module Moab
         stdout
       else
         msg = "Shell command failed: [#{command}] caused by <STDERR = #{stderr}>"
-        msg << " STDOUT = #{stdout}" if stdout && stdout.length.positive?
+        msg << " STDOUT = #{stdout}" if stdout&.length&.positive?
         raise(MoabStandardError, msg)
       end
     rescue SystemCallError => e

data/lib/moab/config.rb

@@ -1,10 +1,43 @@
+# frozen_string_literal: true
+
 module Moab
-  # @return [Confstruct::Configuration] the configuration data
-  Config = Confstruct::Configuration.new do
-    storage_roots nil
-    storage_trunk nil
-    deposit_trunk nil
-    path_method :druid_tree
-    checksum_algos [:md5, :sha1, :sha256]
+  # A place to store configuration for the gem
+  class Configuration
+    def initialize
+      @path_method = :druid_tree
+      @checksum_algos = [:md5, :sha1, :sha256]
+    end
+
+    def configure(&block)
+      instance_eval(&block)
+    end
+
+    def storage_roots(new_value = nil)
+      @storage_roots = new_value if new_value
+      @storage_roots
+    end
+
+    def storage_trunk(new_value = nil)
+      @storage_trunk = new_value if new_value
+      @storage_trunk
+    end
+
+    def deposit_trunk(new_value = nil)
+      @deposit_trunk = new_value if new_value
+      @deposit_trunk
+    end
+
+    def path_method(new_value = nil)
+      @path_method = new_value if new_value
+      @path_method
+    end
+
+    def checksum_algos(new_value = nil)
+      @checksum_algos = new_value if new_value
+      @checksum_algos
+    end
   end
+
+  # @return [Moab::Configuration] the configuration data
+  Config = Configuration.new
 end

data/lib/moab/exceptions.rb

@@ -1,9 +1,15 @@
+# frozen_string_literal: true
+
 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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # A container for a standard subset of a digital objects {FileManifestation} objects
   # Used to segregate depositor content from repository metadata files
@@ -28,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 }
@@ -44,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 }
@@ -52,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 }
@@ -65,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
@@ -161,9 +163,11 @@ module Moab
     # @return [Boolean] Test whether the given path is contained within the {#base_directory}
     def is_descendent_of_base?(pathname)
       raise(MoabRuntimeError, "base_directory has not been set") if @base_directory.nil?
+
       is_descendent = false
       pathname.expand_path.ascend { |ancestor| is_descendent ||= (ancestor == @base_directory) }
       raise(MoabRuntimeError, "#{pathname} is not a descendent of #{@base_directory}") unless is_descendent
+
       is_descendent
     end
 
@@ -203,6 +207,7 @@ module Moab
       validated ||= is_descendent_of_base?(pathname)
       pathname.children.sort.each do |child|
         next if child.basename.to_s == '.DS_Store'
+
         if child.directory?
           harvest_directory(child, recursive, validated) if recursive
         else
@@ -222,9 +227,7 @@ module Moab
       instance = FileInstance.new.instance_from_file(pathname, @base_directory)
       if @signatures_from_bag && @signatures_from_bag[pathname]
         signature = @signatures_from_bag[pathname]
-        unless signature.complete?
-          signature = signature.normalized_signature(pathname)
-        end
+        signature = signature.normalized_signature(pathname) unless signature.complete?
       else
         signature = FileSignature.new.signature_from_file(pathname)
       end

data/lib/moab/file_group_difference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # Performs analysis and reports the differences between two matching {FileGroup} objects.
   # The descending elements of the report hold a detailed breakdown of file-level differences, organized by change type.
@@ -51,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
@@ -74,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
@@ -124,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
@@ -132,6 +134,7 @@ module Moab
 
     def subsets=(array)
       return unless array
+
       array.each { |subset| subset_hash[subset.change.to_sym] = subset }
     end
 
@@ -144,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
 
@@ -228,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
@@ -281,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]
@@ -300,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]
@@ -318,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # A container for reporting a set of file-level differences of the type specified by the change attribute
   #
@@ -24,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
@@ -36,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # The file path and last modification date properties of a file
   #
@@ -23,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/,' ')
@@ -52,6 +54,7 @@ module Moab
     # @return [Boolean] Returns true if self and other have the same path.
     def eql?(other)
       return false unless other.respond_to?(:path) # Cannot equal an incomparable type!
+
       path == other.path
     end
 

data/lib/moab/file_instance_difference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # A container for recording difference information at the file level
   # * If there was no change, the change type is set to <i>identical</i>
@@ -36,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # A structured container for recording information about a collection of related files.
   #
@@ -44,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)
@@ -69,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 }
@@ -77,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 }
@@ -85,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 }
@@ -93,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
@@ -132,9 +134,11 @@ module Moab
       file_group = group(group_id)
       errmsg = "group #{group_id} not found for #{digital_object_id} - #{version_id}"
       raise FileNotFoundException, errmsg if file_group.nil?
+
       file_signature = file_group.path_hash[file_id]
       errmsg = "#{group_id} file #{file_id} not found for #{digital_object_id} - #{version_id}"
       raise FileNotFoundException, errmsg if file_signature.nil?
+
       file_signature
     end
 
@@ -190,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # Compares two {FileInventory} instances based primarily on file signatures and secondarily on file pathnames.
   # Although the usual use will be to compare the content of 2 different temporal versions of the same object,
@@ -28,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 }
@@ -48,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)
@@ -60,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
@@ -87,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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Moab
   # A container for a file signature and all the physical file instances that have that signature
   # This element has one child {FileSignature} element, and one or more {FileInstance} elements
@@ -28,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
@@ -40,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
@@ -75,6 +77,7 @@ module Moab
     # @return [Boolean] True if {FileManifestation} objects have same content
     def ==(other)
       return false unless other.respond_to?(:signature) && other.respond_to?(:instances) # Cannot equal an incomparable type!
+
       (signature == other.signature) && (instances == other.instances)
     end
   end