dor-services 7.2.4 → 8.0.0

data/lib/dor/services/state_service.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Dor
+  class StateService
+    def initialize(pid)
+      @pid = pid
+    end
+
+    def allows_modification?
+      !client.lifecycle('dor', pid, 'submitted') ||
+        client.active_lifecycle('dor', pid, 'opened') ||
+        client.workflow_status('dor', pid, 'accessionWF', 'sdr-ingest-transfer') == 'hold'
+    end
+
+    private
+
+    attr_reader :pid
+
+    def client
+      Dor::Config.workflow.client
+    end
+  end
+end

data/lib/dor/static_config.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require 'rsolr'
+
+module Dor
+  # Provides configuration for dor-services
+  class StaticConfig
+    extend ActiveSupport::Autoload
+    eager_autoload do
+      autoload :SslConfig
+      autoload :FedoraConfig
+      autoload :SolrConfig
+      autoload :StacksConfig
+      autoload :SuriConfig
+      autoload :WorkflowConfig
+    end
+
+    def initialize(hash)
+      @ssl = SslConfig.new(hash.fetch(:ssl))
+      @fedora = FedoraConfig.new(hash.fetch(:fedora))
+      @solr = SolrConfig.new(hash.fetch(:solr))
+      @stacks = StacksConfig.new(hash.fetch(:stacks))
+      @suri = SuriConfig.new(hash.fetch(:suri))
+      @workflow = WorkflowConfig.new(hash.fetch(:workflow))
+    end
+
+    def configure(&block)
+      instance_eval(&block)
+      maybe_connect_solr
+    end
+
+    def maybe_connect_solr
+      return unless solr.url.present?
+
+      ActiveFedora::SolrService.register
+      ActiveFedora::SolrService.instance.instance_variable_set :@conn, make_solr_connection
+    end
+
+    def make_solr_connection
+      ::RSolr.connect(url: Dor::Config.solr.url)
+    end
+
+    # This is consumed by ActiveFedora.configurator
+    def solr_config
+      { url: solr.url }
+    end
+
+    # This is consumed by ActiveFedora.configurator
+    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
+
+    # This is consumed by ActiveFedora.configurator
+    def predicate_config
+      # rubocop:disable Security/YAMLLoad
+      YAML.load(File.read(File.expand_path('../../config/predicate_mappings.yml', __dir__)))
+      # rubocop:enable Security/YAMLLoad
+    end
+
+    def default_ssl_cert_store
+      @default_ssl_cert_store ||= RestClient::Request.default_ssl_cert_store
+    end
+
+    def cleanup
+      @cleanup.configure(&block) if block_given?
+      @cleanup
+    end
+
+    def ssl(&block)
+      @ssl.configure(&block) if block_given?
+      @ssl
+    end
+
+    def fedora(&block)
+      @fedora.configure(&block) if block_given?
+      @fedora
+    end
+
+    def solr(&block)
+      @solr.configure(&block) if block_given?
+
+      @solr
+    end
+
+    def stacks(&block)
+      @stacks.configure(&block) if block_given?
+
+      @stacks
+    end
+
+    def suri(&block)
+      @suri.configure(&block) if block_given?
+
+      @suri
+    end
+
+    def workflow(&block)
+      @workflow.configure(&block) if block_given?
+
+      @workflow
+    end
+  end
+end

data/lib/dor/static_config/fedora_config.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+require 'dor/certificate_authenticated_rest_resource_factory'
+
+module Dor
+  class StaticConfig
+    # Represents the configuration for Fedora 3
+    class FedoraConfig
+      def initialize(hash)
+        @url = hash.fetch(:url)
+      end
+
+      def configure(&block)
+        instance_eval(&block)
+      end
+
+      def client
+        CertificateAuthenticatedRestResourceFactory.create(:fedora)
+      end
+
+      def url(new_value = nil)
+        @url = new_value if new_value
+        @url
+      end
+
+      # The url without the username or password
+      def safeurl
+        fedora_uri = URI.parse(url)
+        fedora_uri.user = fedora_uri.password = nil
+        fedora_uri.to_s
+      rescue URI::InvalidURIError
+        nil
+      end
+    end
+  end
+end

data/lib/dor/static_config/solr_config.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Dor
+  class StaticConfig
+    class SolrConfig
+      # Represents the configuration for Solr
+      def initialize(hash)
+        @url = hash.fetch(:url)
+      end
+
+      def configure(&block)
+        instance_eval(&block)
+      end
+
+      def url(new_value = nil)
+        @url = new_value if new_value
+        @url
+      end
+    end
+  end
+end

data/lib/dor/static_config/ssl_config.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Dor
+  class StaticConfig
+    class SslConfig
+      # Represents the client side certificate configuration for Fedora 3
+      def initialize(hash)
+        @cert_file = hash.fetch(:cert_file)
+        @key_file = hash.fetch(:key_file)
+        @key_pass = hash.fetch(:key_pass)
+      end
+
+      def configure(&block)
+        instance_eval(&block)
+      end
+
+      def cert_file(new_value = nil)
+        @cert_file = new_value if new_value
+        @cert_file
+      end
+
+      def key_file(new_value = nil)
+        @key_file = new_value if new_value
+        @key_file
+      end
+
+      def key_pass(new_value = nil)
+        @key_pass = new_value if new_value
+        @key_pass
+      end
+    end
+  end
+end

data/lib/dor/static_config/stacks_config.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Dor
+  class StaticConfig
+    # Represents the configuration for the shared filesystem direcotories
+    class StacksConfig
+      def initialize(hash)
+        @document_cache_host = hash.fetch(:document_cache_host)
+        @local_stacks_root = hash.fetch(:local_stacks_root)
+        @local_workspace_root = hash.fetch(:local_workspace_root)
+        @local_document_cache_root = hash.fetch(:local_document_cache_root)
+      end
+
+      def configure(&block)
+        instance_eval(&block)
+      end
+
+      def document_cache_host(new_value = nil)
+        @document_cache_host = new_value if new_value
+        @document_cache_host
+      end
+
+      def local_stacks_root(new_value = nil)
+        @local_stacks_root = new_value if new_value
+        @local_stacks_root
+      end
+
+      def local_workspace_root(new_value = nil)
+        @local_workspace_root = new_value if new_value
+        @local_workspace_root
+      end
+
+      def local_document_cache_root(new_value = nil)
+        @local_document_cache_root = new_value if new_value
+        @local_document_cache_root
+      end
+    end
+  end
+end

data/lib/dor/static_config/suri_config.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Dor
+  class StaticConfig
+    # Represents the configuration for the identifier minter service (suri)
+    class SuriConfig
+      def initialize(hash)
+        @mint_ids = hash.fetch(:mint_ids)
+        @pass = hash.fetch(:pass)
+        @id_namespace = hash.fetch(:id_namespace)
+        @url = hash.fetch(:url)
+        @user = hash.fetch(:user)
+      end
+
+      def configure(&block)
+        instance_eval(&block)
+      end
+
+      def mint_ids(new_value = nil)
+        @mint_ids = new_value if new_value
+        @mint_ids
+      end
+
+      def id_namespace(new_value = nil)
+        @id_namespace = new_value if new_value
+        @id_namespace
+      end
+
+      def url(new_value = nil)
+        @url = new_value if new_value
+        @url
+      end
+
+      def user(new_value = nil)
+        @user = new_value if new_value
+        @user
+      end
+
+      def pass(new_value = nil)
+        @pass = new_value if new_value
+        @pass
+      end
+    end
+  end
+end

data/lib/dor/static_config/workflow_config.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Dor
+  class StaticConfig
+    # Represents the configuration for the workflow service
+    class WorkflowConfig
+      def initialize(hash)
+        @url = hash.fetch(:url)
+        @timeout = hash.fetch(:timeout)
+        @logfile = hash.fetch(:logfile)
+        @shift_age = hash.fetch(:shift_age)
+      end
+
+      def configure(&block)
+        instance_eval(&block)
+      end
+
+      def client
+        @client ||= Dor::Workflow::Client.new(url: url, logger: client_logger, timeout: timeout)
+      end
+
+      def url(new_value = nil)
+        @url = new_value if new_value
+        @url
+      end
+
+      def timeout(new_value = nil)
+        @timeout = new_value if new_value
+        @timeout
+      end
+
+      def logfile(new_value = nil)
+        @logfile = new_value if new_value
+        @logfile
+      end
+
+      def shift_age(new_value = nil)
+        @shift_age = new_value if new_value
+        @shift_age
+      end
+
+      def client_logger
+        if logfile && shift_age
+          Logger.new(logfile, shift_age)
+        elsif logfile
+          Logger.new(logfile)
+        end
+      end
+    end
+  end
+end

data/lib/dor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dor
-  VERSION = '7.2.4'
+  VERSION = '8.0.0'
 end

data/lib/dor/workflow/document.rb

@@ -26,16 +26,6 @@ module Dor
         self.ng_xml = Nokogiri::XML(node)
       end
 
-      # is this an incomplete workflow with steps that have a priority > 0
-      def expedited?
-        processes.any? { |proc| !proc.completed? && proc.priority.to_i > 0 }
-      end
-
-      # @return [Integer] value of the first > 0 priority.  Defaults to 0
-      def priority
-        processes.map { |proc| proc.priority.to_i }.detect(0) { |p| p > 0 }
-      end
-
       # @return [Dor::WorkflowDefinitionDs]
       def definition
         @definition ||= begin

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 7.2.4
+  version: 8.0.0
 platform: ruby
 authors:
 - Michael Klein
@@ -11,10 +11,16 @@ authors:
 - Renzo Sanchez-Silva
 - Joseph Atzberger
 - Johnathan Martin
+- Naomi Dushay
+- Justin Coyne
+- Chris Beer
+- Peter Mangiafico
+- Michael J. Giarlo
+- Justin Littman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -50,20 +56,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.1'
-- !ruby/object:Gem::Dependency
-  name: confstruct
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.7
 - !ruby/object:Gem::Dependency
   name: deprecation
   requirement: !ruby/object:Gem::Requirement
@@ -78,26 +70,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dor-services-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -214,20 +186,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '3'
-- !ruby/object:Gem::Dependency
-  name: ruby-cache
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rubydora
   requirement: !ruby/object:Gem::Requirement
@@ -282,14 +240,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement
@@ -422,14 +380,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.74.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.65.0
+        version: 0.74.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -488,7 +446,7 @@ dependencies:
         version: '0'
 description: Contains classes to register objects and initialize workflows
 email:
-- mbklein@stanford.edu
+- dlss-infrastructure-team@lists.stanford.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -540,26 +498,29 @@ files:
 - lib/dor/models/set.rb
 - lib/dor/models/workflow_object.rb
 - lib/dor/models/workflow_solr_document.rb
+- lib/dor/release_tags.rb
+- lib/dor/release_tags/identity_metadata.rb
+- lib/dor/release_tags/purl.rb
+- lib/dor/release_tags/purl_client.rb
 - lib/dor/rest_resource_factory.rb
-- lib/dor/services/cleanup_service.rb
 - lib/dor/services/collection_service.rb
-- lib/dor/services/create_workflow_service.rb
 - lib/dor/services/creative_commons_license_service.rb
-- lib/dor/services/delete_service.rb
 - lib/dor/services/embargo_service.rb
-- lib/dor/services/metadata_handlers/catalog_handler.rb
-- lib/dor/services/metadata_service.rb
-- lib/dor/services/mods2dc.xslt
 - lib/dor/services/ontology.rb
 - lib/dor/services/open_data_license_service.rb
-- lib/dor/services/public_desc_metadata_service.rb
-- lib/dor/services/purl_client.rb
 - lib/dor/services/release_tag_service.rb
 - lib/dor/services/search_service.rb
+- lib/dor/services/state_service.rb
 - lib/dor/services/status_service.rb
 - lib/dor/services/suri_service.rb
 - lib/dor/services/tag_service.rb
-- lib/dor/services/thumbnail_service.rb
+- lib/dor/static_config.rb
+- lib/dor/static_config/fedora_config.rb
+- lib/dor/static_config/solr_config.rb
+- lib/dor/static_config/ssl_config.rb
+- lib/dor/static_config/stacks_config.rb
+- lib/dor/static_config/suri_config.rb
+- lib/dor/static_config/workflow_config.rb
 - lib/dor/utils/hydrus_shims.rb
 - lib/dor/utils/ng_tidy.rb
 - lib/dor/utils/pid_utils.rb
@@ -589,8 +550,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library