dor-services 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ab63108ab2c8ddd29600d7a9facf709a67dc52474d7c0de6becac108664807
-  data.tar.gz: 332ce5d6ceef2432a7135788bc87de7d28ec108ff9820bc5c4e253ba0f8f700a
+  metadata.gz: 8610285f6083a621745b30d7bd063bf732e33052ff2f8be6ea6fd5f976bbcfe1
+  data.tar.gz: 0f235f97bdc5e5102cc675a2789eafce2cf12a10fa1ba06772b69f864707e476
 SHA512:
-  metadata.gz: 5742a34bb7b5250df9ca07b5c2b4291f59b165acc1050dbc9f76f9bd185d4a5bd0bc961552ab20e40d13b42c631ac0c0c3c515347ae9476b2811ec5dd75f2ad0
-  data.tar.gz: edb36ac7a3bcce46e5d3111c4a23bf69fed05afda48c82d42f0bbcbcca564d128b180774d7cf6231e168e7b3301af40a15a552f57f226a97259e582173a1c29d
+  metadata.gz: 1bbe06840429b3612a827375b54022fc43ea9318153acc4e4b68c747c025f0e12b460630a211ddbdd0a9030be42a8160ce8eeea30b1ce0872e653364aca02709
+  data.tar.gz: 3222dd6c0435580bbf452c9cc89b6ebcedd47d8b279f127dfc256621b9d4ce9ee50b08a2ea4adaf5d3d29bbc2d45f6bd4155a835b5bba5fba24e241c7ffc490d

data/lib/dor-services.rb

@@ -90,6 +90,7 @@ module Dor
     autoload :IdentifiableIndexer
     autoload :ProcessableIndexer
     autoload :ReleasableIndexer
+    autoload :WorkflowIndexer
   end
 
   # datastreams

data/lib/dor/datastreams/workflow_ds.rb

@@ -3,6 +3,9 @@
 module Dor
   # TODO: class docs
   class WorkflowDs < ActiveFedora::OmDatastream
+    extend Deprecation
+    self.deprecation_horizon = 'dor-services version 7.0.0'
+
     before_save :build_location
     set_terminology do |t|
       t.root(path: 'workflows')
@@ -38,8 +41,10 @@ module Dor
 
       Workflow::Document.new(xml.to_s)
     end
+    deprecation_deprecate get_workflow: 'This has been moved to Argo and will be discontinued'
 
     alias [] get_workflow
+    deprecation_deprecate :[] => 'This has been moved to Argo and will be discontinued'
 
     def ng_xml
       @ng_xml ||= Nokogiri::XML::Document.parse(content)
@@ -51,7 +56,8 @@ module Dor
     def content(refresh = false)
       @content = nil if refresh
       @content ||= Dor::Config.workflow.client.get_workflow_xml 'dor', pid, nil
-    rescue Dor::WorkflowException
+    rescue Dor::WorkflowException => e
+      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$/
@@ -76,9 +82,8 @@ module Dor
       cp.priority.to_i
     end
 
-    def to_solr(solr_doc = {}, *args)
-      # super solr_doc, *args
-      workflows.each { |wf| solr_doc = wf.to_solr(solr_doc, *args) }
+    def to_solr(solr_doc = {}, *_args)
+      # noop - indexing is done by the WorkflowIndexer
       solr_doc
     end
 

data/lib/dor/indexers/workflow_indexer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Dor
+  # Indexes the objects position in workflows
+  class WorkflowIndexer
+    include SolrDocHelper
+
+    attr_reader :resource
+    def initialize(resource:)
+      @resource = resource
+    end
+
+    # @return [Hash] the partial solr document for workflow concerns
+    def to_solr
+      {}.tap do |solr_doc|
+        workflows.each { |wf| solr_doc = wf.to_solr(solr_doc) }
+      end
+    end
+
+    private
+
+    # @returns [Array<Dor::WorkflowDocument>]
+    def workflows
+      resource.workflows.workflows
+    end
+  end
+end

data/lib/dor/models/admin_policy_object.rb

@@ -15,7 +15,8 @@ module Dor
       DescribableIndexer,
       EditableIndexer,
       IdentifiableIndexer,
-      ProcessableIndexer
+      ProcessableIndexer,
+      WorkflowIndexer
     )
   end
 end

data/lib/dor/models/collection.rb

@@ -11,7 +11,8 @@ module Dor
       DescribableIndexer,
       IdentifiableIndexer,
       ProcessableIndexer,
-      ReleasableIndexer
+      ReleasableIndexer,
+      WorkflowIndexer
     )
   end
 end

data/lib/dor/models/concerns/preservable.rb

@@ -3,6 +3,8 @@
 module Dor
   module Preservable
     extend ActiveSupport::Concern
+    extend Deprecation
+    self.deprecation_horizon = 'dor-services version 7.0.0'
 
     included do
       has_metadata name: 'provenanceMetadata', type: ProvenanceMetadataDS, label: 'Provenance Metadata'
@@ -21,6 +23,7 @@ module Dor
     def sdr_ingest_transfer(agreement_id)
       SdrIngestService.transfer(self, agreement_id)
     end
+    deprecation_deprecate sdr_ingest_transfer: 'Use SdrIngestService.transfer instead'
 
     private
 

data/lib/dor/models/item.rb

@@ -18,7 +18,8 @@ module Dor
       DescribableIndexer,
       IdentifiableIndexer,
       ProcessableIndexer,
-      ReleasableIndexer
+      ReleasableIndexer,
+      WorkflowIndexer
     )
 
     has_metadata name: 'technicalMetadata', type: TechnicalMetadataDS, label: 'Technical Metadata', control_group: 'M'

data/lib/dor/models/set.rb

@@ -11,7 +11,8 @@ module Dor
       DataIndexer,
       DescribableIndexer,
       IdentifiableIndexer,
-      ProcessableIndexer
+      ProcessableIndexer,
+      WorkflowIndexer
     )
   end
 end

data/lib/dor/models/workflow_object.rb

@@ -14,7 +14,8 @@ module Dor
       DataIndexer,
       DescribableIndexer,
       IdentifiableIndexer,
-      ProcessableIndexer
+      ProcessableIndexer,
+      WorkflowIndexer
     )
 
     def self.find_by_name(name)

data/lib/dor/version.rb

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

data/lib/dor/workflow/document.rb

@@ -67,7 +67,8 @@ module Dor
         @processes ||=
           if definition
             definition.processes.collect do |process|
-              node = ng_xml.at("/workflow/process[@name = '#{process.name}']")
+              nodes = ng_xml.xpath("/workflow/process[@name = '#{process.name}']")
+              node = nodes.max { |a, b| a.attr('version').to_i <=> b.attr('version').to_i }
               process.update!(node, self)
             end
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.3.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -512,6 +512,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.60.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -609,6 +623,7 @@ files:
 - lib/dor/indexers/identifiable_indexer.rb
 - lib/dor/indexers/processable_indexer.rb
 - lib/dor/indexers/releasable_indexer.rb
+- lib/dor/indexers/workflow_indexer.rb
 - lib/dor/models/abstract.rb
 - lib/dor/models/admin_policy_object.rb
 - lib/dor/models/agreement.rb