dor-services 4.22.3 → 4.22.4

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -1,7 +1,7 @@
 module Dor
-class IdentityMetadataDS < ActiveFedora::OmDatastream 
+class IdentityMetadataDS < ActiveFedora::OmDatastream
   include SolrDocHelper
-  
+
   set_terminology do |t|
     t.root(:path=>"identityMetadata")
     t.objectId :index_as => [:searchable]
@@ -18,36 +18,36 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
     t.objectCreator :index_as => [:searchable, :facetable]
     t.adminPolicy :index_as => [:not_searchable]
   end
-  
+
   define_template :value do |builder,name,value,attrs|
     builder.send(name.to_sym, value, attrs)
   end
-  
+
   def self.xml_template
     Nokogiri::XML('<identityMetadata/>')
   end #self.xml_template
-  
-  def add_value(name, value, attrs={})
+
+  def add_value(name, value, attrs = {})
     add_child_node(ng_xml.root, :value, name, value, attrs)
   end
-  
+
   def objectId
-    self.find_by_terms(:objectId).text
+    find_by_terms(:objectId).text
   end
-  
+
   def sourceId
-    node = self.find_by_terms(:sourceId).first
+    node = find_by_terms(:sourceId).first
     node ? [node['source'],node.text].join(':') : nil
   end
-  
+
   def sourceId=(value)
-    node = self.find_by_terms(:sourceId).first
+    node = find_by_terms(:sourceId).first
     unless value.present?
       node.remove unless node.nil?
       nil
     else
       (source,val) = value.split(/:/,2)
-      unless source.present? and value.present?
+      unless source.present? && value.present?
         raise ArgumentError, "Source ID must follow the format namespace:value"
       end
       node = ng_xml.root.add_child('<sourceId/>').first if node.nil?
@@ -58,13 +58,13 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
   end
   def tags()
       result=[]
-      self.ng_xml.search('//tag').each do |node|
+      ng_xml.search('//tag').each do |node|
         result << node.content
       end
       result
   end
   def otherId(type = nil)
-    result = self.find_by_terms(:otherId).to_a
+    result = find_by_terms(:otherId).to_a
     if type.nil?
       result.collect { |n| [n['name'],n.text].join(':') }
     else
@@ -79,8 +79,8 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
     node.content = val
     node
   end
-  
-  def to_solr(solr_doc=Hash.new, *args)
+
+  def to_solr(solr_doc = Hash.new, *args)
     super(solr_doc, *args)
     if digital_object.respond_to?(:profile)
       digital_object.profile.each_pair do |property,value|
@@ -99,8 +99,8 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
       add_solr_value(solr_doc, "identifier", qid, :string, [:searchable])
       add_solr_value(solr_doc, "#{name}_id", id, :string, [:searchable])
     }
-        
-    self.find_by_terms(:tag).each { |tag|
+
+    find_by_terms(:tag).each { |tag|
       (top,rest) = tag.text.split(/:/,2)
       unless rest.nil?
         add_solr_value(solr_doc, "#{top.downcase.strip.gsub(/\s/,'_')}_tag", rest.strip, :string, [:searchable, :facetable])

data/lib/dor/datastreams/role_metadata_ds.rb

@@ -34,8 +34,8 @@ class RoleMetadataDS < ActiveFedora::OmDatastream
   end
 
 
-  def to_solr(solr_doc=Hash.new, *args)
-    self.find_by_xpath('/roleMetadata/role/*').each do |actor|
+  def to_solr(solr_doc = Hash.new, *args)
+    find_by_xpath('/roleMetadata/role/*').each do |actor|
       role_type = actor.parent['type']
       val = [actor.at_xpath('identifier/@type'),actor.at_xpath('identifier/text()')].join ':'
       add_solr_value(solr_doc, "apo_role_#{actor.name}_#{role_type}", val, :string, [:searchable, :facetable])
@@ -48,4 +48,4 @@ class RoleMetadataDS < ActiveFedora::OmDatastream
   end
 
 end
-end
+end

data/lib/dor/datastreams/simple_dublin_core_ds.rb

@@ -1,44 +1,44 @@
-class SimpleDublinCoreDs < ActiveFedora::OmDatastream 
-  
+class SimpleDublinCoreDs < ActiveFedora::OmDatastream
+
   set_terminology do |t|
     t.root(:path=>"dc", :xmlns=>"http://www.openarchives.org/OAI/2.0/oai_dc/", :schema=>"http://cosimo.stanford.edu/standards/oai_dc/v2/oai_dc.xsd", :namespace_prefix => 'oai_dc', :index_as => [:not_searchable])
     t.title(:index_as=>[:searchable, :displayable, :facetable], :xmlns => "http://purl.org/dc/elements/1.1/", :namespace_prefix => 'dc')
     t.creator(:index_as=>[:searchable, :displayable, :facetable], :xmlns => "http://purl.org/dc/elements/1.1/", :namespace_prefix => 'dc')
     t.identifier(:index_as=>[:searchable, :displayable], :xmlns => "http://purl.org/dc/elements/1.1/", :namespace_prefix => 'dc')
   end
-  
+
   def self.xml_template
     builder = Nokogiri::XML::Builder.new do |xml|
-      xml.dc(:xmlns=>"http://www.openarchives.org/OAI/2.0/oai_dc/", 
+      xml.dc(:xmlns=>"http://www.openarchives.org/OAI/2.0/oai_dc/",
         'xmlns:dc'=>'http://purl.org/dc/elements/1.1/') {
           xml['dc'].title
           xml['dc'].creator
           xml['dc'].identifier
-      }   
+      }
     end
 
-    return builder.doc
+    builder.doc
   end
-  
-  def to_solr(solr_doc=Hash.new, *args)
+
+  def to_solr(solr_doc = Hash.new, *args)
     # There are a whole bunch of namespace-related things that can go
     # wrong with this terminology. Until it's fixed in OM, ignore them all.
     begin
       doc = super solr_doc, *args
 
-      add_solr_value(doc, 'dc_title', self.title.first, :string, [:sortable])
-      add_solr_value(doc, 'dc_creator', self.creator.first, :string, [:sortable])
-      
+      add_solr_value(doc, 'dc_title', title.first, :string, [:sortable])
+      add_solr_value(doc, 'dc_creator', creator.first, :string, [:sortable])
+
       identifiers = {}
 
-      self.identifier.each { |i| ns, val = i.split(":"); identifiers[ns] ||= val }
+      identifier.each { |i| ns, val = i.split(":"); identifiers[ns] ||= val }
 
       identifiers.each do |ns, val|
         add_solr_value(doc, "dc_identifier_#{ns}", val, :string, [:sortable])
       end
 
       return doc
-    rescue 
+    rescue
       solr_doc
     end
   end

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -70,7 +70,7 @@ module Dor
           }
         }
       end
-      return builder.doc
+      builder.doc
     end
 
     def ensure_non_versionable
@@ -167,7 +167,7 @@ module Dor
     end
 
     def tag_for_version(versionId)
-      nodes=self.ng_xml.search('//version[@versionId=\''+versionId+'\']')
+      nodes=ng_xml.search('//version[@versionId=\''+versionId+'\']')
       if nodes.length == 1
         nodes.first['tag'].to_s
       else
@@ -177,8 +177,8 @@ module Dor
 
     # @return [String] The description for the specified version, or empty string if there is no description
     def description_for_version(versionId)
-      nodes=self.ng_xml.search('//version[@versionId=\''+versionId+'\']')
-      if nodes.length == 1 and  nodes.first.at_xpath('description')
+      nodes=ng_xml.search('//version[@versionId=\''+versionId+'\']')
+      if nodes.length == 1 &&  nodes.first.at_xpath('description')
         nodes.first.at_xpath('description').content.to_s
       else
         ''
@@ -230,4 +230,4 @@ module Dor
     end
 
   end
-end
+end

data/lib/dor/datastreams/workflow_definition_ds.rb

@@ -1,12 +1,12 @@
 module Dor
-class WorkflowDefinitionDs < ActiveFedora::OmDatastream 
+class WorkflowDefinitionDs < ActiveFedora::OmDatastream
   include SolrDocHelper
-  
+
   set_terminology do |t|
     t.root(:path => "workflow-def", :index_as => [:not_searchable])
     t.process(:index_as => [:not_searchable])
   end
-  
+
   define_template :process do |builder,workflow,attrs|
     prereqs = attrs.delete('prerequisite')
     if prereqs.is_a?(String)
@@ -20,11 +20,11 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
           prereq_name = repo
           repo = nil
         end
-        if (repo == workflow.repo and wf = workflow.name)
+        if (repo == workflow.repo && wf = workflow.name)
           repo = nil
           wf = nil
         end
-        attrs = (repo.nil? and wf.nil?) ? {} : { :repository => repo, :workflow => wf }
+        attrs = (repo.nil? && wf.nil?) ? {} : { :repository => repo, :workflow => wf }
         node.prereq(attrs) { node.text prereq_name }
       end
     end
@@ -33,25 +33,25 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
   def self.xml_template
     Nokogiri::XML('<workflow-def/>')
   end
-  
+
   def add_process(attributes)
     add_child_node(ng_xml.at_xpath('/workflow-def'), :process, self, attributes)
   end
-  
+
   def graph(parent = nil)
-    Workflow::Graph.from_processes(self.repo, self.name, self.processes, parent)
+    Workflow::Graph.from_processes(repo, name, processes, parent)
   end
-  
+
   def processes
     ng_xml.xpath('/workflow-def/process').collect do |node|
-      Workflow::Process.new(self.repo, self.name, node)
+      Workflow::Process.new(repo, name, node)
     end.sort { |a,b| (a.sequence || 0) <=> (b.sequence || 0) }
   end
 
   def name
     ng_xml.at_xpath('/workflow-def/@id').to_s
   end
-  
+
   def repo
     ng_xml.at_xpath('/workflow-def/@repository').to_s
   end
@@ -63,17 +63,17 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
     processes.each { |process| result[process.name] = process.to_hash }
     result
   end
-  
+
   def configuration=(hash)
     self.ng_xml = Nokogiri::XML(%{<workflow-def id="#{hash['name']}" repository="#{hash['repository']}"/>})
     i = 0
-    hash.each_pair do |k,v| 
+    hash.each_pair do |k,v|
       if v.is_a?(Hash)
         add_process(v.merge({:name => k, :sequence => i+=1}))
       end
     end
   end
-  
+
   # Creates the xml used by Dor::WorkflowService.create_workflow
   # @return [String] An object's initial workflow as defined by the <workflow-def> in content
   def initial_workflow
@@ -95,19 +95,19 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
     }
     Nokogiri::XML(doc.to_xml) { |x| x.noblanks }.to_xml { |config| config.no_declaration }
   end
-  
-  def to_solr(solr_doc=Hash.new,*args)
+
+  def to_solr(solr_doc = Hash.new,*args)
     super(solr_doc,*args)
-    add_solr_value(solr_doc, "workflow_name", self.name, :symbol, [:searchable])
+    add_solr_value(solr_doc, "workflow_name", name, :symbol, [:searchable])
     processes.each do |p|
       add_solr_value(solr_doc, "process", "#{p.name}|#{p.label}", :symbol, [:displayable])
     end
     solr_doc
   end
-  
+
   def to_yaml
-    YAML.dump(self.configuration)
+    YAML.dump(configuration)
   end
-  
+
+end
 end
-end

data/lib/dor/migrations/identifiable/assert_adminPolicy.rb

@@ -6,4 +6,4 @@ Dor::Identifiable.on_upgrade '3.5.0', 'Assert hydra:isGovernedBy' do |obj|
   else
     false
   end
-end
+end

data/lib/dor/migrations/identifiable/fix_model_assertions.rb

@@ -4,7 +4,7 @@ Dor::Identifiable.on_upgrade '3.6.1', 'Assert correct models' do |obj|
     obj.remove_relationship :has_model, 'info:fedora/hydra:commonMetadata'
     applied = true
   end
-  
+
   unless obj.relationships.predicates.any? { |p| p.to_s == 'info:fedora/fedora-system:def/model#hasModel' }
     obj.assert_content_model
     applied = true

data/lib/dor/migrations/identifiable/record_remediation.rb

@@ -10,9 +10,9 @@ Dor::Identifiable.on_upgrade '3.6.1', 'Record Remediation Version' do |obj|
   else
     add_tag = true
   end
-  
+
   if add_tag
     obj.identityMetadata.add_value :tag, "Remediated By : #{Dor::VERSION}"
   end
   add_tag
-end
+end

data/lib/dor/migrations/identifiable/uriify_augmented_contentlocation_refs.rb

@@ -4,7 +4,7 @@ Dor::Identifiable.on_upgrade '3.14.8', 'Fix up invalid URIs in content-augmented
     false
   rescue URI::InvalidURIError
     true
-  rescue 
+  rescue
     false
   end
 

data/lib/dor/migrations/identifiable/uriify_contentlocation_refs.rb

@@ -4,7 +4,7 @@ Dor::Identifiable.on_upgrade '3.11.6', 'Fix up invalid URIs in objects' do |obj|
     false
   rescue URI::InvalidURIError
     true
-  rescue 
+  rescue
     false
   end
 

data/lib/dor/migrations/processable/unify_workflows.rb

@@ -5,11 +5,11 @@ Dor::Processable.on_upgrade '3.5.0', 'Replace individual *WF datastreams with un
     obj.workflows.content
     run = true
   end
-      
+
   # Remove individual *WF datastreams
-  obj.datastreams.each_pair do |dsid,ds| 
-    if ds.controlGroup == 'E' and dsid =~ /WF$/
-      ds.delete 
+  obj.datastreams.each_pair do |dsid,ds|
+    if ds.controlGroup == 'E' && dsid =~ /WF$/
+      ds.delete
       run = true
     end
   end

data/lib/dor/migrations/versionable/add_missing_version_md.rb

@@ -6,4 +6,4 @@ Dor::Versionable.on_upgrade '3.12.2', 'Add missing versionMetadata' do |obj|
     run = true
   end
   run
-end
+end

data/lib/dor/models/admin_policy_object.rb

@@ -13,4 +13,4 @@ module Dor
     has_metadata :name => "roleMetadata", :type => Dor::RoleMetadataDS, :label => 'Role Metadata'
     has_metadata :name => "defaultObjectRights", :type => Dor::DefaultObjectRightsDS, :label => 'Default Object Rights'
   end
-end
+end

data/lib/dor/models/assembleable.rb

@@ -1,14 +1,14 @@
 module Dor
   module Assembleable
-    
-    def initialize_workspace(source=nil)
+
+    def initialize_workspace(source = nil)
       if(source.nil?)
-        druid = DruidTools::Druid.new(self.pid,Config.stacks.local_workspace_root)
+        druid = DruidTools::Druid.new(pid,Config.stacks.local_workspace_root)
         druid.mkdir
       else
-        druid = DruidTools::Druid.new(self.pid, Config.stacks.local_workspace_root)
+        druid = DruidTools::Druid.new(pid, Config.stacks.local_workspace_root)
         druid.mkdir_with_final_link(source)
       end
     end
   end
-end
+end

data/lib/dor/models/contentable.rb

@@ -3,17 +3,17 @@ module Dor
     extend ActiveSupport::Concern
 
     #add a file to a resource, not to be confused with add a resource to an object
-    def add_file file, resource, file_name, mime_type=nil,publish='no', shelve='no', preserve='no'
-      contentMD=self.datastreams['contentMetadata']
+    def add_file file, resource, file_name, mime_type = nil,publish = 'no', shelve = 'no', preserve = 'no'
+      contentMD=datastreams['contentMetadata']
       xml=contentMD.ng_xml
       #make sure the resource exists
       if xml.search('//resource[@id=\''+resource+'\']').length == 0
         raise 'resource doesnt exist.'
       end
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
-      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
       location=druid_tools.path(file_name)
-      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
       md5=Digest::MD5.file(file.path).hexdigest
       sha1=Digest::SHA1.file(file.path).hexdigest
       size=File.size?(file.path)
@@ -26,7 +26,7 @@ module Dor
           raise 'The file '+file_name+' already exists!'
         rescue Net::SFTP::StatusException
           sftp.upload!(file.path,location)
-          self.contentMetadata.add_file file_hash,resource
+          contentMetadata.add_file file_hash,resource
         end
       rescue Net::SFTP::StatusException
         #the directory layout doesnt match the new style, so use the old style.
@@ -36,7 +36,7 @@ module Dor
         rescue Net::SFTP::StatusException
           #the file doesnt already exist, which is good. Add it
           sftp.upload!(file.path,oldlocation)
-          self.contentMetadata.add_file file_hash,resource
+          contentMetadata.add_file file_hash,resource
         end
       end
       #can only arrive at this point if a non status exception occurred.
@@ -44,10 +44,10 @@ module Dor
 
     def replace_file file,file_name
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
-      item=Dor::Item.find(self.pid)
-      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
+      item=Dor::Item.find(pid)
+      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
       location=druid_tools.path(file_name)
-      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
 
       md5=Digest::MD5.file(file.path).hexdigest
       sha1=Digest::SHA1.file(file.path).hexdigest
@@ -66,7 +66,7 @@ module Dor
     end
 
     def get_preserved_file file, version
-      preservation_server=Config.content.sdr_server+'/sdr/objects/'+self.pid+"/content/"
+      preservation_server=Config.content.sdr_server+'/sdr/objects/'+pid+"/content/"
       file=URI.encode(file)
       add=preservation_server+file+"?version="+version
       uri = URI(add)
@@ -78,9 +78,9 @@ module Dor
     end
 
     def get_file file
-      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
       location=druid_tools.path(file)
-      oldlocation=location.gsub('/'+file,'').gsub('/'+self.pid.gsub('druid:',''),'')+'/'+file
+      oldlocation=location.gsub('/'+file,'').gsub('/'+pid.gsub('druid:',''),'')+'/'+file
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
       begin
         data=sftp.download!(location)
@@ -89,9 +89,9 @@ module Dor
       end
     end
     def remove_file filename
-      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
       location=druid_tools.path(filename)
-      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
       begin
         data=sftp.remove!(location)
@@ -102,37 +102,37 @@ module Dor
         rescue Net::SFTP::StatusException
         end
       end
-      self.contentMetadata.remove_file filename
+      contentMetadata.remove_file filename
     end
     def rename_file old_name, new_name
-      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
       location=druid_tools.path(old_name)
-      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
       begin
         data=sftp.rename!(location,location.gsub(old_name,new_name))
       rescue
         data=sftp.rename!(oldlocation,oldlocation.gsub(old_name,new_name))
       end
-      self.contentMetadata.rename_file(old_name, new_name)
+      contentMetadata.rename_file(old_name, new_name)
     end
     def remove_resource resource_name
       #run delete for all of the files in the resource
-      xml=self.contentMetadata.ng_xml
+      xml=contentMetadata.ng_xml
       files=xml.search('//resource[@id=\''+resource_name+'\']/file').each do |file|
-        self.remove_file(file['id'])
+        remove_file(file['id'])
       end
       #remove the resource record from the metadata and renumber the resource sequence
-      self.contentMetadata.remove_resource resource_name
+      contentMetadata.remove_resource resource_name
     end
     #list files in the workspace
     def list_files
       filename='none'
       files=[]
       sftp=Net::SFTP.start(Config.content.content_server,Config.content.content_user,:auth_methods=>['publickey'])
-      druid_tools=DruidTools::Druid.new(self.pid,Config.content.content_base_dir)
+      druid_tools=DruidTools::Druid.new(pid,Config.content.content_base_dir)
       location=druid_tools.path(filename).gsub(filename,'')
-      oldlocation=location.gsub('/'+self.pid.gsub('druid:',''),'')
+      oldlocation=location.gsub('/'+pid.gsub('druid:',''),'')
       begin
         sftp.dir.entries(location, "*") do |file|
           files<<file.name
@@ -146,7 +146,7 @@ module Dor
           return files
         end
       end
-      return files
+      files
     end
 
     # Appends contentMetadata file resources from the source objects to this object
@@ -172,7 +172,7 @@ module Dor
             secondary_file['id'] = new_secondary_file_name(secondary_file['id'], max_sequence)
 
             if primary_cm.at_xpath("//file[@id = '#{secondary_file["id"]}']")
-              raise Dor::Exception.new "File '#{secondary_file['id']}' from secondary object #{src_pid} already exist in primary object: #{self.pid}"
+              raise Dor::Exception.new "File '#{secondary_file['id']}' from secondary object #{src_pid} already exist in primary object: #{pid}"
             end
           end
 
@@ -194,7 +194,7 @@ module Dor
           resource_copy.first_element_child.add_previous_sibling attr_node
         end
       end
-      self.contentMetadata.content_will_change!
+      contentMetadata.content_will_change!
     end
 
     def new_secondary_file_name old_name, sequence_num
@@ -223,4 +223,4 @@ module Dor
       add_tag "Decommissioned : #{tag}"
     end
   end
-end
+end