dor-services 4.16.0 → 4.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda19055e5488d98744f9b3f4c88030f5c2ed3fc
-  data.tar.gz: fb252ec7e922e6ee181e6b1628b078dc6732c353
+  metadata.gz: f9827e7ec12f745a9cefc0fc8ef7495d59cd3e30
+  data.tar.gz: c36bbb94cb5472516891b3f1182b43df1e549dfc
 SHA512:
-  metadata.gz: 7056ca6fd329bf73b0d617fe66a4b78caf22d22c903d1901471a20e2cfd66935a60c2b45eb522ea08bce8c9d1d7038bf3f18ada5fc759cb329566fa800ed4398
-  data.tar.gz: 89251676387a262a78991de2112beeb87fcaf2aef1482c4452b114f9a60c4699e57668267ff87ab02e8aa148893d56c773cb00566b3f3eefdd80b49fb20de365
+  metadata.gz: 111845f2b86c6f361ac0f92782bdf7dbd4657dddf79d2982a255d410ad28f13c13f516b85b10d8e4b900b00468a8a852820383e13bc4de5001ea31a8f83451c9
+  data.tar.gz: ace98996317f041e2488bc690a6a2626150f7037210b35715f154a71d83a1af8134fd118081801848a392c0c50da19312ff978f35633628e2b28206d393292e9

data/config/environments/development.rb

@@ -2,7 +2,7 @@ cert_dir = File.join(File.dirname(__FILE__), "..", "certs")
 
 Dor::Config.configure do
   fedora do
-    url 'https://sul-dor-dev.stanford.edu/fedora'
+    url 'https://sul-dor-test.stanford.edu/fedora'
   end
 
   ssl do
@@ -33,7 +33,7 @@ Dor::Config.configure do
     iiif_profile 'http://iiif.io/api/image/2/level1.json'
   end
 
-  solrizer.url 'http://sul-solr.stanford.edu/solr/argo_dev'
+  solrizer.url 'http://127.0.0.1/solr/argo_test'
   workflow.url 'https://lyberservices-dev.stanford.edu/workflow/'
   dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor'
 

data/config/environments/development.rb.old

@@ -0,0 +1,84 @@
+cert_dir = File.join(File.dirname(__FILE__), "..", "certs")
+
+Dor::Config.configure do
+  fedora do
+    url 'https://sul-dor-dev.stanford.edu/fedora'
+  end
+
+  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'
+    url 'http://stacks-dev.stanford.edu'
+    iiif_profile 'http://iiif.io/api/image/2/level1.json'
+  end
+
+  solrizer.url 'http://sul-solr.stanford.edu/solr/argo_dev'
+  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@sul-sdr-services-dev.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')
+
+REDIS_URL = "sul-lyberservices-dev.stanford.edu:6379/resque:#{ENV['ROBOT_ENVIRONMENT']}"

data/config/environments/test.rb

@@ -2,7 +2,7 @@ cert_dir = File.join(File.dirname(__FILE__), "..", "certs")
 
 Dor::Config.configure do
   fedora do
-    url 'https://sul-dor-dev.stanford.edu/fedora'
+    url 'https://sul-dor-test.stanford.edu/fedora'
   end
 
   ssl do
@@ -33,7 +33,7 @@ Dor::Config.configure do
     iiif_profile 'http://iiif.io/api/image/2/level1.json'
   end
 
-  solrizer.url 'http://sul-solr.stanford.edu/solr/argo_dev'
+  solrizer.url 'http://127.0.0.1/solr/argo_test'
   workflow.url 'https://lyberservices-dev.stanford.edu/workflow/'
   dor_services.url 'https://dorAdmin:dorAdmin@sul-lyberservices-dev.stanford.edu/dor'
 

data/lib/dor-services.rb

@@ -118,6 +118,7 @@ module Dor
   autoload :Discoverable, 'dor/models/discoverable'
   autoload :Geoable, 'dor/models/geoable'
   autoload :Presentable, 'dor/models/presentable'
+  autoload :Releaseable, 'dor/models/releaseable'
 
 
   # ActiveFedora Classes

data/lib/dor/models/identifiable.rb

@@ -31,6 +31,48 @@ module Dor
     def tags
       self.identityMetadata.tag
     end
+    
+    #helper method to get the release tags as a nodeset
+    #
+    #@return [Nokogiri::XML::NodeSet] of all release tags and their attributes
+    def release_tags
+      release_tags = self.identityMetadata.ng_xml.xpath('//release')
+      return_hash = {}
+      release_tags.each do |release_tag|
+        hashed_node = self.release_tag_node_to_hash(release_tag)
+        if return_hash[hashed_node[:to]] != nil
+          return_hash[hashed_node[:to]] << hashed_node[:attrs]
+        else
+           return_hash[hashed_node[:to]] = [hashed_node[:attrs]]
+        end
+      end
+      return return_hash
+    end
+    
+    #method to convert one release element into an array
+    #
+    #@param rtag [Nokogiri::XML::Element] the release tag element
+    #
+    #return [Hash] in the form of {:to => String :attrs = Hash}
+    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
+      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
+      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
+      end
+      
+      return_hash[:attrs][when_word] = Time.parse(return_hash[:attrs][when_word]) #convert when to a datetime
+      
+      return return_hash
+    end
 
     # helper method to get just the content type tag
     def content_type_tag
@@ -191,15 +233,7 @@ module Dor
     # the proposed tag is valid, return it in normalized form.  if not, raise an exception with an
     # explanatory message.
     def validate_and_normalize_tag(tag_str, existing_tag_list)
-      tag_arr = split_tag_to_arr(tag_str)
-
-      if tag_arr.length < 2
-        raise "Invalid tag structure:  tag '#{tag_str}' must have at least 2 elements"
-      end
-
-      if tag_arr.detect {|str| str.empty?}
-        raise "Invalid tag structure:  tag '#{tag_str}' contains empty elements"
-      end
+      tag_arr = validate_tag_format(tag_str)
 
       # note that the comparison for duplicate tags is case-insensitive, but we don't change case as part of the normalized version 
       # we return, because we want to preserve the user's intended case.
@@ -211,13 +245,84 @@ module Dor
 
       return normalized_tag
     end
+    
+    #Ensure that an administrative tag meets the proper mininum format
+    #
+    #@params tag_str [String] the tag
+    #
+    #@return [Array] the tag split into an array via ':'
+    def validate_tag_format(tag_str)
+      tag_arr = split_tag_to_arr(tag_str)
+
+      if tag_arr.length < 2
+        raise "Invalid tag structure:  tag '#{tag_str}' must have at least 2 elements"
+      end
+
+      if tag_arr.detect {|str| str.empty?}
+        raise "Invalid tag structure:  tag '#{tag_str}' contains empty elements"
+      end
+      
+      return tag_arr
+      
+    end
 
-    def add_tag(tag)
+    #Add a tag for an item
+    #If you are adding just a :tag att
+    #
+    #@return [String] returned if this function is called with invalid parameters, eg a lack of :who for release_tag
+    #@return [Nokogiri::XML::Element] the tag added if successful 
+    #
+    #@raise [RuntimeError] Raised if the tag already exists on the item or the tag is not of the form a:b
+    #
+    #@params tag [string] The content of the tag
+    #@params type [symbol] The type of tag, :tag is assumed as default 
+    #@params attrs [hash]  A hash of any attributes to be placed onto the tag 
+    # release tag example:
+    #  item.add_tag(true,:release,{:tag=>'Fitch : Batch2',:what=>'self',:to=>'Searchworks',:who=>'petucket'})
+    def add_tag(tag, type=:tag, attrs={})
+      needs_timestamp = [:release] #If you want a tag to get a timestamp attribute, add its symbol here
       identity_metadata_ds = self.identityMetadata
-      normalized_tag = validate_and_normalize_tag(tag, identity_metadata_ds.tags)
-      identity_metadata_ds.add_value(:tag, normalized_tag)
+      normalized_tag = validate_and_normalize_tag(tag, identity_metadata_ds.tags) if type != :release #Release tags are always boolean, so skip this step
+      normalized_tag = tag.to_s if type == :release #just keep the boolean if we have just have a release
+        
+      attrs[:when] = Time.now.utc.iso8601 if needs_timestamp.include? type
+      
+    
+      if type == :release 
+        valid_release_attributes_and_tag(tag, attrs)
+        attrs[:tag] = normalize_tag_arr(validate_tag_format(attrs[:tag])) if attrs[:tag] != nil #:tag must be a valid administrative tag
+      end
+      
+      return identity_metadata_ds.add_value(type, normalized_tag) if attrs == {}
+      return identity_metadata_ds.add_value(type, normalized_tag, attrs) if attrs != {}
     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 and :who to identify who or what added the tag, :to, 
+    def valid_release_attributes_and_tag(tag, attrs={})
+      raise ":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 "#{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 ":what must be self or collection" if not what_correct
+      
+      raise "the value set for this tag is not a boolean" if !!tag != tag
+      identity_metadata_ds = self.identityMetadata
+      validate_tag_format(attrs[:tag]) if attrs[:tag] != nil #Will Raise exception if invalid tag
+      return true
+    end
+    
     def remove_tag(tag)
       identity_metadata_ds = self.identityMetadata
       ds_xml = identity_metadata_ds.ng_xml

data/lib/dor/models/item.rb

@@ -15,6 +15,7 @@ module Dor
     include Contentable
     include Discoverable
     include Geoable
+    include Releaseable
     
   end
   

data/lib/dor/models/presentable.rb

@@ -19,9 +19,9 @@ module Dor
     def build_iiif_manifest pub_obj_doc
       id = self.pid.split(':').last
 
-      lbl_node = pub_obj_doc.at_xpath('/publicObject/identityMetadata/objectLabel')
+      lbl_node = pub_obj_doc.at_xpath '//oai_dc:dc/dc:title', DC_NS
       if lbl_node.nil?
-        lbl_node = pub_obj_doc.at_xpath '//oai_dc:dc/dc:title', ns
+        lbl_node = pub_obj_doc.at_xpath('/publicObject/identityMetadata/objectLabel')
       end
       raise "Unable to build IIIF Presentation manifest:  No identityMetadata/objectLabel or dc:title" if lbl_node.nil?
       lbl = lbl_node.text
@@ -37,8 +37,32 @@ module Dor
           'format' => 'application/mods+xml'
         }
       }
+      # Use the human copyright statement for attribution if present
+      if(cr = pub_obj_doc.at_xpath('/publicObject/rightsMetadata/copyright/human[@type="copyright"]'))
+        manifest_data['attribution'] = cr.text
+      end
+
       manifest = IIIF::Presentation::Manifest.new manifest_data
 
+      # Set viewingHint to paged if this is a book
+      if(pub_obj_doc.at_xpath('/publicObject/contentMetadata[@type="book"]'))
+        manifest.viewingHint = "paged"
+      end
+
+      metadata = []
+      # make into method, pass in xpath and label
+      add_metadata 'Creator', '//oai_dc:dc/dc:creator', metadata, pub_obj_doc
+      add_metadata 'Contributor', '//oai_dc:dc/dc:contributor', metadata, pub_obj_doc
+      add_metadata 'Publisher', '//oai_dc:dc/dc:publisher', metadata, pub_obj_doc
+      add_metadata 'Date', '//oai_dc:dc/dc:date', metadata, pub_obj_doc
+
+      # Save off the first dc:description without displayLabel
+      if(desc = pub_obj_doc.at_xpath('//oai_dc:dc/dc:description[not(@displayLabel)]', DC_NS))
+        manifest.description = desc.text
+      end
+
+      manifest.metadata = metadata unless metadata.empty?
+
       seq_data = {
         '@id' => "#{purl_base_uri}/sequence-1",
         'label' => 'Current order'
@@ -76,6 +100,14 @@ module Dor
           'profile' => Dor::Config.stacks.iiif_profile
         })
 
+        # Use the first image to create a thumbnail on the manifest
+        if count == 1
+          thumb = IIIF::Presentation::Resource.new
+          thumb['@id'] = "#{stacks_uri}/full/400,/0/default.jpg"
+          thumb.service = svc
+          manifest.thumbnail = thumb
+        end
+
         img_res.service = svc
         anno.resource = img_res
         canv.images << anno
@@ -85,5 +117,17 @@ module Dor
       manifest.sequences << sequence
       manifest.to_json(:pretty => true)
     end
+
+    def add_metadata label, xpath, metadata, pub_obj_doc
+      nodes = pub_obj_doc.xpath xpath, DC_NS
+      nodes.each do |node|
+        h = {
+          'label' => label,
+          'value' => node.text
+        }
+        metadata << h
+      end
+    end
+
   end
 end

data/lib/dor/models/publishable.rb

@@ -32,17 +32,28 @@ module Dor
       rels_doc
     end
 
+    #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.xmlschema
-      pub.add_child(self.datastreams['identityMetadata'].ng_xml.root.clone)
+      release_xml=Nokogiri(self.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)  # now add in final <release> tag  #TODO:  Adding this breaks tests, rework these
+
+      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)
+
       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)
       @public_xml_doc = pub # save this for possible IIIF Presentation manifest
+      pub.add_child(Nokogiri(self.generate_release_xml).root.clone)  #TODO:  Adding this breaks tests, rework these
       new_pub = Nokogiri::XML(pub.to_xml) { |x| x.noblanks }
       new_pub.encoding = 'UTF-8'
       new_pub.to_xml

data/lib/dor/models/releaseable.rb

@@ -0,0 +1,186 @@
+module Dor
+  module Releaseable
+    extend ActiveSupport::Concern
+    include Itemizable
+    
+    
+    #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.ReleaseDigest {
+          self.released_for.each do |project,released_value|
+            xml.release(released_value["release"],:to=>project)
+          end  
+          }        
+        end
+      return 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_tags
+      
+      #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)
+      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
+        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) 
+        end
+        
+      end
+        
+      return 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
+    #
+    #@return [Hash] a hash of self tags for each to value
+    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_tags || {}
+      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
+      end
+      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 
+    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
+        hash_one[key] = (hash_one[key] + hash_two[key]).uniq if hash_one[key] != nil
+      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
+    #@param what_target [String] the target for the 'what' key, self or collection
+    #
+    #@return [Hash] a hash of self tags for each to value
+    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}
+        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
+    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
+    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
+    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
+    #
+    #@return [Hash] the most recent tag
+    def newest_release_tag_in_an_array(array_of_tags)
+      latest_tag_in_array = array_of_tags[0] || {}
+      array_of_tags.each do |tag|
+        latest_tag_in_array = tag if tag['when'] > latest_tag_in_array['when']
+      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 not 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'])
+    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
+    #param admin_tags [Array] the administrative tags on an on item
+    #
+    #@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
+      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
+    end
+
+  end
+end

data/lib/dor/version.rb

@@ -1,3 +1,3 @@
 module Dor
-  VERSION = '4.16.0'
+  VERSION = '4.17.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dor-services
 version: !ruby/object:Gem::Version
-  version: 4.16.0
+  version: 4.17.0
 platform: ruby
 authors:
 - Michael Klein
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active-fedora
@@ -506,6 +506,7 @@ files:
 - config/dev_console_env.rb
 - config/dev_console_env.rb.example
 - config/environments/development.rb
+- config/environments/development.rb.old
 - config/environments/test.rb
 - config/predicate_mappings.yml
 - lib/dor-services.rb
@@ -554,6 +555,7 @@ files:
 - lib/dor/models/preservable.rb
 - lib/dor/models/processable.rb
 - lib/dor/models/publishable.rb
+- lib/dor/models/releaseable.rb
 - lib/dor/models/set.rb
 - lib/dor/models/shelvable.rb
 - lib/dor/models/upgradable.rb