dor-services 5.1.1 → 5.2.0

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -15,9 +15,7 @@ module Dor
 
     # @param [String] raw_tag the value of the tag attribute from a Version node
     def self.parse(raw_tag)
-      unless(raw_tag =~ /(\d+)\.(\d+)\.(\d+)/)
-        return nil
-      end
+      return nil unless raw_tag =~ /(\d+)\.(\d+)\.(\d+)/
       VersionTag.new $1, $2, $3
     end
 
@@ -45,7 +43,7 @@ module Dor
     end
 
     def to_s
-      "#{@major.to_s}.#{@minor.to_s}.#{admin.to_s}"
+      "#{@major}.#{@minor}.#{admin}"
     end
   end
 
@@ -81,7 +79,7 @@ module Dor
     # @param [Symbol] significance optional which part of the version tag to increment
     #  :major, :minor, :admin (see VersionTag#increment)
     def increment_version(description = nil, significance = nil)
-      if( find_by_terms(:version).size == 0)
+      if ( find_by_terms(:version).size == 0)
         v = ng_xml.create_element "version",
         :versionId => '1', :tag => '1.0.0'
         d = ng_xml.create_element "description", "Initial Version"
@@ -94,13 +92,13 @@ module Dor
         current_tag = VersionTag.parse(current[:tag])
 
         v = ng_xml.create_element "version", :versionId => (current_id + 1).to_s
-        if(significance && current_tag)
+        if significance && current_tag
           v[:tag] = current_tag.increment(significance).to_s
         end
         ng_xml.root['objectId'] = pid
         ng_xml.root.add_child(v)
 
-        if(description)
+        if description
           d = ng_xml.create_element "description", description
           v.add_child d
         end
@@ -126,18 +124,18 @@ module Dor
       return if find_by_terms(:version).size == 1
       return if opts.empty?
       current = current_version_node
-      if(opts.include? :description)
+      if opts.include? :description
         d = current.at_xpath('description')
-        if(d)
+        if d
           d.content = opts[:description]
         else
           d_node = ng_xml.create_element "description", opts[:description]
           current.add_child d_node
         end
       end
-      if(opts.include? :significance)
+      if opts.include? :significance
         # tricky because if there is no tag, we have to find the newest
-        if(current[:tag].nil?)
+        if current[:tag].nil?
           current[:tag] = newest_tag.increment(opts[:significance]).to_s
         else
           # get rid of the current tag
@@ -154,7 +152,7 @@ module Dor
     # @return [Boolean] returns true if the current version has a tag and a description, false otherwise
     def current_version_closeable?
       current = current_version_node
-      if(current[:tag] && current.at_xpath('description'))
+      if current[:tag] && current.at_xpath('description')
         return true
       else
         return false
@@ -188,9 +186,7 @@ module Dor
     # @return [String] The description for the current version
     def current_description
       desc_node=current_version_node.at_xpath('description')
-      if desc_node
-        return desc_node.content
-      end
+      return desc_node.content if desc_node
       ''
     end
 

data/lib/dor/datastreams/workflow_definition_ds.rb

@@ -1,17 +1,15 @@
 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)
-      prereqs = prereqs.split(/\s*,\s*/)
-    end
+    prereqs = prereqs.split(/\s*,\s*/) if prereqs.is_a?(String)
     attrs.keys.each { |k| attrs[k.to_s.dasherize.to_sym] = attrs.delete(k) }
     builder.process(attrs) do |node|
       Array(prereqs).each do |prereq|
@@ -20,7 +18,7 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
           prereq_name = repo
           repo = nil
         end
-        if (repo == workflow.repo && wf = workflow.name)
+        if repo == workflow.repo && wf = workflow.name
           repo = nil
           wf = nil
         end
@@ -33,15 +31,15 @@ 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)
   end
-  
+
   def processes
     ng_xml.xpath('/workflow-def/process').collect do |node|
       Workflow::Process.new(self.repo, self.name, node)
@@ -51,7 +49,7 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
   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 +61,15 @@ 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| 
-      if v.is_a?(Hash)
-        add_process(v.merge({:name => k, :sequence => i+=1}))
-      end
+    hash.each_pair do |k,v|
+      add_process(v.merge({:name => k, :sequence => i+=1})) if v.is_a?(Hash)
     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
@@ -83,7 +79,7 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
     processes.each { |proc|
       doc.create_element 'process' do |node|
         node['name'] = proc.name
-        if(proc.status)
+        if proc.status
           node['status'] = proc.status
           node['attempts'] = '1'
         else
@@ -95,19 +91,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)
     super(solr_doc,*args)
-    add_solr_value(solr_doc, "workflow_name", self.name, :symbol, [:searchable])
+    add_solr_value(solr_doc, "workflow_name", self.name, :symbol, [:symbol])
     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)
   end
-  
+
 end
 end

data/lib/dor/datastreams/workflow_ds.rb

@@ -8,7 +8,7 @@ class WorkflowDs < ActiveFedora::OmDatastream
       t.process {
         t.name_(:path=>{:attribute=>"name"}, :index_as => [:displayable, :not_searchable])
         t.status(:path=>{:attribute=>"status"}, :index_as => [:displayable, :not_searchable])
-        t.timestamp(:path=>{:attribute=>"datetime"}, :index_as => [:displayable, :not_searchable])#, :data_type => :date)
+        t.timestamp(:path=>{:attribute=>"datetime"}, :index_as => [:displayable, :not_searchable]) #, :data_type => :date)
         t.elapsed(:path=>{:attribute=>"elapsed"}, :index_as => [:displayable, :not_searchable])
         t.lifecycle(:path=>{:attribute=>"lifecycle"}, :index_as => [:displayable, :not_searchable])
         t.attempts(:path=>{:attribute=>"attempts"}, :index_as => [:displayable, :not_searchable])
@@ -16,24 +16,18 @@ class WorkflowDs < ActiveFedora::OmDatastream
     }
   end
 
-  def get_workflow (wf,repo='dor')
-    xml=Dor::WorkflowService.get_workflow_xml(repo, self.pid, wf)
-    xml=Nokogiri::XML(xml)
-    if xml.xpath('workflow').length == 0
-      nil
-    else
-      Workflow::Document.new(xml.to_s)
-    end
+  def get_workflow(wf, repo = 'dor')
+    xml = Dor::WorkflowService.get_workflow_xml(repo, self.pid, wf)
+    xml = Nokogiri::XML(xml)
+    return nil if xml.xpath('workflow').length == 0
+    Workflow::Document.new(xml.to_s)
   end
 
   def [](wf)
-    xml=Dor::WorkflowService.get_workflow_xml('dor', self.pid, wf)
-    xml=Nokogiri::XML(xml)
-    if xml.xpath('workflow').length == 0
-      nil
-    else
-      Workflow::Document.new(xml.to_s)
-    end
+    xml = Dor::WorkflowService.get_workflow_xml('dor', self.pid, wf)
+    xml = Nokogiri::XML(xml)
+    return nil if xml.xpath('workflow').length == 0
+    Workflow::Document.new(xml.to_s)
   end
 
   def ensure_xml_loaded
@@ -46,33 +40,27 @@ class WorkflowDs < ActiveFedora::OmDatastream
   end
 
   def content
-    begin
-      @content ||= Dor::WorkflowService.get_workflow_xml 'dor', self.pid, nil
-    rescue RestClient::ResourceNotFound
-      xml = Nokogiri::XML(%{<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<workflows objectId="#{self.pid}"/>})
-      self.digital_object.datastreams.keys.each do |dsid|
-        if dsid =~ /WF$/
-          ds_content = Nokogiri::XML(Dor::WorkflowService.get_workflow_xml 'dor', self.pid, dsid)
-          xml.root.add_child(ds_content.root)
-        end
-      end
-      @content ||= xml.to_xml
+    @content ||= Dor::WorkflowService.get_workflow_xml 'dor', self.pid, nil
+  rescue RestClient::ResourceNotFound
+    xml = Nokogiri::XML(%{<?xml version="1.0" encoding="UTF-8" standalone="yes"?>\n<workflows objectId="#{self.pid}"/>})
+    self.digital_object.datastreams.keys.each do |dsid|
+      next unless dsid =~ /WF$/
+      ds_content = Nokogiri::XML(Dor::WorkflowService.get_workflow_xml 'dor', self.pid, dsid)
+      xml.root.add_child(ds_content.root)
     end
+    @content ||= xml.to_xml
   end
 
   def workflows
     @workflows ||= self.workflow.nodeset.collect { |wf_node| Workflow::Document.new wf_node.to_xml }
   end
 
-  def graph(dir=nil)
+  def graph(dir = nil)
     result = GraphViz.digraph(self.pid)
     sg = result.add_graph('rank') { |g| g[:rank => 'same'] }
-    workflows.each do |wf|
-      wf_name = wf.workflowId.first
-      unless wf.nil?
-        g = wf.graph(result)
-        sg.add_node(g.root.id) unless g.nil?
-      end
+    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
@@ -82,8 +70,8 @@ class WorkflowDs < ActiveFedora::OmDatastream
   #
   # @return [Integer] value of the priority.  Defaults to 0 if none of the workflows are expedited
   def current_priority
-    cp = workflows.detect {|wf| wf.expedited? }
-    return 0 if(cp.nil?)
+    cp = workflows.detect { |wf| wf.expedited? }
+    return 0 if cp.nil?
     cp.priority.to_i
   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

@@ -1,9 +1,9 @@
 Dor::Versionable.on_upgrade '3.12.2', 'Add missing versionMetadata' do |obj|
   run = false
   vm = obj.datastreams['versionMetadata']
-  if(vm.content.nil? || vm.content.strip == '' || vm.new?) # We do not have a versionMetadata ds
+  if vm.content.nil? || vm.content.strip == '' || vm.new? # We do not have a versionMetadata ds
     vm.content = vm.ng_xml.to_s
     run = true
   end
   run
-end
+end

data/lib/dor/models/assembleable.rb

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

data/lib/dor/models/collection.rb

@@ -6,6 +6,7 @@ module Dor
     include Describable
     include Publishable
     include Versionable
+    include Releaseable
 
     has_many :members, :property => :is_member_of_collection, :inbound => true, :class_name => "ActiveFedora::Base"
     has_object_type 'collection'

data/lib/dor/models/contentable.rb

@@ -153,7 +153,7 @@ module Dor
     # determine whether the file in question is present in the object's workspace.
     def is_file_in_workspace? filename
       druid_obj = DruidTools::Druid.new(self.pid, Dor::Config.stacks.local_workspace_root)
-      return druid_obj.find_content(filename) != nil
+      return !druid_obj.find_content(filename).nil?
     end
 
     # Appends contentMetadata file resources from the source objects to this object
@@ -178,7 +178,7 @@ module Dor
           resource_copy.xpath('file').each do |secondary_file|
             secondary_file['id'] = new_secondary_file_name(secondary_file['id'], max_sequence)
 
-            if primary_cm.at_xpath("//file[@id = '#{secondary_file["id"]}']")
+            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}"
             end
           end
@@ -230,4 +230,4 @@ module Dor
       add_tag "Decommissioned : #{tag}"
     end
   end
-end
+end

data/lib/dor/models/describable.rb

@@ -32,12 +32,11 @@ module Dor
 
     def build_descMetadata_datastream(ds)
       content = fetch_descMetadata_datastream
-      unless content.nil?
-        ds.dsLabel = 'Descriptive Metadata'
-        ds.ng_xml = Nokogiri::XML(content)
-        ds.ng_xml.normalize_text!
-        ds.content = ds.ng_xml.to_xml
-      end
+      return nil if content.nil?
+      ds.dsLabel = 'Descriptive Metadata'
+      ds.ng_xml = Nokogiri::XML(content)
+      ds.ng_xml.normalize_text!
+      ds.content = ds.ng_xml.to_xml
     end
 
     # Generates Dublin Core from the MODS in the descMetadata datastream using the LoC mods2dc stylesheet
@@ -54,7 +53,7 @@ module Dor
       dc_doc = xslt.transform(desc_md)
       # Remove empty nodes
       dc_doc.xpath('/oai_dc:dc/*[count(text()) = 0]').remove
-      if(dc_doc.root.nil? || dc_doc.root.children.size == 0)
+      if dc_doc.root.nil? || dc_doc.root.children.size == 0
         raise CrosswalkError, "Dor::Item#generate_dublin_core produced incorrect xml:\n#{dc_doc.to_xml}"
       end
       dc_doc
@@ -158,11 +157,17 @@ module Dor
     def to_solr(solr_doc=Hash.new, *args)
       super solr_doc, *args
       mods_sources = {
+        'sw_language_ssim'           => :sw_language_facet,
         'sw_language_tesim'           => :sw_language_facet,
+        'sw_genre_ssim'               => :sw_genre,
         'sw_genre_tesim'              => :sw_genre,
+        'sw_format_ssim'              => :format_main,   # basically sw_typeOfResource_ssim
         'sw_format_tesim'             => :format_main,   # basically sw_typeOfResource_tesim
+        'sw_subject_temporal_ssim'    => :era_facet,
         'sw_subject_temporal_tesim'   => :era_facet,
+        'sw_subject_geographic_ssim'  => :geographic_facet,
         'sw_subject_geographic_tesim' => :geographic_facet,
+        'mods_typeOfResource_ssim'    => [:term_values, :typeOfResource],
         'mods_typeOfResource_tesim'   => [:term_values, :typeOfResource]
       }
       keys = mods_sources.keys.concat(%w[ metadata_format_ssim ])
@@ -194,7 +199,7 @@ module Dor
         mods = self.stanford_mods
         mods_sources.each_pair do |solr_key, meth|
           vals = meth.is_a?(Array) ? mods.send(meth.shift, *meth) : mods.send(meth)
-          solr_doc[solr_key].push *vals unless (vals.nil? || vals.empty?)
+          solr_doc[solr_key].push *vals unless vals.nil? || vals.empty?
           # asterisk to avoid multi-dimensional array: push values, not the array
         end
         solr_doc['sw_pub_date_sort_ssi' ] = mods.pub_date_sort  # e.g. '0800'
@@ -203,14 +208,12 @@ module Dor
       # some fields get explicit "(none)" placeholder values, mostly for faceting
       %w[sw_language_tesim sw_genre_tesim sw_format_tesim].each { |key| solr_doc[key] = ['(none)'] if solr_doc[key].empty? }
       # otherwise remove empties
-      keys.each{ |key| solr_doc.delete(key) if (solr_doc[key].nil? || solr_doc[key].empty?)}
+      keys.each{ |key| solr_doc.delete(key) if solr_doc[key].nil? || solr_doc[key].empty?}
       solr_doc
     end
 
     def update_title(new_title)
-      if not update_simple_field('mods:mods/mods:titleInfo/mods:title',new_title)
-        raise 'Descriptive metadata has no title to update!'
-      end
+      raise 'Descriptive metadata has no title to update!' unless update_simple_field('mods:mods/mods:titleInfo/mods:title', new_title)
     end
     def add_identifier(type, value)
       ds_xml=self.descMetadata.ng_xml
@@ -252,7 +255,7 @@ module Dor
       xml=obj.descMetadata.ng_xml
       title=''
       title_node = xml.at_xpath('//mods:mods/mods:titleInfo/mods:title','mods' => 'http://www.loc.gov/mods/v3')
-      if(title_node)
+      if title_node
         title = title_node.content
         subtitle=xml.at_xpath('//mods:mods/mods:titleInfo/mods:subTitle','mods' => 'http://www.loc.gov/mods/v3')
         title += " (#{subtitle.content})" if subtitle