dor-services 6.0.0 → 6.0.1

data/lib/dor/datastreams/datastream_spec_solrizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module DatastreamSpecSolrizer
   extend ActiveSupport::Concern
   include SolrDocHelper
@@ -5,8 +7,8 @@ module DatastreamSpecSolrizer
   def datastream_spec_string
     s = begin
       controlGroup == 'E' ? content.to_s.length : size
-    rescue
-      0
+        rescue
+          0
     end
     v = versionID.nil? ? '0' : versionID.to_s.split(/\./).last
     [dsid, controlGroup, mimeType, v, s, label].join('|')

data/lib/dor/datastreams/default_object_rights_ds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stanford/mods/normalizer'
 module Dor
   class DefaultObjectRightsDS < ActiveFedora::OmDatastream
@@ -82,6 +84,7 @@ module Dor
     # Ensures that the template is present for the given term
     def initialize_term!(term)
       return unless find_by_terms(term).length < 1
+
       ng_xml_will_change!
       add_child_node(ng_xml.root, term)
     end
@@ -90,10 +93,10 @@ module Dor
     def update_term!(term, val)
       ng_xml_will_change!
       if val.blank?
-        update_values({ [ term ] => nil })
+        update_values({ [term] => nil })
       else
         initialize_term! term
-        update_values({ [ term ] => val })
+        update_values({ [term] => val })
       end
       normalize!
     end
@@ -124,11 +127,11 @@ module Dor
         # cleanup ordering is important here
         doc.xpath('//machine/text()').each { |node| node.content = node.content.strip }
         doc.xpath('//human')
-          .tap { |node_set| norm.clean_linefeeds(node_set) }
-          .each do |node|
-            norm.trim_text(node)
-            norm.remove_empty_nodes(node)
-          end
+           .tap { |node_set| norm.clean_linefeeds(node_set) }
+           .each do |node|
+          norm.trim_text(node)
+          norm.remove_empty_nodes(node)
+        end
         doc.xpath('/rightsMetadata/copyright').each { |node| norm.remove_empty_nodes(node) }
         doc.xpath('/rightsMetadata/use').each { |node| norm.remove_empty_nodes(node) }
       end

data/lib/dor/datastreams/desc_metadata_ds.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Dor
   class DescMetadataDS < ActiveFedora::OmDatastream
-
-    MODS_NS = 'http://www.loc.gov/mods/v3'.freeze
+    MODS_NS = 'http://www.loc.gov/mods/v3'
     MODS_HEADER_CONFIG = {
       'xmlns' => MODS_NS,
       'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
@@ -15,7 +16,7 @@ module Dor
         t.publisher :index_as => [:stored_searchable]
         t.date_created :path => 'dateCreated', :index_as => [:stored_searchable]
         t.place :index_as => [:not_searchable] do
-          t.placeTerm :attributes => {:type => 'text'}, :index_as => [:stored_searchable]
+          t.placeTerm :attributes => { :type => 'text' }, :index_as => [:stored_searchable]
         end
       end
       t.subject(:index_as => [:not_searchable]) do
@@ -25,11 +26,11 @@ module Dor
       end
       t.title_info(:path => 'titleInfo') {
         t.main_title(:index_as => [:symbol], :path => 'title', :label => 'title') {
-          t.main_title_lang(:path => {:attribute => 'xml:lang'})
+          t.main_title_lang(:path => { :attribute => 'xml:lang' })
         }
       }
       t.language {
-        t.languageTerm :attributes => {:type => 'code', :authority => 'iso639-2b'}, :index_as => [:not_searchable]
+        t.languageTerm :attributes => { :type => 'code', :authority => 'iso639-2b' }, :index_as => [:not_searchable]
       }
       t.coordinates :index_as => [:symbol]
       t.extent      :index_as => [:symbol]
@@ -56,6 +57,5 @@ module Dor
     def prefix
       ''
     end
-
   end
 end

data/lib/dor/datastreams/embargo_metadata_ds.rb

@@ -1,114 +1,114 @@
-module Dor
-class EmbargoMetadataDS < ActiveFedora::OmDatastream
-
-  before_create :ensure_non_versionable
-
-  set_terminology do |t|
-    t.root(:path => 'embargoMetadata')
-    t.status
-    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 => [:symbol])
-    t.twenty_pct_release_date(:path => 'twentyPctVisibilityReleaseDate')
-  end
+# frozen_string_literal: true
 
-  # Default EmbargoMetadataDS xml
-  def self.xml_template
-    builder = Nokogiri::XML::Builder.new do |xml|
-      xml.embargoMetadata {
-        xml.status
-        xml.releaseDate
-        xml.releaseAccess
-        xml.twentyPctVisibilityStatus
-        xml.twentyPctVisibilityReleaseDate
-      }
+module Dor
+  class EmbargoMetadataDS < ActiveFedora::OmDatastream
+    before_create :ensure_non_versionable
+
+    set_terminology do |t|
+      t.root(:path => 'embargoMetadata')
+      t.status
+      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 => [:symbol])
+      t.twenty_pct_release_date(:path => 'twentyPctVisibilityReleaseDate')
     end
-    builder.doc
-  end
 
-  def to_solr(solr_doc = {}, *args)
-    solr_doc = super
-    #::Solrizer.insert_field(solr_doc, field_name, value, *index_types)
-    rd1  = release_date
-    rd20 = twenty_pct_release_date
-    ::Solrizer.insert_field(solr_doc, 'embargo_release', rd1.utc.strftime('%FT%TZ'), :dateable) unless rd1.blank?
-    ::Solrizer.insert_field(solr_doc, 'twenty_pct_visibility_release', rd20.utc.strftime('%FT%TZ'), :dateable) unless rd20.blank?
-    solr_doc
-  end
+    # Default EmbargoMetadataDS xml
+    def self.xml_template
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.embargoMetadata {
+          xml.status
+          xml.releaseDate
+          xml.releaseAccess
+          xml.twentyPctVisibilityStatus
+          xml.twentyPctVisibilityReleaseDate
+        }
+      end
+      builder.doc
+    end
 
-  def ensure_non_versionable
-    self.versionable = 'false'
-  end
+    def to_solr(solr_doc = {}, *args)
+      solr_doc = super
+      #::Solrizer.insert_field(solr_doc, field_name, value, *index_types)
+      rd1  = release_date
+      rd20 = twenty_pct_release_date
+      ::Solrizer.insert_field(solr_doc, 'embargo_release', rd1.utc.strftime('%FT%TZ'), :dateable) unless rd1.blank?
+      ::Solrizer.insert_field(solr_doc, 'twenty_pct_visibility_release', rd20.utc.strftime('%FT%TZ'), :dateable) unless rd20.blank?
+      solr_doc
+    end
 
-  #################################################################################
-  # Convenience methods to get and set embargo properties
-  # Hides complexity/verbosity of OM TermOperators for simple, non-repeating values
-  #################################################################################
+    def ensure_non_versionable
+      self.versionable = 'false'
+    end
 
-  def status=(new_status)
-    update_values([:status] => new_status)
-  end
+    #################################################################################
+    # Convenience methods to get and set embargo properties
+    # Hides complexity/verbosity of OM TermOperators for simple, non-repeating values
+    #################################################################################
 
-  def status
-    term_values(:status).first
-  end
+    def status=(new_status)
+      update_values([:status] => new_status)
+    end
 
-  # Sets the release date.  Does NOT convert to beginning-of-day.
-  # @param [Time] rd the release date object
-  def release_date=(rd = Time.now.utc)
-    update_values([:release_date] => rd.utc.xmlschema)
-  end
+    def status
+      term_values(:status).first
+    end
 
-  # Current releaseDate value
-  # @return [Time]
-  def release_date
-    rd = term_values(:release_date).first
-    (rd.nil? || rd.empty?) ? nil : Time.parse(rd)
-  end
+    # Sets the release date.  Does NOT convert to beginning-of-day.
+    # @param [Time] rd the release date object
+    def release_date=(rd = Time.now.utc)
+      update_values([:release_date] => rd.utc.xmlschema)
+    end
 
-  def twenty_pct_status=(new_status)
-    update_values([:twenty_pct_status] => new_status)
-  end
+    # Current releaseDate value
+    # @return [Time]
+    def release_date
+      rd = term_values(:release_date).first
+      (rd.nil? || rd.empty?) ? nil : Time.parse(rd)
+    end
 
-  def twenty_pct_status
-    term_values(:twenty_pct_status).first
-  end
+    def twenty_pct_status=(new_status)
+      update_values([:twenty_pct_status] => new_status)
+    end
 
-  # Sets the 20% visibility release date.  Converts the date to beginning-of-day, UTC to help with Solr indexing
-  # @param [Time] rd A Time object represeting the release date.  By default, it is set to now
-  def twenty_pct_release_date=(rd = Time.now.utc)
-    update_values([:twenty_pct_release_date] => rd.beginning_of_day.utc.xmlschema)
-  end
+    def twenty_pct_status
+      term_values(:twenty_pct_status).first
+    end
 
-  # Current twentyPctVisibilityReleaseDate value
-  # @return [Time]
-  def twenty_pct_release_date
-    rd = term_values(:twenty_pct_release_date).first
-    (rd.nil? || rd.empty?) ? nil : Time.parse(rd)
-  end
+    # Sets the 20% visibility release date.  Converts the date to beginning-of-day, UTC to help with Solr indexing
+    # @param [Time] rd A Time object represeting the release date.  By default, it is set to now
+    def twenty_pct_release_date=(rd = Time.now.utc)
+      update_values([:twenty_pct_release_date] => rd.beginning_of_day.utc.xmlschema)
+    end
 
-  # @return [Nokogiri::XML::Element] The releaseAccess node
-  def release_access_node
-    find_by_terms(:release_access).first
-  end
+    # Current twentyPctVisibilityReleaseDate value
+    # @return [Time]
+    def twenty_pct_release_date
+      rd = term_values(:twenty_pct_release_date).first
+      (rd.nil? || rd.empty?) ? nil : Time.parse(rd)
+    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'
-      raise 'Trying to replace releaseAccess with a non-releaseAccess document'
+    # @return [Nokogiri::XML::Element] The releaseAccess node
+    def release_access_node
+      find_by_terms(:release_access).first
     end
 
-    term_value_delete(:select => '//embargoMetadata/releaseAccess')
-    ng_xml_will_change!
-    ng_xml.root.add_child(new_doc.root.clone)
-  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'
+        raise 'Trying to replace releaseAccess with a non-releaseAccess document'
+      end
 
-  # maintain AF < 8 indexing behavior
-  def prefix
-    ''
-  end
+      term_value_delete(:select => '//embargoMetadata/releaseAccess')
+      ng_xml_will_change!
+      ng_xml.root.add_child(new_doc.root.clone)
+    end
 
-end
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
+  end
 end

data/lib/dor/datastreams/events_ds.rb

@@ -1,68 +1,69 @@
+# frozen_string_literal: true
+
 module Dor
-class EventsDS < ActiveFedora::OmDatastream
-  before_create :ensure_non_versionable
+  class EventsDS < ActiveFedora::OmDatastream
+    before_create :ensure_non_versionable
 
-  set_terminology do |t|
-    t.root(:path => 'events')
-    t.event do
-      t.who     :path => { :attribute => 'who'  }, :index_as => [:displayable, :not_searchable]
-      t.type_   :path => { :attribute => 'type' }, :index_as => [:displayable, :not_searchable]
-      t.when    :path => { :attribute => 'when' }, :index_as => [:displayable, :not_searchable], :data_type => :date
-      t.message :path => 'text()', :index_as => [:displayable, :not_searchable]
+    set_terminology do |t|
+      t.root(:path => 'events')
+      t.event do
+        t.who     :path => { :attribute => 'who'  }, :index_as => [:displayable, :not_searchable]
+        t.type_   :path => { :attribute => 'type' }, :index_as => [:displayable, :not_searchable]
+        t.when    :path => { :attribute => 'when' }, :index_as => [:displayable, :not_searchable], :data_type => :date
+        t.message :path => 'text()', :index_as => [:displayable, :not_searchable]
+      end
     end
-  end
 
-  # Default EventsDS xml
-  def self.xml_template
-    builder = Nokogiri::XML::Builder.new do |xml|
-      xml.events
+    # Default EventsDS xml
+    def self.xml_template
+      builder = Nokogiri::XML::Builder.new do |xml|
+        xml.events
+      end
+      builder.doc
     end
-    builder.doc
-  end
 
-  def ensure_non_versionable
-    self.versionable = 'false'
-  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)
-    ng_xml_will_change!
-    ev = ng_xml.create_element 'event', message,
-      :type => type, :who => who, :when => Time.now.utc.xmlschema
-    ng_xml.root.add_child(ev)
-  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)
+      ng_xml_will_change!
+      ev = ng_xml.create_element 'event', message,
+                                 :type => type, :who => who, :when => Time.now.utc.xmlschema
+      ng_xml.root.add_child(ev)
+    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
-  # @yieldparam [String] who thing responsible for creating the event. Value of the 'who' attribute
-  # @yieldparam [Time] timestamp when this event was logged.  Value of the 'when' attribute
-  # @yieldparam [String] message what happened. Content of the event node
-  def find_events_by_type(tag, &block)
-    find_by_terms(:event).xpath("//event[@type='#{tag}']").each do |node|
-      block.call(node['who'], Time.parse(node['when']), node.content)
+    # 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
+    # @yieldparam [String] who thing responsible for creating the event. Value of the 'who' attribute
+    # @yieldparam [Time] timestamp when this event was logged.  Value of the 'when' attribute
+    # @yieldparam [String] message what happened. Content of the event node
+    def find_events_by_type(tag, &block)
+      find_by_terms(:event).xpath("//event[@type='#{tag}']").each do |node|
+        block.call(node['who'], Time.parse(node['when']), node.content)
+      end
     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
-  # @yieldparam [String] who thing responsible for creating the event. Value of the 'who' attribute
-  # @yieldparam [Time] timestamp when this event was logged.  Value of the 'when' attribute
-  # @yieldparam [String] message what happened. Content of the event node
-  def each_event(&block)
-    find_by_terms(:event).each do |node|
-      block.call(node['type'], node['who'], Time.parse(node['when']), node.content)
+    # 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
+    # @yieldparam [String] who thing responsible for creating the event. Value of the 'who' attribute
+    # @yieldparam [Time] timestamp when this event was logged.  Value of the 'when' attribute
+    # @yieldparam [String] message what happened. Content of the event node
+    def each_event(&block)
+      find_by_terms(:event).each do |node|
+        block.call(node['type'], node['who'], Time.parse(node['when']), node.content)
+      end
     end
-  end
 
-  # maintain AF < 8 indexing behavior
-  def prefix
-    ''
+    # maintain AF < 8 indexing behavior
+    def prefix
+      ''
+    end
   end
-
-end
 end

data/lib/dor/datastreams/geo_metadata_ds.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# frozen_string_literal: true
 
 require 'scanf'
 require 'uri'
@@ -10,7 +11,6 @@ module Dor
   # @see http://www.isotc211.org
   # @author Darren Hardy
   class GeoMetadataDS < ActiveFedora::OmDatastream
-
     # namespaces
     NS = {
       :rdf => 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
@@ -20,10 +20,10 @@ module Dor
     }.freeze
 
     # hash with all namespaces
-    XMLNS = Hash[NS.map {|k, v| ["xmlns:#{k}", v]}]
+    XMLNS = Hash[NS.map { |k, v| ["xmlns:#{k}", v] }]
 
     # schema locations
-    NS_XSD = NS.keys.collect {|k| "#{NS[k]} #{NS[k]}/#{k}.xsd"}
+    NS_XSD = NS.keys.collect { |k| "#{NS[k]} #{NS[k]}/#{k}.xsd" }
 
     # @return [Nokogiri::XML::Document] with gmd:MD_Metadata as root node
     # @raise [Dor::ParameterError] if MD_Metadata is missing
@@ -40,7 +40,8 @@ module Dor
     #     or nil if not provided
     def feature_catalogue
       root = ng_xml.xpath('/rdf:RDF/rdf:Description/gfc:FC_FeatureCatalogue', XMLNS)
-      return nil if root.nil? || root.empty?  # Feature catalog is optional
+      return nil if root.nil? || root.empty? # Feature catalog is optional
+
       Nokogiri::XML(root.first.to_xml)
     end
 
@@ -50,8 +51,8 @@ module Dor
     def self.xml_template
       Nokogiri::XML::Builder.new do |xml|
         xml['rdf'].RDF XMLNS,
-          'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
-          'xsi:schemaLocation' => NS_XSD.join(' ') do
+                       'xmlns:xsi' => 'http://www.w3.org/2001/XMLSchema-instance',
+                       'xsi:schemaLocation' => NS_XSD.join(' ') do
           xml['rdf'].Description 'rdf:about' => nil do
             xml['gmd'].MD_Metadata
           end