dor-services 4.22.3 → 4.22.4

data/lib/dor/models/identifiable.rb

@@ -6,8 +6,8 @@ module Dor
     include Upgradable
 
     included do
-      has_metadata :name => "DC", :type => SimpleDublinCoreDs, :label => 'Dublin Core Record for self object'
-      has_metadata :name => "identityMetadata", :type => Dor::IdentityMetadataDS, :label => 'Identity Metadata'
+      has_metadata :name => 'DC', :type => SimpleDublinCoreDs, :label => 'Dublin Core Record for self object'
+      has_metadata :name => 'identityMetadata', :type => Dor::IdentityMetadataDS, :label => 'Identity Metadata'
     end
 
     module ClassMethods
@@ -18,24 +18,22 @@ module Dor
       end
     end
 
-    def initialize attrs={}
+    def initialize attrs = {}
       if Dor::Config.suri.mint_ids
-        unless attrs[:pid]
-          attrs = attrs.merge!({:pid=>Dor::SuriService.mint_id, :new_object => true})
-        end
+        attrs = attrs.merge!({:pid => Dor::SuriService.mint_id, :new_object => true}) unless attrs[:pid]
       end
       super
     end
 
     # helper method to get the tags as an array
     def tags
-      self.identityMetadata.tag
+      identityMetadata.tag
     end
-    
+
     # helper method to get just the content type tag
     def content_type_tag
-      content_tag=tags.select {|tag| tag.include?('Process : Content Type')}
-      content_tag.size == 1 ? content_tag[0].split(':').last.strip : ""
+      content_tag = tags.select {|tag| tag.include?('Process : Content Type')}
+      content_tag.size == 1 ? content_tag[0].split(':').last.strip : ''
     end
 
     # Syntactic sugar for identifying applied DOR Concerns
@@ -53,138 +51,131 @@ module Dor
       end
     end
 
-    @@collection_hash={}
-    @@apo_hash={}
-    @@hydrus_apo_hash={}
-    @@hydrus_collection_hash={}
-    def to_solr(solr_doc=Hash.new, *args)
-      self.assert_content_model
+    @@collection_hash = {}
+    @@apo_hash        = {}
+    @@hydrus_apo_hash = {}
+    @@hydrus_collection_hash = {}
+    def to_solr(solr_doc = {}, *args)
+      assert_content_model
       super(solr_doc)
       solr_doc[Dor::INDEX_VERSION_FIELD] = Dor::VERSION
-      solr_doc[solr_name('indexed_at',:date)] = Time.now.utc.xmlschema
+      solr_doc[solr_name('indexed_at', :date)] = Time.now.utc.xmlschema
       add_solr_value(solr_doc, 'indexed_day', Time.now.beginning_of_day.utc.xmlschema, :string, [:searchable, :facetable])
       datastreams.values.each do |ds|
-        unless ds.new?
-          add_solr_value(solr_doc,'ds_specs',ds.datastream_spec_string,:string,[:displayable])
-        end
+        next if ds.new?
+        add_solr_value(solr_doc, 'ds_specs', ds.datastream_spec_string, :string, [:displayable])
       end
-      add_solr_value(solr_doc, 'title_sort', self.label, :string, [:sortable])
-      rels_doc = Nokogiri::XML(self.datastreams['RELS-EXT'].content)
-      apos=rels_doc.search('//rdf:RDF/rdf:Description/hydra:isGovernedBy','hydra' => 'http://projecthydra.org/ns/relations#', 'fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' 	)
+      add_solr_value(solr_doc, 'title_sort', label, :string, [:sortable])
+      rels_doc = Nokogiri::XML(datastreams['RELS-EXT'].content)
+      apos = rels_doc.search('//rdf:RDF/rdf:Description/hydra:isGovernedBy', 'hydra' => 'http://projecthydra.org/ns/relations#', 'fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' )
       apos.each do |apo_node|
-        druid=apo_node['rdf:resource']
-        if druid
-          druid=druid.gsub('info:fedora/','')
-          if @@apo_hash.has_key? druid or @@hydrus_apo_hash.has_key? druid
-            add_solr_value(solr_doc, "hydrus_apo_title", @@hydrus_apo_hash[druid], :string, [:searchable, :facetable]) if @@hydrus_apo_hash.has_key? druid
-            add_solr_value(solr_doc, "apo_title", @@apo_hash[druid] , :string, [:searchable, :facetable]) if @@apo_hash.has_key? druid
-          else
-            begin
-              apo_object=Dor.find(druid)
-              if apo_object.tags.include? 'Project : Hydrus'
-                add_solr_value(solr_doc, "hydrus_apo_title", apo_object.label, :string, [:searchable, :facetable])
-                @@hydrus_apo_hash[druid]=apo_object.label
-              else
-                add_solr_value(solr_doc, "apo_title", apo_object.label, :string, [:searchable, :facetable])
-                @@apo_hash[druid]=apo_object.label
-              end
-            rescue
-              add_solr_value(solr_doc, "apo_title", druid, :string, [:searchable, :facetable])
+        druid = apo_node['rdf:resource']
+        next unless druid
+        druid = druid.gsub('info:fedora/','')
+        if @@apo_hash.has_key?(druid) || @@hydrus_apo_hash.has_key?(druid)
+          add_solr_value(solr_doc, 'hydrus_apo_title', @@hydrus_apo_hash[druid], :string, [:searchable, :facetable]) if @@hydrus_apo_hash.has_key? druid
+          add_solr_value(solr_doc, 'apo_title', @@apo_hash[druid] , :string, [:searchable, :facetable]) if @@apo_hash.has_key? druid
+        else
+          begin
+            apo_object = Dor.find(druid)
+            if apo_object.tags.include? 'Project : Hydrus'
+              add_solr_value(solr_doc, 'hydrus_apo_title', apo_object.label, :string, [:searchable, :facetable])
+              @@hydrus_apo_hash[druid] = apo_object.label
+            else
+              add_solr_value(solr_doc, 'apo_title', apo_object.label, :string, [:searchable, :facetable])
+              @@apo_hash[druid] = apo_object.label
             end
+          rescue
+            add_solr_value(solr_doc, 'apo_title', druid, :string, [:searchable, :facetable])
           end
         end
       end
-      collections=rels_doc.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection','fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' 	)
+      collections = rels_doc.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection', 'fedora' => 'info:fedora/fedora-system:def/relations-external#', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#')
       collections.each do |collection_node|
-        druid=collection_node['rdf:resource']
-        if(druid)
-          druid=druid.gsub('info:fedora/','')
-          if @@collection_hash.has_key? druid or @@hydrus_collection_hash.has_key? druid
-            add_solr_value(solr_doc, "hydrus_collection_title", @@hydrus_collection_hash[druid], :string, [:searchable, :facetable]) if @@hydrus_collection_hash.has_key? druid
-            add_solr_value(solr_doc, "collection_title", @@collection_hash[druid], :string, [:searchable, :facetable]) if @@collection_hash.has_key? druid
-          else
-            begin
-              collection_object=Dor.find(druid)
-              if collection_object.tags.include? 'Project : Hydrus'
-                add_solr_value(solr_doc, "hydrus_collection_title", collection_object.label, :string, [:searchable, :facetable])
-                @@hydrus_collection_hash[druid]=collection_object.label
-              else
-                add_solr_value(solr_doc, "collection_title", collection_object.label, :string, [:searchable, :facetable])
-                @@collection_hash[druid]=collection_object.label
-              end
-            rescue
-              add_solr_value(solr_doc, "collection_title", druid, :string, [:searchable, :facetable])
+        druid = collection_node['rdf:resource']
+        next unless druid
+        druid = druid.gsub('info:fedora/', '')
+        if @@collection_hash.has_key?(druid) || @@hydrus_collection_hash.has_key?(druid)
+          add_solr_value(solr_doc, 'hydrus_collection_title', @@hydrus_collection_hash[druid], :string, [:searchable, :facetable]) if @@hydrus_collection_hash.has_key? druid
+          add_solr_value(solr_doc, 'collection_title', @@collection_hash[druid], :string, [:searchable, :facetable]) if @@collection_hash.has_key? druid
+        else
+          begin
+            collection_object = Dor.find(druid)
+            if collection_object.tags.include? 'Project : Hydrus'
+              add_solr_value(solr_doc, 'hydrus_collection_title', collection_object.label, :string, [:searchable, :facetable])
+              @@hydrus_collection_hash[druid] = collection_object.label
+            else
+              add_solr_value(solr_doc, 'collection_title', collection_object.label, :string, [:searchable, :facetable])
+              @@collection_hash[druid] = collection_object.label
             end
+          rescue
+            add_solr_value(solr_doc, 'collection_title', druid, :string, [:searchable, :facetable])
           end
         end
       end
       # Fix for ActiveFedora 3.3 to ensure all date fields are properly formatted as UTC XML Schema datetime strings
-      solr_doc.each_pair { |k,v|
-        if k =~ /(_dt|_date)$/
-          if v.is_a?(Array)
-            solr_doc[k] = v.collect { |t| Time.parse(t.to_s).utc.xmlschema }
-          else
-            solr_doc[k] = Time.parse(v.to_s).utc.xmlschema
-          end
+      solr_doc.each_pair { |k, v|
+        next unless k =~ /(_dt|_date)$/
+        if v.is_a?(Array)
+          solr_doc[k] = v.collect { |t| Time.parse(t.to_s).utc.xmlschema }
+        else
+          solr_doc[k] = Time.parse(v.to_s).utc.xmlschema
         end
       }
-
       solr_doc
     end
+
     def set_source_id(source_id)
-      self.identityMetadata.sourceId = source_id
+      identityMetadata.sourceId = source_id
     end
 
-    def add_other_Id(type,val)
-      if self.identityMetadata.otherId(type).length>0
+    def add_other_Id(type, val)
+      if identityMetadata.otherId(type).length > 0
         raise 'There is an existing entry for '+node_name+', consider using update_other_identifier.'
       end
-      identity_metadata_ds = self.identityMetadata
+      identity_metadata_ds = identityMetadata
       identity_metadata_ds.add_otherId(type+':'+val)
     end
 
-    def update_other_Id(type,new_val, val=nil)
-      identity_metadata_ds = self.identityMetadata
-      ds_xml=identity_metadata_ds.ng_xml
-      #split the thing they sent in to find the node name
-      updated=false
+    def update_other_Id(type, new_val, val = nil)
+      identity_metadata_ds = identityMetadata
+      ds_xml = identity_metadata_ds.ng_xml
+      # split the thing they sent in to find the node name
+      updated = false
       ds_xml.search('//otherId[@name=\''+type+'\']').each do |node|
-        if node.content==val or val==nil
-          node.content=new_val
-          updated=true
-        end
+        next unless node.content == val || val.nil?
+        node.content = new_val
+        updated = true
       end
-      return updated
+      updated
     end
 
-    def remove_other_Id(type,val=nil)
-      ds_xml=self.identityMetadata.ng_xml
-      #split the thing they sent in to find the node name
-      removed=false
-
+    def remove_other_Id(type, val = nil)
+      ds_xml = identityMetadata.ng_xml
+      # split the thing they sent in to find the node name
+      removed = false
       ds_xml.search('//otherId[@name=\''+type+'\']').each do |node|
-        if node.content===val or val==nil
-          node.remove
-          removed=true
-        end
+        next unless node.content === val || val.nil?
+        node.remove
+        removed = true
       end
-      return removed
+      removed
     end
 
     # turns a tag string into an array with one element per tag part.
     # split on ":", disregard leading and trailing whitespace on tokens.
     def split_tag_to_arr(tag_str)
-      return tag_str.split(":").map {|str| str.strip}
+      tag_str.split(':').map {|str| str.strip}
     end
 
     # turn a tag array back into a tag string with a standard format
     def normalize_tag_arr(tag_arr)
-      return tag_arr.join(' : ')
+      tag_arr.join(' : ')
     end
 
     # take a tag string and return a normalized tag string
     def normalize_tag(tag_str)
-      return normalize_tag_arr(split_tag_to_arr(tag_str))
+      normalize_tag_arr(split_tag_to_arr(tag_str))
     end
 
     # take a proposed tag string and a list of the existing tags for the object being edited.  if
@@ -192,49 +183,34 @@ module Dor
     # explanatory message.
     def validate_and_normalize_tag(tag_str, existing_tag_list)
       tag_arr = validate_tag_format(tag_str)
-
-      # note that the comparison for duplicate tags is case-insensitive, but we don't change case as part of the normalized version 
+      # note that the comparison for duplicate tags is case-insensitive, but we don't change case as part of the normalized version
       # we return, because we want to preserve the user's intended case.
       normalized_tag = normalize_tag_arr(tag_arr)
       dupe_existing_tag = existing_tag_list.detect { |existing_tag| normalize_tag(existing_tag).downcase == normalized_tag.downcase }
-      if dupe_existing_tag
-        raise "An existing tag (#{dupe_existing_tag}) is the same, consider using update_tag?"
-      end
-
-      return normalized_tag
+      raise "An existing tag (#{dupe_existing_tag}) is the same, consider using update_tag?" if dupe_existing_tag
+      normalized_tag
     end
-    
-    #Ensure that an administrative tag meets the proper mininum format
-    #
-    #@params tag_str [String] the tag
-    #
-    #@return [Array] the tag split into an array via ':'
+
+    # Ensure that an administrative tag meets the proper mininum format
+    # @param [String] tag_str the tag
+    # @return [Array] the tag split into an array via ':'
     def validate_tag_format(tag_str)
       tag_arr = split_tag_to_arr(tag_str)
-
-      if tag_arr.length < 2
-        raise "Invalid tag structure:  tag '#{tag_str}' must have at least 2 elements"
-      end
-
-      if tag_arr.detect {|str| str.empty?}
-        raise "Invalid tag structure:  tag '#{tag_str}' contains empty elements"
-      end
-      
-      return tag_arr
-      
+      raise "Invalid tag structure:  tag '#{tag_str}' must have at least 2 elements" if tag_arr.length < 2
+      raise "Invalid tag structure:  tag '#{tag_str}' contains empty elements" if tag_arr.detect {|str| str.empty?}
+      tag_arr
     end
-    
-    #Add an administrative tag to an item, you will need to seperately save the item to write it to fedora
-    #
-    #@param tag [string] The tag you wish to add
+
+    # Add an administrative tag to an item, you will need to seperately save the item to write it to fedora
+    # @param tag [string] The tag you wish to add
     def add_tag(tag)
-        identity_metadata_ds = self.identityMetadata
-        normalized_tag = validate_and_normalize_tag(tag, identity_metadata_ds.tags)
-        identity_metadata_ds.add_value(:tag, normalized_tag)
+      identity_metadata_ds = identityMetadata
+      normalized_tag = validate_and_normalize_tag(tag, identity_metadata_ds.tags)
+      identity_metadata_ds.add_value(:tag, normalized_tag)
     end
-  
+
     def remove_tag(tag)
-      identity_metadata_ds = self.identityMetadata
+      identity_metadata_ds = identityMetadata
       ds_xml = identity_metadata_ds.ng_xml
       removed = false
       ds_xml.search('//tag').each do |node|
@@ -243,32 +219,30 @@ module Dor
           removed = true
         end
       end
-      return removed
+      removed
     end
-    
-    #Removes all displayTypes from an item in preparation of adding a new display type
-    #
-    #@return Boolean True if displayTypes were removed, False if no displayTypes were removed
+
+    # Removes all displayTypes from an item in preparation of adding a new display type
+    # @return Boolean True if displayTypes were removed, False if no displayTypes were removed
     def remove_displayTypes
       removed = false
-      self.identityMetadata.ng_xml.search('//displayType').each do |node|
-          node.remove
-          removed = true
+      identityMetadata.ng_xml.search('//displayType').each do |node|
+        node.remove
+        removed = true
       end
-      return removed
+      removed
     end
 
     def update_tag(old_tag, new_tag)
-      identity_metadata_ds = self.identityMetadata
+      identity_metadata_ds = identityMetadata
       ds_xml = identity_metadata_ds.ng_xml
       updated = false
       ds_xml.search('//tag').each do |node|
-        if normalize_tag(node.content) == normalize_tag(old_tag)
-          node.content = normalize_tag(new_tag)
-          updated = true
-        end
+        next unless normalize_tag(node.content) == normalize_tag(old_tag)
+        node.content = normalize_tag(new_tag)
+        updated = true
       end
-      return updated
+      updated
     end
   end
 end

data/lib/dor/models/item.rb

@@ -1,7 +1,7 @@
 module Dor
   module BasicItem
     extend ActiveSupport::Concern
-    
+
     include Identifiable
     include Processable
     include Governable
@@ -17,7 +17,7 @@ module Dor
     include Geoable
     include Releaseable
   end
-  
+
   class Abstract < ::ActiveFedora::Base
     include Identifiable
   end

data/lib/dor/models/itemizable.rb

@@ -8,20 +8,20 @@ module Dor
     included do
       has_metadata :name => "contentMetadata", :type => Dor::ContentMetadataDS, :label => 'Content Metadata', :control_group => 'M'
     end
-    
+
     DIFF_FILENAME = 'cm_inv_diff'
     DIFF_QUERY = DIFF_FILENAME.gsub('_', '-')
 
     # Deletes all cm_inv_diff files in the workspace for the Item
     def clear_diff_cache
       if Dor::Config.stacks.local_workspace_root.nil?
-        raise ArgumentError, 'Missing Dor::Config.stacks.local_workspace_root' 
+        raise ArgumentError, 'Missing Dor::Config.stacks.local_workspace_root'
       end
-      druid = DruidTools::Druid.new(self.pid, Dor::Config.stacks.local_workspace_root)
+      druid = DruidTools::Druid.new(pid, Dor::Config.stacks.local_workspace_root)
       diff_pattern = File.join(druid.temp_dir, DIFF_FILENAME + '.*')
       FileUtils.rm_f Dir.glob(diff_pattern)
     end
-    
+
     # Retrieves file difference manifest for contentMetadata from SDR
     #
     # @param [String] subset keyword for file attributes :shelve, :preserve, :publish. Default is :all.
@@ -29,7 +29,7 @@ module Dor
     # @return [String] XML contents of cm_inv_diff manifest
     def get_content_diff(subset = :all, version = nil)
       if Dor::Config.stacks.local_workspace_root.nil?
-        raise Dor::ParameterError, 'Missing Dor::Config.stacks.local_workspace_root' 
+        raise Dor::ParameterError, 'Missing Dor::Config.stacks.local_workspace_root'
       end
       unless %w{all shelve preserve publish}.include?(subset.to_s)
         raise Dor::ParameterError, "Invalid subset value: #{subset}"
@@ -40,17 +40,17 @@ module Dor
         raise Dor::ParameterError, 'Missing Dor::Config.sdr.rest_client'
       end
       sdr_client = Dor::Config.sdr.rest_client
-      current_content = self.datastreams['contentMetadata'].content
+      current_content = datastreams['contentMetadata'].content
       if current_content.nil?
         raise Dor::Exception, "Missing contentMetadata datastream"
       end
       query_string = { :subset => subset.to_s }
       query_string[:version] = version.to_s unless version.nil?
       query_string = URI.encode_www_form(query_string)
-      sdr_query = "objects/#{self.pid}/#{DIFF_QUERY}?#{query_string}"
+      sdr_query = "objects/#{pid}/#{DIFF_QUERY}?#{query_string}"
       response = sdr_client[sdr_query].post(current_content, :content_type => 'application/xml')
       response
     end
-    
+
   end
-end
+end

data/lib/dor/models/presentable.rb

@@ -17,7 +17,7 @@ module Dor
 
     # Bypass this method if there are no image resources in contentMetadata
     def build_iiif_manifest pub_obj_doc
-      id = self.pid.split(':').last
+      id = pid.split(':').last
 
       lbl_node = pub_obj_doc.at_xpath '//oai_dc:dc/dc:title', DC_NS
       if lbl_node.nil?
@@ -32,13 +32,13 @@ module Dor
         '@id'   => "#{purl_base_uri}/iiif/manifest.json",
         'label' => lbl,
         'attribution' => 'Provided by the Stanford University Libraries',
-        'logo' => { 
-          '@id' => "https://stacks.stanford.edu/image/iiif/wy534zh7137%2FSULAIR_rosette/full/400,/0/default.jpg", 
-          'service' => { 
-            '@context' => "http://iiif.io/api/image/2/context.json", 
-            '@id' => "https://stacks.stanford.edu/image/iiif/wy534zh7137%2FSULAIR_rosette", 
-            'profile' => "http://iiif.io/api/image/2/level1.json" 
-            } 
+        'logo' => {
+          '@id' => "https://stacks.stanford.edu/image/iiif/wy534zh7137%2FSULAIR_rosette/full/400,/0/default.jpg",
+          'service' => {
+            '@context' => "http://iiif.io/api/image/2/context.json",
+            '@id' => "https://stacks.stanford.edu/image/iiif/wy534zh7137%2FSULAIR_rosette",
+            'profile' => "http://iiif.io/api/image/2/level1.json"
+            }
           },
         'seeAlso' => {
           '@id' => "#{purl_base_uri}.mods",