dor-services 4.22.2 → 4.22.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDYxZTA5OWZlY2Y4ZGE5ZjM2NzY5NTgwYjk2YzRmZTNkYjYwNGY5Ng==
+    NjI5NzlkM2JlOTJlYTIwYzM2YTg1MWY4ZWE1MTQyMzZiMmQ0YmM5Yw==
   data.tar.gz: !binary |-
-    MWNiNTFmZTMzYjJjOTExNDhiNTJkODI4OTg3NDNmZDAzMDMwYzUxZQ==
+    N2VmNmU5NTRhYjY0MDgyYjBmNWVjMjgzNTcyODVkNjA1OGFjMmRiYQ==
 SHA512:
   metadata.gz: !binary |-
-    NjZlZWJkYzUwMTEyNmVhNDg5YjNiMzVlYTE2MThiYzNjYTVkM2RkMDU4ZWFh
-    OTFiZDcxZjA5NDU5Y2JlYTc3Y2IxMzg1ZGY1OWZmM2ZiYzFhNTgwYzMxOWM1
-    ZGNhNWRiMGQyNjI5MDE4Mzk1NWVlYmQ3NDdhODA4YWUwNzg2MWI=
+    M2VhNWZiNGNjMWZiZDY1NGUyOWZhZDZlZDFmZWFlYTIzNTRlZDA3MzI2OTA1
+    MWQ3ZWUzOTQwMzUxYTBlZmIzZDcyMzNkMDA1ZTEzYWI2NjdmZmI0MTczYWVm
+    MGFkN2Q3MDIwYzRlNmEwMzg1YWJjYWI3ZTc1ZjdjNWExOWM1ZWI=
   data.tar.gz: !binary |-
-    YzlkNWU5ODMyYjZlMzg2M2IzYTFiMThlOGQ4OWY0OTE4NmI2MDIzNTVkNDcx
-    NTMwMjViM2Q4OTA3N2FjNTEyNmE1MDMxMTg0Njg5MjYzMjZkODk5MTY4ZDQ4
-    YjMxOTUxN2VlNjRmYWM5YzI5NmNkZTJkYzQ1MDY2YWFiNzE5Mzc=
+    Y2E5NzY0NGZhYjk1ZWVmOGNiYzliYWE3Nzc1NmVhNTY1ZWEzODMwZTVhZDQ5
+    YTMyZDk5ODU2MDNiMTJiOTljYzMyNzE0ZjZlN2E2NDc0OWMzYTZmY2NhMmIw
+    ZmY4OGEzYjBmMjBlNDRkMjhlMTJmNWJmYWZmMjYwMTg1MTNjMWE=

data/lib/dor/models/discoverable.rb

@@ -56,11 +56,9 @@ module Dor
           :sw_all_search_facet_facet => stanford_mods_record.text
       
         }
-        if doc_hash
-          solr_doc = solr_doc.merge(doc_hash)
-        end
+        solr_doc.merge!(doc_hash) if doc_hash
       end
       solr_doc
     end
   end
-end
+end

data/lib/dor/models/publishable.rb

@@ -10,21 +10,21 @@ module Dor
     include Presentable
 
     included do
-      has_metadata :name => "rightsMetadata", :type => ActiveFedora::OmDatastream, :label => 'Rights Metadata'
+      has_metadata name: 'rightsMetadata', type: ActiveFedora::OmDatastream, label: 'Rights Metadata'
     end
 
     def build_rightsMetadata_datastream(ds)
-      content_ds = self.admin_policy_object.datastreams['defaultObjectRights']
+      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 public_relationships
-      include_elements = ['fedora:isMemberOf','fedora:isMemberOfCollection']
-      rels_doc = Nokogiri::XML(self.datastreams['RELS-EXT'].content)
-      rels_doc.xpath('/rdf:RDF/rdf:Description/*', { 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#' }).each do |rel|
-        unless include_elements.include?([rel.namespace.prefix,rel.name].join(':'))
+      include_elements = ['fedora:isMemberOf', 'fedora:isMemberOfCollection']
+      rels_doc = Nokogiri::XML(datastreams['RELS-EXT'].content)
+      rels_doc.xpath('/rdf:RDF/rdf:Description/*', 'rdf' => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#').each do |rel|
+        unless include_elements.include?([rel.namespace.prefix, rel.name].join(':'))
           rel.next_sibling.remove if rel.next_sibling.content.strip.empty?
           rel.remove
         end
@@ -32,31 +32,30 @@ module Dor
       rels_doc
     end
 
-    #Generate the public .xml for a PURL page.
-    #@return [xml] The public xml for the item
-    #
+    # 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 = Nokogiri::XML('<publicObject/>').root
       pub['id'] = pid
       pub['published'] = Time.now.xmlschema
       pub['publishVersion'] = 'dor-services/' + Dor::VERSION
-      release_xml=Nokogiri(self.generate_release_xml).xpath('//release')
+      release_xml = Nokogiri(generate_release_xml).xpath('//release')
 
-      im=self.datastreams['identityMetadata'].ng_xml.clone
-      im.search('//release').each {|node| node.remove} # remove any <release> tags from public xml which have full history
-      im.root.add_child(release_xml) 
+      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(self.datastreams['contentMetadata'].public_xml.root.clone)
-      pub.add_child(self.datastreams['rightsMetadata'].ng_xml.root.clone)
+      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(self.generate_dublin_core.root.clone)
+      pub.add_child(generate_dublin_core.root.clone)
       @public_xml_doc = pub # save this for possible IIIF Presentation manifest
-      pub.add_child(Nokogiri(self.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
-      new_pub = Nokogiri::XML(pub.to_xml) { |x| x.noblanks }
+      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
+      new_pub = Nokogiri::XML(pub.to_xml, &:noblanks)
       new_pub.encoding = 'UTF-8'
       new_pub.to_xml
     end
@@ -65,30 +64,26 @@ module Dor
     #  otherwise, it prunes the object's metadata from the document cache
     def publish_metadata
       rights = datastreams['rightsMetadata'].ng_xml.clone.remove_namespaces!
-      if(rights.at_xpath("//rightsMetadata/access[@type='discover']/machine/world"))
-        dc_xml = self.generate_dublin_core.to_xml {|config| config.no_declaration}
+      if rights.at_xpath("//rightsMetadata/access[@type='discover']/machine/world")
+        dc_xml = generate_dublin_core.to_xml(&:no_declaration)
         DigitalStacksService.transfer_to_document_store(pid, dc_xml, 'dc')
-        DigitalStacksService.transfer_to_document_store(pid, self.datastreams['identityMetadata'].to_xml, 'identityMetadata')
-        DigitalStacksService.transfer_to_document_store(pid, self.datastreams['contentMetadata'].to_xml, 'contentMetadata')
-        DigitalStacksService.transfer_to_document_store(pid, self.datastreams['rightsMetadata'].to_xml, 'rightsMetadata')
+        DigitalStacksService.transfer_to_document_store(pid, datastreams['identityMetadata'].to_xml, 'identityMetadata')
+        DigitalStacksService.transfer_to_document_store(pid, datastreams['contentMetadata'].to_xml, 'contentMetadata')
+        DigitalStacksService.transfer_to_document_store(pid, datastreams['rightsMetadata'].to_xml, 'rightsMetadata')
         DigitalStacksService.transfer_to_document_store(pid, public_xml, 'public')
-        if self.metadata_format == 'mods'
-          DigitalStacksService.transfer_to_document_store(pid, self.generate_public_desc_md, 'mods')
-        end
-        if iiif_presentation_manifest_needed? @public_xml_doc
-          DigitalStacksService.transfer_to_document_store(pid, build_iiif_manifest(@public_xml_doc), 'manifest')
-        end
+        DigitalStacksService.transfer_to_document_store(pid, generate_public_desc_md, 'mods') if metadata_format == 'mods'
+        DigitalStacksService.transfer_to_document_store(pid, build_iiif_manifest(@public_xml_doc), 'manifest') if iiif_presentation_manifest_needed? @public_xml_doc
       else
         # Clear out the document cache for this item
         DigitalStacksService.prune_purl_dir pid
       end
     end
-    #call the dor services app to have it publish the metadata
+
+    # Call dor services app to have it publish the metadata
     def publish_metadata_remotely
-      dor_services = RestClient::Resource.new(Config.dor_services.url+"/v1/objects/#{pid}/publish")
+      dor_services = RestClient::Resource.new(Config.dor_services.url + "/v1/objects/#{pid}/publish")
       dor_services.post ''
       dor_services.url
     end
   end
-
 end

data/lib/dor/models/releaseable.rb

@@ -5,7 +5,7 @@ module Dor
   module Releaseable
     extend ActiveSupport::Concern
     include Itemizable
-        
+
     #Add release tags to an item and initialize the item release workflow
     #
     #@params release_tags [Hash or Array] Either a hash of a single release tag.  Each tag should be in the form of {:tag=>'Fitch : Batch2',:what=>'self',:to=>'Searchworks',:who=>'petucket', :release=>true/false}
@@ -14,18 +14,16 @@ module Dor
     #
     #
     def add_release_nodes_and_start_releaseWF(release_tags)
-      release_tags = [release_tags] if release_tags.class != Array
-      
-      #Add in each tag
+      release_tags = [release_tags] unless release_tags.is_a?(Array)
+
+      # Add in each tag
       release_tags.each do |r_tag|
         self.add_release_node(r_tag[:release],r_tag)
       end
-      
-      #Save the item to dor so the robots work with the latest data
-      self.save 
-      
-      #Intialize the release workflow
-      self.initialize_workflow('releaseWF') 
+
+      # Save item to dor so the robots work with the latest data
+      save
+      initialize_workflow('releaseWF')
     end
 
     #Generate XML structure for inclusion to Purl
@@ -34,56 +32,51 @@ module Dor
     def generate_release_xml
       builder = Nokogiri::XML::Builder.new do |xml|
         xml.releaseData {
-          self.released_for.each do |project,released_value|
-            xml.release(released_value["release"],:to=>project)
-          end  
-          }        
-        end
-      return builder.to_xml
+          released_for.each do |project, released_value|
+            xml.release(released_value['release'], :to => project)
+          end
+        }
+      end
+      builder.to_xml
     end
-    
+
     #Determine which projects an item is released for
     #
     #@return [Hash] all namespaces in the form of {"Project" => Boolean}
     def released_for
       released_hash = {}
-      
-      #Get release tags on the item itself 
-      release_tags_on_this_item = self.release_nodes
-      
-      #Get any self tags on this item
-      self_release_tags = self.get_self_release_tags(release_tags_on_this_item)
-      
-      #Get the most recent self tag for all targets and save their result since most recent self always trumps any other non self tags
-      latest_self_tags = self.get_newest_release_tag(self_release_tags)
+      # Get release tags on the item itself
+      release_tags_on_this_item = release_nodes
+
+      # Get any self tags on this item
+      self_release_tags = get_self_release_tags(release_tags_on_this_item)
+
+      # Get the most recent self tag for all targets and save their result since most recent self always trumps any other non self tags
+      latest_self_tags = get_newest_release_tag(self_release_tags)
       latest_self_tags.keys.each do |target|
         released_hash[target] =  self.clean_release_tag_for_purl(latest_self_tags[target])
       end
-      
-      #With Self Tags Resolved We Now need to deal with tags on all sets this object is part of 
-      
-      potential_applicable_release_tags = {}  #This will be where we store all tags that apply, regardless of their timestamp
-       
-      #Get all release tags on the item and strip out the what = self ones, we've already processed all the self tags on this item 
-      potential_applicable_release_tags = get_tags_for_what_value(self.get_release_tags_for_item_and_all_governing_sets, 'collection')
-      
-      administrative_tags = self.tags  #Get them once here and pass them down
-      
-      #We now have the keys for all potential releases, we need to check the tags and the most recent time stamp with an explicit true or false wins, in a nil case, the lack of an explicit false tag we do nothing
-      (potential_applicable_release_tags.keys-released_hash.keys).each do |key|  #don't bother checking the ones already added to the release hash, they were added due to a self tag and that has won
+
+      # With Self Tags Resolved We Now need to deal with tags on all sets this object is part of
+      potential_applicable_release_tags = {}  # This will be where we store all tags that apply, regardless of their timestamp
+
+      # Get all release tags on the item and strip out the what = self ones, we've already processed all the self tags on this item
+      potential_applicable_release_tags = get_tags_for_what_value(get_release_tags_for_item_and_all_governing_sets, 'collection')
+      administrative_tags = tags  # Get them once here and pass them down
+
+      # We now have the keys for all potential releases, we need to check the tags: the most recent timestamp with an explicit true or false wins.
+      # In a nil case, the lack of an explicit false tag we do nothing.
+      (potential_applicable_release_tags.keys - released_hash.keys).each do |key|  # don't bother checking if already added to the release hash, they were added due to a self tag so that has won
         latest_applicable_tag_for_key = latest_applicable_release_tag_in_array(potential_applicable_release_tags[key], administrative_tags)
-        if latest_applicable_tag_for_key != nil #We have a valid tag, record it
-          released_hash[key] = self.clean_release_tag_for_purl(latest_applicable_tag_for_key) 
+        unless latest_applicable_tag_for_key.nil? # We have a valid tag, record it
+          released_hash[key] = clean_release_tag_for_purl(latest_applicable_tag_for_key)
         end
-        
       end
-      
-      #See what the application is currently released for on Purl.  If something is released in purl but not listed here, it needs to be added as a false
-      released_hash = self.add_tags_from_purl(released_hash)
-        
-      return released_hash
+
+      # See what the application is currently released for on Purl.  If something is released in purl but not listed here, it needs to be added as a false
+      add_tags_from_purl(released_hash)
     end
-    
+
     #Take a hash of tags as obtained via Dor::Item.release_tags and returns all self tags
     #
     #@param tags [Hash] a hash of tags obtained via Dor::Item.release_tags or matching format
@@ -92,25 +85,25 @@ module Dor
     def get_self_release_tags(tags)
       return get_tags_for_what_value(tags, 'self')
     end
-    
+
     #Take an item and get all of its release tags and all tags on collections it is a member of it
     #
     #
     #@return [Hash] a hash of all tags
     def get_release_tags_for_item_and_all_governing_sets
-      return_tags = self.release_nodes || {}
-      self.collections.each do |collection|
-        return_tags = combine_two_release_tag_hashes(return_tags, Dor::Item.find(collection.id).get_release_tags_for_item_and_all_governing_sets) #this will function recurvisely so parents of parents are found
+      return_tags = release_nodes || {}
+      collections.each do |collection|
+        return_tags = combine_two_release_tag_hashes(return_tags, Dor::Item.find(collection.id).get_release_tags_for_item_and_all_governing_sets) # recurvise so parents of parents are found
       end
-      return return_tags  
+      return return_tags
     end
-    
+
     #Take two hashes of tags and combine them, will not overwrite but will enforce uniqueness of the tags
     #
     #@param hash_one [Hash] a hash of tags obtained via Dor::Item.release_tags or matching format
     #@param hash_two [Hash] a hash of tags obtained via Dor::Item.release_tags or matching format
     #
-    #@return [Hash] the combined hash with uniquiness enforced 
+    #@return [Hash] the combined hash with uniquiness enforced
     def combine_two_release_tag_hashes(hash_one, hash_two)
       hash_two.keys.each do |key|
         hash_one[key] = hash_two[key] if hash_one[key] == nil
@@ -118,7 +111,7 @@ module Dor
       end
       return hash_one
     end
-    
+
     #Take a hash of tags and return all tags with the matching what target
     #
     #@param tags [Hash] a hash of tags obtained via Dor::Item.release_tags or matching format
@@ -128,40 +121,28 @@ module Dor
     def get_tags_for_what_value(tags, what_target)
       return_hash = {}
       tags.keys.each do |key|
-        self_tags =  tags[key].select{|tag| tag['what'] == what_target.downcase}
+        self_tags = tags[key].select {|tag| tag['what'] == what_target.downcase}
         return_hash[key] = self_tags if self_tags.size > 0
       end
       return return_hash
     end
-    
+
     #Take a hash of tags as obtained via Dor::Item.release_tags and returns the newest tag for each namespace
     #
     #@params tags [Hash] a hash of tags obtained via Dor::Item.release_tags or matching format
     #
     #@return [Hash] a hash of latest tags for each to value
     def get_newest_release_tag(tags)
-      return_hash = {}
-      tags.keys.each do |key|
-        latest_for_key = newest_release_tag_in_an_array(tags[key])
-        return_hash[key] = latest_for_key         
-      end
-      return return_hash
+      Hash[tags.map {|key, val| [key, newest_release_tag_in_an_array(val)]}]
     end
-    
-    #Take a tag and return only the attributes  we want to put into purl
-    #
-    #@param tag [Hash] a tag
-    #
-    #@return [Hash] a hash of the attributes we want for purl
+
+    # Take a tag and return only the attributes we want to put into purl
+    # @param tag [Hash] a tag
+    # @return [Hash] a hash of the attributes we want for purl
     def clean_release_tag_for_purl(tag)
-      for_purl = ['release']
-      return_hash = {}
-      for_purl.each do |attr|
-        return_hash[attr] = tag[attr]
-      end
-      return return_hash
+      {'release' => tag['release']}
     end
-    
+
     #Takes an array of release tags and returns the most recent one
     #
     #@params tags [Array] an array of hashes, with the hashes being release tags
@@ -174,21 +155,18 @@ module Dor
       end
       return latest_tag_in_array
     end
-    
-    #Takes a tag and returns true or false if it applies to the specific item
-    #
-    #@param release_tag [Hash] the tag in a hashed form
-    #@param Optional admin_tags [Array] the administrative tags on an item, if not supplied it will attempt to retrieve them
-    #
-    #@return [Boolean] true or false if it applies (not true or false if it is released, that is the release_tag data)
-    def does_release_tag_apply(release_tag, admin_tags=false)
-      #Is the tag global or restricted 
-      return true if release_tag['tag'] == nil  #there is no specific tag specificied, so that means this tag is global to all members of the collection, it applies, return true
-        
-      admin_tags = self.tags if ! admin_tags #We use false instead of [], since an item can have no admin_tags that which point we'd be passing down this variable as [] and would not an attempt to retrieve it
-      return admin_tags.include?(release_tag['tag'])
+
+    # Takes a tag and returns true or false if it applies to the specific item
+    # @param release_tag [Hash] the tag in a hashed form
+    # @param admin_tags [Array] the administrative tags on an item, if not supplied it will attempt to retrieve them
+    # @return [Boolean] true or false if it applies (not true or false if it is released, that is the release_tag data)
+    def does_release_tag_apply(release_tag, admin_tags = false)
+      # Is the tag global or restricted
+      return true if release_tag['tag'].nil?  # no specific tag specificied means this tag is global to all members of the collection
+      admin_tags = tags unless admin_tags     # We use false instead of [], since an item can have no admin_tags at which point we'd be passing this var as [] and would not attempt to retrieve it
+      admin_tags.include?(release_tag['tag'])
     end
-    
+
     #Takes an array of release tags and returns the most recent one that applies to this item
     #
     #@param release_tags [Array] an array of release tags in hashed form
@@ -197,17 +175,16 @@ module Dor
     #@return [Hash] the tag
     def latest_applicable_release_tag_in_array(release_tags, admin_tags)
       newest_tag = newest_release_tag_in_an_array(release_tags)
-      return newest_tag if does_release_tag_apply(newest_tag, admin_tags) #Return true if we have it
-      
-      #The latest tag wasn't applicable, slice it off and try again
-      #This could be optimized by reordering on the timestamp and just running down it instead of constantly resorting, at least if we end up getting numerous release tags on an item
+      return newest_tag if does_release_tag_apply(newest_tag, admin_tags)
+
+      # The latest tag wasn't applicable, slice it off and try again
+      # This could be optimized by reordering on the timestamp and just running down it instead of constantly resorting, at least if we end up getting numerous release tags on an item
       release_tags.slice!(release_tags.index(newest_tag))
-      
-      return latest_applicable_release_tag_in_array(release_tags, admin_tags) if release_tags.size > 0 #Try again after dropping the one that wasn't applicable 
-      
-      return nil #We're out of tags, no applicable ones
+
+      return latest_applicable_release_tag_in_array(release_tags, admin_tags) if release_tags.size > 0 # Try again after dropping the inapplicable
+      nil # We're out of tags, no applicable ones
     end
-    
+
     #helper method to get the release tags as a nodeset
     #
     #@return [Nokogiri::XML::NodeSet] of all release tags and their attributes
@@ -233,55 +210,31 @@ module Dor
     def release_tag_node_to_hash(rtag)
       to = 'to'
       release = 'release'
-      when_word = 'when' #TODO: Make to and when_word load from some config file instead of hardcoded here
+      when_word = 'when' # TODO: Make to and when_word load from some config file instead of hardcoded here
       attrs = rtag.attributes
       return_hash = { :to => attrs[to].value }
-      attrs.tap { |a| a.delete(to)}
-      attrs[release] = rtag.text.downcase == "true" #save release as a boolean
+      attrs.tap { |a| a.delete(to) }
+      attrs[release] = rtag.text.downcase == 'true' #save release as a boolean
       return_hash[:attrs] = attrs
 
-      #convert all the attrs beside :to to strings, they are currently Nokogiri::XML::Attr
-      (return_hash[:attrs].keys-[to]).each do |a|
-        return_hash[:attrs][a] =  return_hash[:attrs][a].to_s if a != release
+      # convert all the attrs beside :to to strings, they are currently Nokogiri::XML::Attr
+      (return_hash[:attrs].keys - [to]).each do |a|
+        return_hash[:attrs][a] = return_hash[:attrs][a].to_s if a != release
       end
 
       return_hash[:attrs][when_word] = Time.parse(return_hash[:attrs][when_word]) #convert when to a datetime
-
-      return return_hash
+      return_hash
     end
-    
-    #Determine if the supplied tag is a valid release tag that meets all requirements
-    #
-    #@raises [RuntimeError]  Raises an error of the first fault in the release tag
-    #
-    #@return [Boolean] Returns true if no errors found
-    #
-    #@params attrs [hash] A hash of attributes for the tag, must contain: :when, a ISO 8601 timestamp; :who, to identify who or what added the tag; and :to, a string identifying the release target
-    def valid_release_attributes_and_tag(tag, attrs={})
-      raise ArgumentError, ":when is not iso8601" if attrs[:when].match('\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z') == nil
-      [:who, :to, :what].each do |check_attr|
-        raise ArgumentError, "#{check_attr} not supplied as a String" if attrs[check_attr].class != String
-      end
 
-      what_correct = false
-      ['self', 'collection'].each do |allowed_what_value|
-        what_correct = true if attrs[:what] == allowed_what_value
-      end
-      raise ArgumentError, ":what must be self or collection" if ! what_correct
-      raise ArgumentError, "the value set for this tag is not a boolean" if !!tag != tag
-      validate_tag_format(attrs[:tag]) if attrs[:tag] != nil #Will Raise exception if invalid tag
-      return true
-    end
-    
     #Add a release node for the item
     #Will use the current time to add in the timestamp if you do not supply a timestamp, you can supply a timestap for correcting history, etc if desired
     #
-    #@return [Nokogiri::XML::Element] the tag added if successful 
+    #@return [Nokogiri::XML::Element] the tag added if successful
     #
     #@raise [ArgumentError] Raised if attributes are improperly supplied
     #
     #@params tag [Boolean] True or false for the release node
-    #@params attrs [hash]  A hash of any attributes to be placed onto the tag 
+    #@params attrs [hash]  A hash of any attributes to be placed onto the tag
     #Timestamp will be calculated by the function, if no displayType is passed in, it will default to file
     #
     #@example
@@ -291,21 +244,20 @@ module Dor
       attrs[:when] = Time.now.utc.iso8601 if attrs[:when].nil? #add the timestamp
       attrs[:displayType] = 'file' if attrs[:displayType].nil? #default to file is no display type is passed
       valid_release_attributes(release, attrs)
-  
-      #Remove the old displayType and then add the one for this tag
+
+      # Remove the old displayType and then add the one for this tag
       remove_displayTypes
       identity_metadata_ds.add_value(:displayType, attrs[:displayType], {})
-      
-      return identity_metadata_ds.add_value(:release, release.to_s, attrs)
+      identity_metadata_ds.add_value(:release, release.to_s, attrs)
     end
 
     #Determine if the supplied tag is a valid release node that meets all requirements
     #
     #@raises [ArgumentError]  Raises an error of the first fault in the release tag
     #
-    #@return [Boolean] Returns true if no errors found 
+    #@return [Boolean] Returns true if no errors found
     #
-    #@params attrs [hash] A hash of attributes for the tag, must contain :when, a ISO 8601 timestamp and :who to identify who or what added the tag, :to, 
+    #@params attrs [hash] A hash of attributes for the tag, must contain :when, a ISO 8601 timestamp and :who to identify who or what added the tag, :to,
     def valid_release_attributes(tag, attrs={})
       raise ArgumentError, ":when is not iso8601" if attrs[:when].match('\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}Z') == nil
       [:who, :to, :what].each do |check_attr|
@@ -316,12 +268,12 @@ module Dor
       ['self', 'collection'].each do |allowed_what_value|
         what_correct = true if attrs[:what] == allowed_what_value
       end
-      raise ArgumentError, ":what must be self or collection" if ! what_correct
-      raise ArgumentError, "the value set for this tag is not a boolean" if !!tag != tag
-      raise ArgumentError, ":displayType must be passed in as a String" unless attrs[:displayType].class == String
-      
-      validate_tag_format(attrs[:tag]) if attrs[:tag] != nil #Will Raise exception if invalid tag
-      return true
+      raise ArgumentError, ':what must be self or collection' unless what_correct
+      raise ArgumentError, 'the value set for this tag is not a boolean' if !!tag != tag
+      raise ArgumentError, ':displayType must be passed in as a String' unless attrs[:displayType].class == String
+
+      validate_tag_format(attrs[:tag]) unless attrs[:tag].nil? # Will Raise exception if invalid tag
+      true
     end
 
     #helper method to get the release nodes as a nodeset
@@ -335,12 +287,12 @@ module Dor
         if return_hash[hashed_node[:to]] != nil
           return_hash[hashed_node[:to]] << hashed_node[:attrs]
         else
-           return_hash[hashed_node[:to]] = [hashed_node[:attrs]]
+          return_hash[hashed_node[:to]] = [hashed_node[:attrs]]
         end
       end
       return return_hash
     end
-    
+
     #Get a list of all release nodes found in a purl document
     #
     #@params druid [String]
@@ -351,19 +303,21 @@ module Dor
     #
     #@return [Nokogiri::HTML::Document] the parsed xml for the druid or an empty document if no purl is found
     def get_xml_from_purl
-        handler = Proc.new do |exception, attempt_number, total_delay|
-          #We assume a 404 means the document has never been published before and thus has no purl
-          #The strip is needed before the actual message is "404 "
-          return Nokogiri::HTML::Document.new if exception.message.strip == "404"
-        end
+      url = form_purl_url
+      handler = Proc.new do |exception, attempt_number, total_delay|
+        # We assume a 404 means the document has never been published before and thus has no purl
+        Dor.logger.warn "[Attempt #{attempt_number}] GET #{url} -- #{exception.class}: #{exception.message}; #{total_delay} seconds elapsed."
+        raise exception unless exception.is_a? OpenURI::HTTPError
+        return Nokogiri::HTML::Document.new if exception.io.status[0] == '404'
+      end
 
-        with_retries(:max_retries => 5, :base_sleep_seconds => 3, :max_sleep_seconds=> 5, :rescue => OpenURI::HTTPError, :handler => handler) {
-           #If you change the method used for opening the webpage, you can change the :rescue param to handle the new method's errors
-           return Nokogiri::HTML(open(self.form_purl_url))
-         }
-       
+      with_retries(:max_retries => 3, :base_sleep_seconds => 3, :max_sleep_seconds => 5, :handler => handler) do |attempt|
+        # If you change the method used for opening the webpage, you can change the :rescue param to handle the new method's errors
+        Dor.logger.info "[Attempt #{attempt}] GET #{url}"
+        return Nokogiri::HTML(OpenURI.open_uri(url))
+      end
     end
-    
+
     #Since purl does not use the druid: prefix but much of dor does, use this function to strip the druid: if needed
     #
     #@return [String] the druid sans the druid: or if there was no druid: prefix, the entire string you passed
@@ -372,54 +326,58 @@ module Dor
       return self.id.split(druid_prefix)[1] if self.id.split(druid_prefix).size > 1
       return druid
     end
-    
-    #Take the and create the entire purl url that will usable for the open method in open-uri, returns http
-    #
-    #params druid [String], the druid without or without the driud prefix
-    #
-    #return [String], the full url
+
+    # Take the and create the entire purl url that will usable for the open method in open-uri, returns https
+    # @return [String] the full url
     def form_purl_url
-      prefix = "http://" 
-      return prefix + Dor::Config.stacks.document_cache_host + "/#{self.remove_druid_prefix}.xml"
+      'https://' + Dor::Config.stacks.document_cache_host + "/#{remove_druid_prefix}.xml"
     end
-    
+
     #Pull all release nodes from the public xml obtained via the purl query
     #
     #@params druid [Nokogiri::HTML::Document] The druid of the object you want
     #
-    #@return [Array] An array containing all the release tags 
+    #@return [Array] An array containing all the release tags
     def get_release_tags_from_purl_xml(doc)
-      nodes = doc.xpath("//html/body/publicobject/releasedata").children 
-      #We only want the nodes with a name that isn't text
-      return_array = []
-      nodes.each do |n|
-        return_array << n.attr('to') if n.name != nil and n.name.downcase != "text"
-      end
-      return return_array.uniq 
+      nodes = doc.xpath('//html/body/publicobject/releasedata').children
+      # We only want the nodes with a name that isn't text
+      nodes.reject {|n| n.name.nil? || n.name.downcase == 'text'}.map {|n| n.attr('to')}.uniq
     end
-    
+
     #Pull all release nodes from the public xml obtained via the purl query
     #
-    #@return [Array] An array containing all the release tags 
+    #@return [Array] An array containing all the release tags
     def get_release_tags_from_purl
       xml = self.get_xml_from_purl
       return self.get_release_tags_from_purl_xml(xml)
     end
-    
-    #This function calls purl and gets a list of all release tags currently in purl.  It then compares to the list you have generated.
-    #Any tag that is on purl, but not in the newly generated list is added to the new list with a value of false.
-    #
-    #params new_tags [Hash] a hash of all new tags in the form of {Project => Boolean}, where Project is a string
-    #
-    #return [Hash], a hash in the same form as new_tags, with all missing tags not in new_tags, but in current_tag_names, added in with a Boolean value of false
-    def add_tags_from_purl(new_tags) 
-      tags_currently_in_purl = self.get_release_tags_from_purl
-      missing_tags = tags_currently_in_purl.map(&:downcase) - new_tags.keys.map(&:downcase) 
+
+    # This function calls purl and gets a list of all release tags currently in purl.  It then compares to the list you have generated.
+    # Any tag that is on purl, but not in the newly generated list is added to the new list with a value of false.
+    # @param new_tags [Hash{String => Boolean}] all new tags in the form of !{"Project" => Boolean}
+    # @return [Hash], a hash in the same form as new_tags, with all missing tags not in new_tags, but in current_tag_names, added in with a Boolean value of false
+    def add_tags_from_purl(new_tags)
+      tags_currently_in_purl = get_release_tags_from_purl
+      missing_tags = tags_currently_in_purl.map(&:downcase) - new_tags.keys.map(&:downcase)
       missing_tags.each do |missing_tag|
         new_tags[missing_tag.capitalize] = {"release"=>false}
       end
       return new_tags
     end
 
+    def to_solr(solr_doc = {}, *args)
+      super(solr_doc, *args)
+
+      # TODO: sort of worried about the performance impact in bulk reindex
+      # situations, since released_for recurses all parent collections.  jmartin 2015-07-14
+      released_for().each { |key, val|
+        add_solr_value(solr_doc, 'released_to', key, :symbol, []) if val
+      }
+
+      # TODO: need to solrize whether item is released to purl?  does released_for return that?
+      # logic is: "True when there is a published lifecycle and Access Rights is anything but Dark"
+
+      solr_doc
+    end
   end
 end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.22.2'
+  VERSION = '4.22.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.22.2
+  version: 4.22.3
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -540,10 +540,7 @@ files:
 - bin/dor-indexer
 - bin/dor-indexerd
 - config/certs/README
-- config/certs/robots-dor-dev.crt
-- config/certs/robots-dor-dev.key
 - config/config_defaults.yml
-- config/dev_console_env.rb
 - config/dev_console_env.rb.example
 - config/predicate_mappings.yml
 - lib/dor-services.rb
@@ -646,7 +643,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Ruby implmentation of DOR services used by the SULAIR Digital Library

data/config/certs/robots-dor-dev.crt

@@ -1,29 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIE9zCCAt8CCQCcUJVDTu7rTjANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMC
-VVMxEzARBgNVBAgTCkNhbGlmb3JuaWExETAPBgNVBAcTCFN0YW5mb3JkMRwwGgYD
-VQQKExNTdGFuZm9yZCBVbml2ZXJzaXR5MRIwEAYDVQQLEwlMaWJyYXJpZXMxJTAj
-BgNVBAMTHFNVTCBET1IgKGRldi90ZXN0KSBhY2Nlc3MgQ0ExLzAtBgkqhkiG9w0B
-CQEWIHN1bC13ZWJtYXN0ZXJAbGlzdHMuc3RhbmZvcmQuZWR1MB4XDTEyMDkyNjE1
-NTQzNVoXDTIyMDkyNDE1NTQzNVowgboxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpD
-YWxpZm9ybmlhMREwDwYDVQQHEwhTdGFuZm9yZDEcMBoGA1UEChMTU3RhbmZvcmQg
-VW5pdmVyc2l0eTEyMDAGA1UEAxQpcm9ib3RzQHN1bC1seWJlcnNlcnZpY2VzLWRl
-di5zdGFuZm9yZC5lZHUxMTAvBgkqhkiG9w0BCQEWImRsc3MtZGV2ZWxvcGVyc0Bs
-aXN0cy5zdGFuZm9yZC5lZHUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC1t+PPhLTDFQBuAf4f1GOj7jHdXMN0tvSHL1OCaibe0d8iKbXCMMIE0z8lbBpZ
-1pA+8terIvxoTlly92EEvGkywZb+DIxnjyG0b9ftDJ64pARJMcnvwJMW/w3WdHCd
-5uJ5HVM8ZCbEItUfskFukS6tfNBpG8ri6cIQ2ulJzOWYxPV5R2eRneM6vtFD0xtu
-RJb/uMwiOwB79qk4QazbEQtkeZsrvomDFkIuHO/nf9wmgYG99H7q1kXplIrzDDX+
-fvD+JHvuMr5YXfmBQ9wmaZf6YIL7CXj79HUF4uG/a0SjrLZyLh262zWJQFVpjSW8
-Brl/fAyjeZvWJMyCDXRqsedjAgMBAAEwDQYJKoZIhvcNAQEFBQADggIBAG0jIfTj
-1FJsxTzcD938vtKuNo5XEIX8phqW1MA2eJ5Ojgu1hpW5Jf7fmUHKVnamm7eya5QR
-356KCJzZzwdCS4xVFq/l43gCA2j8TYrwO6/0EfM/5psUZS3ecwahzcJXfHPHvd9u
-qaXRqbjJYi+Ls70uStTC/JBIIu48atDF0DeXJ21hAbstZ1OKKNzAcYgZk14GKxCi
-ArgAzdg8UDtC4KsdqgxP6vF8Vc/gcHSu9AkVHgPVXbITjV0/kaKNgFi0bVqP7bJD
-hrUFYrS+S+hflQJCmVrDwW0JU2HnJ3EJOFX5F4FYHL4vt6ZjVsMzucraMqiLyUaO
-s6DVaWO8WMlphmFUfb3ChQjrKxFZZ6vKJPD/ExnQHa0kWwOELyMJuXw2PLk7k+qD
-rmjX+K3Ed+JiJuiDG5k8f1BDZE24lvxDwye5fQyDWPfib1yTClYYy4PRh4AI688f
-qgMyv51Qx82o0IJ1On1rNg5/iB7OEVcYSol3U5xiY9gRUd3vq637agZzMuRQnKXs
-Uj0+Vl4OrZ54F8MVsUKfi7Je1oVUEhuHqFt/tSOGlHg1XyR/ExwulCNBKIVdhhrF
-rxZCYrGDSUCF6tteJXpOBTtFT9b7hbMmBohKyS4XjfPSPRh9QHx7wepqSp3aHpmR
-4gY8Go40mS83xHCKBooqsy2/Z9vQlSb9Cr8u
------END CERTIFICATE-----

data/config/certs/robots-dor-dev.key

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAtbfjz4S0wxUAbgH+H9Rjo+4x3VzDdLb0hy9Tgmom3tHfIim1
-wjDCBNM/JWwaWdaQPvLXqyL8aE5ZcvdhBLxpMsGW/gyMZ48htG/X7QyeuKQESTHJ
-78CTFv8N1nRwnebieR1TPGQmxCLVH7JBbpEurXzQaRvK4unCENrpSczlmMT1eUdn
-kZ3jOr7RQ9MbbkSW/7jMIjsAe/apOEGs2xELZHmbK76JgxZCLhzv53/cJoGBvfR+
-6tZF6ZSK8ww1/n7w/iR77jK+WF35gUPcJmmX+mCC+wl4+/R1BeLhv2tEo6y2ci4d
-uts1iUBVaY0lvAa5f3wMo3mb1iTMgg10arHnYwIDAQABAoIBAQCmlDzsZZ2C24S6
-U29OZFc21kq1vqyaGIEOT48BFSguyDsAyTWKH0IsRC41suRxCGTQn7KeegLh5zjO
-UAGK4uCYm6g7mOs4n5fpHUHWVuRFJG2dX1vbQTBVO1fHCJSX2ygumHhN+w0ibT/r
-v2+F2ObuOGWghM62tkylQNfsRD0QjalE8ST2xp9p4xwPrAwEuURlA04qnLYNi4+6
-qexDtrLG8E6JV/dd3dY95WjKPscadR1fAKm9sebD0XO31Lu6BGCvpmBU0OmYVfrY
-BN/ofhEmJh+Xgwfxx6PicRDvu9bPnffqbGhDO4ckGDlqXp1fDBgf1I7CclXdrVMH
-Qsxunh5pAoGBAN7929V1aw0S7Rqvuf4N+o1XwBExa2DL7EYI1Oea/nuBMPqvfeNh
-SrbM0gYejEzLmeRUUKRhMMoAgXQnxcg3Kz/5pUXT3b4YtzeskX8nkJ6/2gEU3M7E
-lJj7c5wW1otqMH19+iDNR4N8vjPh98kDJW1HZUHSAcdyE+dZiFP2ofMfAoGBANCe
-AJgA9EkdwZsom+I7Ty9LSrTWx6cKmNEbLVn1iSlyJx1kHoWyTMtuZszCWBjiXx70
-84WpX2B4MuJBq6sSoEiUahNsphks82glOd6i+eoE/I+NtZehOFnkAMyGux+FbMyG
-q/9ZlQgsbWpFHxS59vX/kvlNun2RpJkaF6QPBuc9AoGBAIGdscCb5cPNsoCGkGf6
-HB84WG4l+bJkFkyHKaoOT8neSGgOxe/7R4CGAbaI3yhsWGF+GPnTfJaOQLERxUch
-ukQPil/STNwIZcc4ycHNb6S3A7MJO2f8oBtkXcjnBYI4EUOAjHmwmNb3FV/3Ax6W
-c5TXoSXnOh2CU8twIWwcufolAoGATqnFf4uckZVu05rUbNIAYcz6NoZmck5EoVSm
-HS3Asqggp6yA9djtrCfNC5icr4VsaLfku5nKJQ4t4bLxkGhNmBCejwSA/S09+x9O
-Wu0JX3zR3y+IMczQ+tRGmNiU5qXhCJ4fbQHSeGqIN3Io7h/RR6E/QlJU59RrRG/a
-SjqAV+ECgYEA2mA5VFK3jECnLde+biEaXidIOuBMcqaP0VG6sBwz2wTGSTBE1WkG
-6prCD0McWVAgDTm3MMKxeuMaoW5eEi83+G+CywLaTBpc8Hz7qgRhBpKhRirCfHMW
-EfQV5k32vEGoSI+eG8zcGb9mwDeb/EWXAMGXrx2YuYFu7txtwC2mZXc=
------END RSA PRIVATE KEY-----

data/config/dev_console_env.rb

@@ -1,77 +0,0 @@
-cert_dir = File.join(File.dirname(__FILE__), 'certs')
-
-Dor::Config.configure do
-
-  ssl do
-    cert_file File.join(cert_dir, 'robots-dor-dev.crt')
-    key_file  File.join(cert_dir, 'robots-dor-dev.key')
-    key_pass  ''
-  end
-
-  suri do
-    mint_ids true
-    id_namespace 'druid'
-    url 'https://lyberservices-dev.stanford.edu'
-    user 'labware'
-    pass 'lyberteam'
-  end
-
-  metadata do
-    exist.url   'http://viewer:l3l%40nd@lyberapps-dev.stanford.edu/exist/rest/'
-    catalog.url 'http://lyberservices-prod.stanford.edu/catalog/mods'
-  end
-
-  stacks do
-    document_cache_host 'purl-dev.stanford.edu'
-    local_stacks_root         '/stacks'
-    local_document_cache_root '/purl/document_cache'
-    local_workspace_root      '/dor/workspace'
-  end
-
-  solrizer.url     'http://sul-solr.stanford.edu/solr/argo_test'
-  fedora.url       'https://sul-dor-test.stanford.edu/fedora'
-  workflow.url     'https://lyberservices-dev.stanford.edu/workflow/'
-  dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor'
-
-  cleanup do
-    local_workspace_root '/dor/workspace'
-    local_export_home    '/dor/export'
-  end
-
-  sdr do
-    url 'https://sdrAdmin:sdrAdmin@sdr-services-test.stanford.edu/sdr/'
-    local_workspace_root '/dor/workspace'
-    local_export_home    '/dor/export'
-    datastreams do
-      administrativeMetadata 'optional'
-      contentMetadata        'optional'
-      descMetadata           'required'
-      defaultObjectRights    'optional'
-      events                 'optional'
-      embargoMetadata        'optional'
-      identityMetadata       'required'
-      provenanceMetadata     'required'
-      relationshipMetadata   'required'
-      rightsMetadata         'optional'
-      roleMetadata           'optional'
-      sourceMetadata         'optional'
-      technicalMetadata      'optional'
-      versionMetadata        'required'
-      workflows              'optional'
-    end
-  end
-
-  accessioning_robot_sleep_time 30
-
-end
-
-#WORKFLOW_URI = 'http://lyberservices-test.stanford.edu/workflow'
-
-# Constants for Dor::WorkflowService
-#module Dor
-#  CREATE_WORKFLOW = DOR_CREATE_WORKFLOW = true
-#  WF_URI = 'http://lyberservices-test.stanford.edu/workflow'
-#end
-
-# External application locations
-JHOVE_HOME = File.join(ENV['HOME'], 'jhoveToolkit')