dor-services 5.15.1 → 5.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee2e3a30df6e10c8613e8ca4bb85a1b333f3ebe3
-  data.tar.gz: 09c691788a6ea4638c79043c7bfd8c247d0fde05
+  metadata.gz: 6f1d00053e0c4619d64ea02c747efffeae0ba54e
+  data.tar.gz: 46e5cc9321777766ac8a0e37766c5737b8d3bbd8
 SHA512:
-  metadata.gz: 6353ffe9a29cc00e13aab8cec082809f23f0fab7cf612853b33f7e3004f3847bd24186c5e1a6accf34fd391e99b00a2f2bc972aeb25d4d654724e8ec0ddb1252
-  data.tar.gz: 897831d91a6a4e283442032263186c5a6eaeb6a18e00b9d398ecb247f674f69619c872350759e4efc24735ee0827e31359072e7752234bbc1d199f5b73fb1075
+  metadata.gz: 957be3c6e10cf559b4266d52abb5ef0d2de3457d4ffe7459eb62f3c60a8aee37e47c857e5391d3fd9a97f94f5d06abd74cedd06d4fc66746fe22be7783cea018
+  data.tar.gz: 5d2ae7bb68ab836139fafa2120678980edcc7cb1d49e66e2683ac739cb8dddde3b09a7e955dbd2a03f091feae159895953b39ff64f15c4ebe82cfe6e03a8dd07

data/lib/dor-services.rb

@@ -40,7 +40,7 @@ module Dor
     # TODO: restrict fieldlist (fl) for non-:lightweight queries
     def find_all(query, opts = {})
       resp = SearchService.query query, opts
-      resp.docs.collect do |solr_doc|
+      resp['response']['docs'].collect do |solr_doc|
         doc_version = solr_doc[INDEX_VERSION_FIELD].first rescue '0.0.0'
         doc_version = Gem::Version.new(doc_version)
         object_type = Array(solr_doc[ActiveFedora::SolrService.solr_name('objectType', :symbol)]).first
@@ -122,7 +122,6 @@ module Dor
   autoload :Embargoable,  'dor/models/embargoable'
   autoload :Preservable,  'dor/models/preservable'
   autoload :Assembleable, 'dor/models/assembleable'
-  autoload :Upgradable,   'dor/models/upgradable'
   autoload :Eventable,    'dor/models/eventable'
   autoload :Versionable,  'dor/models/versionable'
   autoload :Contentable,  'dor/models/contentable'

data/lib/dor/config.rb

@@ -1,5 +1,5 @@
 require 'confstruct/configuration'
-require 'rsolr-ext'
+require 'rsolr'
 require 'stomp'
 require 'yaml'
 
@@ -49,7 +49,7 @@ module Dor
       opts = Dor::Config.solr.opts.merge(add_opts).merge(
         :url => Dor::Config.solr.url
       )
-      ::RSolr::Ext.connect(opts)
+      ::RSolr.connect(opts)
     end
 
     set_callback :initialize, :after do |config|

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -1,6 +1,5 @@
 module Dor
   class ContentMetadataDS < ActiveFedora::OmDatastream
-    include Upgradable
 
     set_terminology do |t|
       t.root        :path => 'contentMetadata',          :index_as => [:not_searchable]
@@ -158,6 +157,8 @@ module Dor
     def add_file(file, resource_name)
       resource_nodes = ng_xml.search('//resource[@id=\'' + resource_name + '\']')
       raise 'resource doesnt exist.' if resource_nodes.length == 0
+      self.ng_xml_will_change!
+
       node = resource_nodes.first
       file_node = Nokogiri::XML::Node.new('file', ng_xml)
       file_node['id'] = file[:name]
@@ -175,7 +176,6 @@ module Dor
       end
       file_node['size'    ] = file[:size     ] if file[:size     ]
       file_node['mimetype'] = file[:mime_type] if file[:mime_type]
-      self.content = ng_xml.to_s
       file_node
     end
 
@@ -186,6 +186,7 @@ module Dor
     # @return [Nokogiri::XML::Element] the new resource that was added to the contentMetadata
     def add_virtual_resource(child_druid, child_resource)
       # create a virtual resource element with attributes linked to the child and omit label
+      self.ng_xml_will_change!
       sequence_max = ng_xml.search('//resource').map { |node| node[:sequence].to_i }.max
       resource = Nokogiri::XML::Element.new('resource', ng_xml)
       resource[:sequence] = sequence_max + 1
@@ -200,7 +201,6 @@ module Dor
 
       # attach the virtual resource as a sibling and return
       ng_xml.root << resource
-      self.content = ng_xml.to_s
       resource
     end
 
@@ -211,6 +211,7 @@ module Dor
     # @return [Nokogiri::XML::Node] the new resource that was added to the contentMetadata
     def add_resource(files, resource_name, position, type = 'file')
       raise "resource #{resource_name} already exists" if ng_xml.search('//resource[@id=\'' + resource_name + '\']').length > 0
+      self.ng_xml_will_change!
       max = ng_xml.search('//resource').map { |node| node['sequence'].to_i }.max
       # renumber all of the resources that will come after the newly added one
       while max > position
@@ -238,12 +239,12 @@ module Dor
         file_node['size'] = file[:size] if file[:size]
       end
       ng_xml.search('//contentMetadata').first.add_child(node)
-      self.content = ng_xml.to_s
       node
     end
 
     # @param [String] resource_name ID of the resource
     def remove_resource(resource_name)
+      self.ng_xml_will_change!
       node = singular_node('//resource[@id=\'' + resource_name + '\']')
       position = node['sequence'].to_i + 1
       node.remove
@@ -253,13 +254,12 @@ module Dor
         res['sequence'] = position.to_s
         position += 1
       end
-      self.content = ng_xml.to_s
     end
 
     # @param [String] file_name ID of the file element
     def remove_file(file_name)
+      self.ng_xml_will_change!
       ng_xml.search('//file[@id=\'' + file_name + '\']').each(&:remove)
-      self.content = ng_xml.to_s
     end
 
     # @param [String] file_name ID of the file element
@@ -267,16 +267,17 @@ module Dor
     # @param [String] shelve
     # @param [String] preserve
     def update_attributes(file_name, publish, shelve, preserve)
+      self.ng_xml_will_change!
       file_node = ng_xml.search('//file[@id=\'' + file_name + '\']').first
       file_node['publish' ] = publish
       file_node['shelve'  ] = shelve
       file_node['preserve'] = preserve
-      self.content = ng_xml.to_s
     end
 
     # @param file [Object] some hash-like file
     # @param old_file_id [String] unique id attribute of the file element
     def update_file(file, old_file_id)
+      self.ng_xml_will_change!
       file_node = ng_xml.search('//file[@id=\'' + old_file_id + '\']').first
       file_node['id'] = file[:name]
       [:md5, :sha1].each { |algo|
@@ -293,16 +294,15 @@ module Dor
       [:size, :shelve, :preserve, :publish].each { |x|
         file_node[x.to_s] = file[x] if file[x]
       }
-      self.content = ng_xml.to_s
     end
 
     # @param old_name [String] unique id attribute of the file element
     # @param new_name [String] new unique id value being assigned
     # @return [Nokogiri::XML::Element] the file node
     def rename_file(old_name, new_name)
+      self.ng_xml_will_change!
       file_node = ng_xml.search('//file[@id=\'' + old_name + '\']').first
       file_node['id'] = new_name
-      self.content = ng_xml.to_s
       file_node
     end
 
@@ -311,6 +311,7 @@ module Dor
     # @param new_label [String] label value being assigned
     # @return [Nokogiri::XML::Element] the resource node
     def update_resource_label(resource_name, new_label)
+      self.ng_xml_will_change!
       node = singular_node('//resource[@id=\'' + resource_name + '\']')
       labels = node.xpath('./label')
       if labels.length == 0
@@ -320,15 +321,14 @@ module Dor
       else
         labels.first.content = new_label
       end
-      self.content = ng_xml.to_s
       node
     end
 
     # @param resource_name [String] unique id attribute of the resource
     # @param new_type [String] type value being assigned
     def update_resource_type(resource_name, new_type)
+      self.ng_xml_will_change!
       singular_node('//resource[@id=\'' + resource_name + '\']')['type'] = new_type
-      self.content = ng_xml.to_s
     end
 
     # You just *had* to have ordered lists in XML, didn't you?
@@ -337,6 +337,7 @@ module Dor
     # @param new_position [Integer, String] new sequence number of the resource, or a string that looks like one
     # @return [Nokogiri::XML::Element] the resource node
     def move_resource(resource_name, new_position)
+      self.ng_xml_will_change!
       node = singular_node('//resource[@id=\'' + resource_name + '\']')
       position = node['sequence'].to_i
       new_position = new_position.to_i # tolerate strings as a Legacy behavior
@@ -349,7 +350,6 @@ module Dor
         item['sequence'] = (up ? i - 1 : i + 1).to_s # if you're going up, everything else comes down and vice versa
       end
       node['sequence'] = new_position.to_s # set the node we already had last, so we don't hit it twice!
-      self.content = ng_xml.to_s
       node
     end
 
@@ -359,13 +359,13 @@ module Dor
     # @param [String] new_type the new content type
     # @param [String] new_resource_type the new type for all resources
     def set_content_type(old_type, old_resource_type, new_type, new_resource_type)
+      self.ng_xml_will_change!
       ng_xml.search('/contentMetadata[@type=\'' + old_type + '\']').each do |node|
         node['type'] = new_type
         ng_xml.search('//resource[@type=\'' + old_resource_type + '\']').each do |resource|
           resource['type'] = new_resource_type
         end
       end
-      self.content = ng_xml.to_s
     end
 
     # maintain AF < 8 indexing behavior

data/lib/dor/datastreams/default_object_rights_ds.rb

@@ -1,5 +1,9 @@
 module Dor
   class DefaultObjectRightsDS < ActiveFedora::OmDatastream
+    # Note that the XSL file was taken from the (apparently defunct) nokogiri-pretty project:
+    # https://github.com/tobym/nokogiri-pretty/blob/master/lib/indent.xsl
+    # The only modification made was to declare UTF-8 to be the encoding, instead of ISO-8859-1.
+    HUMAN_XSLT = Nokogiri::XSLT(File.read(File.expand_path('../human.xslt', __FILE__)))
 
     set_terminology do |t|
       t.root :path => 'rightsMetadata', :index_as => [:not_searchable]
@@ -131,12 +135,8 @@ module Dor
     end
 
     # Returns a nicely indented XML document.
-    # Note that the XSL file was taken from the (apparently defunct) nokogiri-pretty project:
-    # https://github.com/tobym/nokogiri-pretty/blob/master/lib/indent.xsl
-    # The only modification made was to declare UTF-8 to be the encoding, instead of ISO-8859-1.
     def prettify(xml_doc)
-      template = Nokogiri::XSLT(File.read(File.expand_path('../human.xslt', __FILE__)))
-      template.apply_to(xml_doc)
+      HUMAN_XSLT.apply_to(xml_doc)
     end
 
     # maintain AF < 8 indexing behavior

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -58,7 +58,6 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
   # @param [Time] rd the release date object
   def release_date=(rd = Time.now.utc)
     update_values([:release_date] => rd.utc.xmlschema)
-    self.content = ng_xml.to_s
   end
 
   # Current releaseDate value
@@ -70,7 +69,6 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
 
   def twenty_pct_status=(new_status)
     update_values([:twenty_pct_status] => new_status)
-    content_will_change!
   end
 
   def twenty_pct_status
@@ -81,7 +79,6 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
   # @param [Time] rd A Time object represeting the release date.  By default, it is set to now
   def twenty_pct_release_date=(rd = Time.now.utc)
     update_values([:twenty_pct_release_date] => rd.beginning_of_day.utc.xmlschema)
-    content_will_change!
   end
 
   # Current twentyPctVisibilityReleaseDate value

data/lib/dor/datastreams/events_ds.rb

@@ -29,10 +29,10 @@ class EventsDS < ActiveFedora::OmDatastream
   # @param [String] who who is responsible for this event. Sets the who attribute for the event
   # @param [String] message what happened. Sets the content of the event with this message
   def add_event(type, who, message)
+    ng_xml_will_change!
     ev = ng_xml.create_element 'event', message,
       :type => type, :who => who, :when => Time.now.utc.xmlschema
     ng_xml.root.add_child(ev)
-    ng_xml_will_change!
   end
 
   # Finds events with the desired type attribute

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -128,11 +128,10 @@ module Dor
         raise('The rights metadata stream doesnt contain an entry for machine read permissions. Consider populating it from the APO before trying to change it.')
       end
 
+      ng_xml_will_change!
       RightsMetadataDS.upd_rights_xml_for_rights_type(rights_xml, rights)
 
       self.dra_object = nil # until TODO complete, we'll expect to have to reparse after modification
-      self.content = rights_xml.to_xml
-      content_will_change!
     end
 
     def to_solr(solr_doc = {}, *args)

data/lib/dor/datastreams/version_metadata_ds.rb

@@ -78,7 +78,8 @@ 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
+      ng_xml_will_change!
+      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'
@@ -122,6 +123,7 @@ module Dor
       ng_xml.root['objectId'] = pid
       return if find_by_terms(:version).size == 1
       return if opts.empty?
+      ng_xml_will_change!
       current = current_version_node
       if opts.include? :description
         d = current.at_xpath('description')
@@ -145,7 +147,6 @@ module Dor
         end
 
       end
-      self.content = ng_xml.to_s
     end
 
     # @return [Boolean] returns true if the current version has a tag and a description, false otherwise

data/lib/dor/models/contentable.rb

@@ -157,6 +157,7 @@ module Dor
     # @param [Array<String>] source_obj_pids ids of the secondary objects that will get their contentMetadata merged into this one
     def copy_file_resources(source_obj_pids)
       primary_cm = contentMetadata.ng_xml
+      contentMetadata.ng_xml_will_change!
       base_id = primary_cm.at_xpath('/contentMetadata/@objectId').value
       max_sequence = primary_cm.at_xpath('/contentMetadata/resource[last()]/@sequence').value.to_i
 
@@ -198,7 +199,6 @@ module Dor
           resource_copy.first_element_child.add_previous_sibling attr_node
         end
       end
-      contentMetadata.content_will_change!
     end
 
     def new_secondary_file_name(old_name, sequence_num)

data/lib/dor/models/describable.rb

@@ -2,10 +2,8 @@ module Dor
   module Describable
     extend ActiveSupport::Concern
 
-    DESC_MD_FORMATS = {
-      'http://www.tei-c.org/ns/1.0' => 'tei',
-      'http://www.loc.gov/mods/v3'  => 'mods'
-    }.freeze
+    MODS_TO_DC_XSLT = Nokogiri::XSLT(File.new(File.expand_path(File.dirname(__FILE__) + "/mods2dc.xslt")))
+
     class CrosswalkError < Exception; end
 
     included do
@@ -43,12 +41,10 @@ module Dor
     #    Should not be used for the Fedora DC datastream
     # @raise [CrosswalkError] Raises an Exception if the generated DC is empty or has no children
     # @return [Nokogiri::Doc] the DublinCore XML document object
-    def generate_dublin_core
-      raise CrosswalkError, "Unknown descMetadata namespace: #{metadata_namespace.inspect}" if metadata_format.nil?
-      xslt = Nokogiri::XSLT(File.new(File.expand_path(File.dirname(__FILE__) + "/#{metadata_format}2dc.xslt")) )
+    def generate_dublin_core(include_collection_as_related_item: true)
       desc_md = descMetadata.ng_xml.dup(1)
-      add_collection_reference(desc_md)
-      dc_doc = xslt.transform(desc_md)
+      add_collection_reference(desc_md) if include_collection_as_related_item
+      dc_doc = MODS_TO_DC_XSLT.transform(desc_md)
       dc_doc.xpath('/oai_dc:dc/*[count(text()) = 0]').remove # Remove empty nodes
       raise CrosswalkError, "Dor::Item#generate_dublin_core produced incorrect xml (no root):\n#{dc_doc.to_xml}" if dc_doc.root.nil?
       raise CrosswalkError, "Dor::Item#generate_dublin_core produced incorrect xml (no children):\n#{dc_doc.to_xml}" if dc_doc.root.children.size == 0
@@ -198,16 +194,6 @@ module Dor
       end
     end
 
-    def metadata_namespace
-      desc_md = datastreams['descMetadata'].ng_xml
-      return nil if desc_md.nil? || desc_md.root.nil? || desc_md.root.namespace.nil?
-      desc_md.root.namespace.href
-    end
-
-    def metadata_format
-      DESC_MD_FORMATS[metadata_namespace]
-    end
-
     def to_solr(solr_doc = {}, *args)
       solr_doc = super solr_doc, *args
       mods_sources = {
@@ -229,9 +215,11 @@ module Dor
         solr_doc[key] ||= []     # initialize multivalue targts if necessary
       }
 
-      solr_doc['metadata_format_ssim'] << metadata_format
+      solr_doc['metadata_format_ssim'] << 'mods'
       begin
-        dc_doc = generate_dublin_core
+        dc_doc = generate_dublin_core(include_collection_as_related_item: false)
+        # we excluding the generated collection relation here; we instead get the collection
+        # title from Dor::Identifiable.
         dc_doc.xpath('/oai_dc:dc/*').each do |node|
           add_solr_value(solr_doc, "public_dc_#{node.name}", node.text, :string, [:stored_searchable])
         end
@@ -267,31 +255,6 @@ module Dor
       solr_doc
     end
 
-    def update_title(new_title)
-      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 = descMetadata.ng_xml
-      ds_xml.search('//mods:mods', 'mods' => 'http://www.loc.gov/mods/v3').each do |node|
-        new_node = Nokogiri::XML::Node.new('identifier', ds_xml) # this ends up being mods:identifier without having to specify the namespace
-        new_node['type'] = type
-        new_node.content = value
-        node.add_child(new_node)
-      end
-    end
-
-    def delete_identifier(type, value = nil)
-      ds_xml = descMetadata.ng_xml
-      ds_xml.search('//mods:identifier', 'mods' => 'http://www.loc.gov/mods/v3').each do |node|
-        if node.content == value || value.nil?
-          node.remove
-          return true
-        end
-      end
-      false
-    end
-
     # @param [Boolean] force Overwrite existing XML
     # @return [String] descMetadata.content XML
     def set_desc_metadata_using_label(force = false)
@@ -325,15 +288,6 @@ module Dor
 
     private
 
-    # generic updater useful for updating things like title or subtitle which can only have a single occurance and must be present
-    def update_simple_field(field, new_val)
-      descMetadata.ng_xml.search('//' + field, 'mods' => 'http://www.loc.gov/mods/v3').each do |node|
-        node.content = new_val
-        return true
-      end
-      false
-    end
-
     # Builds case-insensitive xpath translate function call that will match the attribute to a value
     def ci_compare(attribute, value)
       "translate(

data/lib/dor/models/editable.rb

@@ -60,6 +60,7 @@ module Dor
     # @param type   [Symbol] :workgroup for a group or :person for a person
     def add_roleplayer(role, entity, type = :workgroup)
       xml = roleMetadata.ng_xml
+      roleMetadata.ng_xml_will_change!
       group = type == :workgroup ? 'group' : 'person'
       nodes = xml.search('/roleMetadata/role[@type=\'' + role + '\']')
       if nodes.length > 0
@@ -80,7 +81,6 @@ module Dor
         id_node['type'] = type.to_s
         xml.search('/roleMetadata').first.add_child(node)
       end
-      roleMetadata.content = xml.to_s
     end
 
     # remove all people groups and roles from the APO role metadata datastream
@@ -106,6 +106,7 @@ module Dor
     # @param val [String] pid of the collection, ex. druid:ab123cd4567
     def add_default_collection(val)
       xml = administrativeMetadata.ng_xml
+      administrativeMetadata.ng_xml_will_change!
       reg = xml.search('//administrativeMetadata/registration').first
       unless reg
         reg = Nokogiri::XML::Node.new('registration', xml)
@@ -114,12 +115,11 @@ module Dor
       node = Nokogiri::XML::Node.new('collection', xml)
       node['id'] = val
       reg.add_child(node)
-      administrativeMetadata.content = xml.to_s
     end
     def remove_default_collection(val)
       xml = administrativeMetadata.ng_xml
+      administrativeMetadata.ng_xml_will_change!
       xml.search('//administrativeMetadata/registration/collection[@id=\'' + val + '\']').remove
-      administrativeMetadata.content = xml.to_s
     end
 
     # Get all roles defined in the role metadata, and the people or groups in those roles. Groups are prefixed with 'workgroup:'

data/lib/dor/models/embargoable.rb

@@ -23,6 +23,7 @@ module Dor
       # Remove all read acces nodes
       rights_md = datastreams['rightsMetadata']
       rights_xml = rights_md.ng_xml
+      rights_md.ng_xml_will_change!
       rights_xml.xpath("//rightsMetadata/access[@type='read']").each { |n| n.remove }
 
       # Replace rights <access> nodes with those from embargoMetadta
@@ -36,7 +37,6 @@ module Dor
         end
       end
 
-      rights_md.content = rights_md.ng_xml.to_s
       datastreams['events'].add_event('embargo', release_agent, 'Embargo released')
     end
 
@@ -48,6 +48,7 @@ module Dor
       # Remove all read acces nodes
       rights_md = datastreams['rightsMetadata']
       rights_xml = rights_md.ng_xml
+      rights_md.ng_xml_will_change!
       rights_xml.xpath("//rightsMetadata/access[@type='read']").each { |n| n.remove }
 
       # Replace rights <access> nodes with 1 machine/world node
@@ -58,7 +59,6 @@ module Dor
         rights_xml.root.add_child(world_doc.root.clone)
       end
 
-      rights_md.content = rights_md.ng_xml.to_s
       datastreams['events'].add_event('embargo', release_agent, '20% Visibility Embargo released')
     end
 
@@ -74,13 +74,13 @@ module Dor
         node.content = new_date.beginning_of_day.utc.xmlschema
         updated = true
       end
-      rightsMetadata.content = rightsMetadata.ng_xml.to_s
+      rightsMetadata.ng_xml_will_change!
       rightsMetadata.save
       raise 'No release date in rights metadata, cannot proceed!' unless updated
       embargoMetadata.ng_xml.xpath('//releaseDate').each do |node|
         node.content = new_date.beginning_of_day.utc.xmlschema
       end
-      embargoMetadata.content = embargoMetadata.ng_xml.to_s
+      embargoMetadata.ng_xml_will_change!
       embargoMetadata.save
     end
   end

data/lib/dor/models/identifiable.rb

@@ -3,7 +3,6 @@ module Dor
     extend ActiveSupport::Concern
     include SolrDocHelper
     include Eventable
-    include Upgradable
 
     included do
       has_metadata :name => 'DC', :type => SimpleDublinCoreDs, :label => 'Dublin Core Record for self object'
@@ -36,21 +35,6 @@ module Dor
       content_tag.size == 1 ? content_tag[0].split(':').last.strip : ''
     end
 
-    # Syntactic sugar for identifying applied DOR Concerns
-    # e.g., obj.is_identifiable? is the same as obj.is_a?(Dor::Identifiable)
-    def method_missing(sym, *args)
-      if sym.to_s =~ /^is_(.+)\?$/
-        begin
-          klass = Dor.const_get $1.capitalize.to_sym
-          return self.is_a?(klass)
-        rescue NameError
-          return false
-        end
-      else
-        super
-      end
-    end
-
     ## Module-level variables, shared between ALL mixin includers (and ALL *their* includers/extenders)!
     ## used for caching found values
     @@collection_hash = {}
@@ -74,7 +58,7 @@ module Dor
       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')
-
+      solr_doc['public_dc_relation_tesim'] ||= solr_doc['collection_title_tesim'] if solr_doc['collection_title_tesim']
       solr_doc['metadata_source_ssi'] = identity_metadata_source
       solr_doc
     end

data/lib/dor/models/item.rb

@@ -23,7 +23,6 @@ end
 # Processable  = Workflow.
 # Publishable  = Transfer of metadata to discovery and access systems.
 # Shelvable    = Transfer of content to digital stacks.
-# Upgradable   = Remediation of existing objects when content standards change.
 # Geoable      = Descriptive metadata for GIS in ISO 19139/19110.
 
 # Required for all DOR objects:

data/lib/dor/models/preservable.rb

@@ -11,11 +11,9 @@ module Dor
 
     def build_provenanceMetadata_datastream(workflow_id, event_text)
       workflow_provenance = create_workflow_provenance(workflow_id, event_text)
-      dsname = 'provenanceMetadata'
-      ds = datastreams[dsname]
-      ds.label = 'Provenance Metadata' unless datastreams.keys.include?(dsname)
+      ds = datastreams['provenanceMetadata']
+      ds.label ||= 'Provenance Metadata'
       ds.ng_xml = workflow_provenance
-      ds.content = ds.ng_xml.to_s
       ds.save
     end
 

data/lib/dor/models/processable.rb

@@ -4,7 +4,6 @@ module Dor
   module Processable
     extend ActiveSupport::Concern
     include SolrDocHelper
-    include Upgradable
 
     included do
       has_metadata :name => 'workflows', :type => Dor::WorkflowDs, :label => 'Workflows', :control_group => 'E'
@@ -100,7 +99,7 @@ module Dor
     end
 
     def milestones
-      Dor::Config.workflow.client.get_milestones('dor', pid)
+      @milestones ||= Dor::Config.workflow.client.get_milestones('dor', pid)
     end
 
     # @return [Hash{Symbol => Object}] including :current_version, :status_code and :status_time

data/lib/dor/models/publishable.rb

@@ -94,7 +94,7 @@ module Dor
       rels = public_relationships.root
       pub.add_child(rels.clone) unless rels.nil? # TODO: Should never be nil in practice; working around an ActiveFedora quirk for testing
       pub.add_child(generate_dublin_core.root.clone)
-      pub.add_child(Nokogiri::XML(generate_public_desc_md).root.clone) if metadata_format == 'mods'
+      pub.add_child(Nokogiri::XML(generate_public_desc_md).root.clone)
       pub.add_child(Nokogiri(generate_release_xml).root.clone) unless release_xml.children.size == 0 # If there are no release_tags, this prevents an empty <releaseData/> from being added
       # Note we cannot base this on if an individual object has release tags or not, because the collection may cause one to be generated for an item,
       # so we need to calculate it and then look at the final result.s
@@ -115,7 +115,7 @@ module Dor
           DigitalStacksService.transfer_to_document_store(pid, datastreams[stream].to_xml, stream)
         end
         DigitalStacksService.transfer_to_document_store(pid, public_xml, 'public')
-        DigitalStacksService.transfer_to_document_store(pid, generate_public_desc_md, 'mods') if metadata_format == 'mods'
+        DigitalStacksService.transfer_to_document_store(pid, generate_public_desc_md, 'mods')
         publish_notify_on_success
       else
         # Clear out the document cache for this item

data/lib/dor/models/rightsable.rb

@@ -10,7 +10,6 @@ module Dor
       content_ds = admin_policy_object.datastreams['defaultObjectRights']
       ds.dsLabel = 'Rights Metadata'
       ds.ng_xml = content_ds.ng_xml.clone
-      ds.content = ds.ng_xml.to_xml
     end
 
     def world_doc

data/lib/dor/models/versionable.rb

@@ -1,7 +1,7 @@
 module Dor
   module Versionable
     extend ActiveSupport::Concern
-    include Processable # implies Upgradable
+    include Processable
 
     included do
       has_metadata :name => 'versionMetadata', :type => Dor::VersionMetadataDS, :label => 'Version Metadata', :autocreate => true
@@ -24,7 +24,6 @@ module Dor
 
       vmd_ds = datastreams['versionMetadata']
       vmd_ds.sync_then_increment_version sdr_version
-      vmd_ds.content = vmd_ds.ng_xml.to_s
       vmd_ds.save unless self.new_record?
 
       k = :create_workflows_ds

data/lib/dor/services/search_service.rb

@@ -48,14 +48,14 @@ module Dor
       def query(query, args = {})
         params = args.merge({ :q => query })
         params[:start] ||= 0
-        resp = solr.find params
+        resp = solr.get 'select', params: params
         return resp unless block_given?
         cont = true
-        while cont && resp.docs.length > 0
+        while cont && resp['response']['docs'].length > 0
           cont = yield(resp)
-          params[:rows] ||= resp.docs.length
+          params[:rows] ||= resp['response']['docs'].length
           params[:start] += params[:rows]
-          resp = solr.find params
+          resp = solr.get 'select', params: params
         end
       end
 
@@ -65,10 +65,10 @@ module Dor
         elsif id.is_a?(Array) # Two values: [ 'google', 'STANFORD_0123456789' ]
           id = id.join(':')
         end
-        q = %(#{Solrizer.solr_name 'identifier', :stored_searchable}:"#{id}")
+        q = "{!term f=#{Solrizer.solr_name 'identifier', :symbol}}#{id}"
         result = []
         query(q, :fl => 'id', :rows => 1000) do |resp|
-          result += resp.docs.collect { |doc| doc['id'] }
+          result += resp['response']['docs'].collect { |doc| doc['id'] }
           true
         end
         result
@@ -86,10 +86,10 @@ module Dor
 
       def find_sdr_graveyard_apo_druid
         r = Dor::SearchService.query('dc_title_tesim:"SDR Graveyard"', :fl => 'id')
-        if r.docs.empty?
+        if r['response']['docs'].empty?
           nil
         else
-          r.docs.first[:id]
+          r['response']['docs'].first[:id]
         end
       end
 

data/lib/dor/utils/ng_tidy.rb

@@ -20,8 +20,7 @@ end
 
 class Nokogiri::XML::Document
 
-  def prettify
-    xslt = Nokogiri::XSLT <<-EOC
+  PRETTIFY_XSLT = Nokogiri::XSLT <<-EOC
     <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:output omit-xml-declaration="yes" indent="yes"/>
       <xsl:template match="node()|@*">
@@ -31,7 +30,9 @@ class Nokogiri::XML::Document
       </xsl:template>
     </xsl:stylesheet>
     EOC
-    xslt.transform(self).to_xml
+
+  def prettify
+    PRETTIFY_XSLT.transform(self).to_xml
   end
 
 end

data/lib/dor/utils/solr_doc_helper.rb

@@ -1,15 +1,9 @@
 module SolrDocHelper
   def add_solr_value(solr_doc, field_name, value, field_type = :default, index_types = [:searchable])
-    if Solrizer::VERSION > '3'
-      case field_type
-        when :symbol
-          index_types << field_type
-      end
-      ::Solrizer.insert_field(solr_doc, field_name, value, *index_types)
-    else
-      index_types.each { |index_type|
-        ::Solrizer::Extractor.insert_solr_field_value(solr_doc, ::ActiveFedora::SolrService.solr_name(field_name, field_type, index_type), value)
-      }
+    case field_type
+      when :symbol
+        index_types << field_type
     end
+    ::Solrizer.insert_field(solr_doc, field_name, value, *index_types)
   end
 end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.15.1'.freeze
+  VERSION = '5.16.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.15.1
+  version: 5.16.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -181,19 +181,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rsolr-ext
+  name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: ruby-cache
   requirement: !ruby/object:Gem::Requirement
@@ -605,14 +611,6 @@ files:
 - lib/dor/datastreams/workflow_definition_ds.rb
 - lib/dor/datastreams/workflow_ds.rb
 - lib/dor/exceptions.rb
-- lib/dor/migrations/content_metadata_ds/change_content_type.rb
-- lib/dor/migrations/identifiable/assert_adminPolicy.rb
-- lib/dor/migrations/identifiable/fix_model_assertions.rb
-- lib/dor/migrations/identifiable/record_remediation.rb
-- lib/dor/migrations/identifiable/uriify_augmented_contentlocation_refs.rb
-- lib/dor/migrations/identifiable/uriify_contentlocation_refs.rb
-- lib/dor/migrations/processable/unify_workflows.rb
-- lib/dor/migrations/versionable/add_missing_version_md.rb
 - lib/dor/models/abstract.rb
 - lib/dor/models/admin_policy_object.rb
 - lib/dor/models/agreement.rb
@@ -636,7 +634,6 @@ files:
 - lib/dor/models/rightsable.rb
 - lib/dor/models/set.rb
 - lib/dor/models/shelvable.rb
-- lib/dor/models/upgradable.rb
 - lib/dor/models/versionable.rb
 - lib/dor/models/workflow_object.rb
 - lib/dor/services/cleanup_reset_service.rb
@@ -653,7 +650,6 @@ files:
 - lib/dor/services/search_service.rb
 - lib/dor/services/suri_service.rb
 - lib/dor/services/technical_metadata_service.rb
-- lib/dor/services/tei2dc.xslt
 - lib/dor/utils/ng_tidy.rb
 - lib/dor/utils/predicate_patch.rb
 - lib/dor/utils/sdr_client.rb

data/lib/dor/migrations/content_metadata_ds/change_content_type.rb

@@ -1,7 +0,0 @@
-Dor::ContentMetadataDS.on_upgrade '3.6.0', 'Change contentMetadata type attribute' do |ds|
-  translations = { 'googleScannedBook' => 'book', 'etd' => 'file', 'eem' => 'file' }
-  translations.any? do |old_type, new_type|
-    current_type = ds.contentType.to_ary.first rescue ds.contentType
-    (current_type == old_type) && (ds.contentType = new_type)
-  end
-end

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

@@ -1,9 +0,0 @@
-Dor::Identifiable.on_upgrade '3.5.0', 'Assert hydra:isGovernedBy' do |obj|
-  # Assign hydra:isGovernedBy based on identityMetadata/adminPolicy
-  if obj.admin_policy_object.nil?
-    apo_id = obj.identityMetadata.adminPolicy.first
-    apo_id.present? && obj.admin_policy_object = Dor.find(apo_id) unless apo_id.nil?
-  else
-    false
-  end
-end

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

@@ -1,13 +0,0 @@
-Dor::Identifiable.on_upgrade '3.6.1', 'Assert correct models' do |obj|
-  applied = false
-  if obj.relationships.any? { |r| r.predicate.to_s == 'info:fedora/fedora-system:def/model#hasModel' && r.object.to_s == 'info:fedora/hydra:commonMetadata' }
-    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
-  end
-  applied
-end

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

@@ -1,18 +0,0 @@
-Dor::Identifiable.on_upgrade '3.6.1', 'Record Remediation Version' do |obj|
-  version_tag = obj.identityMetadata.find_by_terms(:tag).find { |e| e.text =~ /Remediated By\s*:\s*(.+)/ }
-  add_tag = false
-  if version_tag
-    current_version = Gem::Version.new($1)
-    if current_version < Gem::Version.new(Dor::VERSION)
-      version_tag.remove
-      add_tag = true
-    end
-  else
-    add_tag = true
-  end
-
-  if add_tag
-    obj.identityMetadata.add_value :tag, "Remediated By : #{Dor::VERSION}"
-  end
-  add_tag
-end

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

@@ -1,18 +0,0 @@
-Dor::Identifiable.on_upgrade '3.14.8', 'Fix up invalid URIs in content-augmented datastreams' do |obj|
-  bad_content_location_uri = begin
-    URI.parse(obj.send('content-augmented').dsLocation)
-    false
-  rescue URI::InvalidURIError
-    true
-  rescue
-    false
-  end
-
-  next unless bad_content_location_uri
-
-  parts = obj.send('content-augmented').dsLocation.split('/')
-  parts[parts.length - 1] = URI.escape(parts.last)
-  obj.send('content-augmented').dsLocation = parts.join('/')
-
-  obj.send('content-augmented').save
-end

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

@@ -1,18 +0,0 @@
-Dor::Identifiable.on_upgrade '3.11.6', 'Fix up invalid URIs in objects' do |obj|
-  bad_content_location_uri = begin
-    URI.parse(obj.content.dsLocation)
-    false
-  rescue URI::InvalidURIError
-    true
-  rescue
-    false
-  end
-
-  next unless bad_content_location_uri
-
-  parts = obj.content.dsLocation.split('/')
-  parts[parts.length - 1] = URI.escape(parts.last)
-  obj.content.dsLocation = parts.join('/')
-
-  obj.content.save
-end

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

@@ -1,17 +0,0 @@
-Dor::Processable.on_upgrade '3.5.0', 'Replace individual *WF datastreams with unified workflows datastream' do |obj|
-  run = false
-  # Touch workflows datastream to ensure it gets saved
-  if obj.workflows.new?
-    obj.workflows.content
-    run = true
-  end
-
-  # Remove individual *WF datastreams
-  obj.datastreams.each_pair do |dsid, ds|
-    if ds.controlGroup == 'E' && dsid =~ /WF$/
-      ds.delete
-      run = true
-    end
-  end
-  run
-end

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

@@ -1,9 +0,0 @@
-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
-    vm.content = vm.ng_xml.to_s
-    run = true
-  end
-  run
-end

data/lib/dor/models/upgradable.rb

@@ -1,73 +0,0 @@
-module Dor
-  module Upgradable
-    # The Upgradable mixin is responsible for making sure all DOR objects,
-    # concerns, and datastreams know how to upgrade themselves to the latest
-    # Chimera/DOR content standards.
-    #
-    # To add a new upgrade:
-    # 1) include Dor::Upgradable within whatever model, datastream, or mixin
-    #    you want to make upgradable.
-    # 2) Add a block to the model, datastream, or mixin as follows:
-    #
-    #    on_upgrade(v) do |obj|
-    #      # Do whatever needs to be done to obj
-    #    end
-    #
-    #    where v is the first released version of dor-services that will
-    #    include the upgrade.
-    #
-    # The block can either be defined on the model itself, or in a file
-    # in the dor/migrations/[model] directory. See Dor::Identifiable and
-    # dor/migrations/identifiable/* for an example.
-
-    Callback = Struct.new :module, :version, :description, :block
-
-    mattr_accessor :__upgrade_callbacks
-    @@__upgrade_callbacks = []
-    def self.add_upgrade_callback(c, v, d, &b)
-      @@__upgrade_callbacks << Callback.new(c, Gem::Version.new(v), d, b)
-    end
-
-    def self.run_upgrade_callbacks(obj, event_handler)
-      relevant = @@__upgrade_callbacks.select { |c| obj.is_a?(c.module) }.sort_by(&:version)
-      results = relevant.collect do |c|
-        result = c.block.call(obj)
-        if result && event_handler.respond_to?(:add_event)
-          event_handler.add_event 'remediation', "#{c.module.name} #{c.version}", c.description
-        end
-        if result
-          Dor.logger.info "Applied remediation '#{c.description}' to '#{obj.pid}'"
-        end
-        result
-      end
-      results.any?
-    end
-
-    def self.included(base)
-      base.instance_eval do
-        def self.on_upgrade(version, desc, &block)
-          Dor::Upgradable.add_upgrade_callback self, version, desc, &block
-        end
-
-        Dir[File.join(Dor.root, 'dor', 'migrations', base.name.split(/::/).last.underscore, '*.rb')].each do |migration|
-          require migration
-        end
-      end
-    end
-
-    def upgrade!
-      results = [Dor::Upgradable.run_upgrade_callbacks(self, self)]
-      if self.respond_to?(:datastreams)
-        datastreams.each_pair do |dsid, ds|
-          results << Dor::Upgradable.run_upgrade_callbacks(ds, self) unless ds.new?
-        end
-      end
-
-      if results.any?
-        save
-      else
-        false
-      end
-    end
-  end
-end

data/lib/dor/services/tei2dc.xslt

@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:tei="http://www.tei-c.org/ns/1.0"
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:dcterms="http://purl.org/dc/terms/"
-    xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-    exclude-result-prefixes="tei xsl"
-    version="1.0">
-    
-    <xsl:output xml:space="default" indent="yes"/>
-
-    <xsl:template match="/">
-        <oai_dc:dc xsi:schemaLocation="http://www.openarchives.org/OAI/2.0/oai_dc/ http://www.openarchives.org/OAI/2.0/oai_dc.xsd">
-            <xsl:apply-templates/>
-        </oai_dc:dc>
-    </xsl:template>
-
-    <xsl:template match="tei:teiHeader">
-        <xsl:apply-templates/>
-    </xsl:template>
-    
-    <xsl:template match="tei:fileDesc/tei:titleStmt/tei:title">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:title</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:fileDesc/tei:titleStmt/tei:author">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:creator</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:profileDesc/tei:textClass/tei:keywords/tei:list/tei:item">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:subject</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:encodingDesc/tei:refsDecl|tei:encodingDesc/tei:projectDesc|tei:encodingDesc/tei:editorialDesc">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:description</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:fileDesc/tei:publicationStmt/tei:publisher/tei:publisher|tei:fileDesc/tei:publicationStmt/tei:publisher/tei:pubPlace">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:publisher</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:fileDesc/tei:titleStmt/tei:editor|tei:fileDesc/tei:titleStmt/tei:funder|tei:fileDesc/tei:titleStmt/tei:sponsor|tei:fileDesc/tei:titleStmt/tei:principle">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:contributor</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:fileDesc/tei:publicationStmt/tei:date">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:date</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:extent/tei:seg[@type='size']">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dcterms:extent</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:fileDesc/tei:publicationStmt/tei:idno[@type='ARK']">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:identifier</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:sourceDesc/tei:bibful/tei:publicationStmt/tei:publisher|tei:sourceDesc/tei:bibful/tei:publicationStmt/tei:pubPlace|tei:sourceDesc/tei:bibful/tei:publicationStmt/tei:date|tei:sourceDesc/tei:bibl">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:source</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:profileDesc/tei:langUsage/tei:language">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:language</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:fileDesc/tei:seriesStmt/tei:title">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dc:relation</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:fileDesc/tei:publicationStmt/tei:availability">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dcterms:accessRights</xsl:with-param></xsl:call-template>
-    </xsl:template>
-    
-    <xsl:template match="tei:notesStmt/tei:note[@type='summary']">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dcterms:abstract</xsl:with-param></xsl:call-template>
-    </xsl:template>
-
-<!-- 
-    <xsl:template match="tei:notesStmt/tei:note[not(@type)]">
-        <xsl:call-template name="ptext"><xsl:with-param name="element-name">dcterms:note</xsl:with-param></xsl:call-template>
-    </xsl:template>
--->
-    
-    <xsl:template name="ptext">
-        <xsl:param name="element-name"/>
-        <xsl:variable name="text">
-            <xsl:for-each select=".|./tei:p">
-                <xsl:variable name="t" select="normalize-space(./text())"/>
-                <xsl:if test="string-length($t) &gt; 0">
-                    <xsl:value-of select="$t"/>
-                </xsl:if>
-            </xsl:for-each>
-        </xsl:variable>
-        <xsl:if test="string-length($text) &gt; 0">
-            <xsl:element name="{$element-name}"><xsl:value-of select="$text"/></xsl:element>
-        </xsl:if>
-    </xsl:template>
-    
-    <xsl:template match="text()|@*"/>
-    
-</xsl:stylesheet>