libis-tools 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e11e0bac24cf562c5834d59510d7899d61e1295e3128fa66f549f40549d6c3e
-  data.tar.gz: 834820ad3715e8321c34af9099a7ff01278f15641ef99fb677eea3df0a0bcef4
+  metadata.gz: '01219a5f1fbace5f69a992675d9e67a049c1924cf7b9d9f24db18be8fdf4dc60'
+  data.tar.gz: 0b1ded7e545eeec542e739bfbf20a2c680a6a3a05561d95087f172932312a53a
 SHA512:
-  metadata.gz: b5c898f23a098f8c592f9cb0a672e8d5248ffc71b4c93062c759daff7341a0cbdd4e95af9dd1017244afd31627c9c4e8d26df8698d433669f919db338eb83a7f
-  data.tar.gz: 9c90ddab8ff5e79f0c9478eea359baa70117570a5cafad8fc8454050af4b3f7709ba54a1c314b8aa81ea6cbba791cb64e759ccec2e6c5b97360271aa04cbc388
+  metadata.gz: e6e997f4405fef929aef639c6807b8b3de168777c487efb7f91ffc31eb1f588d03cf9d4210485314b44ccd074a5f7aa5ad02a1fe5e0c245a6a8524955a643e36
+  data.tar.gz: cc69c4dadac622c704539fb1c3357eed4c6fe6784b1870a6a4b46edc927c635c528812e9817f7769b6497ad9eba06d8faa86fce56f166d0ba3ce6cdc92a4dab8

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
@@ -291,7 +109,7 @@ module Libis
               fileLocation: location,
               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.16'
+    VERSION = '1.0.17'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-31 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.