dor-services 5.1.1 → 5.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGQ5ZWQ0NWFjYTg0ZDc0YTFiNmMwMjM2ZmEzYzJjYTA4NzA5NmUwOA==
+    MTIxOTE5NDBmNGMxNDI2OTg5ZWZiMzVhYWFlNmNlYWVkMjI0MTljZg==
   data.tar.gz: !binary |-
-    MDJmMmQ5ZGNmNzU5OWQxNmMwNjJlOWY2MTgwMTc4NWM4ZmI3YWNhYg==
+    YjMzM2M1ZThjYjZmZjdjMjJjY2VlODM3OTYzMDg1MjZiOTNjMDE4Yg==
 SHA512:
   metadata.gz: !binary |-
-    MzcxNDU3MjQ4NjQwODgwZTQyM2Q1OGQ4ZGYzYjdhOTI3ZTY1MzA3OGEzZjc2
-    MWJiYjkzN2VjNzVmYWI1NWRhMDBjMTE4MDZhMjM5Y2QzOTIwNGRlY2IwYWYy
-    YmQyZDc5YjY4N2I3ODcwMDZkZDE3ODRlOTM3NTY4MDY3ODhmNzI=
+    YzBjMzFiOTU0YmY3OGE5ZDA1NzZlYWM5ZjYwNTMxYmU3MDM4MzkwOWI0MzVi
+    N2UyM2U5MTUxMzJjNjFjMjRkM2U3NTFjNWFhMDVkYTg5M2UyYmUxYzkzOTQ2
+    MGM5MTYxMDM1ZTIyY2U0MDYwNDJkODhiNDc4YWZiZjlhNTNkZTc=
   data.tar.gz: !binary |-
-    OTZiMzAzNjg3NDFlZTM3NzYwYmVmNjljMzcxYjA4YzE2Y2MwYmQ3ZjA2Zjdh
-    ZjY0MWVhNDlmMWE3ZWE2ZWUxNWUwN2JkNWU2NDlhZGNiYWZkZTg3MmUzZWQx
-    Y2FhM2I3MGFhMjc4OTk2YTk3MGU5N2YwYjkzYTQyOTQxMTIxNjY=
+    NmE4ZjZjNjMwYTM1YTBhY2Q0MzJmZjQxNGZkOGVhMzUxYWQ0MTRmNDYwMTYy
+    NDgxNWVmMzFlOTAwMDkzOTNiMWE4MjQ1ZmJhNjc0NGFlMTY1NzI5MzQ5MDVk
+    NWU1NmJlZWNmODIzNjA1NDVmNzJmODcwNDA5ZDFiZmQ3ZjRlN2I=

data/lib/dor-services.rb

@@ -42,7 +42,7 @@ module Dor
         doc_version = Gem::Version.new(doc_version)
         object_type = Array(solr_doc[ActiveFedora::SolrService.solr_name('objectType', :symbol)]).first
         object_class = registered_classes[object_type] || ActiveFedora::Base
-        if opts[:lightweight] and doc_version >= Gem::Version.new('3.1.0')
+        if opts[:lightweight] && doc_version >= Gem::Version.new('3.1.0')
           begin
             object_class.load_instance_from_solr solr_doc['id'], solr_doc
           rescue Exception => e
@@ -115,7 +115,6 @@ module Dor
   autoload :Releaseable,   'dor/models/releaseable'
   autoload :Rightsable,   'dor/models/rightsable'
 
-
   # ActiveFedora Classes
   autoload :Abstract,   'dor/models/item'
   autoload :Item,       'dor/models/item'

data/lib/dor/config.rb

@@ -70,7 +70,7 @@ module Dor
           }
         },
         :sdr => {
-          :rest_client => Confstruct.deferred { |c| config.make_rest_client c.url },
+          :rest_client => Confstruct.deferred { |c| config.make_rest_client c.url }
         },
         :gsearch => {
           :rest_client => Confstruct.deferred { |c| config.make_rest_client c.rest_url },
@@ -88,13 +88,12 @@ module Dor
       config[:stomp][:host] ||= URI.parse(config.fedora.url).host rescue nil
 
       [:cert_file, :key_file, :key_pass].each do |key|
+        next unless config.fedora[key].present?
         stack = Kernel.caller.dup
         stack.shift while stack[0] =~ %r{(active_support/callbacks|dor/config|dor-services)\.rb}
-        if config.fedora[key].present?
-          ActiveSupport::Deprecation.warn "Dor::Config -- fedora.#{key.to_s} is deprecated. Please use ssl.#{key.to_s} instead.", stack
-          config.ssl[key] = config.fedora[key] unless config.ssl[key].present?
-          config.fedora.delete(key)
-        end
+        ActiveSupport::Deprecation.warn "Dor::Config -- fedora.#{key} is deprecated. Please use ssl.#{key} instead.", stack
+        config.ssl[key] = config.fedora[key] unless config.ssl[key].present?
+        config.fedora.delete(key)
       end
 
       if ActiveFedora.respond_to?(:configurator)

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -9,7 +9,7 @@ module Dor
       t.stacks      :path => '/contentMetadata/@stacks', :index_as => [:not_searchable]
       t.resource(:index_as => [:not_searchable]) do
         t.id_       :path => { :attribute => 'id' }
-        t.sequence  :path => { :attribute => 'sequence' }#, :data_type => :integer
+        t.sequence  :path => { :attribute => 'sequence' } #, :data_type => :integer
         t.type_     :path => { :attribute => 'type' }, :index_as => [:displayable]
         t.attribute(:path => 'attr', :index_as => [:not_searchable]) do
           t.name    :path => { :attribute => 'name' }, :index_as => [:not_searchable]
@@ -18,19 +18,19 @@ module Dor
           t.id_      :path => { :attribute => 'id' }
           t.mimeType :path => { :attribute => 'mimeType' }, :index_as => [:displayable]
           t.dataType :path => { :attribute => 'dataType' }, :index_as => [:displayable]
-          t.size     :path => { :attribute => 'size'     }, :index_as => [:displayable]#, :data_type => :long
-          t.shelve   :path => { :attribute => 'shelve'   }, :index_as => [:not_searchable]#, :data_type => :boolean
-          t.publish  :path => { :attribute => 'publish'  }, :index_as => [:not_searchable]#, :data_type => :boolean
-          t.preserve :path => { :attribute => 'preserve' }, :index_as => [:not_searchable]#, :data_type => :boolean
+          t.size     :path => { :attribute => 'size'     }, :index_as => [:displayable] #, :data_type => :long
+          t.shelve   :path => { :attribute => 'shelve'   }, :index_as => [:not_searchable] #, :data_type => :boolean
+          t.publish  :path => { :attribute => 'publish'  }, :index_as => [:not_searchable] #, :data_type => :boolean
+          t.preserve :path => { :attribute => 'preserve' }, :index_as => [:not_searchable] #, :data_type => :boolean
           t.checksum do
             t.type_ :path => { :attribute => 'type' }
           end
         end
         t.shelved_file(:path => 'file', :attributes => {:shelve=>'yes'}, :index_as => [:not_searchable]) do
-          t.id_ :path => { :attribute => 'id' }, :index_as => [:displayable, :searchable]
+          t.id_ :path => { :attribute => 'id' }, :index_as => [:displayable, :stored_searchable]
         end
       end
-      t.shelved_file_id :proxy => [:resource, :shelved_file, :id], :index_as => [:displayable, :searchable]
+      t.shelved_file_id :proxy => [:resource, :shelved_file, :id], :index_as => [:displayable, :stored_searchable]
     end
 
     def public_xml
@@ -75,7 +75,7 @@ module Dor
 
       max = xml.search('//resource').map{ |node| node['sequence'].to_i }.max
       #renumber all of the resources that will come after the newly added one
-      while max>position do
+      while max>position
         node=xml.search('//resource[@sequence=\'' + position + '\']')
         node.first[sequence]=max+1 if node.length>0
         max-=1
@@ -113,7 +113,7 @@ module Dor
         res=xml.search('//resource[@sequence=\''+position.to_s+'\']')
         break if res.length==0
         res['sequence']=position.to_s
-        position=position+1
+        position+=1
       end
       self.content=xml.to_s
       self.save
@@ -168,20 +168,17 @@ module Dor
       preserved_size=0
       counts = Hash.new(0)                # default count is zero
       resource_type_counts = Hash.new(0)  # default count is zero
-      first_shelved_image=nil
+      first_shelved_image = nil
 
       doc.xpath('contentMetadata/resource').sort { |a,b| a['sequence'].to_i <=> b['sequence'].to_i }.each do |resource|
-        counts['resource']+=1
-        resource_type_counts[resource['type']]+=1 if resource['type']
+        counts['resource'] += 1
+        resource_type_counts[resource['type']] += 1 if resource['type']
         resource.xpath('file').each do |file|
-          counts['content_file']+=1
+          counts['content_file'] += 1
           preserved_size += file['size'].to_i if file['preserve'] == 'yes'
-          if file['shelve'] == 'yes'
-            counts['shelved_file']+=1
-            if first_shelved_image.nil? && file['id'].match(/jp2$/)
-              first_shelved_image=file['id']
-            end
-          end
+          next unless file['shelve'] == 'yes'
+          counts['shelved_file'] += 1
+          first_shelved_image ||= file['id'] if file['id'].match(/jp2$/)
         end
       end
       solr_doc["content_type_ssim"              ] = doc.root['type']
@@ -216,7 +213,7 @@ module Dor
     def update_resource_label resource_name, new_label
       node = singular_node('//resource[@id=\''+resource_name+'\']')
       labels = node.xpath('./label')
-      if(labels.length==0)
+      if (labels.length==0)
         #create a label
         label_node = Nokogiri::XML::Node.new('label',self.ng_xml)
         label_node.content=new_label

data/lib/dor/datastreams/datastream_spec_solrizer.rb

@@ -1,7 +1,7 @@
 module DatastreamSpecSolrizer
   extend ActiveSupport::Concern
   include SolrDocHelper
-  
+
   def datastream_spec_string
     s = begin
       controlGroup == 'E' ? content.to_s.length : size

data/lib/dor/datastreams/desc_metadata_ds.rb

@@ -12,19 +12,19 @@ class DescMetadataDS < ActiveFedora::OmDatastream
       end
     end
     t.subject(:index_as => [:not_searchable]) do
-      t.geographic :index_as => [:stored_searchable]
-      t.topic      :index_as => [:stored_searchable]
+      t.geographic :index_as => [:symbol, :stored_searchable]
+      t.topic      :index_as => [:symbol, :stored_searchable]
       t.temporal   :index_as => [:stored_searchable]
     end
     t.title_info(:path=>"titleInfo") {
-      t.main_title(:index_as=>[:facetable], :path=>"title", :label=>"title") {
+      t.main_title(:index_as=>[:symbol], :path=>"title", :label=>"title") {
         t.main_title_lang(:path=>{:attribute=> "xml:lang"})
       }
     }
-    t.coordinates :index_as => [:searchable]
-    t.extent      :index_as => [:searchable]
-    t.scale       :index_as => [:searchable]
-    t.topic       :index_as => [:stored_searchable]
+    t.coordinates :index_as => [:symbol]
+    t.extent      :index_as => [:symbol]
+    t.scale       :index_as => [:symbol]
+    t.topic       :index_as => [:symbol, :stored_searchable]
     t.abstract    :index_as => [:stored_searchable]
   end
 

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -9,7 +9,7 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
     t.embargo_status(:path => 'status', :index_as => [:symbol])
     t.release_date(:path => "releaseDate", :index_as => [:dateable])
     t.release_access(:path => "releaseAccess")
-    t.twenty_pct_status( :path => "twentyPctVisibilityStatus", :index_as => [:facetable])
+    t.twenty_pct_status( :path => "twentyPctVisibilityStatus", :index_as => [:symbol])
     t.twenty_pct_release_date(:path => "twentyPctVisibilityReleaseDate")
   end
 
@@ -96,15 +96,10 @@ class EmbargoMetadataDS < ActiveFedora::OmDatastream
     find_by_terms(:release_access).first
   end
 
-  # @return [Nokogiri::XML::Element] The releaseAccess node
-  def release_access_node
-    find_by_terms(:release_access).first
-  end
-
   # Sets the embargaAccess node
   # @param [Nokogiri::XML::Document] new_doc Document that will replace the existing releaseAccess node
   def release_access_node=(new_doc)
-    if(new_doc.root.name != 'releaseAccess')
+    if (new_doc.root.name != 'releaseAccess')
       raise "Trying to replace releaseAccess with a non-releaseAccess document"
     end
 

data/lib/dor/datastreams/events_ds.rb

@@ -1,7 +1,7 @@
 module Dor
 class EventsDS < ActiveFedora::OmDatastream
   before_create :ensure_non_versionable
-  
+
   set_terminology do |t|
     t.root(:path => 'events')
     t.event do
@@ -11,30 +11,30 @@ class EventsDS < ActiveFedora::OmDatastream
       t.message :path => 'text()', :index_as => [:displayable, :not_searchable]
     end
   end
-  
-  # Default EventsDS xml 
+
+  # Default EventsDS xml
   def self.xml_template
     builder = Nokogiri::XML::Builder.new do |xml|
       xml.events
     end
     return builder.doc
   end
-  
+
   def ensure_non_versionable
     self.versionable = 'false'
   end
-  
+
   # Adds an event to the datastream
   # @param [String] type a tag used to group events together. Sets the type attribute for the event
   # @param [String] who who is responsible for this event. Sets the who attribute for the event
   # @param [String] message what happened. Sets the content of the event with this message
   def add_event(type, who, message)
-    ev = ng_xml.create_element 'event', message, 
+    ev = ng_xml.create_element 'event', message,
       :type => type, :who => who, :when => Time.now.xmlschema
     ng_xml.root.add_child(ev)
     ng_xml_will_change!
   end
-  
+
   # Finds events with the desired type attribute
   # @param [String] tag events where type == tag will be returned
   # @yield [who, timestamp, message] The values of the current event
@@ -46,7 +46,7 @@ class EventsDS < ActiveFedora::OmDatastream
       block.call(node['who'], Time.parse(node['when']), node.content)
     end
   end
-  
+
   # Returns all the events in the datastream
   # @yield [type, who, timestamp, message] The values of the current event
   # @yieldparam [String] type tag for this particular event.  Value of the 'type' attribute
@@ -58,6 +58,6 @@ class EventsDS < ActiveFedora::OmDatastream
       block.call(node['type'], node['who'], Time.parse(node['when']), node.content)
     end
   end
-  
+
 end
 end

data/lib/dor/datastreams/identity_metadata_ds.rb

@@ -1,10 +1,10 @@
 module Dor
-class IdentityMetadataDS < ActiveFedora::OmDatastream 
+class IdentityMetadataDS < ActiveFedora::OmDatastream
   include SolrDocHelper
-  
+
   set_terminology do |t|
     t.root(:path=>"identityMetadata")
-    t.objectId :index_as => [:symbol]
+    t.objectId   :index_as => [:symbol]
     t.objectType :index_as => [:symbol]
     t.objectLabel
     t.citationCreator
@@ -16,53 +16,48 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
     t.tag :index_as => [:symbol]
     t.citationTitle
     t.objectCreator :index_as => [:stored_searchable, :symbol]
-    t.adminPolicy :index_as => [:not_searchable]
+    t.adminPolicy   :index_as => [:not_searchable]
   end
-  
+
   define_template :value do |builder,name,value,attrs|
     builder.send(name.to_sym, value, attrs)
   end
-  
+
   def self.xml_template
     Nokogiri::XML('<identityMetadata/>')
-  end #self.xml_template
-  
+  end
+
   def add_value(name, value, attrs={})
     add_child_node(ng_xml.root, :value, name, value, attrs)
   end
-  
+
   def objectId
     self.find_by_terms(:objectId).text
   end
-  
+
   def sourceId
     node = self.find_by_terms(:sourceId).first
     node ? [node['source'],node.text].join(':') : nil
   end
-  
+
   def sourceId=(value)
     node = self.find_by_terms(:sourceId).first
-    unless value.present?
+    unless value.present?   # so setting it to '' is the same as removal: worth documenting maybe?
       node.remove unless node.nil?
-      nil
-    else
-      (source,val) = value.split(/:/,2)
-      unless source.present? and value.present?
-        raise ArgumentError, "Source ID must follow the format namespace:value"
-      end
-      node = ng_xml.root.add_child('<sourceId/>').first if node.nil?
-      node['source'] = source
-      node.content = val
-      node
+      return nil
     end
+    (source, val) = value.split(/:/, 2)
+    raise ArgumentError, "Source ID must follow the format namespace:value, not '#{value}'" unless source.present? && val.present?
+    node ||= ng_xml.root.add_child('<sourceId/>').first
+    node['source'] = source
+    node.content = val
+    node
   end
-  def tags()
-      result=[]
-      self.ng_xml.search('//tag').each do |node|
-        result << node.content
-      end
-      result
+
+  def tags
+    self.ng_xml.search('//tag').collect(&:content)
   end
+
   def otherId(type = nil)
     result = self.find_by_terms(:otherId).to_a
     if type.nil?
@@ -73,13 +68,13 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
   end
 
   def add_otherId(other_id)
-    (name,val) = other_id.split(/:/,2)
+    (name, val) = other_id.split(/:/, 2)
     node = ng_xml.root.add_child('<otherId/>').first
     node['name'] = name
     node.content = val
     node
   end
-  
+
   def to_solr(solr_doc=Hash.new, *args)
     super(solr_doc, *args)
 
@@ -102,21 +97,21 @@ class IdentityMetadataDS < ActiveFedora::OmDatastream
       add_solr_value(solr_doc, "identifier", qid, :symbol, [:stored_searchable])
       add_solr_value(solr_doc, "#{name}_id", id, :symbol, [])
     }
-    
+
     # do some stuff to make tags in general and project tags specifically more easily searchable and facetable
     self.find_by_terms(:tag).each { |tag|
       (prefix, rest) = tag.text.split(/:/, 2)
       prefix = prefix.downcase.strip.gsub(/\s/,'_')
       unless rest.nil?
-        # this part will index a value in a field specific to the tag, e.g. registered_by_tag_*, 
+        # this part will index a value in a field specific to the tag, e.g. registered_by_tag_*,
         # book_tag_*, project_tag_*, remediated_by_tag_*, etc.  project_tag_* and registered_by_tag_*
-        # definitley get used, but most don't.  we can limit the prefixes that get solrized if things 
+        # definitley get used, but most don't.  we can limit the prefixes that get solrized if things
         # get out of hand.
         add_solr_value(solr_doc, "#{prefix}_tag", rest.strip, :symbol, [])
       end
 
       # solrize each possible prefix for the tag, inclusive of the full tag.
-      # e.g., for a tag such as "A : B : C", this will solrize to an _ssim field 
+      # e.g., for a tag such as "A : B : C", this will solrize to an _ssim field
       # that contains ["A",  "A : B",  "A : B : C"].
       tag_parts = tag.text.split(/:/)
       progressive_tag_prefix = ''

data/lib/dor/datastreams/rights_metadata_ds.rb

@@ -65,7 +65,7 @@ module Dor
     # slight misnomer: also sets discover rights!
     # TODO: convert xpath reads to dra_object calls
     def set_read_rights(rights)
-      raise(ArgumentError, "Argument '#{rights}' is not a recognized value") unless ['world','stanford','none','dark'].include? rights
+      raise(ArgumentError, "Argument '#{rights}' is not a recognized value") unless %w(world stanford none dark).include? rights
       rights_xml = self.ng_xml
       if (rights_xml.search('//rightsMetadata/access[@type=\'read\']').length==0)
         raise('The rights metadata stream doesnt contain an entry for machine read permissions. Consider populating it from the APO before trying to change it.')

data/lib/dor/datastreams/role_metadata_ds.rb

@@ -33,7 +33,6 @@ class RoleMetadataDS < ActiveFedora::OmDatastream
     end.doc
   end
 
-
   def to_solr(solr_doc=Hash.new, *args)
     self.find_by_xpath('/roleMetadata/role/*').each do |actor|
       role_type = actor.parent['type']

data/lib/dor/datastreams/simple_dublin_core_ds.rb

@@ -24,25 +24,24 @@ class SimpleDublinCoreDs < ActiveFedora::OmDatastream
   def to_solr(solr_doc=Hash.new, *args)
     # There are a whole bunch of namespace-related things that can go
     # wrong with this terminology. Until it's fixed in OM, ignore them all.
-    begin
-      doc = super solr_doc, *args
 
-      add_solr_value(doc, 'dc_title',   self.title.first,   :string, [:stored_sortable, :stored_searchable])
-      add_solr_value(doc, 'dc_creator', self.creator.first, :string, [:stored_sortable, :stored_searchable])
+    doc = super solr_doc, *args
 
-      identifiers = {}
+    add_solr_value(doc, 'dc_title',   self.title.first,   :string, [:stored_sortable, :stored_searchable])
+    add_solr_value(doc, 'dc_creator', self.creator.first, :string, [:stored_sortable, :stored_searchable])
 
-      self.identifier.each { |i| ns, val = i.split(":"); identifiers[ns] ||= val }
+    identifiers = {}
 
-      identifiers.each do |ns, val|
-        add_solr_value(doc, "dc_identifier_#{ns}", val, :string, [:stored_sortable, :stored_searchable])
-      end
+    self.identifier.each { |i| ns, val = i.split(":"); identifiers[ns] ||= val }
 
-      return doc
-    rescue Exception => e
-      warn "ERROR in SimpleDublinCoreDs to_solr()! #{e}"
-      solr_doc
+    identifiers.each do |ns, val|
+      add_solr_value(doc, "dc_identifier_#{ns}", val, :string, [:stored_sortable, :stored_searchable])
     end
+
+    return doc
+  rescue Exception => e
+    warn "ERROR in SimpleDublinCoreDs to_solr()! #{e}"
+    solr_doc
   end
 end
 end