ddr-models 2.6.2 → 2.7.0.rc1

data/lib/ddr/datastreams/delete_external_files.rb

@@ -0,0 +1,29 @@
+require 'uri'
+
+module Ddr::Datastreams
+  class DeleteExternalFiles
+
+    def self.call(*args)
+      event = ActiveSupport::Notifications::Event.new(*args)
+      case event.name
+      when Ddr::Datastreams::DELETE
+        delete_files(event.payload[:version_history])
+      when Ddr::Models::Base::DELETE, Ddr::Models::Base::DEACCESSION
+        delete_files(event.payload[:datastream_history].values.flatten)
+      end
+    end
+
+    def self.get_files_to_delete(profiles)
+      return [] if profiles.empty?
+      profiles
+        .select { |prof| (prof["dsControlGroup"] == "E") && prof["dsLocation"].start_with?("file:") }
+        .map    { |prof| Ddr::Utils.path_from_uri(prof["dsLocation"]) }
+    end
+
+    def self.delete_files(profiles)
+      paths = get_files_to_delete(profiles)
+      FileUtils.rm_f(paths) unless paths.empty?
+    end
+
+  end
+end

data/lib/ddr/datastreams/descriptive_metadata_datastream.rb

@@ -1,46 +1,46 @@
-module Ddr
-  module Datastreams
-    class DescriptiveMetadataDatastream < MetadataDatastream
+require "rdf/vocab"
 
-      class_attribute :vocabularies
-      self.vocabularies = [RDF::DC, Ddr::Vocab::DukeTerms].freeze
+module Ddr::Datastreams
+  class DescriptiveMetadataDatastream < MetadataDatastream
 
-      def self.default_attributes
-        super.merge(:mimeType => 'application/n-triples')
-      end
+    class_attribute :vocabularies
+    self.vocabularies = [RDF::Vocab::DC, Ddr::Vocab::DukeTerms].freeze
 
-      def self.indexers
-        # Add term_name => [indexers] mapping to customize indexing
-        {}
-      end
+    def self.default_attributes
+      super.merge(:mimeType => 'application/n-triples')
+    end
 
-      def self.default_indexers
-        [:stored_searchable]
-      end
+    def self.indexers
+      # Add term_name => [indexers] mapping to customize indexing
+      {}
+    end
 
-      def self.indexers_for(term_name)
-        indexers.fetch(term_name, default_indexers)
-      end
+    def self.default_indexers
+      [:stored_searchable]
+    end
 
-      # Add terms from the vocabularies as properties
-      vocabularies.each do |vocab|
-        Ddr::Vocab::Vocabulary.property_terms(vocab).each do |term|
-          term_name = Ddr::Vocab::Vocabulary.term_name(vocab, term)
-          # Do not include :license as a descriptive metadata property
-          unless term_name == :license
-            property term_name, predicate: term do |index|
-              index.as *indexers_for(term_name)
-            end
+    def self.indexers_for(term_name)
+      indexers.fetch(term_name, default_indexers)
+    end
+
+    # Add terms from the vocabularies as properties
+    vocabularies.each do |vocab|
+      Ddr::Vocab::Vocabulary.property_terms(vocab).each do |term|
+        term_name = Ddr::Vocab::Vocabulary.term_name(vocab, term)
+        # Do not include :license as a descriptive metadata property
+        unless term_name == :license
+          property term_name, predicate: term do |index|
+            index.as *indexers_for(term_name)
           end
         end
       end
+    end
 
-      # Override ActiveFedora::Rdf::Indexing#apply_prefix(name) to not
-      # prepend the index field name with a string based on the datastream id.
-      def apply_prefix(name)
-        name
-      end
-
+    # Override ActiveFedora::Rdf::Indexing#apply_prefix(name) to not
+    # prepend the index field name with a string based on the datastream id.
+    def apply_prefix(name)
+      name
     end
+
   end
 end

data/lib/ddr/datastreams/external_file_datastream.rb

@@ -0,0 +1,69 @@
+module Ddr::Datastreams
+  class ExternalFileDatastream < ActiveFedora::Datastream
+
+    FILE_PERMISSIONS = 0644
+
+    class_attribute :file_store
+
+    after_destroy do
+      self.dsLocation = nil # Rubydora does not reset dsLocation
+    end
+
+    def self.default_attributes
+      super.merge(controlGroup: "E")
+    end
+
+    def file_size
+      if path = file_path
+        File.size(path)
+      end
+    end
+
+    def add_file(source_path, mime_type: nil)
+      set_mime_type(source_path, mime_type)
+      store(source_path)
+    end
+
+    def file_path
+      Ddr::Utils.path_from_uri(dsLocation) if dsLocation
+    end
+
+    def file_path=(path)
+      self.dsLocation = Ddr::Utils.path_to_uri(path)
+    end
+
+    def generate_file_name
+      SecureRandom.uuid
+    end
+
+    def generate_stored_path
+      file_name = generate_file_name
+      subpath = File.join([0, 2, 4, 6].map { |i| file_name[i, 2] })
+      File.join(file_store, subpath, file_name)
+    end
+
+    def file_paths
+      new? ? Array(file_path) : versions.map(&:file_path)
+    end
+
+    private
+
+    def store(source_path)
+      stored_path = generate_stored_path
+      FileUtils.mkdir_p File.dirname(stored_path)
+      FileUtils.cp source_path, stored_path
+      File.chmod(FILE_PERMISSIONS, stored_path)
+      self.file_path = stored_path
+    end
+
+    def set_mime_type(source_path, mime_type = nil)
+      self.mimeType = mime_type || get_mime_type(source_path)
+    end
+
+    def get_mime_type(source_path)
+      mime_types = MIME::Types.of(source_path)
+      mime_types.empty? ? Ddr::Models.default_mime_type : mime_types.first.content_type
+    end
+
+  end
+end

data/lib/ddr/datastreams/fits_datastream.rb

@@ -22,10 +22,15 @@ module Ddr::Datastreams
         }
       }
       t.fileinfo {
-        t.size
-        t.creatingApplicationName
         t.created
+        t.creatingApplicationName
+        t.creatingos
+        t.filename
+        t.filepath
+        t.fslastmodified
         t.lastmodified
+        t.md5checksum
+        t.size
       }
       t.filestatus {
         t.valid
@@ -49,24 +54,29 @@ module Ddr::Datastreams
       }
 
       ## proxy terms
+
       # identification / identity
-      t.media_type           proxy: [:identification, :identity, :mimetype]
       t.format_label         proxy: [:identification, :identity, :format_label]
       t.format_version       proxy: [:identification, :identity, :version]
+      t.media_type           proxy: [:identification, :identity, :mimetype]
       t.pronom_identifier    proxy: [:identification, :identity, :pronom_identifier]
+
       # filestatus
       t.valid                proxy: [:filestatus, :valid]
       t.well_formed          proxy: [:filestatus, :well_formed]
+
       # fileinfo
       t.created              proxy: [:fileinfo, :created]
       t.creating_application proxy: [:fileinfo, :creatingApplicationName]
       t.extent               proxy: [:fileinfo, :size]
+      t.md5                  proxy: [:fileinfo, :md5checksum]
+
       # image metadata
-      t.image_width          proxy: [:metadata, :image, :imageWidth]
-      t.image_height         proxy: [:metadata, :image, :imageHeight]
       t.color_space          proxy: [:metadata, :image, :colorSpace]
       t.icc_profile_name     proxy: [:metadata, :image, :iccProfileName]
       t.icc_profile_version  proxy: [:metadata, :image, :iccProfileVersion]
+      t.image_height         proxy: [:metadata, :image, :imageHeight]
+      t.image_width          proxy: [:metadata, :image, :imageWidth]
     end
 
     def self.xml_template

data/lib/ddr/datastreams/intermediate_file_datastream.rb

@@ -0,0 +1,5 @@
+module Ddr::Datastreams
+  class IntermediateFileDatastream < ExternalFileDatastream
+
+  end
+end

data/lib/ddr/datastreams/metadata_datastream.rb

@@ -7,20 +7,18 @@ module Ddr
       end
 
       # Returns ActiveTriplesTerm now that this is an RDF datastream
-      def values term
+      def values(term)
         term == :format ? self.format : self.send(term)
       end
 
       # Update term with values
       # Note that empty values (nil or "") are rejected from values array
-      def set_values term, values
-        if values.respond_to?(:reject!)
-          values.reject! { |v| v.blank? }
-        else
-          values = nil if values.blank?
-        end
+      def set_values(term, values)
+        vals = Array(values)
+               .map { |v| v.to_s.strip }
+               .reject { |v| v.blank? }
         begin
-          self.send("#{term}=", values)
+          self.send("#{term}=", vals)
         rescue NoMethodError
           raise ArgumentError, "No such term: #{term}"
         end
@@ -28,15 +26,15 @@ module Ddr
 
       # Add value to term
       # Note that empty value (nil or "") is not added
-      def add_value term, value
-        begin
-          unless value.blank?
-            values = values(term).to_a << value
-            set_values term, values
-          end
-        rescue NoMethodError
-          raise ArgumentError, "No such term: #{term}"
-        end
+      def add_value(term, value)
+        vals = values(term).to_a << value
+        set_values(term, vals)
+      end
+
+      def content_changed?
+        # Patches a bug in AF RDF datastreams where
+        # Content appears to change from nil to empty string
+        super && !empty?
       end
 
     end

data/lib/ddr/datastreams/multires_image_datastream.rb

@@ -0,0 +1,5 @@
+module Ddr::Datastreams
+  class MultiresImageDatastream < ExternalFileDatastream
+
+  end
+end

data/lib/ddr/derivatives.rb

@@ -5,6 +5,7 @@ module Ddr
     autoload :Generator
     autoload :PngGenerator
     autoload :PtifGenerator
+    autoload :UpdateDerivatives
 
     Derivative = Struct.new(:name, :datastream, :generator, :options)
 

data/lib/ddr/derivatives/ptif_generator.rb

@@ -24,7 +24,7 @@ module Ddr
       private
 
       def run_generator(source_to_use)
-        command = "vips im_vips2tiff #{Ddr::Utils.file_path(source_to_use)} #{Ddr::Utils.file_path(output)}:#{options}"
+        command = "#{vips_command} im_vips2tiff #{Ddr::Utils.file_path(source_to_use)} #{Ddr::Utils.file_path(output)}:#{options}"
         `#{command}`
         $?.exitstatus
       end
@@ -46,6 +46,10 @@ module Ddr
         `identify -quiet -format '%[depth]' #{Ddr::Utils.file_path(source)}[0]`
       end
 
+      def vips_command
+        Ddr::Models.vips_path ? File.join(Ddr::Models.vips_path, 'vips') : 'vips'
+      end
+
     end
   end
 end

data/lib/ddr/derivatives/update_derivatives.rb

@@ -0,0 +1,23 @@
+module Ddr::Derivatives
+  class UpdateDerivatives
+
+    def self.call(*args)
+      event = ActiveSupport::Notifications::Event.new(*args)
+      if event.name == "delete.repo_file" &&
+         !file_ids.include?(event.payload[:file_id])
+        return false
+      end
+      if event.name =~ /\.repo_object\z/ &&
+         (file_ids & event.payload[:datastreams_changed]).empty?
+        return false
+      end
+      obj = ActiveFedora::Base.find(event.payload[:pid])
+      obj.derivatives.update_derivatives(:later)
+    end
+
+    def self.file_ids
+      Ddr::Datastreams.update_derivatives_on_changed
+    end
+
+  end
+end

data/lib/ddr/events/deletion_event.rb

@@ -1,12 +1,8 @@
-module Ddr
-  module Events
-    class DeletionEvent < Event
+module Ddr::Events
+  class DeletionEvent < Event
+    include PreservationEventBehavior
 
-      include PreservationEventBehavior
-
-      self.description = "Object deleted"
-      self.preservation_event_type = :del
-
-    end
+    self.description = "Object deleted"
+    self.preservation_event_type = :del
   end
 end

data/lib/ddr/events/event.rb

@@ -39,7 +39,12 @@ module Ddr
       # Receive message sent by ActiveSupport::Notifications
       def self.call(*args)
         notification = ActiveSupport::Notifications::Event.new(*args)
-        create(notification.payload)
+        payload = notification.payload.dup
+        payload[:event_date_time] ||= notification.time
+        create do |event|
+          event.attributes = payload.select { |k, v| event.has_attribute?(k) }
+          yield [event, notification] if block_given?
+        end
       end
 
       # Repository software version -- e.g., "Fedora Repository 3.7.0"
@@ -49,8 +54,6 @@ module Ddr
                                                     .join(" ")
       end
 
-      # Scopes
-
       def self.for_object(obj)
         for_pid(obj.pid)
       end
@@ -59,8 +62,6 @@ module Ddr
         where(pid: pid)
       end
 
-      # Rendering methods
-
       def display_type
         # Ddr::Events::UpdateEvent => "Update"
         @display_type ||= self.class.to_s.split("::").last.sub("Event", "").titleize
@@ -74,8 +75,6 @@ module Ddr
         comment.present? ? comment : summary
       end
 
-      # Outcome methods
-
       def success!
         self.outcome = SUCCESS
       end
@@ -92,7 +91,6 @@ module Ddr
         outcome == FAILURE
       end
 
-      # Object getter and setter
       def object
         @object ||= ActiveFedora::Base.find(pid) if pid
       end
@@ -123,7 +121,7 @@ module Ddr
       protected
 
       def set_defaults
-        self.attributes = defaults.reject { |attr, val| attribute_present? attr }
+        self.attributes = defaults.reject { |attr, val| attribute_present?(attr) }
       end
 
       def defaults

data/lib/ddr/events/ingestion_event.rb

@@ -1,12 +1,8 @@
-module Ddr
-  module Events
-    class IngestionEvent < Event
+module Ddr::Events
+  class IngestionEvent < Event
+    include PreservationEventBehavior
 
-      include PreservationEventBehavior
-
-      self.preservation_event_type = :ing
-      self.description = "Object ingested into the repository"
-
-    end
+    self.preservation_event_type = :ing
+    self.description = "Object ingested into the repository"
   end
 end