dor-services 4.25.1 → 5.0.0

data/lib/dor/utils/predicate_patch.rb

@@ -20,4 +20,4 @@ module ActiveFedora
       end
     end
   end
-end
+end

data/lib/dor/utils/solr_doc_helper.rb

@@ -1,9 +1,17 @@
 module SolrDocHelper
-
+  
   def add_solr_value(solr_doc, field_name, value, field_type = :default, index_types = [:searchable])
-    index_types.each { |index_type|
-      ::Solrizer::Extractor.insert_solr_field_value(solr_doc, ::ActiveFedora::SolrService.solr_name(field_name, field_type, index_type), value)
-    }
+    if Solrizer::VERSION > "3"
+      case field_type
+        when :symbol
+          index_types << field_type
+      end
+      ::Solrizer.insert_field(solr_doc, field_name, value, *index_types)
+    else
+      index_types.each { |index_type|
+        ::Solrizer::Extractor.insert_solr_field_value(solr_doc, ::ActiveFedora::SolrService.solr_name(field_name, field_type, index_type), value)
+      }
+    end
   end
-
+  
 end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.25.1'
+  VERSION = '5.0.0'
 end

data/lib/dor/workflow/document.rb

@@ -2,7 +2,7 @@ module Dor
 module Workflow
   class Document
     include SolrDocHelper
-    include OM::XML::Document
+    include ::OM::XML::Document
 
     set_terminology do |t|
       t.root(:path => 'workflow')
@@ -15,7 +15,6 @@ module Workflow
         t.elapsed(:path=>{:attribute=>"elapsed"})
         t.lifecycle(:path=>{:attribute=>"lifecycle"})
         t.attempts(:path=>{:attribute=>"attempts"}, :index_as => [:not_searchable])
-        t.version(:path=>{:attribute=>"version"})
       }
     end
     @@definitions={}
@@ -31,28 +30,27 @@ module Workflow
     def priority
       processes.map {|proc| proc.priority.to_i }.detect(0) {|p| p > 0}
     end
-
-    # @return [Boolean] if any process node does not have version, returns true, false otherwise (all processes have version)
+    
     def active?
-      ng_xml.at_xpath("/workflow/process[not(@version)]") ? true : false
+      processes.any? { |proc| !proc.version }
     end
 
     def definition
       @definition ||= begin
-        if @@definitions.has_key? workflowId.first
-          @@definitions[workflowId.first]
+        if @@definitions.has_key? self.workflowId.first
+          @@definitions[self.workflowId.first]
         else
-        wfo = Dor::WorkflowObject.find_by_name(workflowId.first)
+        wfo = Dor::WorkflowObject.find_by_name(self.workflowId.first)
         wf_def=wfo ? wfo.definition : nil
-        @@definitions[workflowId.first] = wf_def
+        @@definitions[self.workflowId.first] = wf_def
         wf_def
         end
       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
+    def graph(parent=nil, dir=nil)
+      wf_definition = self.definition
+      result = wf_definition ? Workflow::Graph.from_processes(wf_definition.repo, wf_definition.name, self.processes, parent) : nil
       unless result.nil?
         result['rankdir'] = dir || 'TB'
       end
@@ -60,7 +58,7 @@ module Workflow
     end
 
     def [](value)
-      processes.find { |p| p.name == value }
+      self.processes.find { |p| p.name == value }
     end
 
     def processes
@@ -68,16 +66,15 @@ module Workflow
       if ng_xml.search("/workflow/process").length == 0
         return []
       end
-      @processes ||=
-      if definition
-        definition.processes.collect do |process|
+      @processes ||= if self.definition
+        self.definition.processes.collect do |process|
           node = ng_xml.at("/workflow/process[@name = '#{process.name}']")
           process.update!(node,self) unless node.nil?
           process
         end
       else
-        find_by_terms(:workflow, :process).collect do |x|
-          pnode = Dor::Workflow::Process.new(repository, workflowId, {})
+        self.find_by_terms(:workflow, :process).collect do |x|
+          pnode = Dor::Workflow::Process.new(self.repository, self.workflowId, {})
           pnode.update!(x,self)
           pnode
         end.sort_by(&:datetime)
@@ -85,12 +82,12 @@ module Workflow
     end
 
     def workflow_should_show_completed? processes
-      processes.all?{|p| ['skipped', 'completed', '', nil].include?(p.status)}
+      return processes.all?{|p| ['skipped', 'completed', '', nil].include?(p.status)}
     end
 
-    def to_solr(solr_doc = Hash.new, *args)
-      wf_name = workflowId.first
-      repo = repository.first
+    def to_solr(solr_doc=Hash.new, *args)
+      wf_name = self.workflowId.first
+      repo = self.repository.first
       add_solr_value(solr_doc, 'wf', wf_name, :string, [:facetable])
       add_solr_value(solr_doc, 'wf_wps', wf_name, :string, [:facetable])
       add_solr_value(solr_doc, 'wf_wsp', wf_name, :string, [:facetable])
@@ -101,20 +98,20 @@ module Workflow
       processes.each do |process|
         if process.status.present?
           #add a record of the robot having operated on this item, so we can track robot activity
-          if process.date_time && process.status && (process.status == 'completed' || process.status == 'error')
+          if process.date_time and process.status and (process.status == 'completed' || process.status == 'error')
             add_solr_value(solr_doc, "wf_#{wf_name}_#{process.name}", process.date_time+'Z', :date)
           end
           add_solr_value(solr_doc, 'wf_error', "#{wf_name}:#{process.name}:#{process.error_message}", :string, [:facetable,:displayable]) if process.error_message #index the error message without the druid so we hopefully get some overlap
           add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.status}", :string, [:facetable])
           add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.status}:#{process.name}", :string, [:facetable])
-          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}", :string, [:facetable])
-          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.status}", :string, [:facetable])
+          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}", :string, [:facetable, :symbol])
+          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.status}", :string, [:facetable, :symbol])
           add_solr_value(solr_doc, 'wf_swp', "#{process.status}", :string, [:facetable])
           add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}", :string, [:facetable])
           add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}:#{process.name}", :string, [:facetable])
           if process.state != process.status
             add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.state}:#{process.name}", :string, [:facetable])
-            add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.state}", :string, [:facetable])
+            add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.state}", :string, [:facetable, :symbol])
             add_solr_value(solr_doc, 'wf_swp', "#{process.state}", :string, [:facetable])
             add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}", :string, [:facetable])
             add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}:#{process.name}", :string, [:facetable])
@@ -122,16 +119,17 @@ module Workflow
         end
       end
 
-      solr_doc['wf_wps_facet'].uniq!    if solr_doc['wf_wps_facet']
-      solr_doc['wf_wsp_facet'].uniq!    if solr_doc['wf_wsp_facet']
-      solr_doc['wf_swp_facet'].uniq!    if solr_doc['wf_swp_facet']
+      solr_doc[Solrizer.solr_name('wf_wps', :symbol)].uniq!    if solr_doc[Solrizer.solr_name('wf_wps', :symbol)]
+      solr_doc[Solrizer.solr_name('wf_wps', :facetable)].uniq!    if solr_doc[Solrizer.solr_name('wf_wps', :facetable)]
+      solr_doc[Solrizer.solr_name('wf_wsp', :facetable)].uniq!    if solr_doc[Solrizer.solr_name('wf_wsp', :facetable)]
+      solr_doc[Solrizer.solr_name('wf_swp', :facetable)].uniq!    if solr_doc[Solrizer.solr_name('wf_swp', :facetable)]
       solr_doc['workflow_status'].uniq! if solr_doc['workflow_status']
 
       solr_doc
     end
 
     def inspect
-      "#<#{self.class.name}:#{object_id}>"
+      "#<#{self.class.name}:#{self.object_id}>"
     end
   end
 end

data/lib/dor/workflow/graph.rb

@@ -3,16 +3,16 @@ require 'graphviz'
 module Dor
 module Workflow
 class Graph
-
+  
   FILL_COLORS = { 'waiting' => "white", 'ready' => "white", 'error' => "#8B0000", 'blocked' => "white", 'completed' => "darkgreen", 'unknown' => "#CFCFCF" }
   TEXT_COLORS = { 'waiting' => "black", 'ready' => "black", 'error' => "white", 'blocked' => "#8B0000", 'completed' => "white", 'unknown' => "black" }
   PATTERNS    = { 'waiting' => "diagonals", 'ready' => "filled", 'error' => "filled", 'blocked' => "diagonals", 'completed' => "filled", 'unknown' => "filled" }
   RESERVED_KEYS = ['repository','name']
 
   attr_reader :repo, :name, :processes, :graph, :root
-
+  
   def self.from_config(name, config, parent = nil)
-    wf = new(config['repository'], name, parent)
+    wf = self.new(config['repository'], name, parent)
     config.keys.each { |p| wf.add_process(p.to_s) unless RESERVED_KEYS.include?(p) }
     config.keys.each { |p|
       if wf.processes[p]
@@ -27,12 +27,12 @@ class Graph
       end
     }
     wf.finish
-    wf
+    return wf
   end
-
+  
   def self.from_processes(repo, name, processes, parent = nil)
-    wf = new(repo, name, parent)
-    processes.each { |p|
+    wf = self.new(repo, name, parent)
+    processes.each { |p| 
       wf.add_process(p.name).status = p.state || 'unknown'
     }
     processes.each { |p|
@@ -46,15 +46,15 @@ class Graph
       }
     }
     wf.finish
-    wf
+    return wf
   end
-
+  
   def initialize(repo, name, parent = nil)
     @repo = repo
     @name = name
     if parent.nil?
       @graph = GraphViz.new(qname)
-      @root = add_nodes(name)
+      @root = self.add_nodes(name)
     else
       @graph = parent.subgraph(qname)
       @root = parent.add_nodes(name)
@@ -63,34 +63,34 @@ class Graph
     @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
+    return p
   end
-
+  
   def finish
     @processes.values.each do |process|
       process.node.fontname = 'Helvetica'
-      if process.id =~ %r{^#{qname}} && process.prerequisites.length == 0
+      if process.id =~ %r{^#{qname}} and process.prerequisites.length == 0
         (@root << process.node)[:arrowhead => 'none', :arrowtail => 'none', :dir => 'both', :style => 'invisible']
       end
     end
 
     @root.fontname = 'Helvetica'
-    self
+    return self
   end
-
+  
   def inspect
-    "#{to_s[0..-2]} #{repo}:#{name} (#{processes.keys.join(', ')})>"
+    "#{self.to_s[0..-2]} #{repo}:#{name} (#{processes.keys.join(', ')})>"
   end
-
+  
   def method_missing(sym,*args)
     if @graph.respond_to?(sym)
       @graph.send(sym,*args)
@@ -98,11 +98,11 @@ class Graph
       super
     end
   end
-
+  
   class Process
-
+    
     attr_reader :name, :status, :node, :prerequisites
-
+    
     def initialize(graph, id, name)
       @name = name
       @graph = graph
@@ -110,13 +110,13 @@ class Graph
       @node.shape = 'box'
       @node.label = name
       @prerequisites = []
-      set_status('unknown')
+      self.set_status('unknown')
     end
-
+    
     def id
       @node.id
     end
-
+    
     def status=(s)
       @status = s
       if s == 'external'
@@ -129,14 +129,14 @@ class Graph
         @node.style = PATTERNS[s]
       end
     end
-
+    
     def set_status(s)
       self.status = s
-      self
+      return self
     end
-
+    
     def depends_on(*processes)
-      wf1 = id.split(/:/)[0..1].join(':')
+      wf1 = self.id.split(/:/)[0..1].join(':')
       processes.each { |process|
         wf2 = process.id.split(/:/)[0..1].join(':')
         edge = (process.node << @node)
@@ -146,21 +146,21 @@ class Graph
         if (wf1 != wf2)
           edge.style = 'dashed'
         end
-        prerequisites << process
+        self.prerequisites << process
       }
-      self
+      return self
     end
-
+    
     def same_as(process)
-      @node = process.node
+      @node = process.node  
     end
-
+    
     def all_prerequisites
       prerequisites.collect { |p| p.all_prerequisites + [p.name] }.flatten.uniq
     end
-
+    
   end
 
 end
 end
-end
+end

data/lib/dor/workflow/process.rb

@@ -23,8 +23,8 @@ module Workflow
         'batch_limit' => node['batch-limit'] ? node['batch-limit'].to_i : nil,
         'error_limit' => node['error-limit'] ? node['error-limit'].to_i : nil,
         'prerequisite' => node.xpath('prereq').collect { |p|
-          repo = (p['repository'].nil? || p['repository'] == @repo) ? nil : p['repository']
-          wf = (p['workflow'].nil? || p['workflow'] == @workflow) ? nil : p['workflow']
+          repo = (p['repository'].nil? or p['repository'] == @repo) ? nil : p['repository']
+          wf = (p['workflow'].nil? or p['workflow'] == @workflow) ? nil : p['workflow']
           [repo,wf,p.text.to_s].compact.join(':')
         },
         'priority' => node['priority'] ? node['priority'].to_i : 0
@@ -43,22 +43,22 @@ module Workflow
     def note          ; @attrs['note']          ; end
     def version       ; @attrs['version']       ; end
     def priority      ; @attrs['priority']      ; end
-    def completed?    ; status == 'completed' ; end
-    def error?        ; status == 'error'     ; end
-    def waiting?      ; status == 'waiting'   ; end
-    def date_time     ;@attrs['datetime']       ; end
+    def completed?    ; self.status == 'completed' ; end
+    def error?        ; self.status == 'error'     ; end
+    def waiting?      ; self.status == 'waiting'   ; end
+    def date_time     ;@attrs['datetime']       ; end 
 
     def archived?
       return true if(@attrs['archived'] =~ /true$/i)
-      false
+      return false
     end
 
     def ready?
-      self.waiting? && (!prerequisite.nil?) && prerequisite.all? { |pr| (prq = owner[pr]) && prq.completed? }
+      self.waiting? and (not self.prerequisite.nil?) and self.prerequisite.all? { |pr| (prq = self.owner[pr]) && prq.completed? }
     end
 
     def blocked?
-      self.waiting? && (!prerequisite.nil?) && prerequisite.any? { |pr| (prq = owner[pr]) && (prq.error? || prq.blocked?) }
+      self.waiting? and (not self.prerequisite.nil?) and self.prerequisite.any? { |pr| (prq = self.owner[pr]) && (prq.error? or prq.blocked?) }
     end
 
     def state
@@ -83,7 +83,7 @@ module Workflow
       @attrs['elapsed'].nil? ? nil : @attrs['elapsed'].to_f
     end
 
-    def update!(info, new_owner = nil)
+    def update!(info, new_owner=nil)
       @owner = new_owner unless new_owner.nil?
       if info.is_a? Nokogiri::XML::Node
         info = Hash[info.attributes.collect { |k,v| [k,v.value] }]
@@ -92,8 +92,8 @@ module Workflow
     end
 
     def to_hash
-      @attrs.reject { |k,v| v.nil? || v == 0 || (v.respond_to?(:empty?) && v.empty?) }
+      @attrs.reject { |k,v| v.nil? or v == 0 or (v.respond_to?(:empty?) and v.empty?) }
     end
   end
 end
-end
+end

data/lib/tasks/dor.rake

@@ -24,7 +24,7 @@ task :bump_version, [:level] do |t, args|
   version = version.join('.')
   file_content.sub!(/^(\s*VERSION = )['"](.+)['"]/,"#{declaration}'#{version}'")
   File.open(version_file,'w') { |f| f.write(file_content) }
-
+  
   readme_file = File.expand_path('../../../README.rdoc',__FILE__)
   file_content = File.read(readme_file)
   lines = file_content.lines.to_a

data/lib/tasks/rdoc.rake

@@ -10,11 +10,11 @@ namespace :doc do
     require 'yard/rake/yardoc_task'
 
     YARD::Rake::YardocTask.new(:generate) do |yt|
-      yt.files   =  Dir.glob(File.join(project_root, 'lib', '*.rb')) +
+      yt.files   =  Dir.glob(File.join(project_root, 'lib', '*.rb')) + 
                     Dir.glob(File.join(project_root, 'lib', '**', '*.rb')) +
                    [ File.join(project_root, 'README.rdoc') ] +
                    [ File.join(project_root, 'LICENSE') ]
-
+                   
       yt.options = ['--output-dir', doc_destination, '--readme', 'README.rdoc']
     end
   rescue LoadError
@@ -29,4 +29,4 @@ namespace :doc do
     rm_r doc_destination if File.exists?(doc_destination)
   end
 
-end
+end