ddr-core 0.3.0 → 1.2.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72f6e405acd06621c1a3f1001264c0d8d8bd5302c3e0f36b7ad5805f990eaa99
-  data.tar.gz: 826a0ae2eda2c5937b4c312e140e55672a4e55af807e2980082e0beae85342d0
+  metadata.gz: c58f60f94bc6a54ea670eb5a7a096e69221e5b8e6fce28191b939f283d4c3528
+  data.tar.gz: 170f607020dfabfa89c77c4a31b3daa10bc7d40bd06c251ff3e3d0a0372159e2
 SHA512:
-  metadata.gz: 03b21dcd66f1a220167fc421849d4a1f7996be806c310f92adfad14ee8f7f9cc0ca030f4d718a29be95586eac0b757d5d78e086ac9b5442d7865bab1d326a438
-  data.tar.gz: cf249bc22b8b381f20b3149ba421496098aa4576528460cbde047e7fdded8396ceb66f522428ed11677799c5bbd0ea53676bb199ea80c9b8c3d75d05508e1eab
+  metadata.gz: 7ff5d87897742e3f736e3313a06145a6d378e168e72d6872effc563906370fe66865bf663027defe32041a45ab92910dab97e9d9a1ebd6d21bdf1d9b0b381b84
+  data.tar.gz: 48869cd2b81bd88378779ab319fb4a13407bc9060aa099b6b45d33469e8d6605af177aecff033b921f5588bca616f94e077ce75455d45ddba2a619fc7d0119a7

data/README.md

@@ -6,7 +6,7 @@ A port of ddr-models based on Valkyrie.
 
 Install docker (Docker for Mac includes all the required components).
 
-Change to the `.docker`  directory.
+Change to the `.docker` directory.
 
 Start the *development* stack:
 

data/app/models/concerns/ddr/#search_builder_behavior.rb#

@@ -0,0 +1,10 @@
+module Ddr
+  module SearchBuilderBehavior
+
+    def effective_role_filter(agents)
+      # https://lucene.apache.org/solr/guide/7_7/other-parsers.html#term-query-parser
+      "{!terms f=#{Ddr::Index::Fields::EFFECTIVE_ROLE} method=booleanQuery}#{agents.join(',')}"
+    end
+
+  end
+end

data/app/models/concerns/ddr/describable.rb

@@ -15,6 +15,8 @@ module Ddr
       term_names
     end
 
+    # Dublin Core vocabulary comes from the rdf-vocab gem (https://github.com/ruby-rdf/rdf-vocab)
+    # DDR vocabulary is defined locally
     def self.vocabularies
       [RDF::Vocab::DC, Ddr::Vocab::DukeTerms].freeze
     end
@@ -34,7 +36,11 @@ module Ddr
 
     included do
       Ddr::Describable.term_names.each do |term_name|
-        attribute term_name, Valkyrie::Types::Set
+        if term_name == :available # Intercept dcterms:available and set it to a single date so it can be used for embargoes
+          attribute term_name, Valkyrie::Types::DateTime.optional
+        else
+          attribute term_name, Valkyrie::Types::Set
+        end
       end
     end
 
@@ -53,7 +59,7 @@ module Ddr
       arg = args.pop
       terms = case arg.to_sym
               when :empty
-                desc_metadata_terms.select { |t| values(t).empty? }
+                desc_metadata_terms.select { |t| values(t).nil? || values(t).empty? }
               when :present
                 desc_metadata_terms.select { |t| values(t).present? }
               when :defined_attributes
@@ -94,15 +100,5 @@ module Ddr
       desc_metadata_terms.each { |t| set_desc_metadata_values(t, term_values_hash[t]) }
     end
 
-    ################
-    # I do not believe this method is needed any longer since I can't find any usage of it in ddr-models, ddr-batch,
-    # dul-hydra, ddr-public, or ddr-portals
-    ################
-    # module ClassMethods
-    #   def find_by_identifier(identifier)
-    #     find(Ddr::Index::Fields::IDENTIFIER_ALL => identifier)
-    #   end
-    # end
-
   end
 end

data/app/models/concerns/ddr/has_admin_metadata.rb

@@ -7,6 +7,7 @@ module Ddr
               affiliation:            Valkyrie::Types::Set,
               aleph_id:               Valkyrie::Types::Strict::String.optional,
               aspace_id:              Valkyrie::Types::Strict::String.optional,
+              contentdm_id:           Valkyrie::Types::Strict::String.optional,
               depositor:              Valkyrie::Types::Strict::String.optional,
               display_format:         Valkyrie::Types::Strict::String.optional,
               doi:                    Valkyrie::Types::Strict::String.optional,
@@ -54,46 +55,10 @@ module Ddr
       workflow_state == Ddr::Workflow::UNPUBLISHED
     end
 
-    ##############
-    # Move to dul-hydra?
-    ##############
-    # def lock
-    #   self.is_locked = true
-    # end
-    #
-    # def unlock
-    #   self.is_locked = false
-    # end
-    #
-    # def lock!
-    #   lock
-    #   save
-    # end
-    #
-    # def unlock!
-    #   unlock
-    #   save
-    # end
-    #
-    # Same with publish! and unpublish!, which is currently delegated to Ddr::Managers::WorkflowManager
-    #
-    ###############
-
-    ###############
-    # attribute defined in has_content, single-valued, stored in adminMetadata datastream
-    ###############
-    # property :original_filename,
-    #          predicate: Ddr::Vocab::PREMIS.hasOriginalName do |index|
-    #   index.as :stored_sortable
-    # end
-    #
-
-    # included do
-    #
-    #   delegate :publish!, :unpublish!, :published?, :unpublished?,
-    #            to: :workflow
-    # end
-    #
+    # Usually won't be called directly. See `publishable?` on Resource and its derivatives
+    def nonpublishable?
+      workflow_state == Ddr::Workflow::NONPUBLISHABLE
+    end
 
     def resource_roles
       roles.select(&:in_resource_scope?)
@@ -107,36 +72,19 @@ module Ddr
       ( has_admin_policy? && admin_policy.policy_roles ) || []
     end
 
-    # def effective_roles(agents)
-    #   ( resource_roles | policy_roles ).select { |r| agents.include?(r.agent) }
-    # end
-
-    # def workflow
-    #   @workflow ||= Ddr::Managers::WorkflowManager.new(self)
-    # end
-    #
-    # def grant_roles_to_creator(creator)
-    #   roles.grant type: Ddr::Auth::Roles::EDITOR,
-    #               agent: creator,
-    #               scope: Ddr::Auth::Roles::RESOURCE_SCOPE
-    # end
-    #
-    # def copy_resource_roles_from(other)
-    #   roles.grant *(other.roles.in_resource_scope)
-    # end
-    #
+    def effective_roles(agents = nil)
+      Ddr::Auth::EffectiveRoles.call(self, agents)
+    end
 
     def effective_permissions(agents)
       Ddr::Auth::EffectivePermissions.call(self, agents)
     end
 
-    #
-    # def finding_aid
-    #   if ead_id
-    #     FindingAid.new(ead_id)
-    #   end
-    # end
-    #
+    def finding_aid
+      if ead_id
+        FindingAid.new(ead_id)
+      end
+    end
 
   end
 end

data/app/models/concerns/ddr/has_children.rb

@@ -6,5 +6,13 @@ module Ddr
       Ddr.query_service.find_inverse_references_by(resource: self, property: 'parent_id')
     end
 
+    def first_child
+      sorted_children.first
+    end
+
+    def sorted_children
+      children.sort_by{ |e| [ e.local_id || '', e.ingestion_date ] }
+    end
+
   end
 end

data/app/models/concerns/ddr/has_content.rb

@@ -66,6 +66,7 @@ module Ddr
     def content_human_size
       ActiveSupport::NumberHelper.number_to_human_size(content_size) if content_size
     end
+    alias_method :content_size_human, :content_human_size
 
     def content_type
       content&.media_type

data/app/models/concerns/ddr/has_parent.rb

@@ -7,12 +7,24 @@ module Ddr
       attribute :parent_id, Valkyrie::Types::ID.optional
     end
 
+    def has_parent?
+      parent_id.present?
+    end
+
     def parent
-      Ddr.query_service.find_by(id: parent_id) if parent_id
+      Ddr.query_service.find_by(id: parent_id) if has_parent?
     end
 
+    # Resources with parents (currently, Items and Components) are publishable only if they have not been marked
+    # nonpublishable and their parent is published
     def publishable?
-      parent&.published? || false
+      !nonpublishable? && parental_publication_guard
+    end
+
+    private
+
+    def parental_publication_guard
+      parent.present? && parent.published?
     end
 
   end

data/app/models/concerns/ddr/search_builder_behavior.rb~

@@ -0,0 +1,9 @@
+module Ddr
+  module SearchBuilderBehavior
+
+    def effective_role_filter
+
+    end
+
+  end
+end

data/app/models/concerns/ddr/solr_document_behavior.rb

@@ -54,29 +54,9 @@ module Ddr
     end
 
     def resource
-      @resource = Valkyrie::MetadataAdapter.find(:index_solr).query_service.find_by(id: id)
+      @resource ||= Valkyrie::MetadataAdapter.find(:index_solr).query_service.find_by(id: id)
     end
 
-    ### DDRevo: Not sure if / where this is used
-    def to_partial_path
-      'document'
-    end
-
-    ### DDRevo: This is probably no longer needed
-    def safe_id
-      id.sub(/:/, "-")
-    end
-
-    ### DDRevo: No longer relevant
-    # def object_profile
-    #   @object_profile ||= get_json(Ddr::Index::Fields::OBJECT_PROFILE)
-    # end
-
-    ### DDRevo: No longer relevant
-    # def object_state
-    #   object_profile["objState"]
-    # end
-
     def object_create_date
       parse_date(self[Ddr::Index::Fields::RESOURCE_CREATE_DATE])
     end
@@ -93,23 +73,13 @@ module Ddr
       get_date(Ddr::Index::Fields::LAST_VIRUS_CHECK_ON)
     end
 
-    ### DDRevo: No longer relevant
-    # def datastreams
-    #   object_profile["datastreams"]
-    # end
-
-    ### DDRevo: No longer relevant
-    # def has_datastream?(dsID)
-    #   datastreams[dsID].present?
-    # end
-
     def has_admin_policy?
       admin_policy_id.present?
     end
 
     def admin_policy
       if has_admin_policy?
-        self.class.find(admin_policy_id)
+        self.class.find(admin_policy_id.gsub(/^id-/,''))
       end
     end
 
@@ -117,11 +87,6 @@ module Ddr
       resource.children.present?
     end
 
-    ### DDRevo: No longer relevant
-    # def label
-    #   object_profile["objLabel"]
-    # end
-
     def title_display
       title
     end
@@ -151,11 +116,6 @@ module Ddr
       resource.has_extracted_text?
     end
 
-    ### DDRevo: Not relevant as coded.  Not sure if comparable functionality is needed
-    # def content_ds
-    #   datastreams[Ddr::Datastreams::CONTENT]
-    # end
-
     def content_mime_type
       resource.content_type
     end
@@ -166,11 +126,6 @@ module Ddr
       resource.content_human_size
     end
 
-    ### DDRevo: Not relevant as coded.  Not sure if comparable functionality is needed
-    # def content_checksum
-    #   content_ds["dsChecksum"] rescue nil
-    # end
-
     def targets
       @targets ||= query_service.find_inverse_references_by(resource: resource, property: 'for_collection_id')
     end
@@ -183,11 +138,6 @@ module Ddr
       targets_count > 0
     end
 
-    ### DDRevo Still relevant?
-    # def association(name)
-    #   get_pid(ActiveFedora::SolrService.solr_name(name, :symbol))
-    # end
-
     def tableized_name
       resource_model.tableize
     end
@@ -197,7 +147,6 @@ module Ddr
     end
 
     def roles
-      # @roles ||= Ddr::Auth::Roles::Role.from_json(access_role)
       @roles ||= resource.roles
     end
 
@@ -246,11 +195,8 @@ module Ddr
       end
     end
 
-    # DRY HasAdminMetadata
     def finding_aid
-      if ead_id
-        FindingAid.new(ead_id)
-      end
+      resource.finding_aid
     end
 
     def intermediate_type
@@ -280,14 +226,18 @@ module Ddr
       resource.captionable?
     end
 
+    def captioned?
+      resource.captioned?
+    end
+
     def caption_type
-      if captionable?
+      if captioned?
         resource.caption_type
       end
     end
 
     def caption_extension
-      if captionable?
+      if captioned?
         extensions = Ddr.preferred_file_extensions
         if extensions.include? caption_type
           extensions[caption_type]
@@ -298,7 +248,7 @@ module Ddr
     end
 
     def caption_path
-      if captionable?
+      if captioned?
         resource.caption_path
       end
     end
@@ -336,9 +286,8 @@ module Ddr
       end
     end
 
-    # FIXME - Probably need a more general solution mapping object reader methods to index field names.
     def rights
-      self["rights_tesim"]
+      resource.rights
     end
 
     def children
@@ -351,14 +300,6 @@ module Ddr
       @query_service ||= Valkyrie::MetadataAdapter.find(:index_solr).query_service
     end
 
-    # def targets_query
-    #   "#{Ddr::Index::Fields::IS_EXTERNAL_TARGET_FOR}:#{internal_uri_for_query}"
-    # end
-    #
-    # def internal_uri_for_query
-    #   ActiveFedora::SolrService.escape_uri_for_query(internal_uri)
-    # end
-    #
     def get_date(field)
       parse_date(self[field])
     end
@@ -371,10 +312,6 @@ module Ddr
       Time.parse(date).localtime if date
     end
 
-    # def get_pid(field)
-    #   ActiveFedora::Base.pid_from_uri(self[field]) rescue nil
-    # end
-    #
     def inherited_research_help_contact
       if doc = admin_policy
         doc.research_help_contact
@@ -398,32 +335,16 @@ module Ddr
     end
 
     def intermediate_extension_default
-      # datastreams[Ddr::Datastreams::INTERMEDIATE_FILE].default_file_extension
       resource.intermediate_file.default_file_extension
     end
 
     def caption_extension_default
-      # datastreams[Ddr::Datastreams::CAPTION].default_file_extension
       resource.caption.default_file_extension
     end
 
     def streamable_media_extension_default
-      # datastreams[Ddr::Datastreams::STREAMABLE_MEDIA].default_file_extension
       resource.streamable_media.default_file_extension
     end
 
-    ### DDRevo: Using resource.children rather than this query
-    # def children_query
-    #   case self[Ddr::Index::Fields::RESOURCE_MODEL]
-    #   when 'Ddr::Collection'
-    #     Ddr::Index::Query.build(self) do |parent|
-    #       is_member_of_collection parent.id
-    #     end
-    #   when 'Ddr::Item'
-    #     Ddr::Index::Query.build(self) do |parent|
-    #       is_part_of parent.id
-    #     end
-    #   end
-    # end
   end
 end