moab-versioning 4.4.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcb99d73bd625e8cbba0201f1dea7f6ae4925806df623e2a1e52198827f5b1c7
-  data.tar.gz: cb53aea7e39eabf83f8f80e0d05b70fe4a73e4376e0a6e054fb912b1225460f1
+  metadata.gz: a921589cd50c4c0ae21c1a46321cc48c66fa9ed9c0add1dce9b2d7f3888cf362
+  data.tar.gz: 2d4e565dcab2a901c618641784fc3d83d65fa23ac47fddcd09352d13386a5faf
 SHA512:
-  metadata.gz: af674dbff0e829b11da52850800fd2b3365e4ebc27d6629cefe7a71de0961bab884e7fb406be515a93a6387e48c5eb90a170144177fef9655331b9517732c298
-  data.tar.gz: d858888aad9e8557b33471f02c600e94217eba5ac213f27469fd7cc745f79752c9699e53c58d007f9c6fd39202d17f5e14da1a5761994309b2e5047ca76e0731
+  metadata.gz: 0f77277e725f7a3ac543e2d14b06721658c02808067bce87e0e314e7544537d9c20064de4a8febcbe495131655661ae4fa59fcb418dc5d992df00750cd7a5d85
+  data.tar.gz: 7e223db6e02a215899ebee8a8aa805282dd333c12038cff2431539d50f07d10608b40edb7046e3eedf3b066e66905cd5a4cd521fdab28f8ce2904899db3357bb

data/lib/moab/bagger.rb

@@ -169,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

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/stanford.rb

@@ -2,20 +2,10 @@
 
 require 'moab'
 require 'stanford/content_inventory'
-require 'stanford/dor_metadata'
 require 'stanford/storage_repository'
 require 'stanford/storage_services'
-require 'stanford/active_fedora_object'
-require 'stanford/moab_storage_directory'
 require 'stanford/storage_object_validator'
 
 # Stanford is a module that isolates classes specific to the Stanford Digital Repository
-#
-# ====Data Model
-# * <b>{DorMetadata} = utility methods for interfacing with Stanford metadata files (esp contentMetadata)</b>
-#   * {ActiveFedoraObject} [1..*] = utility for extracting content or other information from a Fedora Instance
-#
-# @note Copyright (c) 2012 by The Board of Trustees of the Leland Stanford Junior University.
-#   All rights reserved.  See {file:LICENSE.rdoc} for details.
 module Stanford
 end

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