moab-versioning 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 749994fdd6abe9265d77a9c86595fd45790731eab77d953d2e497aa8bf294a51
-  data.tar.gz: 46da4dba3b799cd9e03c7218863590fef18f98a15f326ab80f178424a8aaa828
+  metadata.gz: 0ac9a723ffc977aa08ff80ac3222a5edac9007f34516b269e53323119a129646
+  data.tar.gz: df5e62f7a0c6b1a328676063f08da78977465505bcafa933273f4964dab7f239
 SHA512:
-  metadata.gz: e9c6898512516358683eb76556607942281e5a2b3f9ecb0dfe6e1e25506ae21a46f46c95b8611b3a37f6d6dd4b8b6045e54cdd0531a7e12f47a281f9218c43ab
-  data.tar.gz: 055efae4024095b3f2dba87369fc1a2843c7f2a8d84f66277315232791f1a4ae4e1b5ffbcd6e2474665cf09c9498059f4746fa3bfcef0609381347d8368d914e
+  metadata.gz: 188bdd57026ac1bcdc431ce8266927414dcb4b3539ddc8b0f733240adb888bbd564f3469d6346c8948af5fcf072fb3ebde5a0cc894d65539acddfe104522e43b
+  data.tar.gz: c00a2aa7923f9138b34afd7d2a212dc0c9a9cd4b70a953217771fe46c4cbb2f6013d9ba4632e121a95c6238c1242fedfeba2ba8a4883775afab2558e86ad3fdd

data/lib/moab/file_group.rb

@@ -97,16 +97,23 @@ module Moab
 
     # @api internal
     # @param signature_subset [Array<FileSignature>] The signatures used to select the entries to return
-    # @return [Hash<String,FileSignature>] A pathname,signature hash containing a subset of the filenames in this file group
+    # @return [Hash<String,FileSignature>] A pathname,signature hash containing a subset of the filenames in this file
+    #                                      group, e.g., {"intro-1.jpg"=>#<Moab::FileSignature>, ...}
     def path_hash_subset(signature_subset)
-      path_hash = {}
-      signature_subset.each do |signature|
-        manifestation = signature_hash[signature]
-        manifestation.instances.each do |instance|
-          path_hash[instance.path] = signature
-        end
+      # the structure of the `signature_hash` attr is documented above
+      signature_hash
+        .filter_map do |signature, manifestation|
+        # filters out signatures not in the provided subset
+        next unless signature_subset.include?(signature)
+
+        # for each instance in the manifestation, return an array of its path and the signature from the above block
+        manifestation.instances.map { |instance| [instance.path, signature] }
       end
-      path_hash
+        # the nested map operations above return e.g.: [[["intro-1.jpg",
+        # #<Moab::FileSignature>],...]] which needs to be flattened one time to
+        # convert back into a hash
+        .flatten(1)
+        .to_h
     end
 
     # @param manifestiation_array [Array<FileManifestation>] The collection of {FileManifestation} objects
@@ -133,12 +140,11 @@ module Moab
     # @return [void] Add a single {FileSignature},{FileInstance} key/value pair to this group.
     #   Data is actually stored in the {#signature_hash}
     def add_file_instance(signature, instance)
-      if signature_hash.key?(signature)
-        manifestation = signature_hash[signature]
-      else
-        manifestation = FileManifestation.new
-        manifestation.signature = signature
-        signature_hash[signature] = manifestation
+      manifestation = signature_hash[signature] || begin
+        FileManifestation.new.tap do |file_manifestation|
+          file_manifestation.signature = signature
+          signature_hash[signature] = file_manifestation
+        end
       end
       manifestation.instances << instance
     end

data/lib/moab/file_inventory_difference.rb

@@ -87,11 +87,11 @@ module Moab
       @report_datetime = Time.now
       # get a union list of all group_ids present in either inventory
       group_ids = basis_inventory.group_ids | other_inventory.group_ids
-      group_ids.each do |group_id|
+      @group_differences = group_ids.map 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)
-        @group_differences << FileGroupDifference.new.compare_file_groups(basis_group, other_group)
+        FileGroupDifference.new.compare_file_groups(basis_group, other_group)
       end
       self
     end

data/lib/moab/file_signature.rb

@@ -45,20 +45,20 @@ module Moab
     tag 'fileSignature'
 
     # @attribute
-    # @return [Integer] The size of the file in bytes
+    # @return [String] The size of the file in bytes (can be empty)
     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 }
+    # @return [String] The MD5 checksum value of the file (can be empty)
+    attribute :md5, String, on_save: proc { |n| 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 }
+    # @return [String] The SHA1 checksum value of the file (can be empty)
+    attribute :sha1, String, on_save: proc { |n| 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 }
+    # @return [String] The SHA256 checksum value of the file (can be empty)
+    attribute :sha256, String, on_save: proc { |n| n.to_s }
 
     KNOWN_ALGOS = {
       md5: proc { Digest::MD5.new },
@@ -106,11 +106,11 @@ module Moab
 
    # @return [Hash<Symbol,String>] A hash of the checksum data
     def checksums
-      {
-        md5: md5,
-        sha1: sha1,
-        sha256: sha256
-      }.reject { |_key, value| value.nil? || value.empty? }
+      @checksums ||= {}.tap do |checksum_hash|
+        checksum_hash[:md5] = md5 unless md5.to_s.empty?
+        checksum_hash[:sha1] = sha1 unless sha1.to_s.empty?
+        checksum_hash[:sha256] = sha256 unless sha256.to_s.empty?
+      end
     end
 
     # @return [Boolean] The signature contains all of the 3 desired checksums
@@ -128,7 +128,6 @@ module Moab
     # @param other [FileSignature] The other file signature being compared to this signature
     # @return [Boolean] Returns true if self and other have comparable fixity data.
     def eql?(other)
-      return false unless other.respond_to?(:size) && other.respond_to?(:checksums)
       return false if size.to_i != other.size.to_i
 
       self_checksums = checksums
@@ -140,6 +139,8 @@ module Moab
         return false if self_checksums[key] != other_checksums[key]
       end
       true
+    rescue NoMethodError
+      false
     end
 
     # @api internal

data/lib/stanford/content_inventory.rb

@@ -124,7 +124,7 @@ module Stanford
       cm.to_xml
     end
 
-    # @param content_metadata [String,Nokogiri::XML::Document] The contentMetadata as a string or XML doc
+    # @param content_metadata [String, Nokogiri::XML::Document] The contentMetadata as a string or XML doc
     # @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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moab-versioning
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Naomi Dushay
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-26 00:00:00.000000000 Z
+date: 2023-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: druid-tools
@@ -230,7 +230,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.7
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of digital object versioning toolkit used by Stanford