dor-services 5.32.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6a98b91f456de3720fd592ee203e53147e89b316596af0e9f505b624a3fddf9
-  data.tar.gz: dad70ca22ab235c15281acd92b9a609ddb081b2c1c577e4f94fa51cfe27075d3
+  metadata.gz: cddc117f7297f0e5610b46e5ef181dba30fb0fcd57d7a4f21309cd68a5d5eee8
+  data.tar.gz: 203483f92135bffbb04b40be6e4673153863eb305518f87922b8a7027797abe8
 SHA512:
-  metadata.gz: bffd3df8d64f6206b0e7e2e56ba997b93ff62f0b6cf80b865251505498e8bb340cc820f962875157d3db540593003e1d98f311523acb2f64a1f0db6089043a73
-  data.tar.gz: f23c44bc73d717373f4acebebaef225d2299ebc2b96db4f10d81d999a2b1546be15bd1ebaf6334f7b7cc43c46628d363938acb991ec694fe6d956cd9c628cf11
+  metadata.gz: 14cdd9ea0fa92d23c000de0f992209d9ceff820e143716b0c479ffde26c26c822c73f51f8d799e0ce6820f50beced8e2f0c69f0aca3266227a0341782f1a50ca
+  data.tar.gz: 4056a91b565637a56a126c35998ddbf1f1a8653821587d1a4ddba823a33df82b3a626a6747b0bc6bd6b8bd0cd6efb4e42c82178a698fbca300b33e9782198d37

data/lib/dor-services.rb

@@ -81,6 +81,16 @@ module Dor
 
   require 'druid-tools'
 
+  autoload_under 'indexers' do
+    autoload :CompositeIndexer
+    autoload :DataIndexer
+    autoload :DescribableIndexer
+    autoload :EditableIndexer
+    autoload :IdentifiableIndexer
+    autoload :ProcessableIndexer
+    autoload :ReleasableIndexer
+  end
+
   # datastreams
   autoload_under 'datastreams' do
     autoload :AdministrativeMetadataDS
@@ -154,12 +164,12 @@ module Dor
     autoload :CleanupResetService
     autoload :PublicDescMetadataService
     autoload :PublicXmlService
+    autoload :ThumbnailService
   end
 
   # Workflow Classes
   module Workflow
     extend ActiveSupport::Autoload
-    autoload :Graph
     autoload :Process
     autoload :Document
   end

data/lib/dor/datastreams/workflow_definition_ds.rb

@@ -37,10 +37,6 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
     add_child_node(ng_xml.at_xpath('/workflow-def'), :process, self, attributes)
   end
 
-  def graph(parent = nil)
-    Workflow::Graph.from_processes(repo, name, processes, parent)
-  end
-
   def processes
     ng_xml.xpath('/workflow-def/process').collect do |node|
       Workflow::Process.new(repo, name, node)

data/lib/dor/datastreams/workflow_ds.rb

@@ -49,17 +49,6 @@ module Dor
       @workflows ||= workflow.nodeset.collect { |wf_node| Workflow::Document.new wf_node.to_xml }
     end
 
-    def graph(dir = nil)
-      result = GraphViz.digraph(pid)
-      sg = result.add_graph('rank') { |g| g[:rank => 'same'] }
-      workflows.reject(&:nil?).each do |wf|
-        g = wf.graph(result)
-        sg.add_node(g.root.id) unless g.nil?
-      end
-      result['rankdir'] = dir || 'TB'
-      result
-    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

data/lib/dor/indexers/composite_indexer.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Dor
+  class CompositeIndexer
+    attr_reader :indexers
+    def initialize(*indexers)
+      @indexers = indexers
+    end
+
+    def new(resource:)
+      Instance.new(indexers, resource: resource)
+    end
+
+    class Instance
+      attr_reader :indexers, :resource
+      def initialize(indexers, resource:)
+        @resource = resource
+        @indexers = indexers.map { |i| i.new(resource: resource) }
+      end
+
+      # @return [Hash] the merged solr document for all the sub-indexers
+      def to_solr
+        indexers.map(&:to_solr).inject({}, &:merge)
+      end
+    end
+  end
+end

data/lib/dor/indexers/data_indexer.rb

@@ -0,0 +1,14 @@
+module Dor
+  # Indexing provided by ActiveFedora
+  class DataIndexer
+    include ActiveFedora::Indexing
+
+    attr_reader :resource
+    def initialize(resource:)
+      @resource = resource
+    end
+
+    delegate :create_date, :modified_date, :state, :pid, :inner_object,
+             :datastreams, :relationships, to: :resource
+  end
+end

data/lib/dor/indexers/describable_indexer.rb

@@ -0,0 +1,58 @@
+module Dor
+  class DescribableIndexer
+    attr_reader :resource
+    def initialize(resource:)
+      @resource = resource
+    end
+
+    # @return [Hash] the partial solr document for describable concerns
+    def to_solr
+      add_metadata_format_to_solr_doc.merge(add_mods_to_solr_doc)
+    end
+
+    def add_metadata_format_to_solr_doc
+      { 'metadata_format_ssim' => 'mods' }
+    end
+
+    def add_mods_to_solr_doc
+      solr_doc = {}
+      mods_sources = {
+        sw_title_display: %w(sw_display_title_tesim),
+        main_author_w_date: %w(sw_author_ssim sw_author_tesim),
+        sw_sort_author: %w(sw_author_sort_ssi),
+        sw_language_facet: %w(sw_language_ssim sw_language_tesim),
+        sw_genre: %w(sw_genre_ssim sw_genre_tesim),
+        format_main: %w(sw_format_ssim sw_format_tesim),
+        topic_facet: %w(sw_topic_ssim sw_topic_tesim),
+        era_facet: %w(sw_subject_temporal_ssim sw_subject_temporal_tesim),
+        geographic_facet: %w(sw_subject_geographic_ssim sw_subject_geographic_tesim),
+        [:term_values, :typeOfResource] => %w(mods_typeOfResource_ssim mods_typeOfResource_tesim),
+        pub_year_sort_str: %w(sw_pub_date_sort_ssi),
+        pub_year_int: %w(sw_pub_date_sort_isi),
+        pub_year_display_str: %w(sw_pub_date_facet_ssi)
+      }
+
+      mods_sources.each_pair do |meth, solr_keys|
+        vals = meth.is_a?(Array) ? resource.stanford_mods.send(meth.shift, *meth) : resource.stanford_mods.send(meth)
+
+        next if vals.nil? || (vals.respond_to?(:empty?) && vals.empty?)
+
+        solr_keys.each do |key|
+          solr_doc[key] ||= []
+          solr_doc[key].push(*vals)
+        end
+        # asterisk to avoid multi-dimensional array: push values, not the array
+      end
+
+      # convert multivalued fields to single value
+      %w(sw_pub_date_sort_ssi sw_pub_date_sort_isi sw_pub_date_facet_ssi).each do |key|
+        solr_doc[key] = solr_doc[key].first unless solr_doc[key].nil?
+      end
+      # some fields get explicit "(none)" placeholder values, mostly for faceting
+      %w(sw_language_tesim sw_genre_tesim sw_format_tesim).each do |key|
+        solr_doc[key] = ['(none)'] if solr_doc[key].nil? || solr_doc[key].empty?
+      end
+      solr_doc
+    end
+  end
+end

data/lib/dor/indexers/editable_indexer.rb

@@ -0,0 +1,23 @@
+module Dor
+  class EditableIndexer
+    include SolrDocHelper
+
+    attr_reader :resource
+    def initialize(resource:)
+      @resource = resource
+    end
+
+    def to_solr
+      {}.tap do |solr_doc|
+        add_solr_value(solr_doc, 'default_rights', default_rights_for_indexing, :string, [:symbol])
+        add_solr_value(solr_doc, 'agreement', resource.agreement, :string, [:symbol]) if resource.agreement_object
+        add_solr_value(solr_doc, 'default_use_license_machine', resource.use_license, :string, [:stored_sortable])
+      end
+    end
+
+    # @return [String] A description of the rights defined in the default object rights datastream. Can be 'Stanford', 'World', 'Dark' or 'None'
+    def default_rights_for_indexing
+      RightsMetadataDS::RIGHTS_TYPE_CODES.fetch(resource.default_rights, 'Unrecognized default rights value')
+    end
+  end
+end

data/lib/dor/indexers/identifiable_indexer.rb

@@ -0,0 +1,84 @@
+module Dor
+  class IdentifiableIndexer
+    include SolrDocHelper
+
+    attr_reader :resource
+    def initialize(resource:)
+      @resource = resource
+    end
+
+    ## Module-level variables, shared between ALL mixin includers (and ALL *their* includers/extenders)!
+    ## used for caching found values
+    @@collection_hash = {}
+    @@apo_hash = {}
+
+    # @return [Hash] the partial solr document for identifiable concerns
+    def to_solr
+      solr_doc = {}
+      resource.assert_content_model
+
+      solr_doc[Dor::INDEX_VERSION_FIELD] = Dor::VERSION
+      solr_doc['indexed_at_dtsi'] = Time.now.utc.xmlschema
+      resource.datastreams.values.each do |ds|
+        add_solr_value(solr_doc, 'ds_specs', ds.datastream_spec_string, :string, [:symbol]) unless ds.new?
+      end
+
+      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#'}
+      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')
+      solrize_related_obj_titles(solr_doc, collections, @@collection_hash, 'collection_title', 'nonhydrus_collection_title', 'hydrus_collection_title')
+      solr_doc['public_dc_relation_tesim'] ||= solr_doc['collection_title_tesim'] if solr_doc['collection_title_tesim']
+      solr_doc['metadata_source_ssi'] = identity_metadata_source
+      solr_doc
+    end
+
+    # @return [String] calculated value for Solr index
+    def identity_metadata_source
+      if resource.identityMetadata.otherId('catkey').first ||
+         resource.identityMetadata.otherId('barcode').first
+        'Symphony'
+      else
+        'DOR'
+      end
+    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
+      relationships.each do |rel_node|
+        rel_druid = rel_node['rdf:resource']
+        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}
+          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}
+          end
+        end
+
+        # cache should definitely be populated, so just use that to write solr field
+        if title_hash[rel_druid]['is_from_hydrus']
+          add_solr_value(solr_doc, hydrus_field_name, title_hash[rel_druid]['related_obj_title'], title_type, title_attrs)
+        else
+          add_solr_value(solr_doc, nonhydrus_field_name, title_hash[rel_druid]['related_obj_title'], title_type, title_attrs)
+        end
+        add_solr_value(solr_doc, union_field_name, title_hash[rel_druid]['related_obj_title'], title_type, title_attrs)
+      end
+    end
+  end
+end

data/lib/dor/indexers/processable_indexer.rb

@@ -0,0 +1,70 @@
+module Dor
+  class ProcessableIndexer
+    include SolrDocHelper
+
+    attr_reader :resource
+    def initialize(resource:)
+      @resource = resource
+    end
+
+    # @return [Hash] the partial solr document for processable concerns
+    def to_solr
+      solr_doc = {}
+      sortable_milestones = {}
+      current_version = '1'
+      begin
+        current_version = resource.versionMetadata.current_version_id
+      rescue StandardError
+      end
+      current_version_num = current_version.to_i
+
+      if resource.respond_to?('versionMetadata')
+        # add an entry with version id, tag and description for each version
+        while current_version_num > 0
+          new_val = "#{current_version_num};#{resource.versionMetadata.tag_for_version(current_version_num.to_s)};#{resource.versionMetadata.description_for_version(current_version_num.to_s)}"
+          add_solr_value(solr_doc, 'versions', new_val, :string, [:displayable])
+          current_version_num -= 1
+        end
+      end
+
+      resource.milestones.each do |milestone|
+        timestamp = milestone[:at].utc.xmlschema
+        sortable_milestones[milestone[:milestone]] ||= []
+        sortable_milestones[milestone[:milestone]] << timestamp
+        milestone[:version] ||= current_version
+        solr_doc['lifecycle_ssim'] ||= []
+        solr_doc['lifecycle_ssim'] << milestone[:milestone]
+        add_solr_value(solr_doc, 'lifecycle', "#{milestone[:milestone]}:#{timestamp};#{milestone[:version]}", :symbol)
+      end
+
+      sortable_milestones.each do |milestone, unordered_dates|
+        dates = unordered_dates.sort
+        # create the published_dttsi and published_day fields and the like
+        dates.each do |date|
+          solr_doc["#{milestone}_dttsim"] ||= []
+          solr_doc["#{milestone}_dttsim"] << date unless solr_doc["#{milestone}_dttsim"].include?(date)
+        end
+        # fields for OAI havester to sort on: _dttsi is trie date +stored +indexed (single valued, i.e. sortable)
+        solr_doc["#{milestone}_earliest_dttsi"] = dates.first
+        solr_doc["#{milestone}_latest_dttsi"] = dates.last
+      end
+      solr_doc['status_ssi'] = resource.status # status is singular (i.e. the current one)
+      solr_doc['current_version_isi'] = current_version.to_i
+      solr_doc['modified_latest_dttsi'] = resource.modified_date.to_datetime.utc.strftime('%FT%TZ')
+      add_solr_value(solr_doc, 'rights', resource.rights, :string, [:symbol]) if resource.respond_to? :rights
+
+      status_info_hash = resource.status_info
+      status_code = status_info_hash[:status_code]
+      add_solr_value(solr_doc, 'processing_status_text', simplified_status_code_disp_txt(status_code), :string, [:stored_sortable])
+      solr_doc['processing_status_code_isi'] = status_code # no _isi in Solrizer's default descriptors
+
+      solr_doc
+    end
+
+    # @return [String] text translation of the status code, minus any trailing parenthetical explanation
+    # e.g. 'In accessioning (described)' and 'In accessioning (described, published)' both return 'In accessioning'
+    def simplified_status_code_disp_txt(status_code)
+      Processable::STATUS_CODE_DISP_TXT[status_code].gsub(/\(.*\)$/, '').strip
+    end
+  end
+end

data/lib/dor/indexers/releasable_indexer.rb

@@ -0,0 +1,26 @@
+module Dor
+  class ReleasableIndexer
+    include SolrDocHelper
+
+    attr_reader :resource
+    def initialize(resource:)
+      @resource = resource
+    end
+
+    # @return [Hash] the partial solr document for releasable concerns
+    def to_solr
+      solr_doc = {}
+
+      # TODO: sort of worried about the performance impact in bulk reindex
+      # situations, since released_for recurses all parent collections.  jmartin 2015-07-14
+      resource.released_for(true).each { |release_target, release_info|
+        add_solr_value(solr_doc, 'released_to', release_target, :symbol, []) if release_info['release']
+      }
+
+      # TODO: need to solrize whether item is released to purl?  does released_for return that?
+      # logic is: "True when there is a published lifecycle and Access Rights is anything but Dark"
+
+      solr_doc
+    end
+  end
+end

data/lib/dor/models/abstract.rb

@@ -7,6 +7,10 @@ module Dor
     include Describable
     include Versionable
     include Processable
-    include Preservable
+    class_attribute :resource_indexer
+
+    def to_solr
+      resource_indexer.new(resource: self).to_solr
+    end
   end
 end

data/lib/dor/models/admin_policy_object.rb

@@ -7,5 +7,13 @@ module Dor
     has_metadata :name => 'administrativeMetadata', :type => Dor::AdministrativeMetadataDS, :label => 'Administrative Metadata'
     has_metadata :name => 'roleMetadata',           :type => Dor::RoleMetadataDS,           :label => 'Role Metadata'
     has_metadata :name => 'defaultObjectRights',    :type => Dor::DefaultObjectRightsDS,    :label => 'Default Object Rights'
+
+    self.resource_indexer = CompositeIndexer.new(
+      DataIndexer,
+      DescribableIndexer,
+      EditableIndexer,
+      IdentifiableIndexer,
+      ProcessableIndexer
+    )
   end
 end

data/lib/dor/models/agreement.rb

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

data/lib/dor/models/collection.rb

@@ -3,5 +3,12 @@ module Dor
     include Releaseable
 
     has_object_type 'collection'
+
+    self.resource_indexer = CompositeIndexer.new(
+      DescribableIndexer,
+      IdentifiableIndexer,
+      ProcessableIndexer,
+      ReleasableIndexer
+    )
   end
 end

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

@@ -64,57 +64,6 @@ module Dor
       PublicDescMetadataService.new(self).to_xml(**options)
     end
 
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super solr_doc, *args
-      add_metadata_format_to_solr_doc(solr_doc)
-      add_mods_to_solr_doc(solr_doc)
-    end
-
-    def add_metadata_format_to_solr_doc(solr_doc)
-      solr_doc['metadata_format_ssim'] ||= []
-      solr_doc['metadata_format_ssim'] += ['mods']
-    end
-
-    def add_mods_to_solr_doc(solr_doc)
-      mods_sources = {
-        sw_title_display: %w(sw_display_title_tesim),
-        main_author_w_date: %w(sw_author_ssim sw_author_tesim),
-        sw_sort_author: %w(sw_author_sort_ssi),
-        sw_language_facet: %w(sw_language_ssim sw_language_tesim),
-        sw_genre: %w(sw_genre_ssim sw_genre_tesim),
-        format_main: %w(sw_format_ssim sw_format_tesim),
-        topic_facet: %w(sw_topic_ssim sw_topic_tesim),
-        era_facet: %w(sw_subject_temporal_ssim sw_subject_temporal_tesim),
-        geographic_facet: %w(sw_subject_geographic_ssim sw_subject_geographic_tesim),
-        [:term_values, :typeOfResource] => %w(mods_typeOfResource_ssim mods_typeOfResource_tesim),
-        pub_year_sort_str: %w(sw_pub_date_sort_ssi),
-        pub_year_int: %w(sw_pub_date_sort_isi),
-        pub_year_display_str: %w(sw_pub_date_facet_ssi)
-      }
-
-      mods_sources.each_pair do |meth, solr_keys|
-        vals = meth.is_a?(Array) ? stanford_mods.send(meth.shift, *meth) : stanford_mods.send(meth)
-
-        next if vals.nil? || (vals.respond_to?(:empty?) && vals.empty?)
-
-        solr_keys.each do |key|
-          solr_doc[key] ||= []
-          solr_doc[key].push *vals
-        end
-        # asterisk to avoid multi-dimensional array: push values, not the array
-      end
-
-      # convert multivalued fields to single value
-      %w(sw_pub_date_sort_ssi sw_pub_date_sort_isi sw_pub_date_facet_ssi).each do |key|
-        solr_doc[key] = solr_doc[key].first unless solr_doc[key].nil?
-      end
-      # some fields get explicit "(none)" placeholder values, mostly for faceting
-      %w(sw_language_tesim sw_genre_tesim sw_format_tesim).each do |key|
-        solr_doc[key] = ['(none)'] if solr_doc[key].nil? || solr_doc[key].empty?
-      end
-      solr_doc
-    end
-
     # @param [Boolean] force Overwrite existing XML
     # @return [String] descMetadata.content XML
     def set_desc_metadata_using_label(force = false)

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

@@ -45,14 +45,6 @@ module Dor
                       :uri => 'http://opendatacommons.org/licenses/odbl/1.0/' }
     }.freeze
 
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-      add_solr_value(solr_doc, 'default_rights', default_rights_for_indexing, :string, [:symbol])
-      add_solr_value(solr_doc, 'agreement', agreement, :string, [:symbol]) if agreement_object
-      add_solr_value(solr_doc, 'default_use_license_machine', use_license, :string, [:stored_sortable])
-      solr_doc
-    end
-
     # Adds a person or group to a role in the APO role metadata datastream
     #
     # @param role   [String] the role the group or person will be filed under, ex. dor-apo-manager
@@ -280,11 +272,6 @@ module Dor
       end
     end
 
-    # @return [String] A description of the rights defined in the default object rights datastream. Can be 'Stanford', 'World', 'Dark' or 'None'
-    def default_rights_for_indexing
-      RightsMetadataDS::RIGHTS_TYPE_CODES.fetch(default_rights, 'Unrecognized default rights value')
-    end
-
     # Set the rights in default object rights
     # @param rights [String] Stanford, World, Dark, or None
     def default_rights=(rights)

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

@@ -1,7 +1,6 @@
 module Dor
   module Identifiable
     extend ActiveSupport::Concern
-    include SolrDocHelper
 
     # ids for previous and current catkeys
     CATKEY_TYPE_ID = 'catkey'.freeze
@@ -18,13 +17,13 @@ module Dor
         @object_type = str
         Dor.registered_classes[str] = self
       end
-    end
 
-    def initialize(attrs = {})
-      if Dor::Config.suri.mint_ids && !attrs[:pid]
-        attrs = attrs.merge!({:pid => Dor::SuriService.mint_id, :new_object => true})
+      # Overrides the method in ActiveFedora to mint a pid using SURI rather
+      # than the default Fedora sequence
+      def assign_pid(_obj)
+        return Dor::SuriService.mint_id if Dor::Config.suri.mint_ids
+        super
       end
-      super
     end
 
     # helper method to get the tags as an array
@@ -38,44 +37,6 @@ module Dor
       content_tag.size == 1 ? content_tag[0].split(':').last.strip : ''
     end
 
-    ## Module-level variables, shared between ALL mixin includers (and ALL *their* includers/extenders)!
-    ## used for caching found values
-    @@collection_hash = {}
-    @@apo_hash = {}
-
-    def to_solr(solr_doc = {}, *args)
-      assert_content_model
-      solr_doc = super(solr_doc, *args)
-
-      solr_doc[Dor::INDEX_VERSION_FIELD] = Dor::VERSION
-      solr_doc['indexed_at_dtsi'] = Time.now.utc.xmlschema
-      datastreams.values.each do |ds|
-        add_solr_value(solr_doc, 'ds_specs', ds.datastream_spec_string, :string, [:symbol]) unless ds.new?
-      end
-
-      add_solr_value(solr_doc, 'title_sort', label, :string, [:stored_sortable])
-
-      rels_doc = Nokogiri::XML(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#'}
-      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')
-      solrize_related_obj_titles(solr_doc, collections, @@collection_hash, 'collection_title', 'nonhydrus_collection_title', 'hydrus_collection_title')
-      solr_doc['public_dc_relation_tesim'] ||= solr_doc['collection_title_tesim'] if solr_doc['collection_title_tesim']
-      solr_doc['metadata_source_ssi'] = identity_metadata_source
-      solr_doc
-    end
-
-    # @return [String] calculated value for Solr index
-    def identity_metadata_source
-      if identityMetadata.otherId('catkey').first ||
-         identityMetadata.otherId('barcode').first
-        'Symphony'
-      else
-        'DOR'
-      end
-    end
-
     # Convenience method
     def source_id
       identityMetadata.sourceId
@@ -268,40 +229,5 @@ module Dor
         end
       end
     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
-      relationships.each do |rel_node|
-        rel_druid = rel_node['rdf:resource']
-        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}
-          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}
-          end
-        end
-
-        # cache should definitely be populated, so just use that to write solr field
-        if title_hash[rel_druid]['is_from_hydrus']
-          add_solr_value(solr_doc, hydrus_field_name, title_hash[rel_druid]['related_obj_title'], title_type, title_attrs)
-        else
-          add_solr_value(solr_doc, nonhydrus_field_name, title_hash[rel_druid]['related_obj_title'], title_type, title_attrs)
-        end
-        add_solr_value(solr_doc, union_field_name, title_hash[rel_druid]['related_obj_title'], title_type, title_attrs)
-      end
-    end
   end
 end

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

@@ -3,7 +3,6 @@ require 'equivalent-xml'
 module Dor
   module Processable
     extend ActiveSupport::Concern
-    include SolrDocHelper
 
     included do
       has_metadata :name => 'workflows', :type => Dor::WorkflowDs, :label => 'Workflows', :control_group => 'E'
@@ -147,65 +146,6 @@ module Dor
       result
     end
 
-    # @return [String] text translation of the status code, minus any trailing parenthetical explanation
-    # e.g. 'In accessioning (described)' and 'In accessioning (described, published)' both return 'In accessioning'
-    def simplified_status_code_disp_txt(status_code)
-      STATUS_CODE_DISP_TXT[status_code].gsub(/\(.*\)$/, '').strip
-    end
-
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-      sortable_milestones = {}
-      current_version = '1'
-      begin
-        current_version = versionMetadata.current_version_id
-      rescue
-      end
-      current_version_num = current_version.to_i
-
-      if self.respond_to?('versionMetadata')
-        # add an entry with version id, tag and description for each version
-        while current_version_num > 0
-          new_val = "#{current_version_num};#{versionMetadata.tag_for_version(current_version_num.to_s)};#{versionMetadata.description_for_version(current_version_num.to_s)}"
-          add_solr_value(solr_doc, 'versions', new_val, :string, [:displayable])
-          current_version_num -= 1
-        end
-      end
-
-      milestones.each do |milestone|
-        timestamp = milestone[:at].utc.xmlschema
-        sortable_milestones[milestone[:milestone]] ||= []
-        sortable_milestones[milestone[:milestone]] << timestamp
-        milestone[:version] ||= current_version
-        solr_doc['lifecycle_ssim'] ||= []
-        solr_doc['lifecycle_ssim'] << milestone[:milestone]
-        add_solr_value(solr_doc, 'lifecycle', "#{milestone[:milestone]}:#{timestamp};#{milestone[:version]}", :symbol)
-      end
-
-      sortable_milestones.each do |milestone, unordered_dates|
-        dates = unordered_dates.sort
-        # create the published_dttsi and published_day fields and the like
-        dates.each do |date|
-          solr_doc["#{milestone}_dttsim"] ||= []
-          solr_doc["#{milestone}_dttsim"] << date unless solr_doc["#{milestone}_dttsim"].include?(date)
-        end
-        # fields for OAI havester to sort on: _dttsi is trie date +stored +indexed (single valued, i.e. sortable)
-        solr_doc["#{milestone}_earliest_dttsi"] = dates.first
-        solr_doc["#{milestone}_latest_dttsi"  ] = dates.last
-      end
-      solr_doc['status_ssi'] = status # status is singular (i.e. the current one)
-      solr_doc['current_version_isi'] = current_version.to_i
-      solr_doc['modified_latest_dttsi'] = modified_date.to_datetime.utc.strftime('%FT%TZ')
-      add_solr_value(solr_doc, 'rights', rights, :string, [:symbol]) if self.respond_to? :rights
-
-      status_info_hash = status_info
-      status_code = status_info_hash[:status_code]
-      add_solr_value(solr_doc, 'processing_status_text', simplified_status_code_disp_txt(status_code), :string, [:stored_sortable])
-      solr_doc['processing_status_code_isi'] = status_code # no _isi in Solrizer's default descriptors
-
-      solr_doc
-    end
-
     # Initilizes workflow for the object in the workflow service
     #  It will set the priorty of the new workflow to the current_priority if it is > 0
     #  It will set lane_id from the item's APO default workflow lane

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

@@ -3,50 +3,17 @@ require 'fileutils'
 
 module Dor
   module Publishable
+    extend Deprecation
     extend ActiveSupport::Concern
+    self.deprecation_horizon = 'dor-services version 7.0.0'
 
     # Compute the thumbnail for this object following the rules at https://consul.stanford.edu/display/chimera/The+Rules+of+Thumb
+    # Used by PublicXmlService
     # @return [String] the computed thumb filename, with the druid prefix and a slash in front of it, e.g. oo000oo0001/filenamewith space.jp2
     def thumb
-       return unless respond_to?(:contentMetadata) && !contentMetadata.nil?
-       cm = contentMetadata.ng_xml
-       mime_type_finder = "@mimetype='image/jp2' or @mimeType='image/jp2'" # allow the mimetype attribute to be lower or camelcase when searching to make it more robust
-       thumb_image=nil
-
-       # these are the finders we will use to search for a thumb resource in contentMetadata, they will be searched in the order provided, stopping when one is reached
-       thumb_xpath_finders = [
-           # first find a file of mimetype jp2 explicitly marked as a thumb in the resource type and with a thumb=yes attribute
-           {image_type: 'local', finder: "/contentMetadata/resource[@type='thumb' and @thumb='yes']/file[#{mime_type_finder}]"},
-           # same thing for external files
-           {image_type: 'external', finder: "/contentMetadata/resource[@type='thumb' and @thumb='yes']/externalFile[#{mime_type_finder}]"},
-           # next find any image or page resource types with the thumb=yes attribute of mimetype jp2
-           {image_type: 'local', finder: "/contentMetadata/resource[(@type='page' or @type='image') and @thumb='yes']/file[#{mime_type_finder}]"},
-           # same thing for external file
-           {image_type: 'external', finder: "/contentMetadata/resource[(@type='page' or @type='image') and @thumb='yes']/externalFile[#{mime_type_finder}]"},
-           # next find a file of mimetype jp2 and resource type=thumb but not marked with the thumb directive
-           {image_type: 'local', finder: "/contentMetadata/resource[@type='thumb']/file[#{mime_type_finder}]"},
-           # same thing for external file
-           {image_type: 'external', finder: "/contentMetadata/resource[@type='thumb']/externalFile[#{mime_type_finder}]"},
-           # finally find the first page or image resource of mimetype jp2
-           {image_type: 'local', finder: "/contentMetadata/resource[@type='page' or @type='image']/file[#{mime_type_finder}]"},
-           # same thing for external file
-           {image_type: 'external', finder: "/contentMetadata/resource[@type='page' or @type='image']/externalFile[#{mime_type_finder}]"}
-         ]
-
-       thumb_xpath_finders.each do |search_path|
-         thumb_files = cm.xpath(search_path[:finder]) # look for a thumb
-         if thumb_files.size > 0   # if we find one, return the filename based on whether it is a local file or external file
-           if search_path[:image_type] == 'local'
-             thumb_image="#{remove_druid_prefix}/#{thumb_files[0]['id']}"
-           else
-             thumb_image="#{remove_druid_prefix(thumb_files[0]['objectId'])}/#{thumb_files[0]['fileId']}"
-           end
-           break  # break out of the loop so we stop searching
-         end
-       end
-
-       thumb_image
+      ThumbnailService.new(self).thumb
     end
+    deprecation_deprecate :thumb
 
     # Return a URI encoded version of the thumb image for use by indexers (leaving the extension of the filename)
     # @return [String] URI encoded version of the thumb with the druid prefix, e.g. oo000oo0001%2Ffilenamewith%20space.jp2
@@ -57,6 +24,7 @@ module Dor
       thumb_filename=thumb_image.split(/#{pid_regex}[\/]/).last # everything after the druid
       "#{thumb_druid}%2F#{ERB::Util.url_encode(thumb_filename)}"
     end
+    deprecation_deprecate :encoded_thumb
 
     # Return a full qualified thumbnail image URL if the thumb is computable
     # @return [String] fully qualified image URL for the computed thumbnail, e.g. https://stacks.stanford.edu/image/iiif/oo000oo0001%2Ffilenamewith%20space/full
@@ -65,6 +33,7 @@ module Dor
       thumb_basename=File.basename(encoded_thumb, File.extname(encoded_thumb)) # strip the extension for URL generation
       "https://#{Dor::Config.stacks.host}/image/iiif/#{thumb_basename}/full/!400,400/0/default.jpg"
     end
+    deprecation_deprecate :thumb_url
 
     # strips away the relationships that should not be shown in public desc metadata
     # @return [Nokogiri::XML]

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

@@ -304,20 +304,5 @@ module Dor
       end
       new_tags
     end
-
-    def to_solr(solr_doc = {}, *args)
-      solr_doc = super(solr_doc, *args)
-
-      # TODO: sort of worried about the performance impact in bulk reindex
-      # situations, since released_for recurses all parent collections.  jmartin 2015-07-14
-      released_for(true).each { |release_target, release_info|
-        add_solr_value(solr_doc, 'released_to', release_target, :symbol, []) if release_info['release']
-      }
-
-      # TODO: need to solrize whether item is released to purl?  does released_for return that?
-      # logic is: "True when there is a published lifecycle and Access Rights is anything but Dark"
-
-      solr_doc
-    end
   end
 end

data/lib/dor/models/item.rb

@@ -4,12 +4,21 @@ module Dor
     include Embargoable
     include Publishable
     include Itemizable
+    include Preservable
     include Assembleable
     include Contentable
     include Geoable
     include Releaseable
 
     has_object_type 'item'
+
+    self.resource_indexer = CompositeIndexer.new(
+      DataIndexer,
+      DescribableIndexer,
+      IdentifiableIndexer,
+      ProcessableIndexer,
+      ReleasableIndexer
+    )
   end
 end
 

data/lib/dor/models/set.rb

@@ -4,5 +4,12 @@ module Dor
 
     has_many :members, :property => :is_member_of_collection, :class_name => 'ActiveFedora::Base'
     has_object_type 'set'
+
+    self.resource_indexer = CompositeIndexer.new(
+      DataIndexer,
+      DescribableIndexer,
+      IdentifiableIndexer,
+      ProcessableIndexer
+    )
   end
 end

data/lib/dor/models/workflow_object.rb

@@ -8,6 +8,13 @@ module Dor
     has_object_type 'workflow'
     has_metadata :name => 'workflowDefinition', :type => Dor::WorkflowDefinitionDs, :label => 'Workflow Definition'
 
+    self.resource_indexer = CompositeIndexer.new(
+      DataIndexer,
+      DescribableIndexer,
+      IdentifiableIndexer,
+      ProcessableIndexer
+    )
+
     def self.find_by_name(name)
       Dor::WorkflowObject.where(Solrizer.solr_name('workflow_name', :symbol) => name).first
     end
@@ -38,10 +45,6 @@ module Dor
       datastreams['workflowDefinition']
     end
 
-    def graph(*args)
-      definition.graph *args
-    end
-
     def generate_initial_workflow
       datastreams['workflowDefinition'].initial_workflow
     end

data/lib/dor/services/public_xml_service.rb

@@ -5,7 +5,7 @@ module Dor
     def initialize(object)
       @object = object
     end
-    
+
     def to_xml
       pub = Nokogiri::XML('<publicObject/>').root
       pub['id'] = object.pid
@@ -21,8 +21,10 @@ module Dor
       pub.add_child(Nokogiri::XML(object.generate_public_desc_md).root)
       pub.add_child(release_xml.root) unless release_xml.xpath('//release').children.size == 0 # If there are no release_tags, this prevents an empty <releaseData/> from being added
       # Note we cannot base this on if an individual object has release tags or not, because the collection may cause one to be generated for an item,
-      # so we need to calculate it and then look at the final result.s
-      pub.add_child(Nokogiri("<thumb>#{object.thumb}</thumb>").root) unless object.thumb.nil?
+      # so we need to calculate it and then look at the final result.
+
+      thumb = ThumbnailService.new(object).thumb
+      pub.add_child(Nokogiri("<thumb>#{thumb}</thumb>").root) unless thumb.nil?
 
       new_pub = Nokogiri::XML(pub.to_xml) { |x| x.noblanks }
       new_pub.encoding = 'UTF-8'

data/lib/dor/services/thumbnail_service.rb

@@ -0,0 +1,55 @@
+module Dor
+  # Responsible for finding a path to a thumbnail based on the contentMetadata of an object
+  class ThumbnailService
+    # allow the mimetype attribute to be lower or camelcase when searching to make it more robust
+    MIME_TYPE_FINDER = "@mimetype='image/jp2' or @mimeType='image/jp2'".freeze
+
+    # these are the finders we will use to search for a thumb resource in contentMetadata, they will be searched in the order provided, stopping when one is reached
+    THUMB_XPATH_FINDERS = [
+      # first find a file of mimetype jp2 explicitly marked as a thumb in the resource type and with a thumb=yes attribute
+      { image_type: 'local', finder: "/contentMetadata/resource[@type='thumb' and @thumb='yes']/file[#{MIME_TYPE_FINDER}]"},
+      # same thing for external files
+      { image_type: 'external', finder: "/contentMetadata/resource[@type='thumb' and @thumb='yes']/externalFile[#{MIME_TYPE_FINDER}]"},
+      # next find any image or page resource types with the thumb=yes attribute of mimetype jp2
+      { image_type: 'local', finder: "/contentMetadata/resource[(@type='page' or @type='image') and @thumb='yes']/file[#{MIME_TYPE_FINDER}]"},
+      # same thing for external file
+      { image_type: 'external', finder: "/contentMetadata/resource[(@type='page' or @type='image') and @thumb='yes']/externalFile[#{MIME_TYPE_FINDER}]"},
+      # next find a file of mimetype jp2 and resource type=thumb but not marked with the thumb directive
+      { image_type: 'local', finder: "/contentMetadata/resource[@type='thumb']/file[#{MIME_TYPE_FINDER}]"},
+      # same thing for external file
+      { image_type: 'external', finder: "/contentMetadata/resource[@type='thumb']/externalFile[#{MIME_TYPE_FINDER}]"},
+      # finally find the first page or image resource of mimetype jp2
+      { image_type: 'local', finder: "/contentMetadata/resource[@type='page' or @type='image']/file[#{MIME_TYPE_FINDER}]"},
+      # same thing for external file
+      { image_type: 'external', finder: "/contentMetadata/resource[@type='page' or @type='image']/externalFile[#{MIME_TYPE_FINDER}]"}
+    ].freeze
+
+    # @params [Dor::Item] object
+    def initialize(object)
+      @object = object
+    end
+
+    attr_reader :object
+
+    # @return [String] the computed thumb filename, with the druid prefix and a slash in front of it, e.g. oo000oo0001/filenamewith space.jp2
+    def thumb
+      return unless object.respond_to?(:contentMetadata) && object.contentMetadata.present?
+      cm = object.contentMetadata.ng_xml
+      thumb_image = nil
+
+      THUMB_XPATH_FINDERS.each do |search_path|
+        thumb_files = cm.xpath(search_path[:finder]) # look for a thumb
+        next if thumb_files.empty?
+        # if we find one, return the filename based on whether it is a local file or external file
+        thumb_image = if search_path[:image_type] == 'local'
+                        "#{object.remove_druid_prefix}/#{thumb_files[0]['id']}"
+                      else
+                        "#{object.remove_druid_prefix(thumb_files[0]['objectId'])}/#{thumb_files[0]['fileId']}"
+                      end
+        break  # break out of the loop so we stop searching
+      end
+
+      thumb_image
+    end
+  end
+end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.32.1'.freeze
+  VERSION = '6.0.0'.freeze
 end

data/lib/dor/workflow/document.rb

@@ -54,13 +54,6 @@ module Workflow
       end
     end
 
-    def graph(parent = nil, dir = nil)
-      wf_definition = definition
-      result = wf_definition ? Workflow::Graph.from_processes(wf_definition.repo, wf_definition.name, processes, parent) : nil
-      result['rankdir'] = dir || 'TB' unless result.nil?
-      result
-    end
-
     def [](value)
       processes.find { |p| p.name == value }
     end

data/lib/dor/workflow/process.rb

@@ -89,6 +89,7 @@ module Workflow
     # @param info [Hash,Nokogiri::XML::Element,NilClass]
     # @param new_owner [Dor::Workflow::Document]
     def update!(info, new_owner)
+      raise ArgumentError, 'Owner can not be nil. It must be an instance of Dor::Workflow::Document' unless new_owner
       @owner = new_owner
       return self if info.nil?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.32.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-16 00:00:00.000000000 Z
+date: 2018-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -70,6 +70,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.2.7
+- !ruby/object:Gem::Dependency
+  name: deprecation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -220,20 +234,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: ruby-graphviz
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubydora
   requirement: !ruby/object:Gem::Requirement
@@ -588,6 +588,13 @@ files:
 - lib/dor/datastreams/workflow_definition_ds.rb
 - lib/dor/datastreams/workflow_ds.rb
 - lib/dor/exceptions.rb
+- lib/dor/indexers/composite_indexer.rb
+- lib/dor/indexers/data_indexer.rb
+- lib/dor/indexers/describable_indexer.rb
+- lib/dor/indexers/editable_indexer.rb
+- lib/dor/indexers/identifiable_indexer.rb
+- lib/dor/indexers/processable_indexer.rb
+- lib/dor/indexers/releasable_indexer.rb
 - lib/dor/models/abstract.rb
 - lib/dor/models/admin_policy_object.rb
 - lib/dor/models/agreement.rb
@@ -629,6 +636,7 @@ files:
 - lib/dor/services/search_service.rb
 - lib/dor/services/suri_service.rb
 - lib/dor/services/technical_metadata_service.rb
+- lib/dor/services/thumbnail_service.rb
 - lib/dor/utils/hydrus_shims.rb
 - lib/dor/utils/ng_tidy.rb
 - lib/dor/utils/predicate_patch.rb
@@ -636,7 +644,6 @@ files:
 - lib/dor/utils/solr_doc_helper.rb
 - lib/dor/version.rb
 - lib/dor/workflow/document.rb
-- lib/dor/workflow/graph.rb
 - lib/dor/workflow/process.rb
 - lib/tasks/rdoc.rake
 homepage: 

data/lib/dor/workflow/graph.rb

@@ -1,163 +0,0 @@
-require 'graphviz'
-
-module Dor
-module Workflow
-class Graph
-
-  FILL_COLORS = { 'waiting' => 'white', 'ready' => 'white', 'error' => '#8B0000', 'blocked' => 'white', 'completed' => 'darkgreen', 'unknown' => '#CFCFCF' }.freeze
-  TEXT_COLORS = { 'waiting' => 'black', 'ready' => 'black', 'error' => 'white', 'blocked' => '#8B0000', 'completed' => 'white', 'unknown' => 'black' }.freeze
-  PATTERNS    = { 'waiting' => 'diagonals', 'ready' => 'filled', 'error' => 'filled', 'blocked' => 'diagonals', 'completed' => 'filled', 'unknown' => 'filled' }.freeze
-  RESERVED_KEYS = %w(repository name).freeze
-
-  attr_reader :repo, :name, :processes, :graph, :root
-
-  def self.from_config(name, config, parent = nil)
-    wf = new(config['repository'], name, parent)
-    config.keys.each { |p| wf.add_process(p.to_s) unless RESERVED_KEYS.include?(p) }
-    config.keys.each { |p|
-      next unless wf.processes[p]
-      Array(config[p]['prerequisite']).each { |prereq|
-        prereq.sub!(/^#{config['repository']}:#{name}:/e, '')
-        if wf.processes[prereq]
-          wf.processes[p].depends_on(wf.processes[prereq])
-        else
-          wf.processes[p].depends_on(wf.add_process(prereq).set_status('external'))
-        end
-      }
-    }
-    wf.finish
-    wf
-  end
-
-  def self.from_processes(repo, name, processes, parent = nil)
-    wf = new(repo, name, parent)
-    processes.each { |p|
-      wf.add_process(p.name).status = p.state || 'unknown'
-    }
-    processes.each { |p|
-      p.prerequisite.each { |prereq|
-        prereq.sub!(/^#{repo}:#{name}:/e, '')
-        if wf.processes[prereq]
-          wf.processes[p.name].depends_on(wf.processes[prereq])
-        else
-          wf.processes[p.name].depends_on(wf.add_process(prereq).set_status('external'))
-        end
-      }
-    }
-    wf.finish
-    wf
-  end
-
-  def initialize(repo, name, parent = nil)
-    @repo = repo
-    @name = name
-    if parent.nil?
-      @graph = GraphViz.new(qname)
-      @root = add_nodes(name)
-    else
-      @graph = parent.subgraph(qname)
-      @root = parent.add_nodes(name)
-    end
-    @graph[:truecolor => true]
-    @root.shape = 'plaintext'
-    @processes = {}
-  end
-
-  def qname
-    [@repo, @name].join(':')
-  end
-
-  def add_process(name, external = false)
-    pqname = name.split(/:/).length == 3 ? name : [qname, name].join(':')
-    p = Process.new(self, pqname, name)
-    @processes[name] = p
-    p
-  end
-
-  def finish
-    @processes.values.each do |process|
-      process.node.fontname = 'Helvetica'
-      if process.id =~ %r{^#{qname}} && process.prerequisites.length == 0
-        (@root << process.node)[:arrowhead => 'none', :arrowtail => 'none', :dir => 'both', :style => 'invisible']
-      end
-    end
-
-    @root.fontname = 'Helvetica'
-    self
-  end
-
-  def inspect
-    "#{to_s[0..-2]} #{repo}:#{name} (#{processes.keys.join(', ')})>"
-  end
-
-  def method_missing(sym, *args)
-    if @graph.respond_to?(sym)
-      @graph.send(sym, *args)
-    else
-      super
-    end
-  end
-
-  class Process
-
-    attr_reader :name, :status, :node, :prerequisites
-
-    def initialize(graph, id, name)
-      @name = name
-      @graph = graph
-      @node = @graph.add_nodes(id)
-      @node.shape = 'box'
-      @node.label = name
-      @prerequisites = []
-      set_status('unknown')
-    end
-
-    def id
-      @node.id
-    end
-
-    def status=(s)
-      @status = s
-      if s == 'external'
-        @node.fillcolor = 'gray'
-        @node.fontcolor = 'black'
-        @node.style = 'dashed'
-      else
-        @node.fillcolor = FILL_COLORS[s] || 'yellow'
-        @node.fontcolor = TEXT_COLORS[s]
-        @node.style = PATTERNS[s]
-      end
-    end
-
-    def set_status(s)
-      self.status = s
-      self
-    end
-
-    def depends_on(*processes)
-      wf1 = id.split(/:/)[0..1].join(':')
-      processes.each { |process|
-        wf2 = process.id.split(/:/)[0..1].join(':')
-        edge = (process.node << @node)
-        edge.dir = 'both'
-        edge.arrowhead = 'none'
-        edge.arrowtail = 'none'
-        edge.style = 'dashed' if wf1 != wf2
-        prerequisites << process
-      }
-      self
-    end
-
-    def same_as(process)
-      @node = process.node
-    end
-
-    def all_prerequisites
-      prerequisites.collect { |p| p.all_prerequisites + [p.name] }.flatten.uniq
-    end
-
-  end
-
-end
-end
-end