dor-services 4.22.3 → 4.22.4

data/lib/dor/services/reset_workspace_service.rb

@@ -4,32 +4,32 @@ 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) 
+      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") 
+      end
+
+      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

@@ -6,7 +6,7 @@ module Dor
     # @param [Dor::Item] dor_item The representation of the digital object
     # @param [String] agreement_id  depreciated, included for backward compatability with common-accessoning
     # @return [void] Create the moab manifests, export data to a BagIt bag, kick off the SDR ingest workflow
-    def self.transfer(dor_item, agreement_id=nil)
+    def self.transfer(dor_item, agreement_id = nil)
       druid = dor_item.pid
       workspace = DruidTools::Druid.new(druid,Dor::Config.sdr.local_workspace_root)
       signature_catalog = get_signature_catalog(druid)
@@ -16,14 +16,14 @@ module Dor
       version_inventory = get_version_inventory(metadata_dir, druid, new_version_id)
       version_addtions = signature_catalog.version_additions(version_inventory)
       content_addtions = version_addtions.group('content')
-      if content_addtions.nil? or content_addtions.files.empty?
+      if content_addtions.nil? || content_addtions.files.empty?
         content_dir = nil
       else
         new_file_list = content_addtions.path_list
         content_dir = workspace.find_filelist_parent('content',new_file_list)
       end
       content_group = version_inventory.group('content')
-      unless content_group.nil? or content_group.files.empty?
+      unless content_group.nil? || content_group.files.empty?
         signature_catalog.normalize_group_signatures(content_group, content_dir)
       end
       # export the bag (in tar format)
@@ -61,7 +61,7 @@ module Dor
       Config.sdr.datastreams.to_hash.each_pair do |ds_name, required|
         ds_name = ds_name.to_s
         metadata_file = metadata_dir.join("#{ds_name}.xml")
-        metadata_string = self.get_datastream_content(dor_item, ds_name, required)
+        metadata_string = get_datastream_content(dor_item, ds_name, required)
         metadata_file.open('w') { |f| f << metadata_string } if metadata_string
       end
       metadata_dir
@@ -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) and not 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
@@ -175,4 +175,4 @@ module Dor
 
   end
 
-end
+end

data/lib/dor/services/search_service.rb

@@ -73,7 +73,7 @@ module Dor
         result = JSON.parse(client["select?#{query_string}"].get)
       end
 
-      def query query, args={}
+      def query query, args = {}
         params = args.merge({ :q => query })
         params[:start] ||= 0
         resp = solr.find params
@@ -128,4 +128,4 @@ module Dor
 
   end
 
-end
+end

data/lib/dor/services/suri_service.rb

@@ -6,7 +6,7 @@ module Dor
     # If Dor::Config.suri.mint_ids is set to true, then this method
     # returns Config.suri.id_namespace:id_from_suri
     # Throws an exception if there were any problems
-    def self.mint_id quantity=nil
+    def self.mint_id quantity = nil
       want_array = quantity.is_a?(Numeric)
       quantity = 1 if quantity.nil?
       ids = []
@@ -20,13 +20,13 @@ module Dor
         resp = Nokogiri::XML(repo.next_pid :numPIDs => quantity)
         ids = resp.xpath('/pidList/pid').collect { |node| node.text }
       end
-      return want_array ? ids : ids.first
+      want_array ? ids : ids.first
 
 #    rescue Exception => e
 #      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,11 +1,11 @@
 class Nokogiri::XML::Text
-  
+
   def normalize
-    self.content =~ /\S/ ? self.content.gsub(/\s+/,' ').strip : self.content
+    content =~ /\S/ ? content.gsub(/\s+/,' ').strip : content
   end
-  
+
   def normalize!
-    self.content = self.normalize
+    self.content = normalize
   end
 
 end
@@ -13,13 +13,13 @@ end
 class Nokogiri::XML::Node
 
   def normalize_text!
-    self.xpath('//text()').each { |t| t.normalize! }
+    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,9 +1,9 @@
 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)
     }
   end
-  
+
 end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.22.3'
+  VERSION = '4.22.4'
 end

data/lib/dor/workflow/document.rb

@@ -39,20 +39,20 @@ module Workflow
 
     def definition
       @definition ||= begin
-        if @@definitions.has_key? self.workflowId.first
-          @@definitions[self.workflowId.first]
+        if @@definitions.has_key? workflowId.first
+          @@definitions[workflowId.first]
         else
-        wfo = Dor::WorkflowObject.find_by_name(self.workflowId.first)
+        wfo = Dor::WorkflowObject.find_by_name(workflowId.first)
         wf_def=wfo ? wfo.definition : nil
-        @@definitions[self.workflowId.first] = wf_def
+        @@definitions[workflowId.first] = wf_def
         wf_def
         end
       end
     end
 
-    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
+    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
       unless result.nil?
         result['rankdir'] = dir || 'TB'
       end
@@ -60,7 +60,7 @@ module Workflow
     end
 
     def [](value)
-      self.processes.find { |p| p.name == value }
+      processes.find { |p| p.name == value }
     end
 
     def processes
@@ -69,15 +69,15 @@ module Workflow
         return []
       end
       @processes ||=
-      if self.definition
-        self.definition.processes.collect do |process|
+      if definition
+        definition.processes.collect do |process|
           node = ng_xml.at("/workflow/process[@name = '#{process.name}']")
           process.update!(node,self) unless node.nil?
           process
         end
       else
-        self.find_by_terms(:workflow, :process).collect do |x|
-          pnode = Dor::Workflow::Process.new(self.repository, self.workflowId, {})
+        find_by_terms(:workflow, :process).collect do |x|
+          pnode = Dor::Workflow::Process.new(repository, workflowId, {})
           pnode.update!(x,self)
           pnode
         end.sort_by(&:datetime)
@@ -85,12 +85,12 @@ module Workflow
     end
 
     def workflow_should_show_completed? processes
-      return processes.all?{|p| ['skipped', 'completed', '', nil].include?(p.status)}
+      processes.all?{|p| ['skipped', 'completed', '', nil].include?(p.status)}
     end
 
-    def to_solr(solr_doc=Hash.new, *args)
-      wf_name = self.workflowId.first
-      repo = self.repository.first
+    def to_solr(solr_doc = Hash.new, *args)
+      wf_name = workflowId.first
+      repo = 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,7 +101,7 @@ 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 and process.status and (process.status == 'completed' || process.status == 'error')
+          if process.date_time && process.status && (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
@@ -131,8 +131,8 @@ module Workflow
     end
 
     def inspect
-      "#<#{self.class.name}:#{self.object_id}>"
+      "#<#{self.class.name}:#{object_id}>"
     end
   end
 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 = self.new(config['repository'], name, parent)
+    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|
       if wf.processes[p]
@@ -27,12 +27,12 @@ class Graph
       end
     }
     wf.finish
-    return wf
+    wf
   end
-  
+
   def self.from_processes(repo, name, processes, parent = nil)
-    wf = self.new(repo, name, parent)
-    processes.each { |p| 
+    wf = 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
-    return wf
+    wf
   end
-  
+
   def initialize(repo, name, parent = nil)
     @repo = repo
     @name = name
     if parent.nil?
       @graph = GraphViz.new(qname)
-      @root = self.add_nodes(name)
+      @root = 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
-    return p
+    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
 
     @root.fontname = 'Helvetica'
-    return self
+    self
   end
-  
+
   def inspect
-    "#{self.to_s[0..-2]} #{repo}:#{name} (#{processes.keys.join(', ')})>"
+    "#{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 = []
-      self.set_status('unknown')
+      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
-      return self
+      self
     end
-    
+
     def depends_on(*processes)
-      wf1 = self.id.split(/:/)[0..1].join(':')
+      wf1 = 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
-        self.prerequisites << process
+        prerequisites << process
       }
-      return self
+      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