dor-services 5.5.3 → 5.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d115a932d8e1cb2d0001a0cbd438ccb3b221295
-  data.tar.gz: c6e29d1b5dc81f5b0d01a8219af8203d26f19b8e
+  metadata.gz: ff194a7c8f4523d03cae50e749ca4347aef2ce63
+  data.tar.gz: 0187ff1e3f17f874cbc1412aa3ee1d0a2726284d
 SHA512:
-  metadata.gz: 5a5376112d318df10bfc33b35560bec04ed86d2af40c69fe3347567dd61c33b44c150234f7567c704bf417aa2df84cd65539d3bd0bbdff2b4dd50eac21a2bdb2
-  data.tar.gz: 6559d7a4c7728648b6862bc7e59aad6333404bedbd026588e8ea5b9b2893cbc62295752a0f1d4e81d049dca0dd85eb2676d62ddbc8ae9bee4509a03596c60638
+  metadata.gz: a78df8989f349a9b1d20fd940dd54437d2d756343b56fe1124e1ddad13e0933a076c434ec4db61829989154b50a3f12b51efd7198bb670784add5ed68848a91a
+  data.tar.gz: 9bd63d841e4a4bc0324ace233c5f72ef9b9a67c36e90fcc17eb5477be1ac59d3afbf70c93aa5af289831afe280558fa8399d7d811249c06239fadb0fac4d71a3

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -69,7 +69,7 @@ module Dor
         externalFile.add_previous_sibling(src_label)
         externalFile << src_image_data unless src_image_data.nil?
       end
-      
+
       result
     end
 
@@ -132,7 +132,7 @@ module Dor
           preserved_size += file['size'].to_i if file['preserve'] == 'yes'
           next unless file['shelve'] == 'yes'
           counts['shelved_file'] += 1
-          first_shelved_image ||= file['id'] if file['id'].match(/jp2$/)
+          first_shelved_image ||= file['id'] if file['id'] =~ /jp2$/
         end
       end
       solr_doc['content_type_ssim'              ] = doc.root['type']

data/lib/dor/datastreams/default_object_rights_ds.rb

@@ -119,7 +119,7 @@ module Dor
         # cleanup ordering is important here
         doc.xpath('//machine/text()').each { |node| node.content = node.content.strip }
         doc.xpath('//human')
-          .tap { |nodeset| norm.clean_linefeeds(nodeset) }
+          .tap { |node_set| norm.clean_linefeeds(node_set) }
           .each do |node|
             norm.trim_text(node)
             norm.remove_empty_nodes(node)

data/lib/dor/datastreams/desc_metadata_ds.rb

@@ -33,7 +33,9 @@ module Dor
 
     def self.xml_template
       Nokogiri::XML::Builder.new do |xml|
-        xml.mods( 'xmlns' => MODS_NS, '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') {
+        xml.mods(
+          'xmlns' => MODS_NS, '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') {
           xml.titleInfo {
             xml.title
           }

data/lib/dor/datastreams/simple_dublin_core_ds.rb

@@ -2,7 +2,12 @@ module Dor
 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.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 => [:stored_sortable, :stored_searchable], :xmlns => 'http://purl.org/dc/elements/1.1/', :namespace_prefix => 'dc')
     t.creator(   :index_as => [:stored_sortable, :stored_searchable], :xmlns => 'http://purl.org/dc/elements/1.1/', :namespace_prefix => 'dc')
     t.identifier(:index_as => [:symbol, :stored_searchable],          :xmlns => 'http://purl.org/dc/elements/1.1/', :namespace_prefix => 'dc')

data/lib/dor/datastreams/workflow_ds.rb

@@ -64,7 +64,7 @@ module Dor
     #
     # @return [Integer] value of the priority.  Defaults to 0 if none of the workflows are expedited
     def current_priority
-      cp = workflows.detect &:expedited?
+      cp = workflows.detect(&:expedited?)
       return 0 if cp.nil?
       cp.priority.to_i
     end

data/lib/dor/models/describable.rb

@@ -101,6 +101,48 @@ module Dor
       end
     end
 
+    # Remove existing relatedItem entries for collections from descMetadata
+    def remove_related_item_nodes_for_collections(doc)
+      doc.search('/mods:mods/mods:relatedItem[@type="host"]/mods:typeOfResource[@collection=\'yes\']', 'mods' => 'http://www.loc.gov/mods/v3').each do |node|
+        node.parent.remove
+      end
+    end
+
+    def add_related_item_node_for_collection(doc, collection_druid)
+      begin
+        collection_obj = Dor::Item.find(collection_druid)
+      rescue ActiveFedora::ObjectNotFoundError
+        return nil
+      end
+
+      title_node         = Nokogiri::XML::Node.new('title', doc)
+      title_node.content = Dor::Describable.get_collection_title(collection_obj)
+
+      title_info_node = Nokogiri::XML::Node.new('titleInfo', doc)
+      title_info_node.add_child(title_node)
+
+      # e.g.:
+      #   <location>
+      #     <url>http://purl.stanford.edu/rh056sr3313</url>
+      #   </location>
+      loc_node = doc.create_element('location')
+      url_node = doc.create_element('url')
+      url_node.content = "https://#{Dor::Config.stacks.document_cache_host}/#{collection_druid.split(':').last}"
+      loc_node << url_node
+
+      type_node = Nokogiri::XML::Node.new('typeOfResource', doc)
+      type_node['collection'] = 'yes'
+
+      related_item_node = Nokogiri::XML::Node.new('relatedItem', doc)
+      related_item_node['type'] = 'host'
+
+      related_item_node.add_child(title_info_node)
+      related_item_node.add_child(loc_node)
+      related_item_node.add_child(type_node)
+
+      doc.root.add_child(related_item_node)
+    end
+
     # Adds to desc metadata a relatedItem with information about the collection this object belongs to.
     # For use in published mods and mods-to-DC conversion.
     # @param [Nokogiri::XML::Document] doc A copy of the descriptiveMetadata of the object, to be modified
@@ -110,41 +152,14 @@ module Dor
       return unless methods.include? :public_relationships
       collections = public_relationships.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#' )
+                                       'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#')
       return if collections.empty?
 
-      # Remove any existing collections in the descMetadata
-      doc.search('/mods:mods/mods:relatedItem[@type="host"]/mods:typeOfResource[@collection=\'yes\']', 'mods' => 'http://www.loc.gov/mods/v3').each do |node|
-        node.parent.remove
-      end
+      remove_related_item_nodes_for_collections(doc)
 
       collections.each do |collection_node|
-        druid = collection_node['rdf:resource']
-        druid = druid.gsub('info:fedora/', '')
-        collection_obj = Dor::Item.find(druid)
-        collection_title = Dor::Describable.get_collection_title(collection_obj)
-        related_item_node = Nokogiri::XML::Node.new('relatedItem', doc)
-        related_item_node['type'] = 'host'
-        title_info_node = Nokogiri::XML::Node.new('titleInfo', doc)
-        title_node      = Nokogiri::XML::Node.new('title', doc)
-        title_node.content = collection_title
-
-        # e.g.:
-        #   <location>
-        #     <url>http://purl.stanford.edu/rh056sr3313</url>
-        #   </location>
-        loc_node = doc.create_element('location')
-        url_node = doc.create_element('url')
-        url_node.content = "https://#{Dor::Config.stacks.document_cache_host}/#{druid.split(':').last}"
-        loc_node << url_node
-
-        type_node = Nokogiri::XML::Node.new('typeOfResource', doc)
-        type_node['collection'] = 'yes'
-        doc.root.add_child(related_item_node)
-        related_item_node.add_child(title_info_node)
-        title_info_node.add_child(title_node)
-        related_item_node.add_child(loc_node)
-        related_item_node.add_child(type_node)
+        collection_druid = collection_node['rdf:resource'].gsub('info:fedora/', '')
+        add_related_item_node_for_collection(doc, collection_druid)
       end
     end
 
@@ -285,7 +300,9 @@ module Dor
       end
       label = self.label
       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') {
+        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') {
           xml.titleInfo {
             xml.title label
           }

data/lib/dor/models/governable.rb

@@ -35,23 +35,25 @@ module Dor
     end
 
     def add_collection(collection_or_druid)
-      collection = case collection_or_druid
+      collection =
+        case collection_or_druid
         when String
           Dor::Collection.find(collection_or_druid)
         when Dor::Collection
           collection_or_druid
-      end
+        end
       collections << collection
       sets << collection
     end
 
     def remove_collection(collection_or_druid)
-      collection = case collection_or_druid
+      collection =
+        case collection_or_druid
         when String
           Dor::Collection.find(collection_or_druid)
         when Dor::Collection
           collection_or_druid
-      end
+        end
 
       collections.delete(collection)
       sets.delete(collection)

data/lib/dor/models/identifiable.rb

@@ -69,8 +69,9 @@ module Dor
       add_solr_value(solr_doc, 'title_sort', label, :string, [:stored_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#')
-      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#')
+      ns_hash = {'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 = rels_doc.search('//rdf:RDF/rdf:Description/hydra:isGovernedBy', ns_hash)
+      collections = rels_doc.search('//rdf:RDF/rdf:Description/fedora:isMemberOfCollection', ns_hash)
       solrize_related_obj_titles(solr_doc, apos, @@apo_hash, 'apo_title', 'nonhydrus_apo_title', 'hydrus_apo_title')
       solrize_related_obj_titles(solr_doc, collections, @@collection_hash, 'collection_title', 'nonhydrus_collection_title', 'hydrus_collection_title')
 
@@ -151,7 +152,7 @@ module Dor
       # 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 }
+      dupe_existing_tag = existing_tag_list.detect { |existing_tag| normalize_tag(existing_tag).casecmp(normalized_tag) == 0 }
       if dupe_existing_tag
         raise "An existing tag (#{dupe_existing_tag}) is the same, consider using update_tag?"
       end
@@ -208,15 +209,13 @@ module Dor
     end
 
     def get_related_obj_display_title(related_obj, default_title)
-      if related_obj
-        if related_obj.datastreams['DC'] && related_obj.datastreams['DC'].title
-          return related_obj.datastreams['DC'].title
-        else
-          return related_obj.label
-        end
+      # desc_md_ds_title will be nil if related_obj is nil
+      desc_md_ds_title = if related_obj
+        desc_md_ds = related_obj.datastreams['descMetadata']
+        desc_md_ds ? desc_md_ds.title_info.main_title.first : nil
       end
 
-      default_title
+      desc_md_ds_title.present? ? desc_md_ds_title : default_title
     end
 
     private

data/lib/dor/models/processable.rb

@@ -165,7 +165,8 @@ module Dor
       if self.respond_to?('versionMetadata')
         # add an entry with version id, tag and description for each version
         while current_version_num > 0
-          add_solr_value(solr_doc, 'versions', current_version_num.to_s + ';' + versionMetadata.tag_for_version(current_version_num.to_s) + ';' + versionMetadata.description_for_version(current_version_num.to_s), :string, [:displayable])
+          new_val = "#{current_version_num};#{versionMetadata.tag_for_version(current_version_num.to_s)};#{versionMetadata.description_for_version(current_version_num.to_s)}"
+          add_solr_value(solr_doc, 'versions', new_val, :string, [:displayable])
           current_version_num -= 1
         end
       end

data/lib/dor/models/releaseable.rb

@@ -103,7 +103,7 @@ module Dor
     def get_tags_for_what_value(tags, what_target)
       return_hash = {}
       tags.keys.each do |key|
-        self_tags = tags[key].select {|tag| tag['what'] == what_target.downcase}
+        self_tags = tags[key].select {|tag| tag['what'].casecmp(what_target) == 0}
         return_hash[key] = self_tags if self_tags.size > 0
       end
       return_hash
@@ -180,7 +180,7 @@ module Dor
       attrs = rtag.attributes
       return_hash = { :to => attrs[to].value }
       attrs.tap { |a| a.delete(to) }
-      attrs[release] = rtag.text.downcase == 'true' # save release as a boolean
+      attrs[release] = rtag.text.casecmp('true') == 0 # save release as a boolean
       return_hash[:attrs] = attrs
 
       # convert all the attrs beside :to to strings, they are currently Nokogiri::XML::Attr
@@ -316,7 +316,7 @@ module Dor
     def get_release_tags_from_purl_xml(doc)
       nodes = doc.xpath('//html/body/publicobject/releasedata').children
       # We only want the nodes with a name that isn't text
-      nodes.reject {|n| n.name.nil? || n.name.downcase == 'text'}.map {|n| n.attr('to')}.uniq
+      nodes.reject {|n| n.name.nil? || n.name.casecmp('text') == 0 }.map {|n| n.attr('to')}.uniq
     end
 
     # Pull all release nodes from the public xml obtained via the purl query

data/lib/dor/models/versionable.rb

@@ -74,9 +74,12 @@ module Dor
       false
     end
 
-    # @return [Boolean] true if the object is in a state that allows it to be modified. States that will allow modification are: has not been submitted for accessioning, has an open version or has sdr-ingest set to hold
+    # @return [Boolean] true if the object is in a state that allows it to be modified.
+    #  States that will allow modification are: has not been submitted for accessioning, has an open version or has sdr-ingest set to hold
     def allows_modification?
-      if Dor::Config.workflow.client.get_lifecycle('dor', pid, 'submitted') && !new_version_open? && Dor::Config.workflow.client.get_workflow_status('dor', pid, 'accessionWF', 'sdr-ingest-transfer') != 'hold'
+      if Dor::Config.workflow.client.get_lifecycle('dor', pid, 'submitted') &&
+          !new_version_open? &&
+          Dor::Config.workflow.client.get_workflow_status('dor', pid, 'accessionWF', 'sdr-ingest-transfer') != 'hold'
         false
       else
         true

data/lib/dor/services/registration_service.rb

@@ -115,7 +115,9 @@ module Dor
         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') {
+            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') {
               xml.titleInfo {
                 xml.title label
               }

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.5.3'
+  VERSION = '5.6.0'
 end

data/lib/dor/workflow/document.rb

@@ -105,7 +105,8 @@ module Workflow
         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
+        # index the error message without the druid so we hopefully get some overlap
+        add_solr_value(solr_doc, 'wf_error', "#{wf_name}:#{process.name}:#{process.error_message}", wf_solr_type, wf_solr_attrs) if process.error_message
         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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.5.3
+  version: 5.6.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -295,6 +295,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -302,6 +305,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement
@@ -524,6 +530,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement