libis-tools 1.0.15 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f007ed770338a6d5f537e3388cc72409e4e35deab2c337f8f4a80a76db200371
-  data.tar.gz: c57cd7d2cb65c0cf6cc03a2e7973ee2d24e279f5e975da5580b4569f50c833b3
+  metadata.gz: '01219a5f1fbace5f69a992675d9e67a049c1924cf7b9d9f24db18be8fdf4dc60'
+  data.tar.gz: 0b1ded7e545eeec542e739bfbf20a2c680a6a3a05561d95087f172932312a53a
 SHA512:
-  metadata.gz: a4a87f3ffdb3319e748fa9d60f47971f250fb2ff841ea63f0c7795afbacbee452943958b366b1462f866a406f07a39b5556258778b7913db236e8889a2f2a7ea
-  data.tar.gz: 1058f448308c579de12b41183d185846278ec9c798cf97cece7f5a324039fcd7886f12960a8023e833eadac073f33245d0fbb3e022d00267f5eaa7f633f34c5d
+  metadata.gz: e6e997f4405fef929aef639c6807b8b3de168777c487efb7f91ffc31eb1f588d03cf9d4210485314b44ccd074a5f7aa5ad02a1fe5e0c245a6a8524955a643e36
+  data.tar.gz: cc69c4dadac622c704539fb1c3357eed4c6fe6784b1870a6a4b46edc927c635c528812e9817f7769b6497ad9eba06d8faa86fce56f166d0ba3ce6cdc92a4dab8

data/lib/libis/tools/extend/roo.rb

@@ -88,4 +88,16 @@ module Roo
     end
 
   end
+
+  class CSV
+    def each_row(options, &block)
+      if uri?(filename)
+        each_row_using_tempdir(options, &block)
+      elsif is_stream?(filename_or_stream)
+        ::CSV.new(filename_or_stream, **options).each(&block)
+      else
+        ::CSV.foreach(filename, **options, &block)
+      end
+    end
+  end
 end

data/lib/libis/tools/mets_dnx.rb

@@ -31,7 +31,9 @@ module Libis
       # Specialized DNX section.
       class WebHarvesting < DnxSection; end
       # Specialized DNX section.
-      class Collection < DnxSection; end
+      class Collection < DnxSection
+        def tag; 'Collection'; end
+      end
       # Specialized DNX section.
       class PreservationLevel < DnxSection; end
       # Specialized DNX section.

data/lib/libis/tools/mets_objects.rb

@@ -44,188 +44,6 @@ module Libis
 
       end
 
-      # Container class for creating a representation in the METS.
-      class Representation
-        include MetsObject
-
-        # The currently allowed attributes on this class. The attributes will typically be used in {DnxSection}s.
-        attr_accessor :label, :preservation_type, :usage_type, :representation_code, :entity_type, :access_right_id,
-                      :user_a, :user_b, :user_c,
-                      :group_id, :priority, :order,
-                      :digital_original, :content, :context, :hardware, :carrier, :original_name,
-                      :preservation_levels, :env_dependencies, :hardware_ids, :software_ids,
-                      :hardware_infos, :software_infos, :relationship_infos, :environments,
-                      :dc_record, :source_metadata
-
-        # The id that will be used in the XML file to reference this representation.
-        def xml_id
-          "rep#{@id}"
-        end
-
-        # This method creates the appropriate {DnxSection}s based on what attributes are filled in.
-        def amd
-          dnx = {}
-          tech_data = []
-          # General characteristics
-          data = {
-              preservationType: preservation_type,
-              usageType: usage_type,
-              DigitalOriginal: digital_original,
-              label: label,
-              representationEntityType: entity_type,
-              contentType: content,
-              contextType: context,
-              hardwareUsed: hardware,
-              physicalCarrierMedia: carrier,
-              deliveryPriority: priority,
-              orderingSequence: order,
-              RepresentationCode: representation_code,
-              RepresentationOriginalName: original_name,
-              UserDefinedA: user_a,
-              UserDefinedB: user_b,
-              UserDefinedC: user_c,
-          }.cleanup
-          tech_data << GeneralRepCharacteristics.new(data) unless data.empty?
-          # Object characteristics
-          data = {
-              groupID: group_id
-          }.cleanup
-          tech_data << ObjectCharacteristics.new(data) unless data.empty?
-          # Preservation level
-          if preservation_levels
-            data_list = []
-            preservation_levels.each do |preservation_level|
-              data = {
-                  preservationLevelValue: preservation_level[:value],
-                  preservationLevelRole: preservation_level[:role],
-                  preservationLevelRationale: preservation_level[:rationale],
-                  preservationLevelDateAssigned: preservation_level[:date],
-              }.cleanup
-              data_list << OpenStruct.new(data) unless data.empty?
-            end
-            tech_data << PreservationLevel.new(array: data_list) unless data_list.empty?
-          end
-          # Dependencies
-          if env_dependencies
-            data_list = []
-            env_dependencies.each do |dependency|
-              data = {
-                  dependencyName: dependency[:name],
-                  dependencyIdentifierType1: dependency[:type1],
-                  dependencyIdentifierValue1: dependency[:value1],
-                  dependencyIdentifierType2: dependency[:type2],
-                  dependencyIdentifierValue2: dependency[:value2],
-                  dependencyIdentifierType3: dependency[:type3],
-                  dependencyIdentifierValue3: dependency[:value3],
-              }.cleanup
-              data_list << OpenStruct.new(data) unless data.empty?
-            end
-            tech_data << EnvironmentDependencies.new(array: data_list) unless data_list.empty?
-          end
-          # Hardware registry id
-          if hardware_ids
-            data_list = []
-            hardware_ids.each do |id|
-              data = {
-                  registryId: id
-              }.cleanup
-              data_list << OpenStruct.new(data) unless data.empty?
-            end
-            tech_data << EnvHardwareRegistry.new(array: data_list) unless data_list.empty?
-          end
-          # Software registry id
-          if software_ids
-            data_list = []
-            software_ids.each do |id|
-              data = {
-                  registryId: id
-              }.cleanup
-              data_list << OpenStruct.new(data) unless data.empty?
-            end
-            tech_data << EnvSoftwareRegistry.new(array: data_list) unless data_list.empty?
-          end
-          # Hardware
-          if hardware_infos
-            data_list = []
-            hardware_infos.each do |hardware|
-              data = {
-                  hardwareName: hardware[:name],
-                  hardwareType: hardware[:type],
-                  hardwareOtherInformation: hardware[:info],
-              }.cleanup
-              data_list << OpenStruct.new(data) unless data.empty?
-            end
-            tech_data << EnvironmentHardware.new(array: data_list) unless data_list.empty?
-          end
-          # Software
-          if software_infos
-            data_list = []
-            software_infos.each do |software|
-              data = {
-                  softwareName: software[:name],
-                  softwareVersion: software[:version],
-                  softwareType: software[:type],
-                  softwareOtherInformation: software[:info],
-                  softwareDependancy: software[:dependency],
-              }.cleanup
-              data_list << OpenStruct.new(data) unless data.empty?
-            end
-            tech_data << EnvironmentSoftware.new(array: data_list) unless data_list.empty?
-          end
-          # Relationship
-          if relationship_infos
-            data_list = []
-            relationship_infos.each do |relationship|
-              data = {
-                  relationshipType: relationship[:type],
-                  relationshipSubType: relationship[:subtype],
-                  relatedObjectIdentifierType1: relationship[:type1],
-                  relatedObjectIdentifierValue1: relationship[:id1],
-                  relatedObjectSequence1: relationship[:seq1],
-                  relatedObjectIdentifierType2: relationship[:type2],
-                  relatedObjectIdentifierValue2: relationship[:id2],
-                  relatedObjectSequence2: relationship[:seq2],
-                  relatedObjectIdentifierType3: relationship[:type3],
-                  relatedObjectIdentifierValue3: relationship[:id3],
-                  relatedObjectSequence3: relationship[:seq3],
-              }.cleanup
-              data_list << OpenStruct.new(data) unless data.empty?
-            end
-            tech_data << RelationShip.new(array: data_list) unless data_list.empty?
-          end
-          # Environment
-          if environments
-            data_list = []
-            environments.each do |environment|
-              data = {
-                  environmentCharacteristic: environment[:characteristic],
-                  environmentPurpose: environment[:purpose],
-                  environmentNote: environment[:note],
-              }.cleanup
-              data_list << OpenStruct.new(data) unless data.empty?
-            end
-            tech_data << Environment.new(array: data_list) unless data_list.empty?
-          end
-          # Finally assemble technical section
-          dnx[:tech] = tech_data unless tech_data.empty?
-          # Rights section
-          rights_data = []
-          data = {
-              policyId: access_right_id
-          }.cleanup
-          rights_data << AccessRightsPolicy.new(data) unless data.empty?
-          dnx[:rights] = rights_data unless rights_data.empty?
-          # Source metadata
-          if source_metadata
-            source_metadata.each_with_index do |metadata, i|
-              dnx["source-#{metadata[:type].to_s.upcase}-#{i}"] = metadata[:data]
-            end
-          end
-          dnx
-        end
-
-      end
-
       # Container class for creating a file in the METS.
       class File
         include MetsObject
@@ -289,9 +107,9 @@ module Libis
               compositionLevel: composition_level,
               # fileLocationType: 'FILE',
               fileLocation: location,
-              fileOriginalName: original || target_names,
+              fileOriginalName: original || target_name,
               fileOriginalPath: target_path,
-              # fileOriginalID: URI.encode(location),
+              # fileOriginalID: CGI.escape(location),
               # fileExtension: ::File.extname(orig_name),
               fileMIMEType: mimetype,
               fileSizeBytes: size,
@@ -524,6 +342,187 @@ module Libis
 
       end
 
+      # Container class for creating a representation in the METS.
+      class Representation < Div
+
+        # The currently allowed attributes on this class. The attributes will typically be used in {DnxSection}s.
+        attr_accessor :preservation_type, :usage_type, :representation_code, :entity_type, :access_right_id,
+                      :user_a, :user_b, :user_c,
+                      :group_id, :priority, :order,
+                      :digital_original, :content, :context, :hardware, :carrier, :original_name,
+                      :preservation_levels, :env_dependencies, :hardware_ids, :software_ids,
+                      :hardware_infos, :software_infos, :relationship_infos, :environments,
+                      :dc_record, :source_metadata
+
+        # The id that will be used in the XML file to reference this representation.
+        def xml_id
+          "rep#{@id}"
+        end
+
+        # This method creates the appropriate {DnxSection}s based on what attributes are filled in.
+        def amd
+          dnx = {}
+          tech_data = []
+          # General characteristics
+          data = {
+              preservationType: preservation_type,
+              usageType: usage_type,
+              DigitalOriginal: digital_original,
+              label: label,
+              representationEntityType: entity_type,
+              contentType: content,
+              contextType: context,
+              hardwareUsed: hardware,
+              physicalCarrierMedia: carrier,
+              deliveryPriority: priority,
+              orderingSequence: order,
+              RepresentationCode: representation_code,
+              RepresentationOriginalName: original_name,
+              UserDefinedA: user_a,
+              UserDefinedB: user_b,
+              UserDefinedC: user_c,
+          }.cleanup
+          tech_data << GeneralRepCharacteristics.new(data) unless data.empty?
+          # Object characteristics
+          data = {
+              groupID: group_id
+          }.cleanup
+          tech_data << ObjectCharacteristics.new(data) unless data.empty?
+          # Preservation level
+          if preservation_levels
+            data_list = []
+            preservation_levels.each do |preservation_level|
+              data = {
+                  preservationLevelValue: preservation_level[:value],
+                  preservationLevelRole: preservation_level[:role],
+                  preservationLevelRationale: preservation_level[:rationale],
+                  preservationLevelDateAssigned: preservation_level[:date],
+              }.cleanup
+              data_list << OpenStruct.new(data) unless data.empty?
+            end
+            tech_data << PreservationLevel.new(array: data_list) unless data_list.empty?
+          end
+          # Dependencies
+          if env_dependencies
+            data_list = []
+            env_dependencies.each do |dependency|
+              data = {
+                  dependencyName: dependency[:name],
+                  dependencyIdentifierType1: dependency[:type1],
+                  dependencyIdentifierValue1: dependency[:value1],
+                  dependencyIdentifierType2: dependency[:type2],
+                  dependencyIdentifierValue2: dependency[:value2],
+                  dependencyIdentifierType3: dependency[:type3],
+                  dependencyIdentifierValue3: dependency[:value3],
+              }.cleanup
+              data_list << OpenStruct.new(data) unless data.empty?
+            end
+            tech_data << EnvironmentDependencies.new(array: data_list) unless data_list.empty?
+          end
+          # Hardware registry id
+          if hardware_ids
+            data_list = []
+            hardware_ids.each do |id|
+              data = {
+                  registryId: id
+              }.cleanup
+              data_list << OpenStruct.new(data) unless data.empty?
+            end
+            tech_data << EnvHardwareRegistry.new(array: data_list) unless data_list.empty?
+          end
+          # Software registry id
+          if software_ids
+            data_list = []
+            software_ids.each do |id|
+              data = {
+                  registryId: id
+              }.cleanup
+              data_list << OpenStruct.new(data) unless data.empty?
+            end
+            tech_data << EnvSoftwareRegistry.new(array: data_list) unless data_list.empty?
+          end
+          # Hardware
+          if hardware_infos
+            data_list = []
+            hardware_infos.each do |hardware|
+              data = {
+                  hardwareName: hardware[:name],
+                  hardwareType: hardware[:type],
+                  hardwareOtherInformation: hardware[:info],
+              }.cleanup
+              data_list << OpenStruct.new(data) unless data.empty?
+            end
+            tech_data << EnvironmentHardware.new(array: data_list) unless data_list.empty?
+          end
+          # Software
+          if software_infos
+            data_list = []
+            software_infos.each do |software|
+              data = {
+                  softwareName: software[:name],
+                  softwareVersion: software[:version],
+                  softwareType: software[:type],
+                  softwareOtherInformation: software[:info],
+                  softwareDependancy: software[:dependency],
+              }.cleanup
+              data_list << OpenStruct.new(data) unless data.empty?
+            end
+            tech_data << EnvironmentSoftware.new(array: data_list) unless data_list.empty?
+          end
+          # Relationship
+          if relationship_infos
+            data_list = []
+            relationship_infos.each do |relationship|
+              data = {
+                  relationshipType: relationship[:type],
+                  relationshipSubType: relationship[:subtype],
+                  relatedObjectIdentifierType1: relationship[:type1],
+                  relatedObjectIdentifierValue1: relationship[:id1],
+                  relatedObjectSequence1: relationship[:seq1],
+                  relatedObjectIdentifierType2: relationship[:type2],
+                  relatedObjectIdentifierValue2: relationship[:id2],
+                  relatedObjectSequence2: relationship[:seq2],
+                  relatedObjectIdentifierType3: relationship[:type3],
+                  relatedObjectIdentifierValue3: relationship[:id3],
+                  relatedObjectSequence3: relationship[:seq3],
+              }.cleanup
+              data_list << OpenStruct.new(data) unless data.empty?
+            end
+            tech_data << RelationShip.new(array: data_list) unless data_list.empty?
+          end
+          # Environment
+          if environments
+            data_list = []
+            environments.each do |environment|
+              data = {
+                  environmentCharacteristic: environment[:characteristic],
+                  environmentPurpose: environment[:purpose],
+                  environmentNote: environment[:note],
+              }.cleanup
+              data_list << OpenStruct.new(data) unless data.empty?
+            end
+            tech_data << Environment.new(array: data_list) unless data_list.empty?
+          end
+          # Finally assemble technical section
+          dnx[:tech] = tech_data unless tech_data.empty?
+          # Rights section
+          rights_data = []
+          data = {
+              policyId: access_right_id
+          }.cleanup
+          rights_data << AccessRightsPolicy.new(data) unless data.empty?
+          dnx[:rights] = rights_data unless rights_data.empty?
+          # Source metadata
+          if source_metadata
+            source_metadata.each_with_index do |metadata, i|
+              dnx["source-#{metadata[:type].to_s.upcase}-#{i}"] = metadata[:data]
+            end
+          end
+          dnx
+        end
+
+      end
+
       # Container class for creating a structmap in the METS.
       class Map
         include MetsObject

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '1.0.15'
+    VERSION = '1.0.17'
   end
 end

data/lib/libis/tools/xml_document.rb

@@ -88,7 +88,7 @@ module Libis
 
       # Export the XML Document to an XML string.
       # @param [Hash] options options passed to the underlying Nokogiri::XML::Document#to_xml; default is:
-      #     !{indent: 2, encoding: 'utf-8'}
+      #     {indent: 2, encoding: 'utf-8'}
       # @return [String] a string
       def to_xml(options = {})
         options = {indent: 2, encoding: 'utf-8', save_with: Nokogiri::XML::Node::SaveOptions::DEFAULT_XML}.merge(options)

data/spec/mets_file_spec.rb

@@ -220,4 +220,426 @@ describe 'METS File' do
     end
   end
 
+  context 'builder' do
+
+    let(:dc_record) {
+      Libis::Tools::XmlDocument.parse <<-STR
+        <?xml version="1.0" encoding="UTF-8"?>
+        <dc:record xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:dc="http://purl.org/dc/elements/1.1/"
+                xmlns:dcterms="http://purl.org/dc/terms/">
+          <dc:title>âbç d€f</dc:title>
+        </dc:record>
+      STR
+    }
+
+    let(:sample) {
+      {
+        dc_record: dc_record.root.to_xml,
+        amd: {
+          status: "ACTIVE",
+          access_right: "AR_EVERYONE"
+        },
+        representations: [
+          {
+            preservation_type: "PRESERVATION_MASTER",
+            usage_type: "VIEW",
+            label: "Archiefkopie"
+          },
+        ],
+        files: [
+          {
+            creation_date: '2021-08-27 14:14:26.367 UTC',
+            modification_date: '2018-04-06 05:12:27.077 UTC',
+            location: "/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/b/abc.doc",
+            target_location: "aaa á aaa/b/abc.doc",
+            mimetype: "application/msword",
+            size: 56320,
+            puid: "fmt/39",
+            checksum_MD5: "16ddbd5ad80411d8ac1b6acf8348adfb",
+            label: "abc.doc",
+            representation: 1,
+          }, {
+            creation_date: '2021-08-27 14:14:26.367 UTC',
+            modification_date: '2018-04-06 05:13:04.635 UTC',
+            location: "/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/b/def.dóc",
+            target_location: "aaa á aaa/b/def.dóc",
+            mimetype: "application/msword",
+            size: 45056,
+            puid: "fmt/39",
+            checksum_MD5: "b2907905a58f8599f07334cdc295c2f1",
+            label: "def.dóc",
+            representation: 1,
+          }, {
+            creation_date: '2021-08-27 14:14:26.366 UTC',
+            modification_date: '2018-04-06 05:12:17.935 UTC',
+            location: "/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/b/ábc.doc",
+            target_location: "aaa á aaa/b/ábc.doc",
+            mimetype: "application/msword",
+            size: 61440,
+            puid: "fmt/39",
+            checksum_MD5: "312bba1438acdb17e3d69d19fe4cac4b",
+            label: "ábc.doc",
+            representation: 1,
+          }, {
+            creation_date: '2021-08-27 14:14:26.346 UTC',
+            modification_date: '2018-04-06 05:06:40.297 UTC',
+            location: "/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/ccçcc/ã b ç d ë ¼.doc",
+            target_location: "aaa á aaa/ccçcc/ã b ç d ë ¼.doc",
+            mimetype: "application/msword",
+            size: 50688,
+            puid: "fmt/39",
+            checksum_MD5: "cd3e8cfa9cf5ada3485e205d706cee09",
+            label: "ã b ç d ë ¼.doc",
+            representation: 1,
+          }, {
+            creation_date: '2021-08-27 14:14:26.356 UTC',
+            modification_date: '2018-04-06 05:11:07.095 UTC',
+            location: "/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/ss$ss/ã b ç d ë ¼.doc",
+            target_location: "aaa á aaa/ss$ss/ã b ç d ë ¼.doc",
+            mimetype: "application/msword",
+            size: 61440,
+            puid: "fmt/39",
+            checksum_MD5: "312bba1438acdb17e3d69d19fe4cac4b",
+            label: "ã b ç d ë ¼.doc",
+            representation: 1,
+          },
+        ],
+        divs: [
+          {
+            label: "âbç d€f"
+          }, {
+            parent: 1,
+            label: "aaa á aaa",
+          }, {
+            parent: 2,
+            label: "b",
+            files: [1,2,3]
+          }, {
+            parent: 2,
+            label: "ccçcc",
+            files: [4]
+          }, {
+            parent: 2,
+            label: "ss$ss",
+            files: [5]
+          },
+        ],
+        maps: [
+          {
+            representation: 1,
+            div: 1,
+            is_logical: false
+          }
+        ]
+      }
+    }
+
+    let(:target) {
+      ::Libis::Tools::XmlDocument.build do |xml|
+        xml[:mets].mets 'xmlns:mets' => 'http://www.loc.gov/METS/' do
+          xml[:mets].dmdSec ID: 'ie-dmd' do
+            xml[:mets].mdWrap MDTYPE: 'DC' do
+              xml[:mets].xmlData do
+                xml << dc_record.root.to_xml
+                # xml[:dc].record(
+                #   'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
+                #   'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                #   'xmlns:dcterms' => 'http://purl.org/dc/terms/'
+                # ) do
+                #   xml[:dc].title 'âbç d€f'
+                # end
+              end
+            end
+          end
+          xml[:mets].amdSec ID: 'ie-amd' do
+            xml[:mets].techMD ID: 'ie-amd-tech' do
+              xml[:mets].mdWrap MDTYPE: 'OTHER', OTHERMDTYPE: 'dnx' do
+                xml[:mets].xmlData do
+                  xml.dnx xmlns: 'http://www.exlibrisgroup.com/dps/dnx' do
+                    xml.section.generalIECharacteristics! do
+                      xml.record do
+                        xml.key.status! 'ACTIVE'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+            xml[:mets].rightsMD ID: 'ie-amd-rights' do
+              xml[:mets].mdWrap MDTYPE: 'OTHER', OTHERMDTYPE: 'dnx' do
+                xml[:mets].xmlData do
+                  xml.dnx xmlns: 'http://www.exlibrisgroup.com/dps/dnx' do
+                    xml.section.accessRightsPolicy! do
+                      xml.record do
+                        xml.key.policyId! 'AR_EVERYONE'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+          xml[:mets].amdSec ID: 'rep1-amd' do
+            xml[:mets].techMD ID: 'rep1-amd-tech' do
+              xml[:mets].mdWrap MDTYPE: 'OTHER', OTHERMDTYPE: 'dnx' do
+                xml[:mets].xmlData do
+                  xml.dnx xmlns: 'http://www.exlibrisgroup.com/dps/dnx' do
+                    xml.section.generalRepCharacteristics! do
+                      xml.record do
+                        xml.key.preservationType! 'PRESERVATION_MASTER'
+                        xml.key.usageType! 'VIEW'
+                        xml.key.label! 'Archiefkopie'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+          xml[:mets].amdSec ID: 'fid1-amd' do
+            xml[:mets].techMD ID: 'fid1-amd-tech' do
+              xml[:mets].mdWrap MDTYPE: 'OTHER', OTHERMDTYPE: 'dnx' do
+                xml[:mets].xmlData do
+                  xml.dnx xmlns: 'http://www.exlibrisgroup.com/dps/dnx' do
+                    xml.section.generalFileCharacteristics! do
+                      xml.record do
+                        xml.key.label! 'abc.doc'
+                        xml.key.fileCreationDate! '2021-08-27 14:14:26.367 UTC'
+                        xml.key.fileModificationDate! '2018-04-06 05:12:27.077 UTC'
+                        xml.key.fileLocation! '/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/b/abc.doc'
+                        xml.key.fileOriginalName! 'abc.doc'
+                        xml.key.fileOriginalPath! 'aaa á aaa/b'
+                        xml.key.fileMIMEType! 'application/msword'
+                        xml.key.fileSizeBytes! '56320'
+                      end
+                    end
+                    xml.section.fileFixity! do
+                      xml.record do
+                        xml.key.fixityType! 'MD5'
+                        xml.key.fixityValue! '16ddbd5ad80411d8ac1b6acf8348adfb'
+                      end
+                    end
+                    xml.section.objectCharacteristics! do
+                      xml.record do
+                        xml.key.groupID! 'grp'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+          xml[:mets].amdSec ID: 'fid2-amd' do
+            xml[:mets].techMD ID: 'fid2-amd-tech' do
+              xml[:mets].mdWrap MDTYPE: 'OTHER', OTHERMDTYPE: 'dnx' do
+                xml[:mets].xmlData do
+                  xml.dnx xmlns: 'http://www.exlibrisgroup.com/dps/dnx' do
+                    xml.section.generalFileCharacteristics! do
+                      xml.record do
+                        xml.key.label! 'def.dóc'
+                        xml.key.fileCreationDate! '2021-08-27 14:14:26.367 UTC'
+                        xml.key.fileModificationDate! '2018-04-06 05:13:04.635 UTC'
+                        xml.key.fileLocation! '/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/b/def.dóc'
+                        xml.key.fileOriginalName! 'def.dóc'
+                        xml.key.fileOriginalPath! 'aaa á aaa/b'
+                        xml.key.fileMIMEType! 'application/msword'
+                        xml.key.fileSizeBytes! '45056'
+                      end
+                    end
+                    xml.section.fileFixity! do
+                      xml.record do
+                        xml.key.fixityType! 'MD5'
+                        xml.key.fixityValue! 'b2907905a58f8599f07334cdc295c2f1'
+                      end
+                    end
+                    xml.section.objectCharacteristics! do
+                      xml.record do
+                        xml.key.groupID! 'grp'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+          xml[:mets].amdSec ID: 'fid3-amd' do
+            xml[:mets].techMD ID: 'fid3-amd-tech' do
+              xml[:mets].mdWrap MDTYPE: 'OTHER', OTHERMDTYPE: 'dnx' do
+                xml[:mets].xmlData do
+                  xml.dnx xmlns: 'http://www.exlibrisgroup.com/dps/dnx' do
+                    xml.section.generalFileCharacteristics! do
+                      xml.record do
+                        xml.key.label! 'ábc.doc'
+                        xml.key.fileCreationDate! '2021-08-27 14:14:26.366 UTC'
+                        xml.key.fileModificationDate! '2018-04-06 05:12:17.935 UTC'
+                        xml.key.fileLocation! '/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/b/ábc.doc'
+                        xml.key.fileOriginalName! 'ábc.doc'
+                        xml.key.fileOriginalPath! 'aaa á aaa/b'
+                        xml.key.fileMIMEType! 'application/msword'
+                        xml.key.fileSizeBytes! '61440'
+                      end
+                    end
+                    xml.section.fileFixity! do
+                      xml.record do
+                        xml.key.fixityType! 'MD5'
+                        xml.key.fixityValue! '312bba1438acdb17e3d69d19fe4cac4b'
+                      end
+                    end
+                    xml.section.objectCharacteristics! do
+                      xml.record do
+                        xml.key.groupID! 'grp'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+          xml[:mets].amdSec ID: 'fid4-amd' do
+            xml[:mets].techMD ID: 'fid4-amd-tech' do
+              xml[:mets].mdWrap MDTYPE: 'OTHER', OTHERMDTYPE: 'dnx' do
+                xml[:mets].xmlData do
+                  xml.dnx xmlns: 'http://www.exlibrisgroup.com/dps/dnx' do
+                    xml.section.generalFileCharacteristics! do
+                      xml.record do
+                        xml.key.label! 'ã b ç d ë ¼.doc'
+                        xml.key.fileCreationDate! '2021-08-27 14:14:26.346 UTC'
+                        xml.key.fileModificationDate! '2018-04-06 05:06:40.297 UTC'
+                        xml.key.fileLocation! '/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/ccçcc/ã b ç d ë ¼.doc'
+                        xml.key.fileOriginalName! 'ã b ç d ë ¼.doc'
+                        xml.key.fileOriginalPath! 'aaa á aaa/ccçcc'
+                        xml.key.fileMIMEType! 'application/msword'
+                        xml.key.fileSizeBytes! '50688'
+                      end
+                    end
+                     xml.section.fileFixity! do
+                      xml.record do
+                        xml.key.fixityType! 'MD5'
+                        xml.key.fixityValue! 'cd3e8cfa9cf5ada3485e205d706cee09'
+                      end
+                    end
+                    xml.section.objectCharacteristics! do
+                      xml.record do
+                        xml.key.groupID! 'grp'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+          xml[:mets].amdSec ID: 'fid5-amd' do
+            xml[:mets].techMD ID: 'fid5-amd-tech' do
+              xml[:mets].mdWrap MDTYPE: 'OTHER', OTHERMDTYPE: 'dnx' do
+                xml[:mets].xmlData do
+                  xml.dnx xmlns: 'http://www.exlibrisgroup.com/dps/dnx' do
+                    xml.section.generalFileCharacteristics! do
+                      xml.record do
+                        xml.key.label! 'ã b ç d ë ¼.doc'
+                        xml.key.fileCreationDate! '2021-08-27 14:14:26.356 UTC'
+                        xml.key.fileModificationDate! '2018-04-06 05:11:07.095 UTC'
+                        xml.key.fileLocation! '/nas/upload/demo/test_diacritics/âbç d€f/aaa á aaa/ss$ss/ã b ç d ë ¼.doc'
+                        xml.key.fileOriginalName! 'ã b ç d ë ¼.doc'
+                        xml.key.fileOriginalPath! 'aaa á aaa/ss$ss'
+                        xml.key.fileMIMEType! 'application/msword'
+                        xml.key.fileSizeBytes! '61440'
+                      end
+                    end
+                     xml.section.fileFixity! do
+                      xml.record do
+                        xml.key.fixityType! 'MD5'
+                        xml.key.fixityValue! '312bba1438acdb17e3d69d19fe4cac4b'
+                      end
+                    end
+                    xml.section.objectCharacteristics! do
+                      xml.record do
+                        xml.key.groupID! 'grp'
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+          xml[:mets].fileSec do
+            xml[:mets].fileGrp ID: 'rep1', USE: 'VIEW', ADMID: 'rep1-amd' do
+              xml[:mets].file ID: 'fid1', MIMETYPE: 'application/msword', ADMID: 'fid1-amd', GROUPID: 'grp' do
+                xml[:mets].FLocat 'xmlns:xlin' => 'http://www.w3.org/1999/xlink', LOCTYPE: 'URL', 'xlin:href' => 'aaa á aaa/b/abc.doc'
+              end
+              xml[:mets].file ID: 'fid2', MIMETYPE: 'application/msword', ADMID: 'fid2-amd', GROUPID: 'grp' do
+                xml[:mets].FLocat 'xmlns:xlin' => 'http://www.w3.org/1999/xlink', LOCTYPE: 'URL', 'xlin:href' => 'aaa á aaa/b/def.dóc'
+              end
+              xml[:mets].file ID: 'fid3', MIMETYPE: 'application/msword', ADMID: 'fid3-amd', GROUPID: 'grp' do
+                xml[:mets].FLocat 'xmlns:xlin' => 'http://www.w3.org/1999/xlink', LOCTYPE: 'URL', 'xlin:href' => 'aaa á aaa/b/ábc.doc'
+              end
+              xml[:mets].file ID: 'fid4', MIMETYPE: 'application/msword', ADMID: 'fid4-amd', GROUPID: 'grp' do
+                xml[:mets].FLocat 'xmlns:xlin' => 'http://www.w3.org/1999/xlink', LOCTYPE: 'URL', 'xlin:href' => 'aaa á aaa/ccçcc/ã b ç d ë ¼.doc'
+              end
+              xml[:mets].file ID: 'fid5', MIMETYPE: 'application/msword', ADMID: 'fid5-amd', GROUPID: 'grp' do
+                xml[:mets].FLocat 'xmlns:xlin' => 'http://www.w3.org/1999/xlink', LOCTYPE: 'URL', 'xlin:href' => 'aaa á aaa/ss$ss/ã b ç d ë ¼.doc'
+              end
+            end
+          end
+          xml[:mets].structMap ID: 'rep1-1', TYPE: 'PHYSICAL' do
+            xml[:mets].div LABEL: 'Archiefkopie' do
+              xml[:mets].div LABEL: 'âbç d€f' do
+                xml[:mets].div LABEL: 'aaa á aaa' do
+                  xml[:mets].div LABEL: 'b' do
+                    xml[:mets].div LABEL: 'abc.doc', TYPE: 'FILE' do
+                      xml[:mets].fptr FILEID: 'fid1'
+                    end
+                    xml[:mets].div LABEL: 'def.dóc', TYPE: 'FILE' do
+                      xml[:mets].fptr FILEID: 'fid2'
+                    end
+                    xml[:mets].div LABEL: 'ábc.doc', TYPE: 'FILE' do
+                      xml[:mets].fptr FILEID: 'fid3'
+                    end
+                  end
+                  xml[:mets].div LABEL: 'ccçcc' do
+                    xml[:mets].div LABEL: 'ã b ç d ë ¼.doc', TYPE: 'FILE' do
+                      xml[:mets].fptr FILEID: 'fid4'
+                    end
+                  end
+                  xml[:mets].div LABEL: 'ss$ss' do
+                    xml[:mets].div LABEL: 'ã b ç d ë ¼.doc', TYPE: 'FILE' do
+                      xml[:mets].fptr FILEID: 'fid5'
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
+      end.document
+    }
+
+    it 'produces METS XML' do
+      mets_file.dc_record = sample[:dc_record]
+      mets_file.amd_info = sample[:amd]
+      sample[:representations].each do |rep|
+        mets_file.representation(rep)
+      end
+      sample[:files].each do |file|
+        rep_id = file.delete(:representation)
+        rep = mets_file.representations[rep_id]
+        mets_file.file(file).representation = rep
+      end
+      sample[:divs].each do |div|
+        parent = div.delete(:parent)
+        files = div.delete(:files)
+        d = mets_file.div(div)
+        files.each { |f| d << mets_file.files[f] } if files
+        mets_file.divs[parent] << d if parent
+      end
+      sample[:maps].each do |map|
+        rep = mets_file.representations[map[:representation]]
+        div = mets_file.divs[map[:div]]
+        mets_file.map(rep, div)
+      end
+
+      expect(mets_file.xml_doc.root).to be_equivalent_to target.root
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.17
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-30 00:00:00.000000000 Z
+date: 2023-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -386,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: LIBIS toolbox.