dor-services 4.22.3 → 4.22.4

data/lib/dor/models/editable.rb

@@ -1,4 +1,4 @@
-module Dor  
+module Dor
   module Editable
     extend ActiveSupport::Concern
     include ActiveFedora::Relationships
@@ -6,8 +6,8 @@ module Dor
     included do
       belongs_to 'agreement_object', :property => :referencesAgreement, :class_name => "Dor::Item"
     end
-    
-    def to_solr(solr_doc=Hash.new, *args)
+
+    def to_solr(solr_doc = Hash.new, *args)
       super(solr_doc, *args)
       add_solr_value(solr_doc, "default_rights", default_rights, :string, [:facetable])
       add_solr_value(solr_doc, "agreement", agreement, :string, [:facetable]) if agreement_object
@@ -18,8 +18,8 @@ module Dor
     #@param role [String] the role the group or person will be filed under, ex. dor-apo-manager
     #@param entity [String] the name of the person or group, ex dlss:developers or sunetid:someone
     #@param type [Symbol] :workgroup for a group or :person for a person
-    def add_roleplayer role, entity, type=:workgroup
-      xml=self.roleMetadata.ng_xml
+    def add_roleplayer role, entity, type = :workgroup
+      xml=roleMetadata.ng_xml
       group='person'
       if type == :workgroup
         group='group'
@@ -43,11 +43,11 @@ module Dor
         id_node['type']=type.to_s
         xml.search('/roleMetadata').first.add_child(node)
       end
-      self.roleMetadata.content=xml.to_s
+      roleMetadata.content=xml.to_s
     end
     #remove all people groups and roles from the APO role metadata datastream
-    def purge_roles 
-      xml=self.roleMetadata.ng_xml
+    def purge_roles
+      xml=roleMetadata.ng_xml
       nodes = xml.search('/roleMetadata/role')
       nodes.each do |node|
         node.remove
@@ -55,43 +55,43 @@ module Dor
     end
 
     def mods_title
-      return self.descMetadata.term_values(:title_info, :main_title).first
+      descMetadata.term_values(:title_info, :main_title).first
     end
     def mods_title=(val)
-      self.descMetadata.update_values({[:title_info, :main_title] => val})
+      descMetadata.update_values({[:title_info, :main_title] => val})
     end
     #get all collections listed for this APO, used during registration
     #@return [Array] array of pids
-    def default_collections 
-      return administrativeMetadata.term_values(:registration, :default_collection)
+    def default_collections
+      administrativeMetadata.term_values(:registration, :default_collection)
     end
-    #Add a collection to the listing of collections for items governed by this apo. 
+    #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
-      ds=self.administrativeMetadata
+      ds=administrativeMetadata
       xml=ds.ng_xml
       reg=xml.search('//administrativeMetadata/registration').first
-      if not reg
+      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)
-      self.administrativeMetadata.content=xml.to_s
+      administrativeMetadata.content=xml.to_s
     end
-    
+
     def remove_default_collection val
-      ds=self.administrativeMetadata
+      ds=administrativeMetadata
       xml=ds.ng_xml
       xml.search('//administrativeMetadata/registration/collection[@id=\''+val+'\']').remove
-      self.administrativeMetadata.content=xml.to_s
+      administrativeMetadata.content=xml.to_s
     end
     #Get all roles defined in the role metadata, and the people or groups in those roles. Groups are prefixed with 'workgroup:'
     #@return [Hash] role => ['person','group'] ex. {"dor-apo-manager" => ["workgroup:dlss:developers", "sunetid:lmcrae"]
     def roles
       roles={}
-      self.roleMetadata.ng_xml.search('/roleMetadata/role').each do |role|
+      roleMetadata.ng_xml.search('/roleMetadata/role').each do |role|
         roles[role['type']]=[]
         role.search('identifier').each do |entity|
           roles[role['type']] << entity['type'] + ':' + entity.text()
@@ -99,51 +99,51 @@ module Dor
       end
       roles
     end
-    def metadata_source 
-      self.administrativeMetadata.metadata_source.first
+    def metadata_source
+      administrativeMetadata.metadata_source.first
     end
     def metadata_source=(val)
-      if self.administrativeMetadata.descMetadata == nil
-        self.administrativeMetadata.add_child_node(self.administrativeMetadata, :descMetadata)
+      if administrativeMetadata.descMetadata.nil?
+        administrativeMetadata.add_child_node(administrativeMetadata, :descMetadata)
       end
-      self.administrativeMetadata.update_values({[:descMetadata, :source] => val})
+      administrativeMetadata.update_values({[:descMetadata, :source] => val})
     end
     def use_statement
-      self.defaultObjectRights.use_statement.first
+      defaultObjectRights.use_statement.first
     end
     def use_statement=(val)
-      self.defaultObjectRights.update_values({[:use_statement] => val})
+      defaultObjectRights.update_values({[:use_statement] => val})
     end
     def copyright_statement
-      self.defaultObjectRights.copyright.first
+      defaultObjectRights.copyright.first
     end
     def copyright_statement=(val)
-      self.defaultObjectRights.update_values({[:copyright] => val})
+      defaultObjectRights.update_values({[:copyright] => val})
     end
     def creative_commons_license
-      self.defaultObjectRights.creative_commons.first
+      defaultObjectRights.creative_commons.first
     end
     def creative_commons_license_human
-      self.defaultObjectRights.creative_commons_human.first
+      defaultObjectRights.creative_commons_human.first
     end
     def creative_commons_license=(val)
       (machine, human)=val
-      if creative_commons_license == nil
-        self.defaultObjectRights.add_child_node(self.defaultObjectRights.ng_xml.root, :creative_commons)
+      if creative_commons_license.nil?
+        defaultObjectRights.add_child_node(defaultObjectRights.ng_xml.root, :creative_commons)
       end
-      self.defaultObjectRights.update_values({[:creative_commons] => val})
+      defaultObjectRights.update_values({[:creative_commons] => val})
     end
     def creative_commons_license_human=(val)
-      if creative_commons_license_human == nil
+      if creative_commons_license_human.nil?
         #add the nodes
-       self.defaultObjectRights.add_child_node(self.defaultObjectRights.ng_xml.root, :creative_commons)
+       defaultObjectRights.add_child_node(defaultObjectRights.ng_xml.root, :creative_commons)
       end
-      self.defaultObjectRights.update_values({[:creative_commons_human] => val})
-      
+      defaultObjectRights.update_values({[:creative_commons_human] => val})
+
     end
     #@return [String] A description of the rights defined in the default object rights datastream. Can be 'Stanford', 'World', 'Dark' or 'None'
     def default_rights
-      xml=self.defaultObjectRights.ng_xml
+      xml=defaultObjectRights.ng_xml
       if xml.search('//rightsMetadata/access[@type=\'read\']/machine/group').length == 1
         'Stanford'
       else
@@ -162,7 +162,7 @@ module Dor
     #@param rights [String] Stanford, World, Dark, or None
     def default_rights=(rights)
       rights=rights.downcase
-      ds = self.defaultObjectRights
+      ds = defaultObjectRights
       rights_xml=ds.ng_xml
       rights_xml.search('//rightsMetadata/access[@type=\'discover\']/machine').each do |node|
         node.children.remove
@@ -197,32 +197,32 @@ module Dor
         end
       end
     end
-    
+
     def desc_metadata_format
-      self.administrativeMetadata.metadata_format.first
+      administrativeMetadata.metadata_format.first
     end
     def desc_metadata_format=(format)
       #create the node if it isnt there already
-      if not self.administrativeMetadata.metadata_format.first
-        self.administrativeMetadata.add_child_node(self.administrativeMetadata.ng_xml.root, :metadata_format)
+      unless administrativeMetadata.metadata_format.first
+        administrativeMetadata.add_child_node(administrativeMetadata.ng_xml.root, :metadata_format)
       end
-      self.administrativeMetadata.update_values({[:metadata_format] => format})
+      administrativeMetadata.update_values({[:metadata_format] => format})
     end
     def desc_metadata_source
-      self.administrativeMetadata.metadata_source.first
+      administrativeMetadata.metadata_source.first
     end
     def desc_metadata_source=(source)
       #create the node if it isnt there already
-      if not self.administrativeMetadata.metadata_source.first
-        self.administrativeMetadata.add_child_node(self.administrativeMetadata.ng_xml.root, :metadata_source)
+      unless administrativeMetadata.metadata_source.first
+        administrativeMetadata.add_child_node(administrativeMetadata.ng_xml.root, :metadata_source)
       end
-      self.administrativeMetadata.update_values({[:metadata_source] => format})
+      administrativeMetadata.update_values({[:metadata_source] => format})
     end
     #List of default workflows, used to provide choices at registration
     #@return [Array] and array of pids, ex ['druid:ab123cd4567']
     def default_workflows
-      xml=self.administrativeMetadata.ng_xml
-      nodes=self.administrativeMetadata.term_values(:registration, :workflow_id)
+      xml=administrativeMetadata.ng_xml
+      nodes=administrativeMetadata.term_values(:registration, :workflow_id)
       if nodes.length > 0
         wfs=[]
         nodes.each do |node|
@@ -231,19 +231,19 @@ module Dor
         wfs
       else
         []
-      end      
+      end
     end
     #set a single default workflow
     #@param wf [String] the name of the workflow, ex. 'digitizationWF'
     def default_workflow=(wf)
-      ds=self.administrativeMetadata
+      ds=administrativeMetadata
       xml=ds.ng_xml
       nodes=xml.search('//registration/workflow')
       if nodes.first
         nodes.first['id']=wf
       else
         nodes=xml.search('//registration')
-        if not nodes.first
+        unless nodes.first
           reg_node=Nokogiri::XML::Node.new('registration',xml)
           xml.root.add_child(reg_node)
         end
@@ -254,7 +254,7 @@ module Dor
       end
     end
     def agreement
-      if agreement_object 
+      if agreement_object
         agreement_object.pid
       else
         ''

data/lib/dor/models/embargoable.rb

@@ -15,7 +15,7 @@ module Dor
     # Modifies rightsMetadata to remove embargoReleaseDate and updates/adds access from embargoMetadata/releaseAccess
     # @param [String] release_agent name of the person, application or thing that released embargo
     # @note The caller should save the object to fedora to commit the changes
-    def release_embargo(release_agent="unknown")
+    def release_embargo(release_agent = "unknown")
       # Set status to released
       embargo_md = datastreams['embargoMetadata']
       embargo_md.status = 'released'
@@ -47,10 +47,10 @@ module Dor
           }
         }
       end
-      return builder.doc
+      builder.doc
     end
 
-    def release_20_pct_vis_embargo(release_agent="unknown")
+    def release_20_pct_vis_embargo(release_agent = "unknown")
       # Set status to released
       embargo_md = datastreams['embargoMetadata']
       embargo_md.twenty_pct_status = 'released'
@@ -71,28 +71,28 @@ module Dor
       datastreams['events'].add_event("embargo", release_agent, "20% Visibility Embargo released")
     end
 
-		def update_embargo(new_date)
-			if not embargoMetadata.status == 'embargoed'
-				raise 'You cannot change the embargo date of an item thant isnt embargoed.'
-			end
-			if new_date.past?
-			  raise 'You cannot set the embargo date to a past date.'
-			end
-			updated=false
-			self.rightsMetadata.ng_xml.search('//embargoReleaseDate').each do |node|
-				node.content=new_date.beginning_of_day.utc.xmlschema
-				updated=true
-			end
-			self.rightsMetadata.content=self.rightsMetadata.ng_xml.to_s
-			self.rightsMetadata.save
-			if not updated
-				raise 'No release date in rights metadata, cannot proceed!'
-			end
-			self.embargoMetadata.ng_xml.xpath('//releaseDate').each do |node|
-				node.content=new_date.beginning_of_day.utc.xmlschema
-			end
-			self.embargoMetadata.content=self.embargoMetadata.ng_xml.to_s
-			self.embargoMetadata.save
-		end
+    def update_embargo(new_date)
+      unless embargoMetadata.status == 'embargoed'
+        raise 'You cannot change the embargo date of an item thant isnt embargoed.'
+      end
+      if new_date.past?
+        raise 'You cannot set the embargo date to a past date.'
+      end
+      updated=false
+      rightsMetadata.ng_xml.search('//embargoReleaseDate').each do |node|
+        node.content=new_date.beginning_of_day.utc.xmlschema
+        updated=true
+      end
+      rightsMetadata.content=rightsMetadata.ng_xml.to_s
+      rightsMetadata.save
+      unless updated
+        raise 'No release date in rights metadata, cannot proceed!'
+      end
+      embargoMetadata.ng_xml.xpath('//releaseDate').each do |node|
+        node.content=new_date.beginning_of_day.utc.xmlschema
+      end
+      embargoMetadata.content=embargoMetadata.ng_xml.to_s
+      embargoMetadata.save
+    end
   end
 end

data/lib/dor/models/eventable.rb

@@ -4,9 +4,9 @@ module Dor
     included do
       has_metadata :name => 'events', :type => Dor::EventsDS, :label => 'Events'
     end
-    
+
     def add_event *args
-      self.datastreams['events'].add_event *args
+      datastreams['events'].add_event *args
     end
   end
-end
+end

data/lib/dor/models/geoable.rb

@@ -3,18 +3,18 @@ module Dor
     extend ActiveSupport::Concern
     include SolrDocHelper
 
-    class CrosswalkError < Exception; end    
-    
+    class CrosswalkError < Exception; end
+
     included do
-      has_metadata  :name => 'geoMetadata', 
-                    :type => Dor::GeoMetadataDS, 
-                    :label => 'Geographic Information Metadata in ISO 19139', 
+      has_metadata  :name => 'geoMetadata',
+                    :type => Dor::GeoMetadataDS,
+                    :label => 'Geographic Information Metadata in ISO 19139',
                     :control_group => 'M'
     end
-    
+
     # @return [String] XML
     def fetch_geoMetadata_datastream
-      candidates = self.datastreams['identityMetadata'].otherId.collect { |oid| oid.to_s }
+      candidates = datastreams['identityMetadata'].otherId.collect { |oid| oid.to_s }
       metadata_id = Dor::MetadataService.resolvable(candidates).first
       unless metadata_id.nil?
         return Dor::MetadataService.fetch(metadata_id.to_s)
@@ -26,7 +26,7 @@ module Dor
     def build_geoMetadata_datastream(ds)
       content = fetch_geoMetadata_datastream
       unless content.nil?
-        ds.dsLabel = self.label
+        ds.dsLabel = label
         ds.ng_xml = Nokogiri::XML(content)
         ds.ng_xml.normalize_text!
         ds.content = ds.ng_xml.to_xml

data/lib/dor/models/governable.rb

@@ -10,30 +10,30 @@ module Dor
     end
 
     def initiate_apo_workflow(name)
-      self.initialize_workflow(name, !self.new_object?)
+      initialize_workflow(name, !self.new_object?)
     end
 
     # Returns the default lane_id from the item's APO.  Will return 'default' if the item does not have
     #   and APO, or if the APO does not have a default_lane
     # @return [String] the lane id
     def default_workflow_lane
-      return 'default' if self.admin_policy_object.nil?  # TODO log warning?
+      return 'default' if admin_policy_object.nil?  # TODO log warning?
 
       admin_md = admin_policy_object.datastreams['administrativeMetadata']
       return 'default' unless admin_md.respond_to? :default_workflow_lane
       lane = admin_md.default_workflow_lane
-      return 'default' if lane.nil? or lane.strip == ''
+      return 'default' if lane.nil? || lane.strip == ''
       lane
     end
 
     def reset_to_apo_default()
-      rights_metadata_ds = self.rightsMetadata
+      rights_metadata_ds = rightsMetadata
       rights_metadata_ds.content = admin_policy_object.rightsMetadata.ng_xml
     end
 
     def set_read_rights(rights)
-      return if not ['world','stanford','none', 'dark'].include? rights
-      rights_metadata_ds = self.rightsMetadata
+      return unless ['world','stanford','none', 'dark'].include? rights
+      rights_metadata_ds = rightsMetadata
       rights_xml=rights_metadata_ds.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.')
@@ -64,7 +64,7 @@ module Dor
           node.add_child(machine_node)
           machine_node.add_child(group_node)
         end
-        if rights=='none' or rights == 'dark'
+        if rights=='none' || rights == 'dark'
           none_node=Nokogiri::XML::Node.new('none',rights_xml)
           node.add_child(machine_node)
           machine_node.add_child(none_node)
@@ -79,8 +79,8 @@ module Dor
         when Dor::Collection
           collection_or_druid
       end
-      self.collections << collection
-      self.sets << collection
+      collections << collection
+      sets << collection
     end
 
     def remove_collection(collection_or_druid)
@@ -92,8 +92,8 @@ module Dor
           collection_or_druid
       end
 
-      self.collections.delete(collection)
-      self.sets.delete(collection)
+      collections.delete(collection)
+      sets.delete(collection)
     end
     #set the rights metadata datastream to the content of the APO's default object rights
     def reapplyAdminPolicyObjectDefaults
@@ -101,7 +101,7 @@ module Dor
     end
     def rights
         return nil unless self.respond_to? :rightsMetadata
-        xml=self.rightsMetadata.ng_xml
+        xml=rightsMetadata.ng_xml
         return nil if xml.search('//rightsMetadata').length != 1
         if xml.search('//rightsMetadata/access[@type=\'read\']/machine/group').length == 1
           'Stanford'
@@ -142,7 +142,7 @@ module Dor
       ['dor-administrator', 'sdr-administrator', 'dor-apo-manager', 'dor-apo-depositor', 'dor-viewer', 'sdr-viewer']
     end
     def intersect arr1, arr2
-      return (arr1 & arr2).length > 0
+      (arr1 & arr2).length > 0
     end
     def can_manage_item? roles
       intersect roles, groups_which_manage_item
@@ -169,4 +169,4 @@ module Dor
       intersect roles, groups_which_view_metadata
     end
   end
-end
+end