dor-services 5.19.0 → 5.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dc1bf75851ebaf4b19feb92a2f1acf584dd6855
-  data.tar.gz: 0e075b4ab4cdb029fe3165d6612d51212586012d
+  metadata.gz: 39d428d9a931ec01cf66aa31d6b57b8799790d25
+  data.tar.gz: cf2c1b5e154ec386b91c25acd0a3fad3e972c721
 SHA512:
-  metadata.gz: 45a77bd472e8fa469edada87a30d474aecb5a895978545d271236be31b69da2016726c732fad2d827e45b49bf04cb976e27f118502f196d6de40789f2ac9f55d
-  data.tar.gz: 1805fcdcdd30cc35a2321c00b2a07fd8ecf506ef369fcf762ebcf2a625729b1f4d0a27b269ca005b9125a1a76f658b441e11bb26fca9aa7d4e31ac26db415d57
+  metadata.gz: 24ae862bf0f70a297e2cb19d52f1589664fe20ed0c5cc289e954e1efb3906098f11d8ba22f2daed4b6a131c7478ef2c9a39299aaf0e5c7b425db00b59f3e9b17
+  data.tar.gz: f8977fc6407cd2054f787423e3ea21579ed3efa359a5560d4f006b29f02908191b086efccdec5435f99155c51d7563872f194132c4886e6ad36edf7bbe936d45

data/lib/dor-services.rb

@@ -155,4 +155,6 @@ module Dor
   end
 
   eager_load!
+
+  require 'dor/utils/hydrus_shims'
 end

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -33,45 +33,6 @@ module Dor
 
     ### READ ONLY METHODS
 
-    # @return [Nokogiri::XML::Document] sanitized for public consumption
-    def public_xml
-      result = ng_xml.clone
-
-      # remove any resources or attributes that are not destined for the public XML
-      result.xpath('/contentMetadata/resource[not(file[(@deliver="yes" or @publish="yes")]|externalFile)]').each(&:remove)
-      result.xpath('/contentMetadata/resource/file[not(@deliver="yes" or @publish="yes")]'                ).each(&:remove)
-      result.xpath('/contentMetadata/resource/file').xpath('@preserve|@shelve|@publish|@deliver'          ).each(&:remove)
-      result.xpath('/contentMetadata/resource/file/checksum'                                              ).each(&:remove)
-
-      # support for dereferencing links via externalFile element(s) to the source (child) item - see JUMBO-19
-      result.xpath('/contentMetadata/resource/externalFile').each do |externalFile|
-        # enforce pre-conditions that resourceId, objectId, fileId are required
-        src_resource_id = externalFile['resourceId']
-        src_druid = externalFile['objectId']
-        src_file_id = externalFile['fileId']
-        fail ArgumentError, "Malformed externalFile data: #{externalFile.inspect}" if [src_resource_id, src_file_id, src_druid].map(&:blank?).any?
-
-        # grab source item
-        src_item = Dor.find(src_druid)
-
-        # locate and extract the resourceId/fileId elements
-        doc = src_item.datastreams['contentMetadata'].ng_xml
-        src_resource = doc.at_xpath("//resource[@id=\"#{src_resource_id}\"]")
-        src_file = src_resource.at_xpath("file[@id=\"#{src_file_id}\"]")
-        src_image_data = src_file.at_xpath('imageData')
-
-        # always use title regardless of whether a child label is present
-        src_label = doc.create_element('label')
-        src_label.content = src_item.full_title
-
-        # add the extracted label and imageData
-        externalFile.add_previous_sibling(src_label)
-        externalFile << src_image_data unless src_image_data.nil?
-      end
-
-      result
-    end
-
     # Only use this when you want the behavior of raising an exception if anything besides exactly one matching node
     # is found.  Otherwise just use .xpath, .at_xpath or .search.
     # @param xpath [String] accessor invocation for Nokogiri xpath

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -101,6 +101,7 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
     end
 
     term_value_delete(:select => '//embargoMetadata/releaseAccess')
+    ng_xml_will_change!
     ng_xml.root.add_child(new_doc.root.clone)
   end
 

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -28,6 +28,7 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
   end
 
   def add_value(name, value, attrs = {})
+    ng_xml_will_change!
     add_child_node(ng_xml.root, :value, name, value, attrs)
   end
 
@@ -44,6 +45,7 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
   # @return [String, Nil] The same value, as per Ruby convention for assignment operators
   # @note The actual values assigned will have leading/trailing whitespace stripped.
   def sourceId=(value)
+    ng_xml_will_change!
     node = find_by_terms(:sourceId).first
     unless value.present? # so setting it to '' is the same as removal: worth documenting maybe?
       node.remove unless node.nil?
@@ -72,6 +74,7 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
   end
 
   def add_otherId(other_id)
+    ng_xml_will_change!
     (name, val) = other_id.split(/:/, 2)
     node = ng_xml.root.add_child('<otherId/>').first
     node['name'] = name

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -2,8 +2,6 @@ module Dor
   class RightsMetadataDS < ActiveFedora::OmDatastream
     require 'dor/rights_auth'
 
-    attr_writer :dra_object
-
     # This is separate from default_object_rights because
     # (1) we cannot default to such a permissive state
     # (2) this is real, not default
@@ -131,7 +129,7 @@ module Dor
       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
+      @dra_object = nil # until TODO complete, we'll expect to have to reparse after modification
     end
 
     def to_solr(solr_doc = {}, *args)

data/lib/dor/datastreams/workflow_definition_ds.rb

@@ -33,6 +33,7 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
   end
 
   def add_process(attributes)
+    ng_xml_will_change!
     add_child_node(ng_xml.at_xpath('/workflow-def'), :process, self, attributes)
   end
 
@@ -54,22 +55,6 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
     ng_xml.at_xpath('/workflow-def/@repository').to_s
   end
 
-  def configuration
-    result = ActiveSupport::OrderedHash.new
-    result['repository'] = repo
-    result['name'] = name
-    processes.each { |process| result[process.name] = process.to_hash }
-    result
-  end
-
-  def configuration=(hash)
-    self.ng_xml = Nokogiri::XML(%(<workflow-def id="#{hash['name']}" repository="#{hash['repository']}"/>))
-    i = 0
-    hash.each_pair do |k, v|
-      add_process(v.merge({:name => k, :sequence => i += 1})) if v.is_a?(Hash)
-    end
-  end
-
   # Creates the xml used by Dor::WorkflowService#create_workflow
   # @return [String] An object's initial workflow as defined by the <workflow-def> in content
   def initial_workflow
@@ -101,10 +86,6 @@ class WorkflowDefinitionDs < ActiveFedora::OmDatastream
     solr_doc
   end
 
-  def to_yaml
-    YAML.dump(configuration)
-  end
-
   # maintain AF < 8 indexing behavior
   def prefix
     ''

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

@@ -67,7 +67,6 @@ module Dor
     def to_solr(solr_doc = {}, *args)
       solr_doc = super solr_doc, *args
       add_metadata_format_to_solr_doc(solr_doc)
-      add_dc_to_solr_doc(solr_doc)
       add_mods_to_solr_doc(solr_doc)
     end
 
@@ -76,27 +75,6 @@ module Dor
       solr_doc['metadata_format_ssim'] += ['mods']
     end
 
-    def add_dc_to_solr_doc(solr_doc)
-      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/*', oai_dc: XMLNS_OAI_DC).each do |node|
-        add_solr_value(solr_doc, "public_dc_#{node.name}", node.text, :string, [:stored_searchable])
-      end
-      creator = ''
-      dc_doc.xpath('//dc:creator', dc: XMLNS_DC).each do |node|
-        creator = node.text
-      end
-      title = ''
-      dc_doc.xpath('//dc:title', dc: XMLNS_DC).each do |node|
-        title = node.text
-      end
-      creator_title = creator + title
-      add_solr_value(solr_doc, 'creator_title', creator_title, :string, [:stored_sortable])
-    rescue CrosswalkError => e
-      Dor.logger.warn "Cannot index #{pid}.descMetadata: #{e.message}"
-    end
-
     def add_mods_to_solr_doc(solr_doc)
       mods_sources = {
         sw_title_display: %w(sw_display_title_tesim),

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

@@ -140,6 +140,7 @@ module Dor
     end
     def metadata_source=(val)
       if administrativeMetadata.descMetadata.nil?
+        administrativeMetadata.ng_xml_will_change!
         administrativeMetadata.add_child_node(administrativeMetadata, :descMetadata)
       end
       administrativeMetadata.update_values({[:descMetadata, :source] => val})
@@ -279,6 +280,7 @@ module Dor
       raise(ArgumentError, "Unrecognized rights value '#{rights}'") unless RightsMetadataDS.valid_rights_type? rights
 
       rights_xml = defaultObjectRights.ng_xml
+      defaultObjectRights.ng_xml_will_change!
       RightsMetadataDS.upd_rights_xml_for_rights_type(rights_xml, rights)
     end
 
@@ -288,6 +290,7 @@ module Dor
     def desc_metadata_format=(format)
       # create the node if it isnt there already
       unless administrativeMetadata.metadata_format.first
+        administrativeMetadata.ng_xml_will_change!
         administrativeMetadata.add_child_node(administrativeMetadata.ng_xml.root, :metadata_format)
       end
       administrativeMetadata.update_values({[:metadata_format] => format})
@@ -299,6 +302,7 @@ module Dor
     def desc_metadata_source=(source)
       # create the node if it isnt there already
       unless administrativeMetadata.metadata_source.first
+        administrativeMetadata.ng_xml_will_change!
         administrativeMetadata.add_child_node(administrativeMetadata.ng_xml.root, :metadata_source)
       end
       administrativeMetadata.update_values({[:metadata_source] => format})
@@ -314,6 +318,7 @@ module Dor
     def default_workflow=(wf)
       fail ArgumentError, 'Must have a valid workflow for default' if wf.blank?
       xml = administrativeMetadata.ng_xml
+      administrativeMetadata.ng_xml_will_change!
       nodes = xml.search('//registration/workflow')
       if nodes.first
         nodes.first['id'] = wf

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

@@ -8,22 +8,5 @@ module Dor
                     :label => 'Geographic Information Metadata in ISO 19139',
                     :control_group => 'M'
     end
-
-    # @return [String, nil] XML
-    def fetch_geoMetadata_datastream
-      candidates = datastreams['identityMetadata'].otherId.collect { |oid| oid.to_s }
-      metadata_id = Dor::MetadataService.resolvable(candidates).first
-      return nil if metadata_id.nil?
-      Dor::MetadataService.fetch(metadata_id.to_s)
-    end
-
-    def build_geoMetadata_datastream(ds)
-      content = fetch_geoMetadata_datastream
-      return nil if content.nil?
-      ds.dsLabel = label
-      ds.ng_xml = Nokogiri::XML(content)
-      ds.ng_xml.normalize_text!
-      ds.content = ds.ng_xml.to_xml
-    end
   end
 end

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

@@ -97,6 +97,7 @@ module Dor
     def update_other_Id(type, new_val, val = nil)
       identityMetadata.ng_xml.search('//otherId[@name=\'' + type + '\']')
         .select { |node| val.nil? || node.content == val }
+        .each { identityMetadata.ng_xml_will_change! }
         .each  { |node| node.content = new_val }
         .any?
     end
@@ -104,6 +105,7 @@ module Dor
     def remove_other_Id(type, val = nil)
       identityMetadata.ng_xml.search('//otherId[@name=\'' + type + '\']')
         .select { |node| val.nil? || node.content == val }
+        .each { identityMetadata.ng_xml_will_change! }
         .each(&:remove)
         .any?
     end
@@ -166,6 +168,7 @@ module Dor
       normtag = normalize_tag(tag)
       identityMetadata.ng_xml.search('//tag')
         .select { |node| normalize_tag(node.content) == normtag }
+        .each { identityMetadata.ng_xml_will_change! }
         .each(&:remove)
         .any?
     end
@@ -174,6 +177,7 @@ module Dor
       normtag = normalize_tag(old_tag)
       identityMetadata.ng_xml.search('//tag')
         .select { |node| normalize_tag(node.content) == normtag }
+        .each { identityMetadata.ng_xml_will_change! }
         .each  { |node| node.content = normalize_tag(new_tag)  }
         .any?
     end

data/lib/dor/services/public_xml_service.rb

@@ -11,42 +11,94 @@ module Dor
       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(public_identity_metadata.root) # add in modified identityMetadata datastream
+      pub.add_child(public_content_metadata.root) if public_content_metadata.xpath('//resource').any?
+      pub.add_child(public_rights_metadata.root)
 
-      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
+      pub.add_child(public_relationships.root) unless public_relationships.nil? # TODO: Should never be nil in practice; working around an ActiveFedora quirk for testing
+      pub.add_child(object.generate_dublin_core.root)
+      pub.add_child(Nokogiri::XML(object.generate_public_desc_md).root)
+      pub.add_child(release_xml.root) 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?
+      pub.add_child(Nokogiri("<thumb>#{object.thumb}</thumb>").root) 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
-        }
+    def release_xml
+      @release_xml ||= begin
+          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
+        Nokogiri::XML(builder.to_xml)
+      end
+    end
+
+    def public_relationships
+      @public_relationships ||= object.public_relationships.clone
+    end
+
+    def public_rights_metadata
+      @public_rights_metadata ||= object.datastreams['rightsMetadata'].ng_xml.clone
+    end
+
+    def public_identity_metadata
+      @public_identity_metadata ||= begin
+        im = object.datastreams['identityMetadata'].ng_xml.clone
+        im.search('//release').each(&:remove) # remove any <release> tags from public xml which have full history
+        im
+      end
+    end
+
+    # @return [Nokogiri::XML::Document] sanitized for public consumption
+    def public_content_metadata
+      @public_content_metadata ||= begin
+        result = object.datastreams['contentMetadata'].ng_xml.clone
+
+        # remove any resources or attributes that are not destined for the public XML
+        result.xpath('/contentMetadata/resource[not(file[(@deliver="yes" or @publish="yes")]|externalFile)]').each(&:remove)
+        result.xpath('/contentMetadata/resource/file[not(@deliver="yes" or @publish="yes")]'                ).each(&:remove)
+        result.xpath('/contentMetadata/resource/file').xpath('@preserve|@shelve|@publish|@deliver'          ).each(&:remove)
+        result.xpath('/contentMetadata/resource/file/checksum'                                              ).each(&:remove)
+
+        # support for dereferencing links via externalFile element(s) to the source (child) item - see JUMBO-19
+        result.xpath('/contentMetadata/resource/externalFile').each do |externalFile|
+          # enforce pre-conditions that resourceId, objectId, fileId are required
+          src_resource_id = externalFile['resourceId']
+          src_druid = externalFile['objectId']
+          src_file_id = externalFile['fileId']
+          fail ArgumentError, "Malformed externalFile data: #{externalFile.inspect}" if [src_resource_id, src_file_id, src_druid].map(&:blank?).any?
+
+          # grab source item
+          src_item = Dor.find(src_druid)
+
+          # locate and extract the resourceId/fileId elements
+          doc = src_item.datastreams['contentMetadata'].ng_xml
+          src_resource = doc.at_xpath("//resource[@id=\"#{src_resource_id}\"]")
+          src_file = src_resource.at_xpath("file[@id=\"#{src_file_id}\"]")
+          src_image_data = src_file.at_xpath('imageData')
+
+          # always use title regardless of whether a child label is present
+          src_label = doc.create_element('label')
+          src_label.content = src_item.full_title
+
+          # add the extracted label and imageData
+          externalFile.add_previous_sibling(src_label)
+          externalFile << src_image_data unless src_image_data.nil?
+        end
+
+        result
       end
-      builder.to_xml
     end
   end
 end

data/lib/dor/utils/hydrus_shims.rb

@@ -0,0 +1,11 @@
+module Hydrus
+  # These shims allow DOR to interact seamlessly with Hydrus' custom models
+  class Item < Dor::Item
+  end
+
+  class Collection < Dor::Collection
+  end
+
+  class AdminPolicyObject < Dor::AdminPolicyObject
+  end
+end

data/lib/dor/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 5.19.0
+  version: 5.20.0
 platform: ruby
 authors:
 - Michael Klein
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2017-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -651,6 +651,7 @@ files:
 - lib/dor/services/search_service.rb
 - lib/dor/services/suri_service.rb
 - lib/dor/services/technical_metadata_service.rb
+- lib/dor/utils/hydrus_shims.rb
 - lib/dor/utils/ng_tidy.rb
 - lib/dor/utils/predicate_patch.rb
 - lib/dor/utils/sdr_client.rb