ddr-models 2.11.0 → 3.0.0.alpha.1

data/lib/ddr/managers/permanent_id_manager.rb

@@ -0,0 +1,91 @@
+require "ezid-client"
+require "resque"
+
+module Ddr
+  module Managers
+    #
+    # PermanentIdManager is responsible for managing the permanent id for an object.
+    #
+    # @api private
+    #
+    class PermanentIdManager
+
+      PERMANENT_URL_BASE = "http://id.library.duke.edu/"
+      ASSIGN_EVENT_SUMMARY = "Permanent ID assignment"
+      SOFTWARE = Ezid::Client.version
+
+      attr_reader :object
+
+      def initialize(object)
+        @object = object
+      end
+
+      def assign_later
+        Resque.enqueue(AssignmentJob, object.pid)
+      end
+
+      def assign
+        raise Ddr::Models::Error, "Permanent ID already assigned." if object.permanent_id
+        ActiveSupport::Notifications.instrument(Ddr::Notifications::UPDATE,
+                                                pid: object.pid,
+                                                software: SOFTWARE,
+                                                summary: ASSIGN_EVENT_SUMMARY
+                                                ) do |payload|
+
+          assign!
+          payload[:detail] = <<-EOS
+Permanent ID:  #{object.permanent_id}
+Permanent URL: #{object.permanent_url}
+EZID Metadata:
+#{record.metadata}
+          EOS
+        end
+      end
+
+      # A job class for background execution
+      class AssignmentJob
+        @queue = :permanent_id
+
+        def self.perform(pid)
+          object = ActiveFedora::Base.find(pid)
+          object.permanent_id_manager.assign
+        end
+      end
+
+      def default_metadata
+        { profile: "dc",
+          export: "no"
+        }
+      end
+
+      def record
+        return @record if @record
+        if object.permanent_id
+          @record = Ezid::Identifier.find(object.permanent_id.to_s)
+        end
+      end
+
+      private
+
+        def assign!
+          @record = mint
+          object.permanent_id = record.id
+          object.permanent_url = (PERMANENT_URL_BASE + object.permanent_id)
+          object.save!
+        end
+
+        # @return [Ezid::Identifier]
+        def mint
+          ezid = Ezid::Identifier.create(default_metadata)
+          ezid.target = default_target_url(ezid.id)
+          ezid.save
+          ezid
+        end
+
+        def default_target_url(id)
+          Ddr::Models.permanent_id_target_url_base + id
+        end
+
+    end
+  end
+end

data/lib/ddr/managers/technical_metadata_manager.rb

@@ -5,21 +5,10 @@ module Ddr::Managers
 
     delegate :content, :fits, to: :object
 
-    delegate :color_space,
-             :created,
-             :creating_application,
-             :extent,
-             :format_label,
-             :format_version,
-             :icc_profile_name,
-             :icc_profile_version,
-             :image_height,
-             :image_width,
-             :media_type,
-             :modified,
-             :pronom_identifier,
-             :valid,
-             :well_formed,
+    delegate :valid, :well_formed,
+             :media_type, :format_label, :format_version, :pronom_identifier,
+             :created, :modified, :creating_application, :extent,
+             :image_width, :image_height, :color_space,
              to: :fits
 
     alias_method :last_modified, :modified
@@ -50,16 +39,12 @@ module Ddr::Managers
       end
     end
 
-    def md5
-      fits.md5.first
-    end
-
     def checksum_digest
-      content.checksumType
+      checksum_uri.split(":")[1].upcase rescue nil
     end
 
     def checksum_value
-      content.checksum
+      checksum_uri.split(":").last rescue nil
     end
 
     def invalid?
@@ -96,11 +81,8 @@ module Ddr::Managers
         Ddr::Index::Fields::TECHMD_FILE_SIZE         => file_size,
         Ddr::Index::Fields::TECHMD_FORMAT_LABEL      => format_label,
         Ddr::Index::Fields::TECHMD_FORMAT_VERSION    => format_version,
-        Ddr::Index::Fields::TECHMD_ICC_PROFILE_NAME  => icc_profile_name,
-        Ddr::Index::Fields::TECHMD_ICC_PROFILE_VERSION => icc_profile_version,
         Ddr::Index::Fields::TECHMD_IMAGE_HEIGHT      => image_height,
         Ddr::Index::Fields::TECHMD_IMAGE_WIDTH       => image_width,
-        Ddr::Index::Fields::TECHMD_MD5               => md5,
         Ddr::Index::Fields::TECHMD_MEDIA_TYPE        => media_type,
         Ddr::Index::Fields::TECHMD_PRONOM_IDENTIFIER => pronom_identifier,
         Ddr::Index::Fields::TECHMD_VALID             => valid,
@@ -117,5 +99,9 @@ module Ddr::Managers
       nil
     end
 
+    def checksum_uri
+      content.digest.first.to_s
+    end
+
   end
 end

data/lib/ddr/managers/workflow_manager.rb

@@ -9,43 +9,24 @@ module Ddr
         object.workflow_state == PUBLISHED
       end
 
-      def unpublished?
-        object.workflow_state == UNPUBLISHED
-      end
-
-      def publish!(include_descendants: true)
-        unless published?
-          publish
-          object.save!
-        end
-        if include_descendants && object.respond_to?(:children)
-          solr_results = object.children(response_format: :solr)
-          ActiveFedora::SolrService.lazy_reify_solr_results(solr_results).each do |child|
-            child.publish!(include_descendants: include_descendants)
-          end
-        end
-      end
-
-      def unpublish!
-        if published?
-          unpublish
-          object.save!
-        end
-        if object.respond_to?(:children)
-          object.children.each { |child| child.unpublish! }
-        end
-      end
-
-      private
-
       def publish
         object.workflow_state = PUBLISHED
       end
 
+      def publish!
+        publish
+        object.save
+      end
+
       def unpublish
         object.workflow_state = UNPUBLISHED
       end
 
+      def unpublish!
+        unpublish
+        object.save
+      end
+
     end
   end
 end

data/lib/ddr/models.rb

@@ -1,51 +1,44 @@
 require 'ddr/models/engine'
 require 'ddr/models/version'
-require 'action_view' # https://github.com/haml/haml/issues/695
+
+# Awful hack to make Hydra::AccessControls::Permissions accessible
+# $: << Gem.loaded_specs['hydra-access-controls'].full_gem_path + "/app/models/concerns"
+
 require 'active_record'
+
 require 'hydra-core'
 require 'hydra/validations'
 
 module Ddr
   extend ActiveSupport::Autoload
-  extend Deprecation
 
   autoload :Actions
   autoload :Auth
+  autoload :Contacts
   autoload :Datastreams
   autoload :Derivatives
   autoload :Events
   autoload :Index
+  autoload :IndexFields
+  autoload :Jobs
   autoload :Managers
   autoload :Metadata
   autoload :Notifications
   autoload :Utils
   autoload :Vocab
 
-  def self.const_missing(name)
-    if name == :IndexFields
-      Deprecation.warn(Ddr::Models, "`Ddr::IndexFields` is deprecated and will be removed in ddr-models 3.0." \
-                                    " Use `Ddr::Index::Fields` instead.")
-      Index::Fields
-    else
-      super
-    end
-  end
-
   module Models
     extend ActiveSupport::Autoload
 
+    autoload :AccessControllable
     autoload :AdminSet
     autoload :Base
-    autoload :Cache
-    autoload :Captionable
     autoload :ChecksumInvalid, 'ddr/models/error'
-    autoload :Contact
     autoload :ContentModelError, 'ddr/models/error'
     autoload :DerivativeGenerationFailure, 'ddr/models/error'
     autoload :Describable
     autoload :Error
     autoload :EventLoggable
-    autoload :FileCharacterization
     autoload :FileManagement
     autoload :FindingAid
     autoload :FixityCheckable
@@ -54,42 +47,50 @@ module Ddr
     autoload :HasAttachments
     autoload :HasChildren
     autoload :HasContent
-    autoload :HasIntermediateFile
     autoload :HasMultiresImage
     autoload :HasStructMetadata
     autoload :HasThumbnail
     autoload :Indexing
-    autoload :Language
-    autoload :MediaType
-    autoload :NotFoundError, 'ddr/models/error'
-    autoload :PermanentId
-    autoload :RightsStatement
     autoload :SolrDocument
-    autoload :Streamable
+    autoload :StructDiv
     autoload :Structure
-    autoload :WithContentFile
     autoload :YearFacet
 
-    module Structures
-      extend ActiveSupport::Autoload
-      autoload :Agent
-      autoload :Div
-      autoload :File
-      autoload :FileGrp
-      autoload :FileSec
-      autoload :FLocat
-      autoload :Fptr
-      autoload :MetsHdr
-      autoload :Mptr
-      autoload :StructMap
-      autoload :ComponentTypeTerm
+    autoload_under "licenses" do
+      autoload :AdminPolicyLicense
+      autoload :EffectiveLicense
+      autoload :License
+      autoload :InheritedLicense
+      autoload :ParentLicense
+    end
+
+    autoload_under "metadata" do
+      autoload :DescriptiveMetadata
+      autoload :Metadata
+      autoload :MetadataMapper
+      autoload :MetadataMappers
+      autoload :MetadataTerm
+      autoload :MetadataVocabulary
+      autoload :MetadataVocabularies
     end
 
+    # Base directory of default external file store
+    mattr_accessor :external_file_store
+
+    # Base directory of external file store for multires image derivatives
+    mattr_accessor :multires_image_external_file_store
+
+    # Regexp for building external file subpath from hex digest
+    mattr_accessor :external_file_subpath_regexp
+
     # Image server URL
     mattr_accessor :image_server_url
 
+    # Whether permanent IDs should be automatically assigned on create
+    mattr_accessor :auto_assign_permanent_ids
+
     mattr_accessor :permanent_id_target_url_base do
-      "https://repository.duke.edu/id/"
+      "https://repository.lib.duke.edu/id/"
     end
 
     # Home directory for FITS
@@ -104,69 +105,7 @@ module Ddr
     end
 
     mattr_accessor :ead_xml_base_url do
-      "https://library.duke.edu/rubenstein/findingaids/"
-    end
-
-    # Application temp dir - defaults to system temp dir
-    mattr_accessor :tempdir do
-      Dir.tmpdir
-    end
-
-    # Is repository locked?  Default is false.
-    # A locked repository behaves as though each object in the repository is locked.
-    mattr_accessor :repository_locked do
-      false
-    end
-
-    mattr_accessor :auto_assign_permanent_id do
-      false
-    end
-
-    mattr_accessor :auto_update_permanent_id do
-      false
-    end
-
-    # File path to vips
-    mattr_accessor :vips_path
-
-    mattr_accessor :default_mime_type do
-      "application/octet-stream"
-    end
-
-    # Maps file extensions to preferred media types
-    mattr_accessor :preferred_media_types do
-      {
-        '.aac'  => 'audio/mp4',
-        '.f4a'  => 'audio/mp4',
-        '.flv'  => 'video/flv',
-        '.m4a'  => 'audio/mp4',
-        '.mov'  => 'video/quicktime',
-        '.mp3'  => 'audio/mpeg',
-        '.mp4'  => 'video/mp4',
-        '.oga'  => 'audio/ogg',
-        '.ogg'  => 'audio/ogg',
-        '.srt'  => 'text/plain',
-        '.vtt'  => 'text/vtt',
-        '.wav'  => 'audio/wav',
-        '.webm' => 'video/webm',
-        '.zip'  => 'application/zip'
-      }
-    end
-
-    # Maps media types to preferred file extensions
-    mattr_accessor :preferred_file_extensions do
-      {
-        'application/zip' => 'zip',
-        'audio/mp4'       => 'm4a',
-        'audio/mpeg'      => 'mp3',
-        'audio/ogg'       => 'ogg',
-        'audio/wav'       => 'wav',
-        'text/vtt'        => 'vtt',
-        'video/flv'       => 'flv',
-        'video/mp4'       => 'mp4',
-        'video/quicktime' => 'mov',
-        'video/webm'      => 'webm'
-      }
+      "http://library.duke.edu/rubenstein/findingaids/"
     end
 
     # Yields an object with module configuration accessors
@@ -174,7 +113,17 @@ module Ddr
       yield self
     end
 
+    def self.external_file_subpath_pattern= (pattern)
+      unless /^-{1,2}(\/-{1,2}){0,3}$/ =~ pattern
+        raise "Invalid external file subpath pattern: #{pattern}"
+      end
+      re = pattern.split("/").map { |x| "(\\h{#{x.length}})" }.join("")
+      self.external_file_subpath_regexp = Regexp.new("^#{re}")
+    end
+
   end
 end
 
+ActiveFedora::Predicates.set_predicates(Ddr::Metadata::PREDICATES)
+
 Dir[Ddr::Models::Engine.root.to_s + "/app/models/*.rb"].each { |m| require m }

data/lib/ddr/models/access_controllable.rb

@@ -0,0 +1,12 @@
+module Ddr
+  module Models
+    module AccessControllable
+      extend ActiveSupport::Concern
+
+      included do
+        include Hydra::AccessControls::Permissions
+      end
+
+    end
+  end
+end

data/lib/ddr/models/admin_set.rb

@@ -1,23 +1,12 @@
-require "active_resource"
+require "ddr_aux/client"
 
 module Ddr::Models
-  class AdminSet < ActiveResource::Base
-
-    self.site = ENV["DDR_AUX_API_URL"]
+  class AdminSet < DdrAux::Client::AdminSet
 
     def self.call(obj)
-      find_by_code(obj.admin_set)
-    rescue ActiveResource::ResourceNotFound => e
-      raise Ddr::Models::NotFoundError, e
-    end
-
-    def self.find_by_code(code)
-      return unless code
-      new get(:find, code: code)
-    end
-
-    def self.keys
-      all.map(&:code)
+      if obj.admin_set
+        find(code: obj.admin_set)
+      end
     end
 
     def to_s