moab-versioning 5.0.0.beta1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d109f89af3228b70fe8e8b8cf394830b9397f4815a8c2324bb7e09e849432d6
-  data.tar.gz: 9695c1dfb048663ff1b56084597b8ece2973966704a07d610dd7e537da8be61b
+  metadata.gz: c20a012b9d9c481ddfeed15296e61aaf6648bed0cd1d0065a8b0662301e94a1b
+  data.tar.gz: 8d5a96d608b7334f117b5ee9faa3cbe16f82f543bd3af0d23d11371df2181d76
 SHA512:
-  metadata.gz: 85be7b541e0056fd50296092448b01c4d83195529c00bd4aaa244cce6596336b0ae7b41ba855f54b618666bf265a9986844eaf6a0f7a78eb811b6ccdaf1329ae
-  data.tar.gz: 72dc3ada7f22d891e883ce08fe55c7c783689f73b8868e6c29bb5040c2bcc45197c044a3b5823a94f3e8ade7de6b16ccc291902ee142ab0e68036824623c6695
+  metadata.gz: 296fd7985772e8296f879e955066f7e3c71b00a6a83d9893aa124de5d900a427ca61d57b221f4227ae54210f3518111a5d99ae60db62ed9dbb25818871f8e87d
+  data.tar.gz: 701adc9ee529e10fd608ed890f8f8a3f978cb3ec023f58d8a75bd11a0caa6e27f4631ec4f73c9280cf8de914da855d100be3cd077f029ec91fab4b07749c627c

data/lib/moab/file_inventory_difference.rb

@@ -100,10 +100,10 @@ module Moab
     # @param (see #compare)
     # @return [String] Returns either the common digitial object ID, or a concatenation of both inventory's IDs
     def common_object_id(basis_inventory, other_inventory)
-      if basis_inventory.digital_object_id != other_inventory.digital_object_id
-        "#{basis_inventory.digital_object_id}|#{other_inventory.digital_object_id}"
-      else
+      if basis_inventory.digital_object_id == other_inventory.digital_object_id
         basis_inventory.digital_object_id.to_s
+      else
+        "#{basis_inventory.digital_object_id}|#{other_inventory.digital_object_id}"
       end
     end
 

data/lib/moab/file_signature.rb

@@ -77,7 +77,7 @@ module Moab
     def self.from_file(pathname, algos_to_use = active_algos)
       raise(MoabRuntimeError, 'Unrecognized algorithm requested') unless algos_to_use.all? { |a| KNOWN_ALGOS.include?(a) }
 
-      signatures = algos_to_use.map { |k| [k, KNOWN_ALGOS[k].call] }.to_h
+      signatures = algos_to_use.to_h { |k| [k, KNOWN_ALGOS[k].call] }
 
       pathname.open("r") do |stream|
         while (buffer = stream.read(8192))

data/lib/moab/signature_catalog.rb

@@ -84,7 +84,7 @@ module Moab
 
     def block_count
       block_size = 1024
-      entries.inject(0) { |sum, entry| sum + (entry.signature.size.to_i + block_size - 1) / block_size }
+      entries.inject(0) { |sum, entry| sum + ((entry.signature.size.to_i + block_size - 1) / block_size) }
     end
 
     # @return [Array<String>] The data fields to include in summary reports

data/lib/moab/storage_object.rb

@@ -57,9 +57,10 @@ module Moab
 
     # @api external
     # @param bag_dir [Pathname,String] The location of the bag to be ingested
+    # @param use_links [Boolean] If true, use hard links; if false, make copies
     # @return [void] Ingest a new object version contained in a bag into this objects storage area
     # @example {include:file:spec/features/storage/ingest_spec.rb}
-    def ingest_bag(bag_dir = deposit_bag_pathname)
+    def ingest_bag(bag_dir = deposit_bag_pathname, use_links: true)
       bag_dir = Pathname(bag_dir)
       current_version = StorageObjectVersion.new(self, current_version_id)
       current_inventory = current_version.file_inventory('version')
@@ -70,7 +71,7 @@ module Moab
         new_inventory = versionize_bag(bag_dir, current_version, new_version)
       end
       validate_new_inventory(new_inventory)
-      new_version.ingest_bag_data(bag_dir)
+      new_version.ingest_bag_data(bag_dir, use_links: use_links)
       new_version.update_catalog(current_version.signature_catalog, new_inventory)
       new_version.generate_differences_report(current_inventory, new_inventory)
       new_version.generate_manifest_inventory

data/lib/moab/storage_object_version.rb

@@ -128,24 +128,25 @@ module Moab
     # @api external
     # @return [SignatureCatalog] The signature catalog of the digital object as of this version
     def signature_catalog
-      if version_id > 0
-        SignatureCatalog.read_xml_file(@version_pathname.join('manifests'))
-      else
-        SignatureCatalog.new(digital_object_id: @storage_object.digital_object_id)
-      end
+      @signature_catalog ||= if version_id > 0
+                               SignatureCatalog.read_xml_file(@version_pathname.join('manifests'))
+                             else
+                               SignatureCatalog.new(digital_object_id: @storage_object.digital_object_id)
+                             end
     end
 
     # @api internal
     # @param bag_dir [Pathname,String] The location of the bag to be ingested
+    # @param use_links [Boolean] If true, use hard links; if false, make copies
     # @return [void] Create the version subdirectory and move files into it
-    def ingest_bag_data(bag_dir)
+    def ingest_bag_data(bag_dir, use_links: true)
       raise(MoabRuntimeError, "Version already exists: #{@version_pathname}") if @version_pathname.exist?
 
       @version_pathname.join('manifests').mkpath
       bag_dir = Pathname(bag_dir)
-      ingest_dir(bag_dir.join('data'), @version_pathname.join('data'))
-      ingest_file(bag_dir.join(FileInventory.xml_filename('version')), @version_pathname.join('manifests'))
-      ingest_file(bag_dir.join(FileInventory.xml_filename('additions')), @version_pathname.join('manifests'))
+      ingest_dir(bag_dir.join('data'), @version_pathname.join('data'), use_links)
+      ingest_file(bag_dir.join(FileInventory.xml_filename('version')), @version_pathname.join('manifests'), use_links)
+      ingest_file(bag_dir.join(FileInventory.xml_filename('additions')), @version_pathname.join('manifests'), use_links)
     end
 
     # @api internal
@@ -286,10 +287,10 @@ module Moab
           file.instances.each do |instance|
             relative_path = File.join(group.group_id, instance.path)
             catalog_entry = signature_catalog.signature_hash[file.signature]
-            if !catalog_entry.nil?
-              found += 1
-            else
+            if catalog_entry.nil?
               missing << relative_path.to_s
+            else
+              found += 1
             end
           end
         end

data/lib/moab/utc_time.rb

@@ -7,9 +7,7 @@ module Moab
     # @return [void] Convert input datetime to a Time object, or nil if input is empty.
     def self.input(datetime)
       case datetime
-      when nil
-        nil
-      when ""
+      when nil, ""
         nil
       when String
         Time.parse(datetime)

data/lib/moab/verification_result.rb

@@ -66,7 +66,7 @@ module Moab
     # @param level [Integer] Used to increment the depth of recursion
     # @return [Hash] The verification result of subentities serialized to a hash
     def subentities_to_hash(verbose, level)
-      subentities.map { |s| [s.entity, s.to_hash(verbose, level + 1)] }.to_h
+      subentities.to_h { |s| [s.entity, s.to_hash(verbose, level + 1)] }
     end
   end
 end

data/lib/serializer/serializable.rb

@@ -157,7 +157,7 @@ module Serializer
           diff[k] = if left[k].is_a?(Hash) && right[k].is_a?(Hash)
                       deep_diff(ltag, left[k], rtag, right[k])
                     else
-                      Hash.[](ltag, left[k], rtag, right[k])
+                      { ltag => left[k], rtag => right[k] }
                     end
         end
       end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 5.0.0.beta1
+  version: 5.2.0
 platform: ruby
 authors:
 - Darren Weber
 - Richard Anderson
 - Lynn McRae
 - Hannah Frost
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-19 00:00:00.000000000 Z
+date: 2022-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: druid-tools
@@ -69,20 +69,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -167,6 +153,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Contains classes to process digital object version content and metadata
 email:
 - darren.weber@stanford.edu
@@ -208,8 +208,9 @@ files:
 homepage: https://github.com/sul-dlss/moab-versioning
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,15 +218,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Ruby implementation of digital object versioning toolkit used by the SULAIR
   Digital Library