dor-services 5.18.0 → 5.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2d0fea02b55ee4906b57a7f1ec29d281cd4441a
-  data.tar.gz: 87963a5b75e157f4bb9bfd3aadefaf77b1945707
+  metadata.gz: 0dc1bf75851ebaf4b19feb92a2f1acf584dd6855
+  data.tar.gz: 0e075b4ab4cdb029fe3165d6612d51212586012d
 SHA512:
-  metadata.gz: 3d97aa054071249c9980d50c382823395a8b1deaa0a76241166bb5d0c1d903e5a6b6d0cd619a6bb881d64907ac07ef7beba7f6efda267dc1d55c852a62099d6b
-  data.tar.gz: f5c4680e39daa95b119771e1c6c0006b7e3189552637d4b20650008b2e5697d4b2c179f2ca85f6f518cb25532226b828e0fcf1039518e9546324c79ee70d9b4c
+  metadata.gz: 45a77bd472e8fa469edada87a30d474aecb5a895978545d271236be31b69da2016726c732fad2d827e45b49bf04cb976e27f118502f196d6de40789f2ac9f55d
+  data.tar.gz: 1805fcdcdd30cc35a2321c00b2a07fd8ecf506ef369fcf762ebcf2a625729b1f4d0a27b269ca005b9125a1a76f658b441e11bb26fca9aa7d4e31ac26db415d57

data/lib/dor-services.rb

@@ -37,7 +37,7 @@ module Dor
     # TODO: return enumerable and lazy load_instance
     # TODO: restrict fieldlist (fl) for non-:lightweight queries
     def find_all(query, opts = {})
-      ActiveSupport::Deprecation.warn 'Dor.ensure_models_loaded! is unnecessary and has been deprecated.'
+      ActiveSupport::Deprecation.warn 'Dor.find_all is deprecated; use activefedora finders instead'
 
       resp = SearchService.query query, opts
       resp['response']['docs'].collect do |solr_doc|
@@ -144,6 +144,8 @@ module Dor
   autoload :MergeService,              'dor/services/merge_service'
   autoload :ResetWorkspaceService,     'dor/services/reset_workspace_service'
   autoload :CleanupResetService,       'dor/services/cleanup_reset_service'
+  autoload :PublicDescMetadataService, 'dor/services/public_desc_metadata_service'
+  autoload :PublicXmlService,       'dor/services/public_xml_service'
 
   # Workflow Classes
   module Workflow

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -195,15 +195,18 @@ module Dor
       %w(use_statement_ssim copyright_ssim).each do |key|
         solr_doc[key] = solr_doc[key].reject(&:blank?).flatten unless solr_doc[key].nil?
       end
-      add_solr_value(solr_doc, 'use_license_machine', use_license, :string, [:stored_sortable])
+      add_solr_value(solr_doc, 'use_license_machine', use_license.first, :string, [:stored_sortable])
+      add_solr_value(solr_doc, 'use_licenses_machine', use_license, :symbol, [:stored_searchable])
 
       solr_doc
     end
 
     def use_license
-      return creative_commons unless creative_commons.blank?
-      return open_data_commons unless open_data_commons.blank?
-      nil
+      use_license = []
+      use_license += Array(creative_commons)
+      use_license += Array(open_data_commons)
+
+      use_license.reject(&:blank?)
     end
 
     # maintain AF < 8 indexing behavior

data/lib/dor/models/concerns/describable.rb

@@ -46,8 +46,12 @@ module Dor
     # @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(include_collection_as_related_item: true)
-      desc_md = descMetadata.ng_xml.dup(1)
-      add_collection_reference(desc_md) if include_collection_as_related_item
+      desc_md = if include_collection_as_related_item
+                  Nokogiri::XML(generate_public_desc_md(include_access_conditions: false))
+                else
+                  descMetadata.ng_xml
+                end
+
       dc_doc = MODS_TO_DC_XSLT.transform(desc_md)
       dc_doc.xpath('/oai_dc:dc/*[count(text()) = 0]', oai_dc: XMLNS_OAI_DC).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?
@@ -56,146 +60,8 @@ module Dor
     end
 
     # @return [String] Public descriptive medatada XML
-    def generate_public_desc_md
-      doc = descMetadata.ng_xml.dup(1)
-      add_collection_reference(doc)
-      add_access_conditions(doc)
-      add_constituent_relations(doc)
-      doc.xpath('//comment()').remove
-      new_doc = Nokogiri::XML(doc.to_xml) { |x| x.noblanks }
-      new_doc.encoding = 'UTF-8'
-      new_doc.to_xml
-    end
-
-    # Create MODS accessCondition statements from rightsMetadata
-    # @param [Nokogiri::XML::Document] doc Document representing the descriptiveMetadata of the object
-    # @note this method modifies the passed in doc
-    def add_access_conditions(doc)
-      # clear out any existing accessConditions
-      doc.xpath('//mods:accessCondition', 'mods' => 'http://www.loc.gov/mods/v3').each {|n| n.remove}
-      rights = datastreams['rightsMetadata'].ng_xml
-
-      rights.xpath('//use/human[@type="useAndReproduction"]').each do |use|
-        txt = use.text.strip
-        next if txt.empty?
-        doc.root.element_children.last.add_next_sibling doc.create_element('accessCondition', txt, :type => 'useAndReproduction')
-      end
-      rights.xpath('//copyright/human[@type="copyright"]').each do |cr|
-        txt = cr.text.strip
-        next if txt.empty?
-        doc.root.element_children.last.add_next_sibling doc.create_element('accessCondition', txt, :type => 'copyright')
-      end
-      rights.xpath("//use/machine[#{ci_compare('type', 'creativecommons')}]").each do |lic_type|
-        next if lic_type.text =~ /none/i
-        lic_text = rights.at_xpath("//use/human[#{ci_compare('type', 'creativecommons')}]").text.strip
-        next if lic_text.empty?
-        new_text = "CC #{lic_type.text}: #{lic_text}"
-        doc.root.element_children.last.add_next_sibling doc.create_element('accessCondition', new_text, :type => 'license')
-      end
-      rights.xpath("//use/machine[#{ci_compare('type', 'opendatacommons')}]").each do |lic_type|
-        next if lic_type.text =~ /none/i
-        lic_text = rights.at_xpath("//use/human[#{ci_compare('type', 'opendatacommons')}]").text.strip
-        next if lic_text.empty?
-        new_text = "ODC #{lic_type.text}: #{lic_text}"
-        doc.root.element_children.last.add_next_sibling doc.create_element('accessCondition', new_text, :type => 'license')
-      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.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
-    # @return [Void]
-    # @note this method modifies the passed in doc
-    def add_collection_reference(doc)
-      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#')
-      return if collections.empty?
-
-      remove_related_item_nodes_for_collections(doc)
-
-      collections.each do |collection_node|
-        collection_druid = collection_node['rdf:resource'].gsub('info:fedora/', '')
-        add_related_item_node_for_collection(doc, collection_druid)
-      end
-    end
-
-    # expand constituent relations into relatedItem references -- see JUMBO-18
-    # @param [Nokogiri::XML] doc public MODS XML being built
-    # @return [Void]
-    def add_constituent_relations(doc)
-      public_relationships.search('//rdf:RDF/rdf:Description/fedora:isConstituentOf',
-                                       'fedora' => 'info:fedora/fedora-system:def/relations-external#',
-                                       'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' ).each do |parent|
-        # fetch the parent object to get title
-        druid = parent['rdf:resource'].gsub(/^info:fedora\//, '')
-        parent_item = Dor.find(druid)
-
-        # create the MODS relation
-        relatedItem = doc.create_element 'relatedItem'
-        relatedItem['type'] = 'host'
-        relatedItem['displayLabel'] = 'Appears in'
-
-        # load the title from the parent's DC.title
-        titleInfo = doc.create_element 'titleInfo'
-        title = doc.create_element 'title'
-        title.content = Dor::Describable.get_collection_title(parent_item)
-        titleInfo << title
-        relatedItem << titleInfo
-
-        # point to the PURL for the parent
-        location = doc.create_element 'location'
-        url = doc.create_element 'url'
-        url.content = "http://#{Dor::Config.stacks.document_cache_host}/#{druid.split(':').last}"
-        location << url
-        relatedItem << location
-
-        # finish up by adding relation to public MODS
-        doc.root << relatedItem
-      end
+    def generate_public_desc_md(**options)
+      PublicDescMetadataService.new(self).to_xml(**options)
     end
 
     def to_solr(solr_doc = {}, *args)
@@ -297,16 +163,5 @@ module Dor
     def full_title
       stanford_mods.sw_title_display
     end
-
-    private
-
-    # Builds case-insensitive xpath translate function call that will match the attribute to a value
-    def ci_compare(attribute, value)
-      "translate(
-        @#{attribute},
-        'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
-        'abcdefghijklmnopqrstuvwxyz'
-       ) = '#{value}' "
-    end
   end
 end

data/lib/dor/models/concerns/embargoable.rb

@@ -36,7 +36,7 @@ module Dor
         end
       end
 
-      datastreams['events'].add_event('embargo', release_agent, 'Embargo released')
+      add_event('embargo', release_agent, 'Embargo released')
     end
 
     def release_20_pct_vis_embargo(release_agent = 'unknown')
@@ -58,7 +58,7 @@ module Dor
         rights_xml.root.add_child(world_doc.root.clone)
       end
 
-      datastreams['events'].add_event('embargo', release_agent, '20% Visibility Embargo released')
+      add_event('embargo', release_agent, '20% Visibility Embargo released')
     end
 
     def update_embargo(new_date)

data/lib/dor/models/concerns/geoable.rb

@@ -2,8 +2,6 @@ module Dor
   module Geoable
     extend ActiveSupport::Concern
 
-    class CrosswalkError < Exception; end
-
     included do
       has_metadata  :name => 'geoMetadata',
                     :type => Dor::GeoMetadataDS,

data/lib/dor/models/concerns/governable.rb

@@ -19,9 +19,8 @@ module Dor
       return 'default' if admin_policy_object.nil?  # TODO: log warning?
 
       admin_md = admin_policy_object.datastreams['administrativeMetadata']
-      return 'default' unless admin_md.respond_to? :default_workflow_lane
       lane = admin_md.default_workflow_lane
-      return 'default' if lane.nil? || lane.strip == ''
+      return 'default' if lane.blank?
       lane
     end
 

data/lib/dor/models/concerns/itemizable.rb

@@ -31,7 +31,7 @@ module Dor
         raise Dor::ParameterError, 'Missing Dor::Config.stacks.local_workspace_root'
       end
 
-      if contentMetadata.nil?
+      if !respond_to?(:contentMetadata) || contentMetadata.nil?
         raise Dor::Exception, 'Missing contentMetadata datastream'
       end
 

data/lib/dor/models/concerns/publishable.rb

@@ -73,30 +73,7 @@ module Dor
     # Generate the public .xml for a PURL page.
     # @return [xml] The public xml for the item
     def public_xml
-      pub = Nokogiri::XML('<publicObject/>').root
-      pub['id'] = pid
-      pub['published'] = Time.now.utc.xmlschema
-      pub['publishVersion'] = 'dor-services/' + Dor::VERSION
-      release_xml = Nokogiri(generate_release_xml).xpath('//release')
-
-      im = datastreams['identityMetadata'].ng_xml.clone
-      im.search('//release').each(&:remove) # remove any <release> tags from public xml which have full history
-
-      pub.add_child(im.root) # add in modified identityMetadata datastream
-      pub.add_child(datastreams['contentMetadata'].public_xml.root.clone)
-      pub.add_child(datastreams['rightsMetadata'].ng_xml.root.clone)
-
-      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)
-      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
-      pub.add_child(Nokogiri("<thumb>#{thumb}</thumb>").root.clone) unless thumb.nil?
-      new_pub = Nokogiri::XML(pub.to_xml) { |x| x.noblanks }
-      new_pub.encoding = 'UTF-8'
-      new_pub.to_xml
+      PublicXmlService.new(self).to_xml
     end
 
     # Copies this object's public_xml to the Purl document cache if it is world discoverable

data/lib/dor/models/concerns/releaseable.rb

@@ -22,19 +22,6 @@ module Dor
       create_workflow('releaseWF')
     end
 
-    # Generate XML structure for inclusion to Purl
-    # @return [String] The XML release node as a string, with ReleaseDigest as the root document
-    def generate_release_xml
-      builder = Nokogiri::XML::Builder.new do |xml|
-        xml.releaseData {
-          released_for.each do |project, released_value|
-            xml.release(released_value['release'], :to => project)
-          end
-        }
-      end
-      builder.to_xml
-    end
-
     # Determine projects in which an item is released
     # @param [Boolean] skip_live_purl set true to skip requesting from purl backend
     # @return [Hash{String => Boolean}] all namespaces, keys are Project name Strings, values are Boolean

data/lib/dor/models/concerns/versionable.rb

@@ -35,7 +35,7 @@ module Dor
 
       vmd_upd_info = opts[:vers_md_upd_info]
       return unless vmd_upd_info
-      datastreams['events'].add_event('open', vmd_upd_info[:opening_user_name], "Version #{vmd_ds.current_version_id} opened")
+      add_event('open', vmd_upd_info[:opening_user_name], "Version #{vmd_ds.current_version_id} opened")
       vmd_ds.update_current_version({:description => vmd_upd_info[:description], :significance => vmd_upd_info[:significance].to_sym})
       save
     end

data/lib/dor/models/workflow_object.rb

@@ -8,8 +8,8 @@ module Dor
     has_object_type 'workflow'
     has_metadata :name => 'workflowDefinition', :type => Dor::WorkflowDefinitionDs, :label => 'Workflow Definition'
 
-    def self.find_by_name(name, opts = {})
-      Dor.find_all(%(#{Solrizer.solr_name 'objectType', :symbol}:"#{object_type}" #{Solrizer.solr_name 'workflow_name', :symbol}:"#{name}"), opts).first
+    def self.find_by_name(name)
+      Dor::WorkflowObject.where(Solrizer.solr_name('workflow_name', :symbol) => name).first
     end
 
     # Searches for the workflow definition object in DOR, then

data/lib/dor/services/public_desc_metadata_service.rb

@@ -0,0 +1,174 @@
+module Dor
+  class PublicDescMetadataService
+    attr_reader :object
+    
+    NOKOGIRI_DEEP_COPY = 1
+
+    def initialize(object)
+      @object = object
+    end
+    
+    def doc
+      @doc ||= object.descMetadata.ng_xml.dup(NOKOGIRI_DEEP_COPY)
+    end
+
+    # @return [String] Public descriptive medatada XML
+    def to_xml(include_access_conditions: true)
+      add_collection_reference!
+      add_access_conditions! if include_access_conditions
+      add_constituent_relations!
+      strip_comments!
+      
+      new_doc = Nokogiri::XML(doc.to_xml) { |x| x.noblanks }
+      new_doc.encoding = 'UTF-8'
+      new_doc.to_xml
+    end
+
+    private
+
+    def strip_comments!
+      doc.xpath('//comment()').remove
+    end
+
+    # Create MODS accessCondition statements from rightsMetadata
+    # @param [Nokogiri::XML::Document] doc Document representing the descriptiveMetadata of the object
+    # @note this method modifies the passed in doc
+    def add_access_conditions!
+      # clear out any existing accessConditions
+      doc.xpath('//mods:accessCondition', 'mods' => 'http://www.loc.gov/mods/v3').each {|n| n.remove}
+      rights = object.datastreams['rightsMetadata'].ng_xml
+
+      rights.xpath('//use/human[@type="useAndReproduction"]').each do |use|
+        txt = use.text.strip
+        next if txt.empty?
+        doc.root.element_children.last.add_next_sibling doc.create_element('accessCondition', txt, :type => 'useAndReproduction')
+      end
+      rights.xpath('//copyright/human[@type="copyright"]').each do |cr|
+        txt = cr.text.strip
+        next if txt.empty?
+        doc.root.element_children.last.add_next_sibling doc.create_element('accessCondition', txt, :type => 'copyright')
+      end
+      rights.xpath("//use/machine[#{ci_compare('type', 'creativecommons')}]").each do |lic_type|
+        next if lic_type.text =~ /none/i
+        lic_text = rights.at_xpath("//use/human[#{ci_compare('type', 'creativecommons')}]").text.strip
+        next if lic_text.empty?
+        new_text = "CC #{lic_type.text}: #{lic_text}"
+        doc.root.element_children.last.add_next_sibling doc.create_element('accessCondition', new_text, :type => 'license')
+      end
+      rights.xpath("//use/machine[#{ci_compare('type', 'opendatacommons')}]").each do |lic_type|
+        next if lic_type.text =~ /none/i
+        lic_text = rights.at_xpath("//use/human[#{ci_compare('type', 'opendatacommons')}]").text.strip
+        next if lic_text.empty?
+        new_text = "ODC #{lic_type.text}: #{lic_text}"
+        doc.root.element_children.last.add_next_sibling doc.create_element('accessCondition', new_text, :type => 'license')
+      end
+    end
+
+    # expand constituent relations into relatedItem references -- see JUMBO-18
+    # @param [Nokogiri::XML] doc public MODS XML being built
+    # @return [Void]
+    def add_constituent_relations!
+      object.public_relationships.search('//rdf:RDF/rdf:Description/fedora:isConstituentOf',
+                                       'fedora' => 'info:fedora/fedora-system:def/relations-external#',
+                                       'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' ).each do |parent|
+        # fetch the parent object to get title
+        druid = parent['rdf:resource'].gsub(/^info:fedora\//, '')
+        parent_item = Dor.find(druid)
+
+        # create the MODS relation
+        relatedItem = doc.create_element 'relatedItem'
+        relatedItem['type'] = 'host'
+        relatedItem['displayLabel'] = 'Appears in'
+
+        # load the title from the parent's DC.title
+        titleInfo = doc.create_element 'titleInfo'
+        title = doc.create_element 'title'
+        title.content = Dor::Describable.get_collection_title(parent_item)
+        titleInfo << title
+        relatedItem << titleInfo
+
+        # point to the PURL for the parent
+        location = doc.create_element 'location'
+        url = doc.create_element 'url'
+        url.content = "http://#{Dor::Config.stacks.document_cache_host}/#{druid.split(':').last}"
+        location << url
+        relatedItem << location
+
+        # finish up by adding relation to public MODS
+        doc.root << relatedItem
+      end
+    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
+    # @return [Void]
+    # @note this method modifies the passed in doc
+    def add_collection_reference!
+      collections = object.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#')
+      return if collections.empty?
+
+      remove_related_item_nodes_for_collections!
+
+      collections.each do |collection_node|
+        collection_druid = collection_node['rdf:resource'].gsub('info:fedora/', '')
+        add_related_item_node_for_collection! collection_druid
+      end
+    end
+
+    # Remove existing relatedItem entries for collections from descMetadata
+    def remove_related_item_nodes_for_collections!
+      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! collection_druid
+      begin
+        collection_obj = Dor.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
+
+    private
+
+    # Builds case-insensitive xpath translate function call that will match the attribute to a value
+    def ci_compare(attribute, value)
+      "translate(
+        @#{attribute},
+        'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
+        'abcdefghijklmnopqrstuvwxyz'
+       ) = '#{value}' "
+    end
+  end
+end

data/lib/dor/services/public_xml_service.rb

@@ -0,0 +1,52 @@
+module Dor
+  class PublicXmlService
+    attr_reader :object
+
+    def initialize(object)
+      @object = object
+    end
+    
+    def to_xml
+      pub = Nokogiri::XML('<publicObject/>').root
+      pub['id'] = object.pid
+      pub['published'] = Time.now.utc.xmlschema
+      pub['publishVersion'] = 'dor-services/' + Dor::VERSION
+      release_xml = Nokogiri(generate_release_xml)
+
+      im = object.datastreams['identityMetadata'].ng_xml.clone
+      im.search('//release').each(&:remove) # remove any <release> tags from public xml which have full history
+
+      pub.add_child(im.root) # add in modified identityMetadata datastream
+      public_content_metadata = object.datastreams['contentMetadata'].public_xml
+      pub.add_child(public_content_metadata.root.clone) if public_content_metadata.xpath('//resource').any?
+      pub.add_child(object.datastreams['rightsMetadata'].ng_xml.root.clone)
+
+      rels = object.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(object.generate_dublin_core.root.clone)
+      pub.add_child(Nokogiri::XML(object.generate_public_desc_md).root.clone)
+      pub.add_child(release_xml.root.clone) unless release_xml.xpath('//release').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
+      pub.add_child(Nokogiri("<thumb>#{object.thumb}</thumb>").root.clone) unless object.thumb.nil?
+
+      new_pub = Nokogiri::XML(pub.to_xml) { |x| x.noblanks }
+      new_pub.encoding = 'UTF-8'
+      new_pub.to_xml
+    end
+    
+
+    # Generate XML structure for inclusion to Purl
+    # @return [String] The XML release node as a string, with ReleaseDigest as the root document
+    def generate_release_xml
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.releaseData {
+          object.released_for.each do |project, released_value|
+            xml.release(released_value['release'], :to => project)
+          end
+        }
+      end
+      builder.to_xml
+    end
+  end
+end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '5.18.0'.freeze
+  VERSION = '5.19.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.18.0
+  version: 5.19.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2016-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -643,6 +643,8 @@ files:
 - lib/dor/services/merge_service.rb
 - lib/dor/services/metadata_handlers/catalog_handler.rb
 - lib/dor/services/metadata_service.rb
+- lib/dor/services/public_desc_metadata_service.rb
+- lib/dor/services/public_xml_service.rb
 - lib/dor/services/registration_service.rb
 - lib/dor/services/reset_workspace_service.rb
 - lib/dor/services/sdr_ingest_service.rb
@@ -679,7 +681,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library