libis-tools 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad80b0200a021e9181c164d32163ef90c03ec40
-  data.tar.gz: ff6cba705fa063e1a98c83f80c79e20516da2eaf
+  metadata.gz: 0864d175751dfc12feb50a156f13200b12d14f52
+  data.tar.gz: 53c1f3a745b0f599e2d8c39ff6a57524c9cb7e91
 SHA512:
-  metadata.gz: b09c20e3962dc4b8aeb1555212a51992a5102a07f3b6b27b65af97075bd06de12fcf8fea24a6d762aa8d34554a0ab43cfe13110e4072dcbfb99c0dbd4af58e82
-  data.tar.gz: 597b7334148abc3ba78f675b8914cbaf05647a7b57a5d9d66e61717c1cb083588d0e8d7a69a6d949320528b52f4c7dec9b3bcaf8036663551f4a4fbca98bed96
+  metadata.gz: d798591f94b555ac8ecdfede9a3a368b3bfeef313a06b3084e315cbcfc806ef1a3f324482d05d442f7f346a5d2a7815635bfff63e4b09e84f2041fa532a919ab
+  data.tar.gz: d87cd92dc1340e197da2527b4feb88d5e3b631afc76259a9031428affd7bf71a31e537eab7dfcd28cfcea7770b66f48c6f553c4d2894943e286680353a5852a9

data/lib/libis/tools/config.rb

@@ -25,7 +25,7 @@ module Libis
     #         p cfg[:my_text] # => 'abc'
     #         p cfg.logger.warn('message') # => W, [2015-03-16T12:51:01.180548 #28935]  WARN -- : message
     #
-    class Config < ConfigFile
+    class Config
       include Singleton
 
       class << self
@@ -40,12 +40,18 @@ module Libis
 
       end
 
+      def method_missing(name, *args, &block)
+        result = config.send(name, *args, &block)
+        self === config ? self : result
+      end
+
       # Load configuration parameters from a YAML file or Hash.
       #
       # The file paths and Hashes are memorised and loaded again by the {#reload} methods.
       # @param [String,Hash] file_or_hash
       def <<(file_or_hash)
-        super(file_or_hash) { |data| @sources << data }
+        @config.send('<<', (file_or_hash)) { |data| @sources << data }
+        self
       end
 
       # Load all files and Hashes again.
@@ -59,15 +65,13 @@ module Libis
         self
       end
 
-      alias_method :deep_struct_clear!, :clear!
-
       # Clear data and load all files and Hashes again.
       #
       # All configuration parameters are first deleted which means that any parameters
       # added directly (not via file or hash) will no longer be available. Parameters set explicitly that also exist in
       # the files or hashes will be reset to the values in those files and hashes.
       def reload!
-        deep_struct_clear!
+        @config.clear!
         reload
       end
 
@@ -76,7 +80,7 @@ module Libis
       # Not only all configuration parameters are deleted, but also the memorized list of loaded files
       # and hashes are cleared and the logger configuration is reset to it's default status.
       def clear!
-        super
+        @config.clear!
         @sources = Array.new
         @logger = ::Logger.new(STDOUT)
         set_log_formatter
@@ -98,13 +102,13 @@ module Libis
         end
       end
 
-      attr_accessor :logger
+      attr_accessor :logger, :config, :sources
 
       protected
 
       def initialize(hash = nil, opts = {})
-        super(hash, opts)
-        clear!
+        @config = ConfigFile.new(hash, opts)
+        self.clear!
       end
 
     end

data/lib/libis/tools/metadata/dublin_core_record.rb

@@ -68,19 +68,22 @@ module Libis
           parent ||= root
           m = /^([\/\.]*\/)?(dc(?:terms)?:)?(.*)/.match(tag.to_s)
           return [] unless m[3]
-          path = (m[1] || '') + ('dc:' || m[2]) + m[3]
+          path = (m[1] || '')
+          ns, tag = get_namespace(tag)
+          path += "#{ns}:" if ns
+          path += tag
           parent.xpath(path)
         end
 
         def get_namespace(tag)
           m = /^((dc)?(terms)?(?:_|:)?)?([a-zA-Z_][-_.0-9a-zA-Z]+)(.*)/.match tag
-          ns = if m[1].nil?
+          ns = if m[1].blank?
                    if DC_ELEMENTS.include?(m[4])
                      :dc
                    else
                      DCTERMS_ELEMENTS.include?(m[4]) ? :dcterms : nil
                    end
-               elsif m[3].nil?
+               elsif m[3].blank?
                  :dc
                else
                  :dcterms

data/lib/libis/tools/mets_file.rb

@@ -14,7 +14,7 @@ module Libis
       module IdContainer
 
         def set_from_hash(h)
-          h.each { |k, v| send "#{k}=", v }
+          h.each { |k, v| send "#{k}=", v if respond_to?(k) }
         end
 
         def id
@@ -41,9 +41,10 @@ module Libis
       class Representation
         include IdContainer
 
-        attr_accessor :label, :preservation_type, :usage_type, :representation_code, :entity_type, :priority, :order,
+        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,
-                      :user_a, :user_b, :user_c, :group_id,
                       :preservation_levels, :env_dependencies, :hardware_ids, :software_ids,
                       :hardware_infos, :software_infos, :relationship_infos, :environments,
                       :dc_record, :source_metadata
@@ -200,7 +201,7 @@ module Libis
           # Rights section
           rights_data = []
           data = {
-              policyId: hash[:access_right]
+              policyId: access_right_id
           }.cleanup
           rights_data << Rights.new(data) unless data.empty?
           dnx[:rights] = rights_data unless rights_data.empty?
@@ -218,20 +219,20 @@ module Libis
       class File
         include IdContainer
 
-        attr_accessor :label, :note, :location, :target_location, :mimetype, :entity_type,
+        attr_accessor :label, :note, :location, :target_location, :mimetype, :puid, :size, :entity_type,
                       :creation_date, :modification_date, :composition_level, :group_id,
+                      :checksum_MD5, :checksum_SHA1, :checksum_SHA256,:checksum_SHA384,:checksum_SHA512,
                       :fixity_type, :fixity_value,
                       :preservation_levels, :inhibitors, :env_dependencies, :hardware_ids, :software_ids,
                       :signatures, :hardware_infos, :software_infos, :relationship_infos, :environments, :applications,
-                      :dc_record, :source_metadata
-        :representation
+                      :dc_record, :source_metadata, :representation
 
         def xml_id
           "fid#{id}"
         end
 
-        def group_id
-          "grp#{master.id rescue id}"
+        def make_group_id
+          "grp#{group_id || master.id rescue id}"
         end
 
         def master
@@ -285,18 +286,22 @@ module Libis
               fileExtension: ::File.extname(orig_name),
               fileMIMEType: mimetype,
               fileSizeBytes: size,
-
+              formatLibraryId: puid
           }.cleanup
           tech_data << TechGeneralFile.new(data) unless data.empty?
           # Fixity
-          data = {
-              fixityType: fixity_type,
-              fixityValue: fixity_value,
-          }.cleanup
-          tech_data << TechFixity.new(data) unless data.empty?
+          %w'MD5 SHA1 SHA256 SHA384 SHA512'.each do |checksum_type|
+            if (checksum = self.send("checksum_#{checksum_type}"))
+              data = {
+                  fixityType: checksum_type,
+                  fixityValue: checksum,
+              }.cleanup
+              tech_data << TechFixity.new(data) unless data.empty?
+            end
+          end
           # Object characteristics
           data = {
-              groupID: group_id
+              groupID: make_group_id
           }.cleanup
           tech_data << TechObjectChars.new(data) unless data.empty?
           # Preservation level
@@ -554,6 +559,10 @@ module Libis
         tag 'webHarvesting'
       end
 
+      class CollectionInfo   < DnxSection
+        tag 'Collection'
+      end
+
       class PreservationLevel < DnxSection
         tag 'preservationLevel'
       end
@@ -740,6 +749,10 @@ module Libis
             harvestTime: hash[:harvest_time],
         }.cleanup
         tech_data << WebHarvesting.new(data) unless data.empty?
+        data = {
+            collectionId: hash[:collection_id]
+        }.cleanup
+        tech_data << CollectionInfo.new(data) unless data.empty?
         @dnx[:tech] = tech_data unless tech_data.empty?
         data = {
             policyId: hash[:access_right]
@@ -864,7 +877,7 @@ module Libis
                   ID: object.xml_id,
                   MIMETYPE: object.mimetype,
                   ADMID: amd_id(object.xml_id),
-                  GROUPID: object.group_id,
+                  GROUPID: object.make_group_id,
               }.cleanup
               h[:DMDID] = dmd_id(object.xml_id) if object.dc_record
 
@@ -891,7 +904,7 @@ module Libis
                   TYPE: 'PHYSICAL',
               ) {
                 xml[:mets].div(LABEL: map.representation.label) {
-                  add_struct_map(xml, map.diqv) if map.div
+                  add_struct_map(xml, map.div) if map.div
                 }
               }
             end

data/lib/libis/tools/parameter.rb

@@ -21,12 +21,24 @@ module Libis
       end
 
       def dup
+        # noinspection RubySuperCallWithoutSuperclassInspection
         new_obj = super
         # noinspection RubyResolve
         new_obj[:options] = Marshal.load(Marshal.dump(self[:options]))
         new_obj
       end
 
+      def merge!(other)
+        other.each do |k,v|
+          if k == :options
+            self[:options].merge!(v)
+          else
+            self[k] = v
+          end
+        end
+        self
+      end
+
       def [](key)
         # noinspection RubySuperCallWithoutSuperclassInspection
         return super(key) if members.include?(key)
@@ -44,6 +56,7 @@ module Libis
       end
 
       def to_h
+        # noinspection RubySuperCallWithoutSuperclassInspection
         super.inject({}) do |hash, key, value|
           key == :options ? value.each { |k, v| hash[k] = v } : hash[key] = value
           hash
@@ -159,7 +172,11 @@ module Libis
           begin
             self.superclass.parameter_defs.
                 each_with_object(@parameters) do |(name, param), hash|
-              hash[name] = param.dup
+              if hash.has_key?(name)
+                hash[name].merge!(param)
+              else
+                hash[name] = param.dup
+              end
             end
           rescue NoMethodError
             # ignored

data/lib/libis/tools/version.rb

@@ -1,5 +1,5 @@
 module Libis
   module Tools
-    VERSION = '0.9.15'
+    VERSION = '0.9.16'
   end
 end

data/lib/libis/tools/xml_document.rb

@@ -542,20 +542,19 @@ module Libis
       #
       #
       def method_missing(method, *args, &block)
-        super unless method.to_s =~ /^([a-z_][a-z_0-9]*)(=)?$/i
+        super unless method.to_s =~ /^([a-z_][a-z_0-9]*)(!|=)?$/i
         node = get_node($1)
-        node = add_node($1) unless node
+        node = add_node($1) if node.nil? || $2 == '!'
         case args.size
           when 0
-            node = get_node($1)
             if block_given?
               build(node, &block)
             end
           when 1
-            if $2
-              node.content = args.first.to_s
-            else
+            if $2.blank?
               return node[args.first.to_s]
+            else
+              node.content = args.first.to_s
             end
           when 2
             node[args.first.to_s] = args[1].to_s

data/spec/metadata/dublin_core_spec.rb

@@ -50,8 +50,8 @@ STR
 
     it 'add dc:date' do
       dc.date = '2001'
-      dc.dcdate = '2002'
-      dc.dc_date = '2003'
+      dc.dcdate! '2002'
+      dc.dc_date! '2003'
       match_xml dc.document,
                 header +
                     record_start +
@@ -62,10 +62,10 @@ STR
     end
 
     it 'add dcterms:date' do
-      dc.termsdate = '2001'
-      dc.dctermsdate = '2002'
-      dc.terms_date = '2003'
-      dc.dcterms_date = '2004'
+      dc.termsdate! '2001'
+      dc.dctermsdate! '2002'
+      dc.terms_date! '2003'
+      dc.dcterms_date! '2004'
       match_xml dc.document,
                 header +
                     record_start +

data/spec/metadata/marc21_spec.rb

@@ -106,7 +106,7 @@ describe 'Marc21Record' do
 </dc:record>
 STR
       expect(record.to_dc.root).to be_equivalent_to(xml_doc.root).respecting_element_order
-      record.to_dc.elements.each_with_index do |element, i|
+      record.to_dc.root.elements.each_with_index do |element, i|
         expect(element).to be_equivalent_to(xml_doc.root.elements[i])
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: libis-tools
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Kris Dekeyser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler