dor-services 7.2.4 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57815dc1bd6975e0c465e24baa1c7dbe62ad7b1a9e981d33e0c5eef6a17760db
-  data.tar.gz: 063fb43bd5f584359cf71bccca0013bfa40621a1571b2866efa1b8cbbae7d336
+  metadata.gz: 2b23b30fbc918705e040049d04869e4ce0ca5d2c9060aa52cbc3cb17bcbf1efa
+  data.tar.gz: 75f7b272d2bd43b5cc6546f9881f15cd3f85f484bc5a219c710ac428efb8a558
 SHA512:
-  metadata.gz: cb972848b34b46f78aafbeb4cd250406a989f3563b0d0ea3ae630aa1b64de9afd19e68d1ec664f64aea68d35d5a56ddda2db2e87d42ce636174dfd6da6e7e888
-  data.tar.gz: 134334347411b72274708334175656d887d564463176a884d07e546bcbd7750a271c72635ee18ab827b7cd4e89456cefbd12c1b95e5e3ff978b957e80d59a85f
+  metadata.gz: f0fb8fe1755b93d8257f74b17ebc822e287dbb9d69c2a2376b05b6a45bc0f7241f68d8ffb0b36b0294e42b5030af223e9660e48c116e6c86882cc88f25e1589c
+  data.tar.gz: 4de638d794ec9b372f3093c5ee432067c9ebca4fc213b7d4793a77f29b9d6bbde92cdf180e0f00844ac6cea89ed048639a2817e67f38743f21d03d199c74c327

data/config/config_defaults.yml

@@ -1,42 +1,25 @@
 ---
-:cleanup:
-  :local_workspace_root: /dor/workspace
-  :local_assembly_root: /dor/assembly
-  :local_export_home: /dor/export
-:ssl:
-  :cert_file:
-  :key_file:
-  :key_pass: ""
-:fedora:
-  :url:
-:solr:
-  :url:
-  :opts: {}
-:metadata:
-  :catalog:
-    :url:
-    :user:
-    :pass:
-:stacks:
-  :local_workspace_root: /dor
-  :host:
-  :user:
-  :document_cache_host:
-  :document_cache_user:
-  :local_stacks_root: /stacks
-  :local_document_cache_root: /purl/document_cache
-  :url:
-  :iiif_profile: 'http://iiif.io/api/image/2/level1.json'
-:suri:
-  :pass:
-  :id_namespace: druid
-  :url:
-  :user:
-  :mint_ids: false
-:workflow:
-  :url:
-  :timeout: 60
-  :logfile: workflow_service.log
-  :shift_age: weekly
-:dor_services:
-  :url:
+ssl:
+  cert_file:
+  key_file:
+  key_pass: ""
+fedora:
+  url:
+solr:
+  url:
+stacks:
+  local_workspace_root: /dor
+  document_cache_host:
+  local_stacks_root: /stacks
+  local_document_cache_root: /purl/document_cache
+suri:
+  pass:
+  id_namespace: druid
+  url:
+  user:
+  mint_ids: false
+workflow:
+  url:
+  timeout: 60
+  logfile: workflow_service.log
+  shift_age: weekly

data/config/dev_console_env.rb.example

@@ -21,24 +21,15 @@ Dor::Config.configure do
     pass ''
   end
 
-  metadata do
-    exist.url   'http://server/exist/rest/'
-    catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
-  end
-
   stacks do
     document_cache_host 'purl-dev.stanford.edu'
-    document_cache_user ''
     local_workspace_root '/dor/workspace'
-    host 'host'
-    user ''
     local_stacks_root '/stacks'
     local_document_cache_root '/purl'
   end
 
   solr.url     'https://host/solr'
   workflow.url     'https://workflow.example.edu/'
-  dor_services.url 'https://host/dor/v1'
 
   cleanup do
     local_workspace_root '/dor/workspace'

data/lib/dor-services.rb

@@ -36,6 +36,7 @@ module Dor
   end
 
   require 'dor/version'
+  require 'dor/static_config'
   require 'dor/config'
   require 'dor/exceptions'
 
@@ -87,6 +88,8 @@ module Dor
   end
 
   eager_autoload do
+    autoload :ReleaseTags
+
     # ActiveFedora Classes
     autoload_under 'models' do
       autoload :Abstract
@@ -104,25 +107,19 @@ module Dor
 
   # Services
   autoload_under 'services' do
-    autoload :CleanupService
     autoload :CollectionService
-    autoload :CreateWorkflowService
     autoload :CreativeCommonsLicenseService
-    autoload :DeleteService
     autoload :EmbargoService
-    autoload :IndexingService
-    autoload :MetadataService
+    autoload :IdentityMetadataTagService
     autoload :Ontology
     autoload :OpenDataLicenseService
-    autoload :PublicDescMetadataService
-    autoload :PublishedRelationshipsFilter
-    autoload :PurlClient
+    autoload :PurlTagService
     autoload :ReleaseTagService
     autoload :SearchService
     autoload :StatusService
+    autoload :StateService
     autoload :SuriService
     autoload :TagService
-    autoload :ThumbnailService
   end
 
   # Workflow Classes

data/lib/dor/config.rb

@@ -1,133 +1,9 @@
 # frozen_string_literal: true
 
-require 'confstruct/configuration'
-require 'rsolr'
 require 'yaml'
-require 'dor/certificate_authenticated_rest_resource_factory'
-require 'dor/services/client'
 
 module Dor
-  class Configuration < Confstruct::Configuration
-    include ActiveSupport::Callbacks
-    define_callbacks :initialize
-    define_callbacks :configure
-
-    def initialize(*args)
-      super *args
-      run_callbacks(:initialize) {}
-    end
-
-    # Call the super method with callbacks and with $VERBOSE temporarily disabled
-    def configure(*args)
-      result = self
-      temp_verbose = $VERBOSE
-      $VERBOSE = nil
-      begin
-        run_callbacks :configure do
-          result = super(*args)
-        end
-      ensure
-        $VERBOSE = temp_verbose
-      end
-      result
-    end
-
-    def sanitize
-      dup
-    end
-
-    def make_solr_connection(add_opts = {})
-      opts = Dor::Config.solr.opts.merge(add_opts).merge(
-        url: Dor::Config.solr.url
-      )
-      ::RSolr.connect(opts)
-    end
-
-    set_callback :initialize, :after do |config|
-      config.deep_merge!(
-        fedora: {
-          client: Confstruct.deferred { |_c| CertificateAuthenticatedRestResourceFactory.create(:fedora) },
-          safeurl: Confstruct.deferred do |_c|
-            begin
-              fedora_uri = URI.parse(config.fedora.url)
-              fedora_uri.user = fedora_uri.password = nil
-              fedora_uri.to_s
-            rescue URI::InvalidURIError
-              nil
-            end
-          end
-        },
-        dor_services: {
-          rest_client: Confstruct.deferred { |_c| RestResourceFactory.create(:dor_services) }
-        },
-        purl_services: {
-          rest_client: Confstruct.deferred { |_c| RestResourceFactory.create(:purl_services) }
-        },
-        workflow: {
-          client: Confstruct.deferred do |c|
-            @wfs ||= Dor::Workflow::Client.new(url: c.url, logger: c.client_logger, timeout: c.timeout)
-          end,
-          client_logger: Confstruct.deferred do |c|
-                           if c.logfile && c.shift_age
-                             Logger.new(c.logfile, c.shift_age)
-                           elsif c.logfile
-                             Logger.new(c.logfile)
-                           end
-                         end
-        }
-      )
-      true
-    end
-
-    set_callback :configure, :after do |config|
-      configure_client!(config)
-
-      if config.solr.url.present?
-        ActiveFedora::SolrService.register
-        ActiveFedora::SolrService.instance.instance_variable_set :@conn, make_solr_connection
-      end
-    end
-
-    def configure_client!(config)
-      # Do not configure client if URL not specified
-      return if config.dor_services&.url.blank?
-
-      params = {
-        url: config.dor_services.url
-      }
-      params[:username] = config.dor_services.user if config.dor_services&.user.present?
-      params[:password] = config.dor_services.pass if config.dor_services&.pass.present?
-      params[:token] = config.dor_services.token if config.dor_services&.token.present?
-      params[:token_header] = config.dor_services.token_header if config.dor_services&.token_header.present?
-
-      Dor::Services::Client.configure(params)
-    end
-
-    # Act like an ActiveFedora.configurator
-    def init(*args); end
-
-    def fedora_config
-      fedora_uri = URI.parse(fedora.url)
-      connection_opts = { url: fedora.safeurl, user: fedora_uri.user, password: fedora_uri.password }
-      connection_opts[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(ssl.cert_file)) if ssl.cert_file.present?
-      connection_opts[:ssl_client_key] = OpenSSL::PKey::RSA.new(File.read(ssl.key_file), ssl.key_pass) if ssl.key_file.present?
-      connection_opts[:ssl_cert_store] = default_ssl_cert_store
-      connection_opts
-    end
-
-    def solr_config
-      { url: solr.url }
-    end
-
-    def predicate_config
-      YAML.load(File.read(File.expand_path('../../config/predicate_mappings.yml', __dir__)))
-    end
-
-    def default_ssl_cert_store
-      @default_ssl_cert_store ||= RestClient::Request.default_ssl_cert_store
-    end
-  end
-
-  Config = Configuration.new(YAML.load(File.read(File.expand_path('../../config/config_defaults.yml', __dir__))))
+  defaults = YAML.safe_load(File.read(File.expand_path('../../config/config_defaults.yml', __dir__))).deep_symbolize_keys
+  Config = StaticConfig.new(defaults)
   ActiveFedora.configurator = Config
 end

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -35,6 +35,9 @@ module Dor
       t.shelved_file_id proxy: %i[resource shelved_file id], index_as: %i[displayable stored_searchable]
     end
 
+    extend Deprecation
+    self.deprecation_horizon = '8.0'
+
     ### READ ONLY METHODS
 
     # Only use this when you want the behavior of raising an exception if anything besides exactly one matching node
@@ -165,6 +168,7 @@ module Dor
       file_node['role'] = file[:role] if file[:role]
       file_node
     end
+    deprecation_deprecate :add_file
 
     # Copies the child's resource into the parent (self) as a virtual resource.
     # Assumes the resource isn't a duplicate of an existing virtual or real resource.
@@ -231,6 +235,7 @@ module Dor
       ng_xml.search('//contentMetadata').first.add_child(node)
       node
     end
+    deprecation_deprecate :add_resource
 
     # @param [String] resource_name ID of the resource
     def remove_resource(resource_name)
@@ -246,12 +251,14 @@ module Dor
         position += 1
       end
     end
+    deprecation_deprecate :remove_resource
 
     # @param [String] file_name ID of the file element
     def remove_file(file_name)
       ng_xml_will_change!
       ng_xml.search('//file[@id=\'' + file_name + '\']').each(&:remove)
     end
+    deprecation_deprecate :remove_file
 
     # @param [String] file_name ID of the file element
     # @param [String] publish

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -31,7 +31,7 @@ module Dor
     def to_solr(solr_doc = {}, *args)
       solr_doc = super
       #::Solrizer.insert_field(solr_doc, field_name, value, *index_types)
-      rd1  = release_date
+      rd1 = release_date
       rd20 = twenty_pct_release_date
       ::Solrizer.insert_field(solr_doc, 'embargo_release', rd1.utc.strftime('%FT%TZ'), :dateable) unless rd1.blank?
       ::Solrizer.insert_field(solr_doc, 'twenty_pct_visibility_release', rd20.utc.strftime('%FT%TZ'), :dateable) unless rd20.blank?

data/lib/dor/datastreams/role_metadata_ds.rb

@@ -40,7 +40,7 @@ module Dor
         val = [actor.at_xpath('identifier/@type'), actor.at_xpath('identifier/text()')].join ':'
         add_solr_value(solr_doc, "apo_role_#{actor.name}_#{role_type}", val, :string, [:symbol])
         add_solr_value(solr_doc, "apo_role_#{role_type}", val, :string, [:symbol])
-        add_solr_value(solr_doc, 'apo_register_permissions', val, :string, %i[symbol stored_searchable]) if ['dor-apo-manager', 'dor-apo-depositor'].include? role_type
+        add_solr_value(solr_doc, 'apo_register_permissions', val, :string, %i[symbol stored_searchable]) if %w[dor-apo-manager dor-apo-depositor].include? role_type
       end
       solr_doc
     end

data/lib/dor/datastreams/workflow_definition_ds.rb

@@ -53,28 +53,6 @@ module Dor
       ng_xml.at_xpath('/workflow-def/@repository').to_s
     end
 
-    # Creates the xml used by Dor::Workflow::Client#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 do |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
-      end
-      Nokogiri::XML(doc.to_xml, &:noblanks).to_xml(&: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])

data/lib/dor/datastreams/workflow_ds.rb

@@ -1,23 +1,9 @@
 # frozen_string_literal: true
 
 module Dor
-  # TODO: class docs
-  class WorkflowDs < ActiveFedora::OmDatastream
+  # Represents the datastream that just holds the location of the workflow service
+  class WorkflowDs < ActiveFedora::Datastream
     before_save :build_location
-    set_terminology do |t|
-      t.root(path: 'workflows')
-      t.workflow do
-        t.workflowId(path: { attribute: 'id' })
-        t.process do
-          t.name_(path: { attribute: 'name' }, index_as: %i[displayable not_searchable])
-          t.status(path: { attribute: 'status' }, index_as: %i[displayable not_searchable])
-          t.timestamp(path: { attribute: 'datetime' }, index_as: %i[displayable not_searchable]) # , :data_type => :date)
-          t.elapsed(path: { attribute: 'elapsed' }, index_as: %i[displayable not_searchable])
-          t.lifecycle(path: { attribute: 'lifecycle' }, index_as: %i[displayable not_searchable])
-          t.attempts(path: { attribute: 'attempts' }, index_as: %i[displayable not_searchable])
-        end
-      end
-    end
 
     # Called before saving, but after a pid has been assigned
     def build_location
@@ -30,53 +16,5 @@ module Dor
     def self.default_attributes
       super.merge(mimeType: 'application/xml')
     end
-
-    def ng_xml
-      @ng_xml ||= Nokogiri::XML::Document.parse(content)
-    end
-
-    # @param [Boolean] refresh The WorkflowDS caches the content retrieved from the workflow
-    # service. This flag will invalidate the cached content and refetch it from the workflow
-    # service directly
-    def content(refresh = false)
-      @content = nil if refresh
-      @content ||= Dor::Config.workflow.client.all_workflows_xml pid
-    rescue Dor::WorkflowException => e
-      # TODO: I don't understand when this would be useful as this block ends up calling the workflow service too.
-      # Why not just raise an exception here?
-      Dor.logger.warn "Unable to connect to the workflow service #{e}. Falling back to placeholder XML"
-      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.workflow_xml('dor', pid, dsid))
-        xml.root.add_child(ds_content.root)
-      end
-      @content ||= xml.to_xml
-    end
-
-    def workflows
-      @workflows ||= workflow.nodeset.collect { |wf_node| Workflow::Document.new wf_node.to_xml }
-    end
-
-    # Finds the first workflow that is expedited, then returns the value of its priority
-    #
-    # @return [Integer] value of the priority.  Defaults to 0 if none of the workflows are expedited
-    def current_priority
-      cp = workflows.detect(&:expedited?)
-      return 0 if cp.nil?
-
-      cp.priority.to_i
-    end
-
-    def to_solr(solr_doc = {}, *_args)
-      # noop - indexing is done by the WorkflowsIndexer
-      solr_doc
-    end
-
-    # maintain AF < 8 indexing behavior
-    def prefix
-      ''
-    end
   end
 end