ddr-models 1.11.8 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d10e1ba304fa1a393709a4501e99bafb3faefb5
-  data.tar.gz: a45c8a2567782b1a6f06734a80974c6aae2912ba
+  metadata.gz: e6a7d4a0eb5bff65cd422cdecc6c9a80a1676b13
+  data.tar.gz: 16e2b9cd1b296430fdae20b3de5c680acae7c2a5
 SHA512:
-  metadata.gz: da57bd80925a6054c93f0740e7f7c6fc9fd9429bf8291c1a3ac9adf158832816ae96a070dfab993dda69fb1706816111197b980e44f8a4180846566631cd7a40
-  data.tar.gz: ac8cd9b2a5d146ade89a34a773f167631f4a70e287ff6bf7057febe4227fab5c7094313a147bae3324917cb3b48c96191dbe2fcf15aec5e3b01ed4a1972638d1
+  metadata.gz: ca20806ec02e8961c8463a0a2a56e52ae58a5c4e6bd53a32bcef760f54d9b6ebaa235621c9a278a8938c6d2889b43cd3f059526edc9167086011cf080f9e7079
+  data.tar.gz: d6b05541a63bccf94273ed2b536bd4af1c827d1f3f1c637e8e43ae55881fc455dfe9e2c07492b03c825e8a9081686c2f9296cb39a02b21a2cd29282445eb5573

data/app/models/component.rb

@@ -6,6 +6,7 @@
 class Component < Ddr::Models::Base
  
   include Ddr::Models::HasContent
+  include Ddr::Models::HasStructMetadata
 
   belongs_to :parent, :property => :is_part_of, :class_name => 'Item'
   belongs_to :target, :property => :has_external_target, :class_name => 'Target'

data/app/models/item.rb

@@ -5,7 +5,6 @@
 #
 class Item < Ddr::Models::Base
   
-  include Ddr::Models::HasContentMetadata
   include Ddr::Models::HasChildren
 
   has_many :children, property: :is_part_of, class_name: 'Component'
@@ -20,5 +19,17 @@ class Item < Ddr::Models::Base
   alias_method :collection, :parent
   alias_method :collection_id, :parent_id
   alias_method :collection=, :parent=
-    
+
+  def children_by_file_use
+    file_uses = {}
+    sort_key = "#{Ddr::IndexFields::FILE_USE} ASC, #{Ddr::IndexFields::ORDER} ASC"
+    results = ActiveFedora::SolrService.query(association_query(:children), rows: 999999, sort: sort_key)
+    objs = ActiveFedora::SolrService.lazy_reify_solr_results(results)
+    objs.each do |obj|
+      file_uses[obj.file_use] ||= []
+      file_uses[obj.file_use] << obj
+    end
+    file_uses
+  end
+
 end

data/config/initializers/active_fedora_base.rb

@@ -25,10 +25,6 @@ module ActiveFedora
       can_have_content? && content.has_content?
     end
 
-    def has_content_metadata?
-      self.is_a?(DulHydra::HasContentMetadata) && self.datastreams[Ddr::Datastreams::CONTENT_METADATA].has_content?
-    end
-
     def describable?
       self.is_a? Ddr::Models::Describable
     end
@@ -45,7 +41,15 @@ module ActiveFedora
       ds = self.datastreams[Ddr::Datastreams::RIGHTS_METADATA]
       ds && ds.size && ds.size > 0
     end
-    
+
+    def can_have_struct_metadata?
+      datastreams.include? Ddr::Datastreams::STRUCT_METADATA
+    end
+
+    def has_struct_metadata?
+      can_have_struct_metadata? && structMetadata.has_content?
+    end
+
     def can_have_thumbnail?
       datastreams.include? "thumbnail"
     end

data/config/initializers/subscriptions.rb

@@ -13,3 +13,6 @@ ActiveSupport::Notifications.subscribe(Ddr::Notifications::CREATION, Ddr::Events
 
 # Update
 ActiveSupport::Notifications.subscribe(Ddr::Notifications::UPDATE, Ddr::Events::UpdateEvent)
+
+# Deletion
+ActiveSupport::Notifications.subscribe(Ddr::Notifications::DELETION, Ddr::Events::DeletionEvent)

data/config/locales/groups.en.yml

@@ -2,12 +2,5 @@ en:
   groups:
     public: Public
     registered: Duke Community
-    duke:
-      staff: Duke Staff
-      faculty: Duke Faculty
-      student: Duke Students
-      affiliate: Duke Affiliates
-      alumni: Duke Alumni
-      emeritus: Duke Emeritus Faculty
 # Grouper group example:
 #    "duke:library:repository:ddr:archivists": Archivists          

data/lib/ddr/auth/remote_group_service.rb

@@ -2,10 +2,6 @@ module Ddr
   module Auth
     class RemoteGroupService < GroupService
 
-      AFFILIATIONS = %w( faculty student staff affiliate alumni emeritus )
-      AFFILIATION_GROUP_MAP = AFFILIATIONS.map { |a| [a, "duke.#{a}"] }.to_h
-      AFFILIATION_RE = Regexp.new('(%{a})(?=@duke\.edu)' % {a: AFFILIATIONS.join("|")})
-
       attr_reader :env
 
       def initialize(env = nil)
@@ -13,12 +9,12 @@ module Ddr
       end
 
       def append_groups
-        GrouperService.repository_group_names + AFFILIATION_GROUP_MAP.values
+        GrouperService.repository_group_names
       end
 
       def append_user_groups(user)
         if env && env.key?(Ddr::Auth.remote_groups_env_key)
-          remote_groups + affiliation_groups
+          remote_groups
         else
           GrouperService.user_group_names(user)
         end
@@ -34,11 +30,6 @@ module Ddr
         groups
       end
 
-      def affiliation_groups
-        affiliations = env["affiliation"] ? env["affiliation"].scan(AFFILIATION_RE).flatten : []
-        affiliations.map { |affiliation| AFFILIATION_GROUP_MAP[affiliation] }.compact
-      end
-
     end
   end
 end

data/lib/ddr/datastreams.rb

@@ -4,14 +4,15 @@ module Ddr
   module Datastreams
     extend ActiveSupport::Autoload
 
+    ADMIN_METADATA = "adminMetadata"
     CONTENT = "content"
-    CONTENT_METADATA = "contentMetadata"
     DC = "DC"
     DEFAULT_RIGHTS = "defaultRights"
     DESC_METADATA = "descMetadata"
     PROPERTIES = "properties"
     RELS_EXT = "RELS-EXT"
     RIGHTS_METADATA = "rightsMetadata"
+    STRUCT_METADATA = "structMetadata"
     THUMBNAIL = "thumbnail"
 
     CHECKSUM_TYPE_MD5 = "MD5"
@@ -22,11 +23,11 @@ module Ddr
 
     CHECKSUM_TYPES = [ CHECKSUM_TYPE_MD5, CHECKSUM_TYPE_SHA1, CHECKSUM_TYPE_SHA256, CHECKSUM_TYPE_SHA384, CHECKSUM_TYPE_SHA512 ]
 
-    autoload :AdminMetadataDatastream
-    autoload :ContentMetadataDatastream
+    autoload :MetadataDatastream
+    autoload :AdministrativeMetadataDatastream
     autoload :DescriptiveMetadataDatastream
-    #autoload :PreservationMetadataDatastream
     autoload :PropertiesDatastream
+    autoload :StructuralMetadataDatastream
     autoload :DatastreamBehavior
 
   end

data/lib/ddr/datastreams/{admin_metadata_datastream.rb → administrative_metadata_datastream.rb}

@@ -2,7 +2,7 @@ require "rdf-vocab"
 
 module Ddr
   module Datastreams
-    class AdminMetadataDatastream < ActiveFedora::NtriplesRDFDatastream
+    class AdministrativeMetadataDatastream < MetadataDatastream
 
       property :permanent_id, predicate: Ddr::Vocab::Asset.permanentId
 
@@ -15,7 +15,7 @@ module Ddr
       property :workflow_state, predicate: Ddr::Vocab::Asset.workflowState
 
       Ddr::Vocab::Roles.each do |term|
-        property Ddr::Metadata::Vocabulary.term_name(Ddr::Vocab::Roles, term), 
+        property Ddr::Vocab::Vocabulary.term_name(Ddr::Vocab::Roles, term), 
                  predicate: term do |index|
           index.as :symbol
         end

data/lib/ddr/datastreams/descriptive_metadata_datastream.rb

@@ -1,9 +1,9 @@
 module Ddr
   module Datastreams
-    class DescriptiveMetadataDatastream < ActiveFedora::NtriplesRDFDatastream
+    class DescriptiveMetadataDatastream < MetadataDatastream
 
       class_attribute :vocabularies
-      self.vocabularies = [RDF::DC, Ddr::Metadata::DukeTerms].freeze
+      self.vocabularies = [RDF::DC, Ddr::Vocab::DukeTerms].freeze
 
       def self.default_attributes
         super.merge(:mimeType => 'application/n-triples')
@@ -22,57 +22,16 @@ module Ddr
         indexers.fetch(term_name, default_indexers)
       end
 
-      def self.term_names
-        terms = []
-        vocabularies.each do |vocab|
-          terms |= Ddr::Metadata::Vocabulary.term_names(vocab)
-        end
-        terms.sort
-      end
-
       # Add terms from the vocabularies as properties
       vocabularies.each do |vocab|
-        Ddr::Metadata::Vocabulary.property_terms(vocab).each do |term|
-          term_name = Ddr::Metadata::Vocabulary.term_name(vocab, term)
+        Ddr::Vocab::Vocabulary.property_terms(vocab).each do |term|
+          term_name = Ddr::Vocab::Vocabulary.term_name(vocab, term)
           property term_name, predicate: term do |index|
             index.as *indexers_for(term_name)
           end
         end
       end
      
-      # Returns ActiveFedora::Rdf::Term now that this is an RDF datastream
-      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
-        begin
-          self.send("#{term}=", values)
-        rescue NoMethodError
-          raise ArgumentError, "No such term: #{term}"
-        end
-      end
-
-      # 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
-      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)

data/lib/ddr/datastreams/metadata_datastream.rb

@@ -0,0 +1,44 @@
+module Ddr
+  module Datastreams
+    class MetadataDatastream < ActiveFedora::NtriplesRDFDatastream
+
+      def self.term_names
+        properties.keys.map(&:to_sym).sort
+      end
+
+      # Returns ActiveTriplesTerm now that this is an RDF datastream
+      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
+        begin
+          self.send("#{term}=", values)
+        rescue NoMethodError
+          raise ArgumentError, "No such term: #{term}"
+        end
+      end
+
+      # 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
+      end
+
+    end
+  end
+end

data/lib/ddr/datastreams/structural_metadata_datastream.rb

@@ -0,0 +1,24 @@
+require "rdf-vocab"
+
+module Ddr
+  module Datastreams
+    class StructuralMetadataDatastream < MetadataDatastream
+
+      # analogous to METS fileSec "USE" attribute
+      property :file_use, predicate: Ddr::Vocab::Asset.fileUse do |index|
+        index.as :stored_sortable
+      end
+
+      # analogous to METS fileSec "SEQ" or structMap "ORDER" attribute
+      property :order, predicate: Ddr::Vocab::Asset.order do |index|
+        index.as :stored_sortable
+      end
+
+      # analogous to METS fileSec "GROUPID" attribute
+      property :file_group, predicate: Ddr::Vocab::Asset.fileGroup do |index|
+        index.as :stored_sortable
+      end
+
+    end
+  end
+end

data/lib/ddr/events.rb

@@ -4,14 +4,14 @@ module Ddr
 
     autoload :Event
     autoload :CreationEvent
+    autoload :DeletionEvent
     autoload :FixityCheckEvent
     autoload :IngestionEvent
     autoload :UpdateEvent
     autoload :ValidationEvent
     autoload :VirusCheckEvent
-    autoload :PreservationEventType
     autoload :PreservationEventBehavior
     autoload :ReindexObjectAfterSave
     
   end
-end
+end

data/lib/ddr/events/deletion_event.rb

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

data/lib/ddr/events/event.rb

@@ -34,7 +34,6 @@ module Ddr
   
       validates_presence_of :event_date_time, :pid
       validates :outcome, inclusion: {in: OUTCOMES, message: "\"%{value}\" is not a valid event outcome"}
-      validate :object_exists # unless/until we have a deaccession-type of event
  
       after_initialize :set_defaults
       before_save { failure! if exception.present? }
@@ -126,13 +125,6 @@ module Ddr
         event_date_time.utc.strftime DATE_TIME_FORMAT
       end
 
-      # Return boolean indicator of object existence
-      def object_exists?
-        !object.nil?
-      rescue ActiveFedora::ObjectNotFoundError => e
-        false
-      end
-
       protected
 
       def set_defaults
@@ -147,13 +139,6 @@ module Ddr
         }
       end
 
-      # Validation method
-      def object_exists
-        unless object_exists?
-          errors.add(:pid, "Object \"#{pid}\" does not exist in the repository") 
-        end
-      end
-
       def default_software
         DDR_SOFTWARE
       end

data/lib/ddr/events/preservation_event_behavior.rb

@@ -1,3 +1,5 @@
+require "rdf-vocab"
+
 module Ddr
   module Events
     module PreservationEventBehavior
@@ -16,7 +18,7 @@ module Ddr
 
       def as_premis
         Ddr::Metadata::PremisEvent.new.tap do |doc|
-          doc.event_type = PreservationEventType.label_for(preservation_event_type)
+          doc.event_type = RDF::Vocab::PremisEventType.label_for(preservation_event_type)
           doc.event_id_type = EVENT_ID_TYPE
           doc.event_id_value = id
           doc.event_detail = summary
@@ -34,4 +36,4 @@ module Ddr
 
     end
   end
-end
+end

data/lib/ddr/index_fields.rb

@@ -5,42 +5,38 @@ module Ddr
       ActiveFedora::SolrService.solr_name(*args)
     end
   
-    ACTIVE_FEDORA_MODEL         = solr_name :active_fedora_model, :stored_sortable
-    COLLECTION_URI              = solr_name :collection_uri, :symbol
-    CONTENT_CONTROL_GROUP       = solr_name :content_control_group, :searchable, type: :string
-    CONTENT_METADATA_PARSED     = solr_name :content_metadata_parsed, :symbol
-    CONTENT_SIZE                = solr_name :content_size, :stored_sortable, type: :integer
-    CONTENT_SIZE_HUMAN          = solr_name :content_size_human, :symbol
-    DEFAULT_LICENSE_DESCRIPTION = solr_name :default_license_description, type: :string
-    DEFAULT_LICENSE_TITLE       = solr_name :default_license_title, type: :string
-    DEFAULT_LICENSE_URL         = solr_name :default_license_url, type: :string
-    HAS_MODEL                   = solr_name :has_model, :symbol
-    IDENTIFIER                  = solr_name :identifier, :stored_sortable
-    INTERNAL_URI                = solr_name :internal_uri, :stored_sortable
-    IS_ATTACHED_TO              = solr_name :is_attached_to, :symbol
-    IS_EXTERNAL_TARGET_FOR      = solr_name :is_external_target_for, :symbol
-    IS_GOVERNED_BY              = solr_name :is_governed_by, :symbol
-    IS_MEMBER_OF                = solr_name :is_member_of, :symbol
-    IS_MEMBER_OF_COLLECTION     = solr_name :is_member_of_collection, :symbol
-    IS_PART_OF                  = solr_name :is_part_of, :symbol
-    LAST_FIXITY_CHECK_ON        = solr_name :last_fixity_check_on, :stored_sortable, type: :date
-    LAST_FIXITY_CHECK_OUTCOME   = solr_name :last_fixity_check_outcome, :symbol
-    LAST_VIRUS_CHECK_ON         = solr_name :last_virus_check_on, :stored_sortable, type: :date
-    LAST_VIRUS_CHECK_OUTCOME    = solr_name :last_virus_check_outcome, :symbol
-    LICENSE_DESCRIPTION         = solr_name :license_description, type: :string
-    LICENSE_TITLE               = solr_name :license_title, type: :string
-    LICENSE_URL                 = solr_name :license_url, type: :string
-    MEDIA_SUB_TYPE              = solr_name :content_media_sub_type, :facetable
-    MEDIA_MAJOR_TYPE            = solr_name :content_media_major_type, :facetable
-    MEDIA_TYPE                  = solr_name :content_media_type, :symbol
-    OBJECT_PROFILE              = solr_name :object_profile, :displayable
-    OBJECT_STATE                = solr_name :object_state, :stored_sortable
-    OBJECT_CREATE_DATE          = solr_name :system_create, :stored_sortable, type: :date
-    OBJECT_MODIFIED_DATE        = solr_name :system_modified, :stored_sortable, type: :date
-    PERMANENT_ID                = solr_name :permanent_id, :stored_sortable, type: :string
-    PERMANENT_URL               = solr_name :permanent_url, :stored_sortable, type: :string
-    TITLE                       = solr_name :title, :stored_sortable
-    WORKFLOW_STATE              = solr_name :workflow_state, :stored_sortable
+    ACTIVE_FEDORA_MODEL       = solr_name :active_fedora_model, :stored_sortable
+    COLLECTION_URI            = solr_name :collection_uri, :symbol
+    CONTENT_CONTROL_GROUP     = solr_name :content_control_group, :searchable, type: :string
+    CONTENT_SIZE              = solr_name :content_size, :stored_sortable, type: :integer
+    CONTENT_SIZE_HUMAN        = solr_name :content_size_human, :symbol
+    FILE_GROUP                = solr_name :struct_metadata__file_group, :stored_sortable
+    FILE_USE                  = solr_name :struct_metadata__file_use, :stored_sortable
+    HAS_MODEL                 = solr_name :has_model, :symbol
+    IDENTIFIER                = solr_name :identifier, :stored_sortable
+    INTERNAL_URI              = solr_name :internal_uri, :stored_sortable
+    IS_ATTACHED_TO            = solr_name :is_attached_to, :symbol
+    IS_EXTERNAL_TARGET_FOR    = solr_name :is_external_target_for, :symbol
+    IS_GOVERNED_BY            = solr_name :is_governed_by, :symbol
+    IS_MEMBER_OF              = solr_name :is_member_of, :symbol
+    IS_MEMBER_OF_COLLECTION   = solr_name :is_member_of_collection, :symbol
+    IS_PART_OF                = solr_name :is_part_of, :symbol
+    LAST_FIXITY_CHECK_ON      = solr_name :last_fixity_check_on, :stored_sortable, type: :date
+    LAST_FIXITY_CHECK_OUTCOME = solr_name :last_fixity_check_outcome, :symbol
+    LAST_VIRUS_CHECK_ON       = solr_name :last_virus_check_on, :stored_sortable, type: :date
+    LAST_VIRUS_CHECK_OUTCOME  = solr_name :last_virus_check_outcome, :symbol
+    MEDIA_SUB_TYPE            = solr_name :content_media_sub_type, :facetable
+    MEDIA_MAJOR_TYPE          = solr_name :content_media_major_type, :facetable
+    MEDIA_TYPE                = solr_name :content_media_type, :symbol
+    OBJECT_PROFILE            = solr_name :object_profile, :displayable
+    OBJECT_STATE              = solr_name :object_state, :stored_sortable
+    OBJECT_CREATE_DATE        = solr_name :system_create, :stored_sortable, type: :date
+    OBJECT_MODIFIED_DATE      = solr_name :system_modified, :stored_sortable, type: :date
+    ORDER                     = solr_name :struct_metadata__order, :stored_sortable, type: :integer
+    PERMANENT_ID              = solr_name :permanent_id, :stored_sortable, type: :string
+    PERMANENT_URL             = solr_name :permanent_url, :stored_sortable, type: :string
+    TITLE                     = solr_name :title, :stored_sortable
+    WORKFLOW_STATE            = solr_name :workflow_state, :stored_sortable
 
   end
 end