dor-services 5.1.1 → 5.2.0

data/lib/dor/services/registration_service.rb

@@ -39,7 +39,7 @@ module Dor
         rights=nil
         if params[:rights]
           rights=params[:rights]
-          unless ['world','stanford','dark','default','none'].include? rights
+          unless %w(world stanford dark default none).include? rights
             raise Dor::ParameterError, "Unknown rights setting '#{rights}' when calling #{self.name}.register_object"
           end
         end
@@ -52,7 +52,7 @@ module Dor
           end
         end
 
-        if (other_ids.has_key?(:uuid) or other_ids.has_key?('uuid')) == false
+        if (other_ids.key?(:uuid) || other_ids.key?('uuid')) == false
           other_ids[:uuid] = UUIDTools::UUID.timestamp_create.to_s
         end
         short_label = label.length>254 ? label[0,254] : label
@@ -75,21 +75,19 @@ module Dor
           short_predicate = ActiveFedora::RelsExtDatastream.short_predicate rel.namespace.href+rel.name
           if short_predicate.nil?
             ix = 0
-            ix += 1 while ActiveFedora::Predicates.predicate_mappings[rel.namespace.href].has_key?(short_predicate = :"extra_predicate_#{ix}")
+            ix += 1 while ActiveFedora::Predicates.predicate_mappings[rel.namespace.href].key?(short_predicate = :"extra_predicate_#{ix}")
             ActiveFedora::Predicates.predicate_mappings[rel.namespace.href][short_predicate] = rel.name
           end
           new_item.add_relationship short_predicate, rel['rdf:resource']
         end
-        if collection
-          new_item.add_collection(collection)
-        end
-        if (rights && ['item','collection'].include?(object_type))
+        new_item.add_collection(collection) if collection
+        if rights && %w(item collection).include?(object_type)
           rights_xml=apo_object.defaultObjectRights.ng_xml
           new_item.datastreams['rightsMetadata'].content=rights_xml.to_s
           new_item.set_read_rights(rights) unless rights == 'default'    # already defaulted to default!
         end
         #create basic mods from the label
-        if(metadata_source=='label')
+        if (metadata_source=='label')
           ds=new_item.build_datastream('descMetadata');
           builder = Nokogiri::XML::Builder.new { |xml|
             xml.mods( 'xmlns' => 'http://www.loc.gov/mods/v3', 'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',:version => '3.3', "xsi:schemaLocation" => 'http://www.loc.gov/mods/v3 http://www.loc.gov/standards/mods/v3/mods-3-3.xsd'){

data/lib/dor/services/reset_workspace_service.rb

@@ -4,32 +4,30 @@ module Dor
   class ResetWorkspaceService
 
     def self.reset_workspace_druid_tree(druid, version, workspace_root)
-      
+
       druid_tree_path = DruidTools::Druid.new(druid, workspace_root).pathname.to_s
-      
-      raise "The archived directory #{druid_tree_path}_v#{version} already existed." if  File.exists?("#{druid_tree_path}_v#{version}") 
-      
-      if File.exists?(druid_tree_path) 
+
+      raise "The archived directory #{druid_tree_path}_v#{version} already existed." if  File.exists?("#{druid_tree_path}_v#{version}")
+
+      if File.exists?(druid_tree_path)
         FileUtils.mv(druid_tree_path, "#{druid_tree_path}_v#{version}")
       end #Else is a truncated tree where we shouldn't do anything
 
     end
 
     def self.reset_export_bag(druid, version, export_root)
-      
+
       id = druid.split(':').last
       bag_dir = File.join(export_root, id)
 
-      raise "The archived bag #{bag_dir}_v#{version} already existed." if  File.exists?("#{bag_dir}_v#{version}") 
-      
-      if File.exists?(bag_dir) 
-        FileUtils.mv(bag_dir, "#{bag_dir}_v#{version}")
-      end 
-      
-      if File.exists?("#{bag_dir}.tar") 
+      raise "The archived bag #{bag_dir}_v#{version} already existed." if  File.exists?("#{bag_dir}_v#{version}")
+
+      FileUtils.mv(bag_dir, "#{bag_dir}_v#{version}") if File.exists?(bag_dir)
+
+      if File.exists?("#{bag_dir}.tar")
         FileUtils.mv("#{bag_dir}.tar", "#{bag_dir}_v#{version}.tar")
-      end 
+      end
     end
-        
+
   end
-end
+end

data/lib/dor/services/sdr_ingest_service.rb

@@ -74,7 +74,7 @@ module Dor
     #   If not found, return nil unless it is a required datastream in which case raise exception
     def self.get_datastream_content(dor_item, ds_name, required)
       ds = (ds_name == 'relationshipMetadata' ? 'RELS-EXT' : ds_name)
-      if dor_item.datastreams.keys.include?(ds) && ! dor_item.datastreams[ds].new?
+      if dor_item.datastreams.keys.include?(ds) && !dor_item.datastreams[ds].new?
         return dor_item.datastreams[ds].content
       elsif (required == 'optional')
         return nil
@@ -137,11 +137,7 @@ module Dor
     # @return [String] Return the contents of the contentMetadata.xml file from the content directory
     def self.get_content_metadata(metadata_dir)
       content_metadata_pathname = metadata_dir.join('contentMetadata.xml')
-      if content_metadata_pathname.exist?
-        content_metadata_pathname.read
-      else
-        nil
-      end
+      content_metadata_pathname.read if content_metadata_pathname.exist?
     end
 
     # @param [Pathname] metadata_dir The location of the the object's metadata files

data/lib/dor/services/search_service.rb

@@ -74,7 +74,7 @@ module Dor
         resp = solr.find params
         if block_given?
           cont = true
-          while cont and resp.docs.length > 0
+          while cont && resp.docs.length > 0
             cont = yield(resp)
             params[:rows] ||= resp.docs.length
             params[:start] += params[:rows]
@@ -91,7 +91,7 @@ module Dor
         elsif id.is_a?(Array) # Two values: [ 'google', 'STANFORD_0123456789' ]
           id = id.join(':')
         end
-        q = %{#{Solrizer.solr_name 'identifier', :facetable}:"#{id}"}
+        q = %{#{Solrizer.solr_name 'identifier', :stored_searchable}:"#{id}"}
         result = []
         resp = query(q, :fl => 'id', :rows => 1000) do |resp|
           result += resp.docs.collect { |doc| doc['id'] }
@@ -123,4 +123,4 @@ module Dor
 
   end
 
-end
+end

data/lib/dor/services/suri_service.rb

@@ -26,7 +26,6 @@ module Dor
 #      Rails.logger.error("Unable to mint id from suri: #{e.to_s}")
 #      raise e
     end
-  
-    
+
   end
-end
+end

data/lib/dor/services/technical_metadata_service.rb

@@ -99,7 +99,7 @@ module Dor
     #   The data is updated to the latest format.
     def self.get_dor_technical_metadata(dor_item)
       ds = "technicalMetadata"
-      if dor_item.datastreams.keys.include?(ds) and not dor_item.datastreams[ds].new?
+      if dor_item.datastreams.keys.include?(ds) && !dor_item.datastreams[ds].new?
         dor_techmd = dor_item.datastreams[ds].content
       else
         return nil
@@ -127,7 +127,7 @@ module Dor
     # @param [Array<String>] new_files The list of filenames for files that are either added or modifed since the previous version
     # @return [String] The technicalMetadata datastream for the new files of the new digital object version
     def self.get_new_technical_metadata(druid, new_files)
-      return nil if new_files.nil? or new_files.empty?
+      return nil if new_files.nil? || new_files.empty?
       workspace = DruidTools::Druid.new(druid, Dor::Config.sdr.local_workspace_root)
       content_dir = workspace.find_filelist_parent('content',new_files)
       temp_dir = workspace.temp_dir
@@ -223,4 +223,3 @@ module Dor
   end
 
 end
-

data/lib/dor/utils/ng_tidy.rb

@@ -1,9 +1,9 @@
 class Nokogiri::XML::Text
-  
+
   def normalize
     self.content =~ /\S/ ? self.content.gsub(/\s+/,' ').strip : self.content
   end
-  
+
   def normalize!
     self.content = self.normalize
   end
@@ -15,11 +15,11 @@ class Nokogiri::XML::Node
   def normalize_text!
     self.xpath('//text()').each { |t| t.normalize! }
   end
-  
+
 end
 
 class Nokogiri::XML::Document
-  
+
   def prettify
     xslt = Nokogiri::XSLT <<-EOC
     <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
@@ -33,5 +33,5 @@ class Nokogiri::XML::Document
     EOC
     xslt.transform(self).to_xml
   end
-  
-end
+
+end

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,5 +1,5 @@
 module SolrDocHelper
-  
+
   def add_solr_value(solr_doc, field_name, value, field_type = :default, index_types = [:searchable])
     if Solrizer::VERSION > "3"
       case field_type
@@ -13,5 +13,5 @@ module SolrDocHelper
       }
     end
   end
-  
+
 end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.1.1'
+  VERSION = '5.2.0'
 end

data/lib/dor/workflow/document.rb

@@ -11,7 +11,7 @@ module Workflow
       t.process {
         t.name_(:path=>{:attribute=>"name"})
         t.status(:path=>{:attribute=>"status"})
-        t.timestamp(:path=>{:attribute=>"datetime"})#, :data_type => :date)
+        t.timestamp(:path=>{:attribute=>"datetime"}) #, :data_type => :date)
         t.elapsed(:path=>{:attribute=>"elapsed"})
         t.lifecycle(:path=>{:attribute=>"lifecycle"})
         t.attempts(:path=>{:attribute=>"attempts"}, :index_as => [:not_searchable])
@@ -39,13 +39,13 @@ module Workflow
 
     def definition
       @definition ||= begin
-        if @@definitions.has_key? self.workflowId.first
+        if @@definitions.key? self.workflowId.first
           @@definitions[self.workflowId.first]
         else
-        wfo = Dor::WorkflowObject.find_by_name(self.workflowId.first)
-        wf_def=wfo ? wfo.definition : nil
-        @@definitions[self.workflowId.first] = wf_def
-        wf_def
+          wfo = Dor::WorkflowObject.find_by_name(self.workflowId.first)
+          wf_def=wfo ? wfo.definition : nil
+          @@definitions[self.workflowId.first] = wf_def
+          wf_def
         end
       end
     end
@@ -53,9 +53,7 @@ module Workflow
     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
+      result['rankdir'] = dir || 'TB' unless result.nil?
       result
     end
 
@@ -65,9 +63,7 @@ module Workflow
 
     def processes
       #if the workflow service didnt return any processes, dont return any processes from the reified wf
-      if ng_xml.search("/workflow/process").length == 0
-        return []
-      end
+      return [] if ng_xml.search("/workflow/process").length == 0
       @processes ||=
       if self.definition
         self.definition.processes.collect do |process|
@@ -93,7 +89,7 @@ module Workflow
       repo = self.repository.first
       wf_solr_type = :string
       wf_solr_attrs = [:symbol]
-      add_solr_value(solr_doc, 'wf', wf_name, wf_solr_type, wf_solr_attrs)
+      add_solr_value(solr_doc, 'wf',     wf_name, wf_solr_type, wf_solr_attrs)
       add_solr_value(solr_doc, 'wf_wps', wf_name, wf_solr_type, wf_solr_attrs)
       add_solr_value(solr_doc, 'wf_wsp', wf_name, wf_solr_type, wf_solr_attrs)
       status = processes.empty? ? 'empty' : (workflow_should_show_completed?(processes) ? 'completed' : 'active')
@@ -101,27 +97,25 @@ module Workflow
       add_solr_value(solr_doc, 'workflow_status', [wf_name,status,errors,repo].join('|'), wf_solr_type, wf_solr_attrs)
 
       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 and process.status and (process.status == 'completed' || process.status == 'error')
-            solr_doc["wf_#{wf_name}_#{process.name}_dttsi"] = "#{process.date_time}Z"
-          end
-          add_solr_value(solr_doc, 'wf_error', "#{wf_name}:#{process.name}:#{process.error_message}", wf_solr_type, wf_solr_attrs) 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}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.status}:#{process.name}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.status}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', "#{process.status}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}", wf_solr_type, wf_solr_attrs)
-          add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
-          if process.state != process.status
-            add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.state}:#{process.name}", wf_solr_type, wf_solr_attrs)
-            add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.state}", wf_solr_type, wf_solr_attrs)
-            add_solr_value(solr_doc, 'wf_swp', "#{process.state}", wf_solr_type, wf_solr_attrs)
-            add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}", wf_solr_type, wf_solr_attrs)
-            add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
-          end
+        next unless 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')
+          solr_doc["wf_#{wf_name}_#{process.name}_dttsi"] = "#{process.date_time}Z"
         end
+        add_solr_value(solr_doc, 'wf_error', "#{wf_name}:#{process.name}:#{process.error_message}", wf_solr_type, wf_solr_attrs) 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}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.status}:#{process.name}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.status}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_swp', "#{process.status}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_swp', "#{process.status}:#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
+        next unless process.state != process.status
+        add_solr_value(solr_doc, 'wf_wsp', "#{wf_name}:#{process.state}:#{process.name}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_wps', "#{wf_name}:#{process.name}:#{process.state}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_swp', "#{process.state}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}", wf_solr_type, wf_solr_attrs)
+        add_solr_value(solr_doc, 'wf_swp', "#{process.state}:#{wf_name}:#{process.name}", wf_solr_type, wf_solr_attrs)
       end
 
       solr_doc[Solrizer.solr_name('wf_wps', :symbol)].uniq! if solr_doc[Solrizer.solr_name('wf_wps', :symbol)]

data/lib/dor/workflow/graph.rb

@@ -3,36 +3,35 @@ 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']
+  RESERVED_KEYS = %w(repository name)
 
   attr_reader :repo, :name, :processes, :graph, :root
-  
+
   def self.from_config(name, config, parent = nil)
     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]
-        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
-        }
-      end
+      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
     return wf
   end
-  
+
   def self.from_processes(repo, name, processes, parent = nil)
     wf = self.new(repo, name, parent)
-    processes.each { |p| 
+    processes.each { |p|
       wf.add_process(p.name).status = p.state || 'unknown'
     }
     processes.each { |p|
@@ -48,7 +47,7 @@ class Graph
     wf.finish
     return wf
   end
-  
+
   def initialize(repo, name, parent = nil)
     @repo = repo
     @name = name
@@ -63,22 +62,22 @@ 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
     return p
   end
-  
+
   def finish
     @processes.values.each do |process|
       process.node.fontname = 'Helvetica'
-      if process.id =~ %r{^#{qname}} and process.prerequisites.length == 0
+      if process.id =~ %r{^#{qname}} && process.prerequisites.length == 0
         (@root << process.node)[:arrowhead => 'none', :arrowtail => 'none', :dir => 'both', :style => 'invisible']
       end
     end
@@ -86,11 +85,11 @@ class Graph
     @root.fontname = 'Helvetica'
     return self
   end
-  
+
   def inspect
     "#{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 +97,11 @@ class Graph
       super
     end
   end
-  
+
   class Process
-    
+
     attr_reader :name, :status, :node, :prerequisites
-    
+
     def initialize(graph, id, name)
       @name = name
       @graph = graph
@@ -112,11 +111,11 @@ class Graph
       @prerequisites = []
       self.set_status('unknown')
     end
-    
+
     def id
       @node.id
     end
-    
+
     def status=(s)
       @status = s
       if s == 'external'
@@ -129,12 +128,12 @@ class Graph
         @node.style = PATTERNS[s]
       end
     end
-    
+
     def set_status(s)
       self.status = s
       return self
     end
-    
+
     def depends_on(*processes)
       wf1 = self.id.split(/:/)[0..1].join(':')
       processes.each { |process|
@@ -143,24 +142,22 @@ class Graph
         edge.dir = 'both'
         edge.arrowhead = 'none'
         edge.arrowtail = 'none'
-        if (wf1 != wf2)
-          edge.style = 'dashed'
-        end
+        edge.style = 'dashed' if (wf1 != wf2)
         self.prerequisites << process
       }
       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