ddr-models 2.11.0 → 3.0.0.alpha.1

data/lib/ddr/models/finding_aid.rb

@@ -1,55 +1,22 @@
-require "nokogiri"
-
 module Ddr::Models
   class FindingAid
 
     attr_reader :ead_id
 
-    EAD_XMLNS = "urn:isbn:1-931666-22-9"
-
     def initialize(ead_id)
       @ead_id = ead_id
     end
 
     def url
-      doc.css("eadid").attr("url").text
+      @url ||= doc.css("eadid").attr("url").text
     end
 
-    # The finding aid title
     def title
-      doc.css("titleproper").children.first.text.strip
-    end
-
-    def repository
-      collection.xpath('ead:did/ead:repository/ead:corpname', ead: EAD_XMLNS).text
-    end
-
-    def collection_date_span
-      collection.xpath('ead:did/ead:unitdate[@type="inclusive"]', ead: EAD_XMLNS).text
-    end
-
-    def collection_number
-      collection.xpath('ead:did/ead:unitid', ead: EAD_XMLNS).text
-    end
-
-    def collection_title
-      collection.xpath('ead:did/ead:unittitle', ead: EAD_XMLNS).text
-    end
-
-    def extent
-      collection.xpath('ead:did/ead:physdesc/ead:extent', ead: EAD_XMLNS).map(&:text).join("; ")
-    end
-
-    def abstract
-      collection.xpath('ead:did/ead:abstract', ead: EAD_XMLNS).text
+      @title ||= doc.css("titleproper").children.first.text.strip
     end
 
     private
 
-    def collection
-      doc.xpath('//ead:archdesc[@level="collection"]', ead: EAD_XMLNS)
-    end
-
     # @raise [OpenURI::HTTPError] if 404, etc.
     def doc
       @doc ||= Nokogiri::XML(open(ead_xml_url))

data/lib/ddr/models/fixity_checkable.rb

@@ -2,6 +2,10 @@ module Ddr
   module Models
     module FixityCheckable
 
+      def datastreams_to_validate
+        datastreams.select { |dsid, ds| ds.has_content? }
+      end
+
       def fixity_checks
         Ddr::Events::FixityCheckEvent.for_object(self)
       end

data/lib/ddr/models/governable.rb

@@ -4,7 +4,9 @@ module Ddr
       extend ActiveSupport::Concern
 
       included do
-        belongs_to :admin_policy, :property => :is_governed_by, :class_name => "Collection"
+        belongs_to :admin_policy,
+                   predicate: ActiveFedora::RDF::ProjectHydra.isGovernedBy,
+                   class_name: "Collection"
       end
 
       def inherited_permissions

data/lib/ddr/models/has_admin_metadata.rb

@@ -1,47 +1,75 @@
+require "resque"
+require "rdf/vocab"
+
 module Ddr::Models
   module HasAdminMetadata
     extend ActiveSupport::Concern
-    extend Deprecation
-
-    self.deprecation_horizon = 'ddr-models v3.0'
 
     included do
-      has_metadata "adminMetadata",
-                   type: Ddr::Datastreams::AdministrativeMetadataDatastream,
-                   versionable: true,
-                   control_group: "M"
-
-      has_attributes :admin_set,
-                     :depositor,
-                     :display_format,
-                     :license,
-                     :local_id,
-                     :nested_path,
-                     :permanent_id,
-                     :permanent_url,
-                     :research_help_contact,
-                     :workflow_state,
-                     :ead_id,
-                     :aspace_id,
-                     :is_locked,
-                     :doi,
-                     :ingested_by,
-                     :ingestion_date,
-                     :aleph_id,
-                     datastream: "adminMetadata",
-                     multiple: false
-
-      has_attributes :affiliation,
-                     :rights_note,
-                     datastream: "adminMetadata",
-                     multiple: true
-
-      delegate :publish!, :unpublish!, :published?, :unpublished?,
-               to: :workflow
+      contains "accessRoles", class_name: "Ddr::Auth::Roles::RolesDatastream"
+
+      property :admin_set,
+               predicate: Ddr::Vocab::Asset.adminSet,
+               multiple: false
+
+      property :depositor,
+               predicate: RDF::Vocab::MARCRelators.dpt,
+               multiple: false
+
+      property :display_format,
+               predicate: Ddr::Vocab::Display.format,
+               multiple: false
+
+      property :doi,
+               predicate: RDF::Vocab::Identifiers.doi
+
+      property :ead_id,
+               predicate: Ddr::Vocab::Asset.eadId,
+               multiple: false
+
+      property :license,
+               predicate: RDF::DC.license,
+               multiple: false
+
+      property :local_id,
+               predicate: RDF::Vocab::Identifiers.local,
+               multiple: false
+
+      # XXX Is this admin metadata?
+      property :original_filename,
+               predicate: Ddr::Vocab::PREMIS.hasOriginalName,
+               multiple: false do |index|
+        index.as :stored_sortable
+      end
+
+      property :permanent_id,
+               predicate: Ddr::Vocab::Asset.permanentId,
+               multiple: false
+
+      property :permanent_url,
+               predicate: Ddr::Vocab::Asset.permanentUrl,
+               multiple: false
+
+      property :research_help_contact,
+               predicate: Ddr::Vocab::Contact.assistance,
+               multiple: false
+
+      property :workflow_state,
+               predicate: Ddr::Vocab::Asset.workflowState,
+               multiple: false
+
+      delegate :publish, :publish!, :unpublish, :unpublish!, :published?, to: :workflow
+
+      after_create :assign_permanent_id!, if: "Ddr::Models.auto_assign_permanent_ids"
+      around_destroy :update_permanent_id_on_destroy, if: "permanent_id.present?"
+    end
+
+    def permanent_id_manager
+      @permanent_id_manager ||= Ddr::Managers::PermanentIdManager.new(self)
     end
 
     def roles
-      Ddr::Auth::Roles::PropertyRoleSet.new(adminMetadata.access_role)
+      Ddr::Auth::Roles::PropertyRoleSet.new(accessRoles.roles)
     end
 
     def inherited_roles
@@ -52,6 +80,10 @@ module Ddr::Models
       @workflow ||= Ddr::Managers::WorkflowManager.new(self)
     end
 
+    def assign_permanent_id!
+      permanent_id_manager.assign_later
+    end
+
     def grant_roles_to_creator(creator)
       roles.grant type: Ddr::Auth::Roles::EDITOR,
                   agent: creator,
@@ -67,35 +99,29 @@ module Ddr::Models
     end
 
     def research_help
-      Ddr::Models::Contact.call(research_help_contact) if research_help_contact
-    end
-
-    def finding_aid
-      if ead_id
-        FindingAid.new(ead_id)
-      end
+      Ddr::Contacts.get(research_help_contact) if research_help_contact
     end
 
-    def locked?
-      !!is_locked || Ddr::Models.repository_locked
+    def effective_license
+      EffectiveLicense.call(self)
     end
 
-    def lock
-      self.is_locked = true
+    def inherited_license
+      InheritedLicense.call(self)
     end
 
-    def unlock
-      self.is_locked = false
+    def finding_aid
+      if ead_id
+        FindingAid.new(ead_id)
+      end
     end
 
-    def lock!
-      lock
-      save
-    end
+    private
 
-    def unlock!
-      unlock
-      save
+    def update_permanent_id_on_destroy
+      @permanent_id = permanent_id
+      yield
+      Resque.enqueue(Ddr::Jobs::PermanentId::MakeUnavailable, @permanent_id, "deleted")
     end
 
   end

data/lib/ddr/models/has_attachments.rb

@@ -4,7 +4,9 @@ module Ddr
       extend ActiveSupport::Concern
 
       included do
-        has_many :attachments, property: :is_attached_to, class_name: 'Attachment'
+        has_many :attachments,
+                 predicate: ::RDF::URI("http://projecthydra.org/ns/relations#isAttachedTo"),
+                 class_name: 'Attachment'
       end
 
     end

data/lib/ddr/models/has_children.rb

@@ -2,14 +2,10 @@ module Ddr
   module Models
     module HasChildren
 
-      DEFAULT_SORT = "#{Ddr::Index::Fields::LOCAL_ID} ASC, #{Ddr::Index::Fields::OBJECT_CREATE_DATE} ASC"
-
       def first_child
-        ActiveFedora::SolrService.lazy_reify_solr_results(sorted_children).first
-      end
-
-      def sorted_children
-        ActiveFedora::SolrService.query(association_query(:children), sort: DEFAULT_SORT, rows: 999999)
+        child_class = self.class.reflect_on_association(:children).klass
+        solr_field = child_class.reflect_on_association(:parent).solr_key
+        child_class.where(solr_field => id).order("#{Ddr::Index::Fields::LOCAL_ID} ASC").first
       end
 
     end

data/lib/ddr/models/has_content.rb

@@ -1,44 +1,41 @@
+require 'openssl'
+
 module Ddr
   module Models
     module HasContent
       extend ActiveSupport::Concern
 
+      MASTER_FILE_TYPES = [ "image/tiff" ]
+
+      def master_file?
+        if respond_to?(:file_use) && file_use.present?
+          file_use == Ddr::Models::HasStructMetadata::FILE_USE_MASTER
+        else
+          MASTER_FILE_TYPES.include?(content_type)
+        end
+      end
+
       included do
-        has_file_datastream \
-          name: Ddr::Datastreams::CONTENT,
-          type: Ddr::Datastreams::ContentDatastream,
-          versionable: true,
-          label: "Content file for this object",
-          control_group: "E"
-
-        has_file_datastream \
-          name: Ddr::Datastreams::EXTRACTED_TEXT,
-          type: Ddr::Datastreams::PlainTextDatastream,
-          versionable: true,
-          label: "Text extracted from the content file",
-          control_group: "M"
-
-        has_metadata \
-          name: Ddr::Datastreams::FITS,
-          type: Ddr::Datastreams::FitsDatastream,
-          versionable: false,
-          label: "FITS Output for content file",
-          control_group: "M"
-
-        has_attributes :original_filename, datastream: "adminMetadata", multiple: false
+        contains Ddr::Datastreams::CONTENT
+        contains Ddr::Datastreams::EXTRACTED_TEXT, class_name: 'Ddr::Datastreams::PlainTextDatastream'
+        contains Ddr::Datastreams::FITS, class_name: 'Ddr::Datastreams::FitsDatastream'
 
         include FileManagement
 
+        around_save :update_derivatives, if: :content_changed?
+
+        around_save :characterize_file, if: [ :content_changed?, "Ddr::Models.characterize_files?" ]
+
         delegate :validate_checksum!, to: :content
       end
 
       # Convenience method wrapping FileManagement#add_file
-      def upload file, opts={}
-        add_file(file, Ddr::Datastreams::CONTENT, opts)
+      def upload(file, opts={})
+        add_file(file, opts.merge(path: Ddr::Datastreams::CONTENT))
       end
 
       # Set content to file and save
-      def upload! file, opts={}
+      def upload!(file, opts={})
         upload(file, opts)
         save
       end
@@ -52,7 +49,7 @@ module Ddr
       end
 
       def content_size
-        content.external? ? content.file_size : content.dsSize
+        content.size
       end
 
       def content_human_size
@@ -60,7 +57,7 @@ module Ddr
       end
 
       def content_type
-        content.mimeType
+        content.mime_type
       end
 
       def content_major_type
@@ -100,18 +97,24 @@ module Ddr
       end
 
       def content_changed?
-        content.external? ? content.dsLocation_changed? : content.content_changed?
+        content.content_changed?
       end
 
       def has_extracted_text?
-        extractedText.has_content?
+        !extractedText.empty?
       end
 
-      def with_content_file(&block)
-        WithContentFile.new(self, &block)
+      protected
+
+      def update_derivatives
+        yield
+        derivatives.update_derivatives(:later)
       end
 
-      protected
+      def characterize_file
+        yield
+        Resque.enqueue(Ddr::Jobs::FitsFileCharacterization, pid)
+      end
 
       def default_content_type
         "application/octet-stream"

data/lib/ddr/models/has_multires_image.rb

@@ -1,17 +1,12 @@
-module Ddr::Models
-  module HasMultiresImage
-    extend ActiveSupport::Concern
+module Ddr
+  module Models
+    module HasMultiresImage
+      extend ActiveSupport::Concern
 
-    included do
-      has_file_datastream name: Ddr::Datastreams::MULTIRES_IMAGE,
-                          type: Ddr::Datastreams::MultiresImageDatastream,
-                          label: "Multi-resolution image derivative for this object",
-                          control_group: "E"
-    end
+      included do
+        property :multires_image_file_path, predicate: Ddr::Vocab::Asset.multiresImageFilePath, multiple: false
+      end
 
-    def multires_image_file_path
-      datastreams[Ddr::Datastreams::MULTIRES_IMAGE].file_path
     end
-
   end
 end

data/lib/ddr/models/has_struct_metadata.rb

@@ -4,18 +4,56 @@ module Ddr
       extend ActiveSupport::Concern
 
       included do
-        has_file_datastream name: Ddr::Datastreams::STRUCT_METADATA,
-                            type: Ddr::Datastreams::StructuralMetadataDatastream
+        contains Ddr::Datastreams::STRUCT_METADATA, class_name: 'Ddr::Datastreams::StructuralMetadataDatastream'
       end
 
       def structure
-        if datastreams[Ddr::Datastreams::STRUCT_METADATA].has_content?
-          Ddr::Models::Structure.new(Nokogiri::XML(datastreams[Ddr::Datastreams::STRUCT_METADATA].content))
+        unless @structure
+          if datastreams[Ddr::Datastreams::STRUCT_METADATA].content
+            @structure = Ddr::Models::Structure.new(Nokogiri::XML(datastreams[Ddr::Datastreams::STRUCT_METADATA].content))
+          end
         end
+        @structure
       end
 
-      def multires_image_file_paths
-        ::SolrDocument.find(pid).multires_image_file_paths
+      def build_default_structure
+        structure = Ddr::Models::Structure.new(Ddr::Models::Structure.template)
+        children = find_children
+        children.each do |child|
+          add_to_struct_map(structure, child)
+        end
+        structure
+      end
+
+      def multires_image_file_paths(type='default')
+        ::SolrDocument.find(pid).multires_image_file_paths(type)
+      end
+
+      private
+
+      def find_children
+        query = association_query(:children)
+        sort = "#{Ddr::Index::Fields::LOCAL_ID} ASC, #{Ddr::Index::Fields::OBJECT_CREATE_DATE} ASC"
+        ActiveFedora::SolrService.query(query, sort: sort, rows: 999999)
+      end
+
+      def add_to_struct_map(stru, child)
+        div = create_div(stru)
+        create_fptr(stru, div, child['id'])
+      end
+
+      def create_div(stru)
+        div_count = stru.structMap_node('default').xpath('xmlns:div').size
+        div = Nokogiri::XML::Node.new('div', stru.as_xml_document)
+        div['ORDER'] = div_count + 1
+        stru.structMap_node('default').add_child(div)
+        div
+      end
+
+      def create_fptr(stru, div, pid)
+        fptr = Nokogiri::XML::Node.new('fptr', stru.as_xml_document)
+        fptr['CONTENTIDS'] = "info:fedora/#{pid}"
+        div.add_child(fptr)
       end
 
     end