dor-services 6.0.5 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34400d0eac69c0ceb30ae0f68bab89c9f9a88e568b7c174495838a1b7cdad52e
-  data.tar.gz: 92b08f85258d8f85a743c6a19f1086a6e77b7070cc38f873a2941c401054c83b
+  metadata.gz: 26a4905c3d1c7ff07df99e6b7de0ec136d87cb847c30e1e676332f2142fafeac
+  data.tar.gz: 476d89693752ff2e17aa58d5efb9e559abc79a610da4c6ea413755df64c57009
 SHA512:
-  metadata.gz: 0cbfce9b71dbcfdf16dcf7de39addb71ef888672f94fbb1c04b3da944927235ee098f61a414fcf32db7f6597f34ca8b2e97a263b42008336512e97df79481ad0
-  data.tar.gz: a61f68d51174b64015a7c45f9beb8bcac73764a46c41550b06c47eb804ac038596b29d87222ec844685f2f2e289539a5dfaf8fd9c4ca5d1e35e15cf782568fae
+  metadata.gz: 96957b78cb9f2e13efd0a82f3d20cc19dc9f544243bed791fe9c86cee69a179b88c1386511eaf4a1ac159d15868ecae40ffb1753847359b7b116d69fa7588fa8
+  data.tar.gz: f27dd546d898ebae9bae95ef3180296cc434b6fdd8a06e293d92bc8ba6db5fa327758a34f895d21b63f817504ceffc161bc065f6ee86e319d30d75adcbbe4d7d

data/lib/dor-services.rb

@@ -30,7 +30,7 @@ module Dor
     # Dor.load_instance() if the item is not in the index, or is improperly indexed.
     # @param [String] pid The object's PID
     # @return [Object] the ActiveFedora-modeled object
-    def find(pid, opts = {})
+    def find(pid, _opts = {})
       load_instance(pid)
     end
 
@@ -149,23 +149,38 @@ module Dor
 
   # Services
   autoload_under 'services' do
-    autoload :SearchService
+    autoload :Ability
+    autoload :CleanupResetService
+    autoload :CleanupService
+    autoload :CreateWorkflowService
+    autoload :CreativeCommonsLicenseService
+    autoload :DatastreamBuilder
+    autoload :DigitalStacksService
+    autoload :DublinCoreService
+    autoload :FileMetadataMergeService
     autoload :IndexingService
     autoload :MetadataService
-    autoload :RegistrationService
-    autoload :SuriService
-    autoload :WorkflowService
-    autoload :DigitalStacksService
-    autoload :SdrIngestService
-    autoload :CleanupService
-    autoload :ProvenanceMetadataService
-    autoload :TechnicalMetadataService
     autoload :MergeService
-    autoload :ResetWorkspaceService
-    autoload :CleanupResetService
+    autoload :Ontology
+    autoload :OpenDataLicenseService
+    autoload :ProvenanceMetadataService
     autoload :PublicDescMetadataService
     autoload :PublicXmlService
+    autoload :PublishMetadataService
+    autoload :RegistrationService
+    autoload :ReleaseTagService
+    autoload :ResetWorkspaceService
+    autoload :SdrIngestService
+    autoload :SearchService
+    autoload :SecondaryFileNameService
+    autoload :ShelvingService
+    autoload :StatusService
+    autoload :SuriService
+    autoload :TagService
+    autoload :TechnicalMetadataService
     autoload :ThumbnailService
+    autoload :VersionService
+    autoload :WorkflowService
   end
 
   # Workflow Classes

data/lib/dor/config.rb

@@ -4,6 +4,7 @@ require 'confstruct/configuration'
 require 'rsolr'
 require 'yaml'
 require 'dor/certificate_authenticated_rest_resource_factory'
+require 'dor/services/client'
 
 module Dor
   class Configuration < Confstruct::Configuration
@@ -52,56 +53,58 @@ module Dor
 
     def make_solr_connection(add_opts = {})
       opts = Dor::Config.solr.opts.merge(add_opts).merge(
-        :url => Dor::Config.solr.url
+        url: Dor::Config.solr.url
       )
       ::RSolr.connect(opts)
     end
 
     set_callback :initialize, :after do |config|
-      config.deep_merge!({
-                           :fedora => {
-                             :client => Confstruct.deferred { |c| CertificateAuthenticatedRestResourceFactory.create(:fedora) },
-                             :safeurl => Confstruct.deferred { |c|
-                               begin
-                                 fedora_uri = URI.parse(config.fedora.url)
-                                 fedora_uri.user = fedora_uri.password = nil
-                                 fedora_uri.to_s
-                               rescue URI::InvalidURIError
-                                 nil
-                               end
-                             }
-                           },
-                           :dor_services => {
-                             :rest_client => Confstruct.deferred { |c| RestResourceFactory.create(:dor_services) }
-                           },
-                           :purl_services => {
-                             :rest_client => Confstruct.deferred { |c| RestResourceFactory.create(:purl_services) }
-                           },
-                           :sdr => {
-                             :rest_client => Confstruct.deferred { |c| RestResourceFactory.create(:sdr) }
-                           },
-                           :workflow => {
-                             :client => Confstruct.deferred do |c|
-                               Dor::WorkflowService.configure c.url, logger: c.client_logger, timeout: c.timeout, dor_services_url: config.dor_services.url
-                               Dor::WorkflowService
-                             end,
-                             :client_logger => Confstruct.deferred do |c|
-                                                 if c.logfile && c.shift_age
-                                                   Logger.new(c.logfile, c.shift_age)
-                                                 elsif c.logfile
-                                                   Logger.new(c.logfile)
-                                                 end
-                                               end
-                           }
-                         })
+      config.deep_merge!(
+        fedora: {
+          client: Confstruct.deferred { |_c| CertificateAuthenticatedRestResourceFactory.create(:fedora) },
+          safeurl: Confstruct.deferred do |_c|
+            begin
+              fedora_uri = URI.parse(config.fedora.url)
+              fedora_uri.user = fedora_uri.password = nil
+              fedora_uri.to_s
+            rescue URI::InvalidURIError
+              nil
+            end
+          end
+        },
+        dor_services: {
+          rest_client: Confstruct.deferred { |_c| RestResourceFactory.create(:dor_services) }
+        },
+        purl_services: {
+          rest_client: Confstruct.deferred { |_c| RestResourceFactory.create(:purl_services) }
+        },
+        sdr: {
+          rest_client: Confstruct.deferred { |_c| RestResourceFactory.create(:sdr) }
+        },
+        workflow: {
+          client: Confstruct.deferred do |c|
+            Dor::WorkflowService.configure c.url, logger: c.client_logger, timeout: c.timeout, dor_services_url: config.dor_services.url
+            Dor::WorkflowService
+          end,
+          client_logger: Confstruct.deferred do |c|
+                           if c.logfile && c.shift_age
+                             Logger.new(c.logfile, c.shift_age)
+                           elsif c.logfile
+                             Logger.new(c.logfile)
+                           end
+                         end
+        }
+      )
       true
     end
 
     set_callback :configure, :after do |config|
+      Dor::Services::Client.configure(url: config.dor_services.url) if config.dor_services
+
       if config.solrizer.present?
         stack = Kernel.caller.dup
         stack.shift while stack[0] =~ %r{(active_support/callbacks|dor/config|dor-services)\.rb}
-        ActiveSupport::Deprecation.warn "Dor::Config -- solrizer configuration is deprecated. Please use solr instead.", stack
+        ActiveSupport::Deprecation.warn 'Dor::Config -- solrizer configuration is deprecated. Please use solr instead.', stack
 
         config.solrizer.each do |k, v|
           config.solr[k] ||= v
@@ -120,7 +123,7 @@ module Dor
 
     def fedora_config
       fedora_uri = URI.parse(fedora.url)
-      connection_opts = { :url => fedora.safeurl, :user => fedora_uri.user, :password => fedora_uri.password }
+      connection_opts = { url: fedora.safeurl, user: fedora_uri.user, password: fedora_uri.password }
       connection_opts[:ssl_client_cert] = OpenSSL::X509::Certificate.new(File.read(ssl.cert_file)) if ssl.cert_file.present?
       connection_opts[:ssl_client_key] = OpenSSL::PKey::RSA.new(File.read(ssl.key_file), ssl.key_pass) if ssl.key_file.present?
       connection_opts[:ssl_cert_store] = default_ssl_cert_store
@@ -128,11 +131,11 @@ module Dor
     end
 
     def solr_config
-      { :url => solr.url }
+      { url: solr.url }
     end
 
     def predicate_config
-      YAML.load(File.read(File.expand_path('../../../config/predicate_mappings.yml', __FILE__)))
+      YAML.load(File.read(File.expand_path('../../config/predicate_mappings.yml', __dir__)))
     end
 
     def default_ssl_cert_store
@@ -140,6 +143,6 @@ module Dor
     end
   end
 
-  Config = Configuration.new(YAML.load(File.read(File.expand_path('../../../config/config_defaults.yml', __FILE__))))
+  Config = Configuration.new(YAML.load(File.read(File.expand_path('../../config/config_defaults.yml', __dir__))))
   ActiveFedora.configurator = Config
 end

data/lib/dor/datastreams/administrative_metadata_ds.rb

@@ -3,90 +3,90 @@
 module Dor
   class AdministrativeMetadataDS < ActiveFedora::OmDatastream
     set_terminology do |t|
-      t.root :path => 'administrativeMetadata', :index_as => [:not_searchable]
-      t.metadata_format :path => 'descMetadata/format'
-      t.admin_metadata_format :path => 'descMetadata/format', :index_as => [:symbol]
-      t.metadata_source :path => 'descMetadata/source', :index_as => [:symbol]
+      t.root path: 'administrativeMetadata', index_as: [:not_searchable]
+      t.metadata_format path: 'descMetadata/format'
+      t.admin_metadata_format path: 'descMetadata/format', index_as: [:symbol]
+      t.metadata_source path: 'descMetadata/source', index_as: [:symbol]
       t.descMetadata do
         t.source
         t.format
       end
       # Placeholders for existing defined stanzas to be fleshed out as needed
-      t.contact :index_as => [:not_searchable]
-      t.rights :index_as => [:not_searchable]
-      t.relationships :index_as => [:not_searchable]
-      t.registration :index_as => [:not_searchable] do
+      t.contact index_as: [:not_searchable]
+      t.rights index_as: [:not_searchable]
+      t.relationships index_as: [:not_searchable]
+      t.registration index_as: [:not_searchable] do
         t.agreementId
         t.itemTag
-        t.workflow_id :path => 'workflow/@id', :index_as => [:symbol]
-        t.default_collection :path => 'collection/@id'
+        t.workflow_id path: 'workflow/@id', index_as: [:symbol]
+        t.default_collection path: 'collection/@id'
       end
-      t.workflow :path => 'registration/workflow'
-      t.deposit :index_as => [:not_searchable]
+      t.workflow path: 'registration/workflow'
+      t.deposit index_as: [:not_searchable]
 
-      t.accessioning :index_as => [:not_searchable] do
-        t.workflow_id :path => 'workflow/@id', :index_as => [:symbol]
+      t.accessioning index_as: [:not_searchable] do
+        t.workflow_id path: 'workflow/@id', index_as: [:symbol]
       end
 
-      t.preservation :index_as => [:not_searchable]
-      t.dissemination :index_as => [:not_searchable] do
+      t.preservation index_as: [:not_searchable]
+      t.dissemination index_as: [:not_searchable] do
         t.harvester
         t.releaseDelayLimit
       end
       t.defaults do
-        t.initiate_workflow :path => 'initiateWorkflow' do
-          t.lane :path => { :attribute => 'lane' }
+        t.initiate_workflow path: 'initiateWorkflow' do
+          t.lane path: { attribute: 'lane' }
         end
-        t.shelving :path => 'shelving' do
-          t.path :path => { :attribute => 'path' }
+        t.shelving path: 'shelving' do
+          t.path path: { attribute: 'path' }
         end
       end
     end
 
     define_template :default_collection do |xml|
-      xml.administrativeMetadata {
-        xml.registration {
-          xml.collection(:id => '')
-        }
-      }
+      xml.administrativeMetadata do
+        xml.registration do
+          xml.collection(id: '')
+        end
+      end
     end
 
     define_template :agreementId do |xml|
-      xml.administrativeMetadata {
-        xml.registration {
+      xml.administrativeMetadata do
+        xml.registration do
           xml.agreementId
-        }
-      }
+        end
+      end
     end
 
     define_template :metadata_format do |xml|
-      xml.descMetadata {
+      xml.descMetadata do
         xml.format
-      }
+      end
     end
 
     define_template :metadata_source do |xml|
-      xml.administrativeMetadata {
-        xml.descMetadata {
+      xml.administrativeMetadata do
+        xml.descMetadata do
           xml.source
-        }
-      }
+        end
+      end
     end
 
     define_template :registration do |xml|
-      xml.administrativeMetadata {
-        xml.registration {
-          xml.workflow(:id => '')
-        }
-      }
+      xml.administrativeMetadata do
+        xml.registration do
+          xml.workflow(id: '')
+        end
+      end
     end
 
     define_template :default_collection do |xml|
-      xml.administrativeMetadata {
-        xml.registration {
+      xml.administrativeMetadata do
+        xml.registration do
           xml.collection
-        }
-      }
+        end
+      end
     end
 
     def self.xml_template
@@ -116,6 +116,99 @@ module Dor
       defaults.shelving.path.first
     end
 
+    # get all collections listed for this APO, used during registration
+    # @return [Array] array of pids
+    def default_collections
+      term_values(:registration, :default_collection)
+    end
+
+    # Add a collection to the listing of collections for items governed by this apo.
+    # @param val [String] pid of the collection, ex. druid:ab123cd4567
+    def add_default_collection(val)
+      xml = ng_xml
+      ng_xml_will_change!
+      reg = xml.search('//administrativeMetadata/registration').first
+      unless reg
+        reg = Nokogiri::XML::Node.new('registration', xml)
+        xml.search('/administrativeMetadata').first.add_child(reg)
+      end
+      node = Nokogiri::XML::Node.new('collection', xml)
+      node['id'] = val
+      reg.add_child(node)
+    end
+
+    def remove_default_collection(val)
+      ng_xml_will_change!
+      ng_xml.search('//administrativeMetadata/registration/collection[@id=\'' + val + '\']').remove
+    end
+
+    def metadata_source
+      super.first
+    end
+
+    def metadata_source=(val)
+      if descMetadata.nil?
+        ng_xml_will_change!
+        add_child_node(administrativeMetadata, :descMetadata)
+      end
+      update_values(%i[descMetadata source] => val)
+    end
+
+    # List of default workflows, used to provide choices at registration
+    # @return [Array] and array of pids, ex ['druid:ab123cd4567']
+    def default_workflows
+      term_values(:registration, :workflow_id)
+    end
+
+    # set a single default workflow
+    # @param wf [String] the name of the workflow, ex. 'digitizationWF'
+    def default_workflow=(wf_name)
+      raise ArgumentError, 'Must have a valid workflow for default' if wf_name.blank?
+
+      xml = ng_xml
+      ng_xml_will_change!
+      nodes = xml.search('//registration/workflow')
+      if nodes.first
+        nodes.first['id'] = wf_name
+      else
+        nodes = xml.search('//registration')
+        unless nodes.first
+          reg_node = Nokogiri::XML::Node.new('registration', xml)
+          xml.root.add_child(reg_node)
+        end
+        nodes = xml.search('//registration')
+        wf_node = Nokogiri::XML::Node.new('workflow', xml)
+        wf_node['id'] = wf_name
+        nodes.first.add_child(wf_node)
+      end
+    end
+
+    def desc_metadata_format
+      metadata_format.first
+    end
+
+    def desc_metadata_format=(format)
+      # create the node if it isnt there already
+      unless metadata_format.first
+        ng_xml_will_change!
+        add_child_node(ng_xml.root, :metadata_format)
+      end
+      update_values([:metadata_format] => format)
+    end
+
+    def desc_metadata_source
+      metadata_source.first
+    end
+
+    def desc_metadata_source=(_source)
+      # create the node if it isnt there already
+      unless metadata_source.first
+        ng_xml_will_change!
+        add_child_node(administrativeMetadata.ng_xml.root, :metadata_source)
+      end
+      update_values([:metadata_source] => format)
+    end
+
     # maintain AF < 8 indexing behavior
     def prefix
       ''

data/lib/dor/datastreams/content_metadata_ds.rb

@@ -5,34 +5,34 @@ require 'set'
 module Dor
   class ContentMetadataDS < ActiveFedora::OmDatastream
     set_terminology do |t|
-      t.root        :path => 'contentMetadata',          :index_as => [:not_searchable]
-      t.contentType :path => '/contentMetadata/@type',   :index_as => [:not_searchable]
-      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.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]
+      t.root        path: 'contentMetadata',          index_as: [:not_searchable]
+      t.contentType path: '/contentMetadata/@type',   index_as: [:not_searchable]
+      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.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]
         end
-        t.file(:index_as => [:not_searchable]) do
-          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.role     :path => { :attribute => 'role' },     :index_as => [:not_searchable]
-          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.file(index_as: [:not_searchable]) do
+          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.role     path: { attribute: 'role' },     index_as: [:not_searchable]
+          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' }
+            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, :stored_searchable]
+        t.shelved_file(path: 'file', attributes: { shelve: 'yes' }, index_as: [:not_searchable]) do
+          t.id_ path: { attribute: 'id' }, index_as: %i[displayable stored_searchable]
         end
       end
-      t.shelved_file_id :proxy => [:resource, :shelved_file, :id], :index_as => [:displayable, :stored_searchable]
+      t.shelved_file_id proxy: %i[resource shelved_file id], index_as: %i[displayable stored_searchable]
     end
 
     ### READ ONLY METHODS
@@ -80,7 +80,7 @@ module Dor
     # Terminology-based solrization is going to be painfully slow for large
     # contentMetadata streams. Just select the relevant elements instead.
     # TODO: Call super()?
-    def to_solr(solr_doc = {}, *args)
+    def to_solr(solr_doc = {}, *_args)
       doc = ng_xml
       return solr_doc unless doc.root['type']
 
@@ -134,7 +134,7 @@ module Dor
       resource_nodes = ng_xml.search('//resource[@id=\'' + resource_name + '\']')
       raise 'resource doesnt exist.' if resource_nodes.length == 0
 
-      self.ng_xml_will_change!
+      ng_xml_will_change!
 
       node = resource_nodes.first
       file_node = Nokogiri::XML::Node.new('file', ng_xml)
@@ -144,7 +144,7 @@ module Dor
       file_node['preserve'] = file[:preserve] || ''
       node.add_child(file_node)
 
-      [:md5, :sha1].each do |algo|
+      %i[md5 sha1].each do |algo|
         next unless file[algo]
 
         checksum_node = Nokogiri::XML::Node.new('checksum', ng_xml)
@@ -165,7 +165,7 @@ module Dor
     # @return [Nokogiri::XML::Element] the new resource that was added to the contentMetadata
     def add_virtual_resource(child_druid, child_resource)
       # create a virtual resource element with attributes linked to the child and omit label
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       sequence_max = ng_xml.search('//resource').map { |node| node[:sequence].to_i }.max
       resource = Nokogiri::XML::Element.new('resource', ng_xml)
       resource[:sequence] = sequence_max + 1
@@ -191,7 +191,7 @@ module Dor
     def add_resource(files, resource_name, position, type = 'file')
       raise "resource #{resource_name} already exists" if ng_xml.search('//resource[@id=\'' + resource_name + '\']').length > 0
 
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       max = ng_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
@@ -209,14 +209,14 @@ module Dor
         file_node['id'] = file[:name]
         node.add_child(file_node)
 
-        [:md5, :sha1].each { |algo|
+        %i[md5 sha1].each do |algo|
           next if file[algo].nil?
 
           checksum_node = Nokogiri::XML::Node.new('checksum', ng_xml)
           checksum_node['type'] = algo.to_s
           checksum_node.content = file[algo]
           file_node.add_child(checksum_node)
-        }
+        end
         file_node['size'] = file[:size] if file[:size]
         file_node['role'] = file[:role] if file[:role]
       end
@@ -226,7 +226,7 @@ module Dor
 
     # @param [String] resource_name ID of the resource
     def remove_resource(resource_name)
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       node = singular_node('//resource[@id=\'' + resource_name + '\']')
       position = node['sequence'].to_i + 1
       node.remove
@@ -241,7 +241,7 @@ module Dor
 
     # @param [String] file_name ID of the file element
     def remove_file(file_name)
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       ng_xml.search('//file[@id=\'' + file_name + '\']').each(&:remove)
     end
 
@@ -250,7 +250,7 @@ module Dor
     # @param [String] shelve
     # @param [String] preserve
     def update_attributes(file_name, publish, shelve, preserve, attributes = {})
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       file_node = ng_xml.search('//file[@id=\'' + file_name + '\']').first
       file_node['publish'] = publish
       file_node['shelve'] = shelve
@@ -263,10 +263,10 @@ module Dor
     # @param file [Object] some hash-like file
     # @param old_file_id [String] unique id attribute of the file element
     def update_file(file, old_file_id)
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       file_node = ng_xml.search('//file[@id=\'' + old_file_id + '\']').first
       file_node['id'] = file[:name]
-      [:md5, :sha1].each { |algo|
+      %i[md5 sha1].each do |algo|
         next if file[algo].nil?
 
         checksum_node = ng_xml.search('//file[@id=\'' + old_file_id + '\']/checksum[@type=\'' + algo.to_s + '\']').first
@@ -276,18 +276,18 @@ module Dor
         end
         checksum_node['type'] = algo.to_s
         checksum_node.content = file[algo]
-      }
+      end
 
-      [:size, :shelve, :preserve, :publish, :role].each { |x|
+      %i[size shelve preserve publish role].each do |x|
         file_node[x.to_s] = file[x] if file[x]
-      }
+      end
     end
 
     # @param old_name [String] unique id attribute of the file element
     # @param new_name [String] new unique id value being assigned
     # @return [Nokogiri::XML::Element] the file node
     def rename_file(old_name, new_name)
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       file_node = ng_xml.search('//file[@id=\'' + old_name + '\']').first
       file_node['id'] = new_name
       file_node
@@ -298,7 +298,7 @@ module Dor
     # @param new_label [String] label value being assigned
     # @return [Nokogiri::XML::Element] the resource node
     def update_resource_label(resource_name, new_label)
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       node = singular_node('//resource[@id=\'' + resource_name + '\']')
       labels = node.xpath('./label')
       if labels.length == 0
@@ -314,7 +314,7 @@ module Dor
     # @param resource_name [String] unique id attribute of the resource
     # @param new_type [String] type value being assigned
     def update_resource_type(resource_name, new_type)
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       singular_node('//resource[@id=\'' + resource_name + '\']')['type'] = new_type
     end
 
@@ -324,7 +324,7 @@ module Dor
     # @param new_position [Integer, String] new sequence number of the resource, or a string that looks like one
     # @return [Nokogiri::XML::Element] the resource node
     def move_resource(resource_name, new_position)
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       node = singular_node('//resource[@id=\'' + resource_name + '\']')
       position = node['sequence'].to_i
       new_position = new_position.to_i # tolerate strings as a Legacy behavior
@@ -347,7 +347,7 @@ module Dor
     # @param [String] new_type the new content type
     # @param [String] new_resource_type the new type for all resources
     def set_content_type(old_type, old_resource_type, new_type, new_resource_type)
-      self.ng_xml_will_change!
+      ng_xml_will_change!
       ng_xml.search('/contentMetadata[@type=\'' + old_type + '\']').each do |node|
         node['type'] = new_type
         ng_xml.search('//resource[@type=\'' + old_resource_type + '\']').each do |resource|