dor-services 6.0.0 → 6.0.1

data/lib/dor/datastreams/technical_metadata_ds.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Dor
   # Represents the Fedora 3 datastream that hold technical metadata
   class TechnicalMetadataDS < ActiveFedora::OmDatastream
     # This provides the prefix for the solr fields generated by ActiveFedora.
     # Since we don't want a prefix, we override this to return an empty string.
     def prefix
-      ''.freeze
+      ''
     end
   end
 end

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class VersionTag
     include Comparable
@@ -7,14 +9,17 @@ module Dor
     def <=>(other)
       diff = @major <=> other.major
       return diff if diff != 0
+
       diff = @minor <=> other.minor
       return diff if diff != 0
+
       @admin <=> other.admin
     end
 
     # @param [String] raw_tag the value of the tag attribute from a Version node
     def self.parse(raw_tag)
       return nil unless raw_tag =~ /(\d+)\.(\d+)\.(\d+)/
+
       VersionTag.new $1, $2, $3
     end
 
@@ -81,7 +86,7 @@ module Dor
       ng_xml_will_change!
       if find_by_terms(:version).size == 0
         v = ng_xml.create_element 'version',
-        :versionId => '1', :tag => '1.0.0'
+                                  :versionId => '1', :tag => '1.0.0'
         d = ng_xml.create_element 'description', 'Initial Version'
         ng_xml.root['objectId'] = pid
         ng_xml.root.add_child(v)
@@ -123,6 +128,7 @@ module Dor
       ng_xml.root['objectId'] = pid
       return if find_by_terms(:version).size == 1
       return if opts.empty?
+
       ng_xml_will_change!
       current = current_version_node
       if opts.include? :description
@@ -141,8 +147,8 @@ module Dor
         else
           # get rid of the current tag
           tags = find_by_terms(:version, :tag)
-          sorted_tags = tags.map {|t| VersionTag.parse(t.value)}.sort
-          current_tag = sorted_tags[sorted_tags.length - 2]           # Get the second greatest tag since we are dropping the current, greatest
+          sorted_tags = tags.map { |t| VersionTag.parse(t.value) }.sort
+          current_tag = sorted_tags[sorted_tags.length - 2] # Get the second greatest tag since we are dropping the current, greatest
           current[:tag] = current_tag.increment(opts[:significance]).to_s
         end
 
@@ -187,6 +193,7 @@ module Dor
     def current_description
       desc_node = current_version_node.at_xpath('description')
       return desc_node.content if desc_node
+
       ''
     end
 
@@ -222,12 +229,12 @@ module Dor
     # @return [Nokogiri::XML::Node] Node representing the current version
     def current_version_node
       versions = find_by_terms(:version)
-      versions.max_by {|v| v[:versionId].to_i }
+      versions.max_by { |v| v[:versionId].to_i }
     end
 
     def newest_tag
       tags = find_by_terms(:version, :tag)
-      tags.map {|t| VersionTag.parse(t.value)}.max
+      tags.map { |t| VersionTag.parse(t.value) }.max
     end
   end
 end

data/lib/dor/datastreams/workflow_definition_ds.rb

@@ -1,91 +1,92 @@
+# frozen_string_literal: true
+
 module Dor
-class WorkflowDefinitionDs < ActiveFedora::OmDatastream
-  include SolrDocHelper
+  class WorkflowDefinitionDs < ActiveFedora::OmDatastream
+    include SolrDocHelper
 
-  set_terminology do |t|
-    t.root(:path => 'workflow-def', :index_as => [:not_searchable])
-    t.process(:index_as => [:not_searchable])
-  end
+    set_terminology do |t|
+      t.root(:path => 'workflow-def', :index_as => [:not_searchable])
+      t.process(:index_as => [:not_searchable])
+    end
 
-  define_template :process do |builder, workflow, attrs|
-    prereqs = attrs.delete('prerequisite')
-    prereqs = prereqs.split(/\s*,\s*/) if prereqs.is_a?(String)
-    attrs.keys.each { |k| attrs[k.to_s.dasherize.to_sym] = attrs.delete(k) }
-    builder.process(attrs) do |node|
-      Array(prereqs).each do |prereq|
-        (repo, wf, prereq_name) = prereq.split(/:/)
-        if prereq_name.nil?
-          prereq_name = repo
-          repo = nil
+    define_template :process do |builder, workflow, attrs|
+      prereqs = attrs.delete('prerequisite')
+      prereqs = prereqs.split(/\s*,\s*/) if prereqs.is_a?(String)
+      attrs.keys.each { |k| attrs[k.to_s.dasherize.to_sym] = attrs.delete(k) }
+      builder.process(attrs) do |node|
+        Array(prereqs).each do |prereq|
+          (repo, wf, prereq_name) = prereq.split(/:/)
+          if prereq_name.nil?
+            prereq_name = repo
+            repo = nil
+          end
+          if repo == workflow.repo && wf = workflow.name
+            repo = nil
+            wf = nil
+          end
+          attrs = (repo.nil? && wf.nil?) ? {} : { :repository => repo, :workflow => wf }
+          node.prereq(attrs) { node.text prereq_name }
         end
-        if repo == workflow.repo && wf = workflow.name
-          repo = nil
-          wf = nil
-        end
-        attrs = (repo.nil? && wf.nil?) ? {} : { :repository => repo, :workflow => wf }
-        node.prereq(attrs) { node.text prereq_name }
       end
     end
-  end
 
-  def self.xml_template
-    Nokogiri::XML('<workflow-def/>')
-  end
+    def self.xml_template
+      Nokogiri::XML('<workflow-def/>')
+    end
 
-  def add_process(attributes)
-    ng_xml_will_change!
-    add_child_node(ng_xml.at_xpath('/workflow-def'), :process, self, attributes)
-  end
+    def add_process(attributes)
+      ng_xml_will_change!
+      add_child_node(ng_xml.at_xpath('/workflow-def'), :process, self, attributes)
+    end
 
-  def processes
-    ng_xml.xpath('/workflow-def/process').collect do |node|
-      Workflow::Process.new(repo, name, node)
-    end.sort { |a, b| (a.sequence || 0) <=> (b.sequence || 0) }
-  end
+    def processes
+      ng_xml.xpath('/workflow-def/process').collect do |node|
+        Workflow::Process.new(repo, name, node)
+      end.sort { |a, b| (a.sequence || 0) <=> (b.sequence || 0) }
+    end
 
-  def name
-    ng_xml.at_xpath('/workflow-def/@id').to_s
-  end
+    def name
+      ng_xml.at_xpath('/workflow-def/@id').to_s
+    end
 
-  def repo
-    ng_xml.at_xpath('/workflow-def/@repository').to_s
-  end
+    def repo
+      ng_xml.at_xpath('/workflow-def/@repository').to_s
+    end
 
-  # Creates the xml used by Dor::WorkflowService#create_workflow
-  # @return [String] An object's initial workflow as defined by the <workflow-def> in content
-  def initial_workflow
-    doc = Nokogiri::XML('<workflow/>')
-    root = doc.root
-    root['id'] = name
-    processes.each { |proc|
-      doc.create_element 'process' do |node|
-        node['name'] = proc.name
-        if proc.status
-          node['status'] = proc.status
-          node['attempts'] = '1'
-        else
-          node['status'] = 'waiting'
+    # Creates the xml used by Dor::WorkflowService#create_workflow
+    # @return [String] An object's initial workflow as defined by the <workflow-def> in content
+    def initial_workflow
+      doc = Nokogiri::XML('<workflow/>')
+      root = doc.root
+      root['id'] = name
+      processes.each { |proc|
+        doc.create_element 'process' do |node|
+          node['name'] = proc.name
+          if proc.status
+            node['status'] = proc.status
+            node['attempts'] = '1'
+          else
+            node['status'] = 'waiting'
+          end
+          node['lifecycle'] = proc.lifecycle if proc.lifecycle
+          root.add_child node
         end
-        node['lifecycle'] = proc.lifecycle if proc.lifecycle
-        root.add_child node
-      end
-    }
-    Nokogiri::XML(doc.to_xml) { |x| x.noblanks }.to_xml { |config| config.no_declaration }
-  end
+      }
+      Nokogiri::XML(doc.to_xml) { |x| x.noblanks }.to_xml { |config| config.no_declaration }
+    end
 
-  def to_solr(solr_doc = {}, *args)
-    solr_doc = super(solr_doc, *args)
-    add_solr_value(solr_doc, 'workflow_name', name, :symbol, [:symbol])
-    processes.each do |p|
-      add_solr_value(solr_doc, 'process', "#{p.name}|#{p.label}", :symbol, [:displayable])
+    def to_solr(solr_doc = {}, *args)
+      solr_doc = super(solr_doc, *args)
+      add_solr_value(solr_doc, 'workflow_name', name, :symbol, [:symbol])
+      processes.each do |p|
+        add_solr_value(solr_doc, 'process', "#{p.name}|#{p.label}", :symbol, [:displayable])
+      end
+      solr_doc
     end
-    solr_doc
-  end
 
-  # maintain AF < 8 indexing behavior
-  def prefix
-    ''
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
   end
-
-end
 end

data/lib/dor/datastreams/workflow_ds.rb

@@ -1,17 +1,19 @@
+# frozen_string_literal: true
+
 module Dor
   # TODO: class docs
   class WorkflowDs < ActiveFedora::OmDatastream
     set_terminology do |t|
       t.root(:path => 'workflows')
       t.workflow {
-        t.workflowId( :path => {:attribute => 'id'} )
+        t.workflowId(:path => { :attribute => 'id' })
         t.process {
-          t.name_(    :path => {:attribute => 'name'     }, :index_as => [:displayable, :not_searchable] )
-          t.status(   :path => {:attribute => 'status'   }, :index_as => [:displayable, :not_searchable] )
-          t.timestamp(:path => {:attribute => 'datetime' }, :index_as => [:displayable, :not_searchable] ) #, :data_type => :date)
-          t.elapsed(  :path => {:attribute => 'elapsed'  }, :index_as => [:displayable, :not_searchable] )
-          t.lifecycle(:path => {:attribute => 'lifecycle'}, :index_as => [:displayable, :not_searchable] )
-          t.attempts( :path => {:attribute => 'attempts' }, :index_as => [:displayable, :not_searchable] )
+          t.name_(:path => { :attribute => 'name' }, :index_as => [:displayable, :not_searchable])
+          t.status(:path => { :attribute => 'status' }, :index_as => [:displayable, :not_searchable])
+          t.timestamp(:path => { :attribute => 'datetime' }, :index_as => [:displayable, :not_searchable]) # , :data_type => :date)
+          t.elapsed(:path => { :attribute => 'elapsed' }, :index_as => [:displayable, :not_searchable])
+          t.lifecycle(:path => { :attribute => 'lifecycle' }, :index_as => [:displayable, :not_searchable])
+          t.attempts(:path => { :attribute => 'attempts' }, :index_as => [:displayable, :not_searchable])
         }
       }
     end
@@ -20,6 +22,7 @@ module Dor
       xml = Dor::Config.workflow.client.get_workflow_xml(repo, pid, wf)
       xml = Nokogiri::XML(xml)
       return nil if xml.xpath('workflow').length == 0
+
       Workflow::Document.new(xml.to_s)
     end
 
@@ -39,6 +42,7 @@ module Dor
       xml = Nokogiri::XML(%(<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<workflows objectId="#{pid}"/>))
       digital_object.datastreams.keys.each do |dsid|
         next unless dsid =~ /WF$/
+
         ds_content = Nokogiri::XML(Dor::Config.workflow.client.get_workflow_xml('dor', pid, dsid))
         xml.root.add_child(ds_content.root)
       end
@@ -55,6 +59,7 @@ module Dor
     def current_priority
       cp = workflows.detect(&:expedited?)
       return 0 if cp.nil?
+
       cp.priority.to_i
     end
 

data/lib/dor/exceptions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class Exception < ::StandardError; end
   class ParameterError < Exception; end

data/lib/dor/indexers/data_indexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   # Indexing provided by ActiveFedora
   class DataIndexer
@@ -8,6 +10,20 @@ module Dor
       @resource = resource
     end
 
+    # we need to override this until https://github.com/samvera/active_fedora/pull/1371
+    # has been released
+    def to_solr(solr_doc = {}, opts = {})
+      super.tap do |doc|
+        doc['active_fedora_model_ssi'] = has_model
+      end
+    end
+
+    # rubocop:disable Naming/PredicateName
+    def has_model
+      resource.class.inspect
+    end
+    # rubocop:enable Naming/PredicateName
+
     delegate :create_date, :modified_date, :state, :pid, :inner_object,
              :datastreams, :relationships, to: :resource
   end

data/lib/dor/indexers/describable_indexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class DescribableIndexer
     attr_reader :resource

data/lib/dor/indexers/editable_indexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class EditableIndexer
     include SolrDocHelper

data/lib/dor/indexers/identifiable_indexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class IdentifiableIndexer
     include SolrDocHelper
@@ -26,7 +28,7 @@ module Dor
       add_solr_value(solr_doc, 'title_sort', resource.label, :string, [:stored_sortable])
 
       rels_doc = Nokogiri::XML(resource.datastreams['RELS-EXT'].content)
-      ns_hash = {'hydra' => 'http://projecthydra.org/ns/relations#', 'fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'}
+      ns_hash = { 'hydra' => 'http://projecthydra.org/ns/relations#', 'fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' }
       apos = rels_doc.search('//rdf:RDF/rdf:Description/hydra:isGovernedBy', ns_hash)
       collections = rels_doc.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection', ns_hash)
       solrize_related_obj_titles(solr_doc, apos, @@apo_hash, 'apo_title', 'nonhydrus_apo_title', 'hydrus_apo_title')
@@ -46,28 +48,35 @@ module Dor
       end
     end
 
+    # Clears out the cache of items. Used primarily in testing.
+    def self.reset_cache!
+      @@collection_hash = {}
+      @@apo_hash = {}
+    end
+
     private
 
     def solrize_related_obj_titles(solr_doc, relationships, title_hash, union_field_name, nonhydrus_field_name, hydrus_field_name)
       # TODO: if you wanted to get a little fancier, you could also solrize a 2 level hierarchy and display using hierarchial facets, like
       # ["SOURCE", "SOURCE : TITLE"] (e.g. ["Hydrus", "Hydrus : Special Collections"], see (exploded) tags in IdentityMetadataDS#to_solr).
-      title_type = :symbol  # we'll get an _ssim because of the type
-      title_attrs = [:stored_searchable]  # we'll also get a _tesim from this attr
+      title_type = :symbol # we'll get an _ssim because of the type
+      title_attrs = [:stored_searchable] # we'll also get a _tesim from this attr
       relationships.each do |rel_node|
         rel_druid = rel_node['rdf:resource']
-        next unless rel_druid   # TODO: warning here would also be useful
+        next unless rel_druid # TODO: warning here would also be useful
+
         rel_druid = rel_druid.gsub('info:fedora/', '')
 
         # populate cache if necessary
         unless title_hash.key?(rel_druid)
           begin
             related_obj = Dor.find(rel_druid)
-            related_obj_title = get_related_obj_display_title(related_obj, rel_druid)
-            is_from_hydrus = (related_obj && related_obj.tags.include?('Project : Hydrus'))
-            title_hash[rel_druid] = {'related_obj_title' => related_obj_title, 'is_from_hydrus' => is_from_hydrus}
+            related_obj_title = related_obj_display_title(related_obj, rel_druid)
+            is_from_hydrus = (related_obj&.tags&.include?('Project : Hydrus'))
+            title_hash[rel_druid] = { 'related_obj_title' => related_obj_title, 'is_from_hydrus' => is_from_hydrus }
           rescue ActiveFedora::ObjectNotFoundError
             # This may happen if the given APO or Collection does not exist (bad data)
-            title_hash[rel_druid] = {'related_obj_title' => rel_druid, 'is_from_hydrus' => false}
+            title_hash[rel_druid] = { 'related_obj_title' => rel_druid, 'is_from_hydrus' => false }
           end
         end
 
@@ -80,5 +89,11 @@ module Dor
         add_solr_value(solr_doc, union_field_name, title_hash[rel_druid]['related_obj_title'], title_type, title_attrs)
       end
     end
+
+    def related_obj_display_title(related_obj, default_title)
+      return default_title unless related_obj
+
+      related_obj.full_title || default_title
+    end
   end
 end

data/lib/dor/indexers/processable_indexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class ProcessableIndexer
     include SolrDocHelper

data/lib/dor/indexers/releasable_indexer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class ReleasableIndexer
     include SolrDocHelper

data/lib/dor/models/abstract.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class Abstract < ::ActiveFedora::Base
     include Identifiable

data/lib/dor/models/admin_policy_object.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class AdminPolicyObject < Dor::Abstract
     include Editable

data/lib/dor/models/agreement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dor
   class Agreement < Item
     has_object_type 'agreement'