sufia-models 6.2.0 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5e3ced04ed7546efd8a437f75c39d33bd25ef49
-  data.tar.gz: beb42fc315b7a71f58a87f00492940f0ba57263d
+  metadata.gz: e8aaf1e2e42b84b0e4a1331a69fa75380c39b5d8
+  data.tar.gz: aa45e5332b4d18964bd006da94f500081a848b46
 SHA512:
-  metadata.gz: 3b35bd03100ce61e5d87660b5f10cf7fa0591642859fea090423d170b99af71cea155b4b46f4fd6014c3b98a80e918e5f6cfb64fd86c23579f3ab3629a6fd675
-  data.tar.gz: dbe7e42f40291485bdb85fa8bb241d0115a29819da55d9155229f0a45b5359f65cc2178e9c7c83c27311657521a8ea6f974eee7a3b5e70e2b5315c853f2965c9
+  metadata.gz: 78bd0e47f109f0c8eecfc861458d6ba77726f77ca72f1eb42f2e8969a0fc7409c1f7739b2c1f3c649eb847e658788b45c6cfd0a2c1817ef5c640f3e6e9546ce1
+  data.tar.gz: 991b122862009f831320945391d228c1068259b27d1102e44176ed5dea353cb9d366a93b8776f978da8cd0b688c31734247ea1c97267f07fbe03d0c8692d0ae4

data/app/actors/sufia/generic_file/actor.rb

@@ -1,7 +1,6 @@
 module Sufia::GenericFile
   # Actions are decoupled from controller logic so that they may be called from a controller or a background job.
   class Actor
-
     attr_reader :generic_file, :user
 
     def initialize(generic_file, user)
@@ -73,9 +72,7 @@ module Sufia::GenericFile
     def destroy
       generic_file.destroy
       FeaturedWork.where(generic_file_id: generic_file.id).destroy_all
-      if Sufia.config.respond_to?(:after_destroy)
-        Sufia.config.after_destroy.call(generic_file.id, user)
-      end
+      Sufia.config.after_destroy.call(generic_file.id, user) if Sufia.config.respond_to?(:after_destroy)
     end
 
     # Takes an optional block and executes the block if the save was successful.
@@ -93,9 +90,9 @@ module Sufia::GenericFile
         return false unless generic_file.save
       rescue RSolr::Error::Http => error
         ActiveFedora::Base.logger.warn "Sufia::GenericFile::Actor::save_and_record_committer Caught RSOLR error #{error.inspect}"
-        save_tries+=1
+        save_tries += 1
         # fail for good if the tries is greater than 3
-        raise error if save_tries >=3
+        raise error if save_tries >= 3
         sleep 0.01
         retry
       end
@@ -116,7 +113,7 @@ module Sufia::GenericFile
           return
         end
         scan_result = ClamAV.instance.scanfile(path)
-        raise Sufia::VirusFoundError.new("A virus was found in #{path}: #{scan_result}") unless scan_result == 0
+        raise Sufia::VirusFoundError, "A virus was found in #{path}: #{scan_result}" unless scan_result == 0
       end
     end
 

data/app/jobs/active_fedora_id_based_job.rb

@@ -17,6 +17,6 @@ class ActiveFedoraIdBasedJob
   alias_method :generic_file_id, :id
 
   def run
-    raise RuntimeError, "Define #run in a subclass"
+    raise "Define #run in a subclass"
   end
 end

data/app/jobs/active_fedora_pid_based_job.rb

@@ -1,7 +1,6 @@
 class ActiveFedoraPidBasedJob < ActiveFedoraIdBasedJob
   extend Deprecation
-  def self.extended(document)
+  def self.extended(_document)
     Deprecation.warn ActiveFedoraPidBasedJob, "ActiveFedoraPidBasedJob is deprecated; use ActiveFedoraIdBasedJob instead."
   end
 end
-

data/app/jobs/audit_job.rb

@@ -27,7 +27,7 @@ class AuditJob < ActiveFedoraIdBasedJob
       login = generic_file.depositor
       user = User.find_by_user_key(login)
       logger.warn "User '#{login}' not found" unless user
-      job_user = User.audituser()
+      job_user = User.audituser
       file_title = generic_file.title.first
       message = "The audit run at #{log.created_at} for #{file_title} (#{uri}) failed."
       subject = FAIL

data/app/jobs/batch_update_job.rb

@@ -19,8 +19,8 @@ class BatchUpdateJob
   end
 
   def run
-    batch = Batch.find_or_create(self.batch_id)
-    user = User.find_by_user_key(self.login)
+    batch = Batch.find_or_create(batch_id)
+    user = User.find_by_user_key(login)
 
     batch.generic_files.each do |gf|
       update_file(gf, user)
@@ -43,7 +43,7 @@ class BatchUpdateJob
     end
     gf.title = title[gf.id] if title[gf.id]
     gf.attributes = file_attributes
-    gf.visibility= visibility
+    gf.visibility = visibility
 
     save_tries = 0
     begin
@@ -52,7 +52,7 @@ class BatchUpdateJob
       save_tries += 1
       ActiveFedora::Base.logger.warn "BatchUpdateJob caught RSOLR error on #{gf.id}: #{error.inspect}"
       # fail for good if the tries is greater than 3
-      raise error if save_tries >=3
+      raise error if save_tries >= 3
       sleep 0.01
       retry
     end #
@@ -60,12 +60,12 @@ class BatchUpdateJob
     saved << gf
   end
 
-  def send_user_success_message user, batch
+  def send_user_success_message(user, batch)
     message = saved.count > 1 ? multiple_success(batch.id, saved) : single_success(batch.id, saved.first)
     User.batchuser.send_message(user, message, success_subject, false)
   end
 
-  def send_user_failure_message user, batch
+  def send_user_failure_message(user, batch)
     message = denied.count > 1 ? multiple_failure(batch.id, denied) : single_failure(batch.id, denied.first)
     User.batchuser.send_message(user, message, failure_subject, false)
   end

data/app/jobs/create_derivatives_job.rb

@@ -5,9 +5,8 @@ class CreateDerivativesJob < ActiveFedoraIdBasedJob
 
   def run
     return unless generic_file.content.has_content?
-    if generic_file.video?
-      return unless Sufia.config.enable_ffmpeg
-    end
+    return if generic_file.video? && !Sufia.config.enable_ffmpeg
+
     generic_file.create_derivatives
     generic_file.save
   end

data/app/jobs/import_url_job.rb

@@ -3,7 +3,6 @@ require 'uri'
 require 'tempfile'
 
 class ImportUrlJob < ActiveFedoraIdBasedJob
-
   def queue_name
     :import_url
   end
@@ -11,8 +10,12 @@ class ImportUrlJob < ActiveFedoraIdBasedJob
   def run
     user = User.find_by_user_key(generic_file.depositor)
 
-    Tempfile.open(id.gsub('/', '_')) do |f|
+    Tempfile.open(id.tr('/', '_')) do |f|
       path, mime_type = copy_remote_file(generic_file.import_url, f)
+
+      # reload the generic file once the data is copied since this is a long running task
+      generic_file.reload
+
       # attach downloaded file to generic file stubbed out
       if Sufia::GenericFile::Actor.new(generic_file, user).create_content(f, path, 'content', mime_type)
         # add message to user for downloaded file
@@ -24,12 +27,12 @@ class ImportUrlJob < ActiveFedoraIdBasedJob
     end
   end
 
-  def copy_remote_file(import_url, f)
+  def copy_remote_file(_import_url, f)
     f.binmode
     # download file from url
     uri = URI(generic_file.import_url)
     http = Net::HTTP.new(uri.host, uri.port)
-    http.use_ssl = uri.scheme == "https"  # enable SSL/TLS
+    http.use_ssl = uri.scheme == "https" # enable SSL/TLS
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     mime_type = nil
 
@@ -43,7 +46,7 @@ class ImportUrlJob < ActiveFedoraIdBasedJob
     end
 
     f.rewind
-    return uri.path, mime_type
+    [uri.path, mime_type]
   end
 
   def job_user

data/app/jobs/ingest_local_file_job.rb

@@ -12,7 +12,7 @@ class IngestLocalFileJob
     self.user_key = user_key
   end
 
-  #TODO this should use Actor#create_content
+  # TODO: this should use Actor#create_content
   def run
     user = User.find_by_user_key(user_key)
     raise "Unable to find user for #{user_key}" unless user

data/app/models/batch.rb

@@ -10,27 +10,21 @@ class Batch < ActiveFedora::Base
   property :status, predicate: ::RDF::DC.type
 
   def self.find_or_create(id)
-    begin
-      Batch.find(id)
-    rescue ActiveFedora::ObjectNotFoundError
-      safe_create(id)
-    end
+    Batch.find(id)
+  rescue ActiveFedora::ObjectNotFoundError
+    safe_create(id)
   end
 
-  private
-
-    # This method handles most race conditions gracefully. 
-    # If a batch with the same ID is created by another thread
-    # we fetch the batch that was created (rather than throwing
-    # an error) and continute.
-    def self.safe_create(id)
-      begin      
-        Batch.create(id: id)
-      rescue ActiveFedora::IllegalOperation
-        # This is the exception thrown by LDP when we attempt to 
-        # create a duplicate object. If we can find the object
-        # then we are good to go.
-        Batch.find(id)
-      end
-    end
+  # This method handles most race conditions gracefully.
+  # If a batch with the same ID is created by another thread
+  # we fetch the batch that was created (rather than throwing
+  # an error) and continute.
+  def self.safe_create(id)
+    Batch.create(id: id)
+  rescue ActiveFedora::IllegalOperation
+    # This is the exception thrown by LDP when we attempt to
+    # create a duplicate object. If we can find the object
+    # then we are good to go.
+    Batch.find(id)
+  end
 end

data/app/models/checksum_audit_log.rb

@@ -1,5 +1,4 @@
 class ChecksumAuditLog < ActiveRecord::Base
-
   def self.get_audit_log(id, path, version_uri)
     ChecksumAuditLog.find_or_create_by(generic_file_id: id, dsid: path, version: version_uri)
   end

data/app/models/concerns/sufia/ability.rb

@@ -12,6 +12,7 @@ module Sufia
       featured_work_abilities
       editor_abilities
       stats_abilities
+      citation_abilities
       proxy_deposit_abilities
     end
 
@@ -51,6 +52,10 @@ module Sufia
       alias_action :stats, to: :read
     end
 
+    def citation_abilities
+      alias_action :citation, to: :read
+    end
+
     private
 
       def depositor_for_document(document_id)

data/app/models/concerns/sufia/collection_behavior.rb

@@ -16,7 +16,7 @@ module Sufia
     end
 
     # Compute the sum of each file in the collection using Solr to
-    # avoid having to hit Fedora 
+    # avoid having to hit Fedora
     #
     # @return [Fixnum] size of collection in bytes
     # @raise [RuntimeError] unsaved record does not exist in solr
@@ -34,10 +34,11 @@ module Sufia
       }
 
       files = ActiveFedora::SolrService.query(query, args)
-      files.reduce(0) { |sum, f| sum += f[file_size_field].to_i }
+      files.reduce(0) { |sum, f| sum + f[file_size_field].to_i }
     end
 
     protected
+
       # Field to look up when locating the size of each file in Solr.
       # Override for your own installation if using something different
       def file_size_field

data/app/models/concerns/sufia/file_stat_utils.rb

@@ -1,35 +1,33 @@
 module Sufia
   module FileStatUtils
-
-    def to_flots stats
-      stats.map {|stat| stat.to_flot}
+    def to_flots(stats)
+      stats.map(&:to_flot)
     end
 
-    def convert_date date_time
+    def convert_date(date_time)
       date_time.to_datetime.to_i * 1000
     end
 
     private
 
-    def cached_stats(file_id, start_date, method)
-      stats = self.where(file_id:file_id).order(date: :asc)
-      ga_start_date = stats.size > 0 ? stats[stats.size-1].date + 1.day : start_date.to_date
-      {ga_start_date: ga_start_date, cached_stats: stats.to_a }
-    end
+      def cached_stats(file_id, start_date, _method)
+        stats = where(file_id: file_id).order(date: :asc)
+        ga_start_date = stats.size > 0 ? stats[stats.size - 1].date + 1.day : start_date.to_date
+        { ga_start_date: ga_start_date, cached_stats: stats.to_a }
+      end
 
-    def combined_stats file_id, start_date, object_method, ga_key, user_id=nil
-      stat_cache_info = cached_stats( file_id, start_date, object_method)
-      stats = stat_cache_info[:cached_stats]
-      if stat_cache_info[:ga_start_date] < Date.today
-        ga_stats =  ga_statistics(stat_cache_info[:ga_start_date], file_id)
-        ga_stats.each do |stat|
-          lstat = self.new file_id: file_id, date: stat[:date], object_method => stat[ga_key], user_id: user_id
-          lstat.save unless Date.parse(stat[:date]) == Date.today
-          stats << lstat
+      def combined_stats(file_id, start_date, object_method, ga_key, user_id = nil)
+        stat_cache_info = cached_stats(file_id, start_date, object_method)
+        stats = stat_cache_info[:cached_stats]
+        if stat_cache_info[:ga_start_date] < Date.today
+          ga_stats = ga_statistics(stat_cache_info[:ga_start_date], file_id)
+          ga_stats.each do |stat|
+            lstat = new file_id: file_id, date: stat[:date], object_method => stat[ga_key], user_id: user_id
+            lstat.save unless Date.parse(stat[:date]) == Date.today
+            stats << lstat
+          end
         end
+        stats
       end
-      stats
-    end
-
   end
 end

data/app/models/concerns/sufia/generic_file/batches.rb

@@ -19,10 +19,8 @@ module Sufia
 
       # Is this file in the middle of being processed by a batch?
       def processing?
-         try(:batch).try(:status) == ['processing'.freeze]
+        try(:batch).try(:status) == ['processing'.freeze]
       end
-
     end
   end
 end
-

data/app/models/concerns/sufia/generic_file/characterization.rb

@@ -50,7 +50,6 @@ module Sufia
         property :data_format,       delegate_to: 'characterization'
         property :offset,            delegate_to: 'characterization'
         property :frame_rate,        delegate_to: 'characterization'
-
       end
 
       def width
@@ -80,19 +79,16 @@ module Sufia
 
       # Populate GenericFile's properties with fields from FITS (e.g. Author from pdfs)
       def append_metadata
-        terms = self.characterization_terms
+        terms = characterization_terms
         Sufia.config.fits_to_desc_mapping.each_pair do |k, v|
-          if terms.has_key?(k)
-            # coerce to array to remove a conditional
-            terms[k] = [terms[k]] unless terms[k].is_a? Array
-            terms[k].each do |term_value|
-              proxy_term = self.send(v)
-              if proxy_term.kind_of?(Array)
-                proxy_term << term_value unless proxy_term.include?(term_value)
-              else
-                # these are single-valued terms which cannot be appended to
-                self.send("#{v}=", term_value)
-              end
+          next unless terms.key?(k)
+          Array.wrap(terms[k]).each do |term_value|
+            proxy_term = send(v)
+            if proxy_term.is_a?(Array)
+              proxy_term << term_value unless proxy_term.include?(term_value)
+            else
+              # these are single-valued terms which cannot be appended to
+              send("#{v}=", term_value)
             end
           end
         end
@@ -100,11 +96,11 @@ module Sufia
 
       def characterization_terms
         h = {}
-        FitsDatastream.terminology.terms.each_pair do |k, v|
+        FitsDatastream.terminology.terms.each_pair do |_k, v|
           next unless v.respond_to? :proxied_term
           term = v.proxied_term
           begin
-            value = self.send(term.name)
+            value = send(term.name)
             h[term.name] = value unless value.empty?
           rescue NoMethodError
             next
@@ -112,7 +108,6 @@ module Sufia
         end
         h
       end
-
     end
   end
 end

data/app/models/concerns/sufia/generic_file/content.rb

@@ -7,7 +7,6 @@ module Sufia
         contains "content", class_name: 'FileContentDatastream'
         contains "thumbnail"
       end
-
     end
   end
 end

data/app/models/concerns/sufia/generic_file/derivatives.rb

@@ -9,7 +9,7 @@ module Sufia
         makes_derivatives do |obj|
           case obj.mime_type
           when *pdf_mime_types
-            obj.transform_file :content, { thumbnail: { format: 'jpg', size: '338x493', datastream: 'thumbnail' } }
+            obj.transform_file :content, thumbnail: { format: 'jpg', size: '338x493', datastream: 'thumbnail' }
           when *office_document_mime_types
             obj.transform_file :content, { thumbnail: { format: 'jpg', size: '200x150>', datastream: 'thumbnail' } }, processor: :document
           when *audio_mime_types
@@ -17,7 +17,7 @@ module Sufia
           when *video_mime_types
             obj.transform_file :content, { webm: { format: 'webm', datastream: 'webm' }, mp4: { format: 'mp4', datastream: 'mp4' }, thumbnail: { format: 'jpg', datastream: 'thumbnail' } }, processor: :video
           when *image_mime_types
-            obj.transform_file :content, { thumbnail: { format: 'jpg', size: '200x150>', datastream: 'thumbnail' } }
+            obj.transform_file :content, thumbnail: { format: 'jpg', size: '200x150>', datastream: 'thumbnail' }
           end
         end
       end

data/app/models/concerns/sufia/generic_file/export.rb

@@ -4,8 +4,8 @@ module Sufia
       # MIME: 'application/x-endnote-refer'
       def export_as_endnote
         end_note_format = {
-          '%T' => [:title, lambda { |x| x.first }],
-          '%Q' => [:title, lambda { |x| x.drop(1) }],
+          '%T' => [:title, ->(x) { x.first }],
+          '%Q' => [:title, ->(x) { x.drop(1) }],
           '%A' => [:creator],
           '%C' => [:publication_place],
           '%D' => [:date_created],
@@ -30,15 +30,15 @@ module Sufia
           if mapping.is_a? String
             values = [mapping]
           else
-            values = self.send(mapping[0]) if self.respond_to? mapping[0]
+            values = send(mapping[0]) if self.respond_to? mapping[0]
             values = mapping[1].call(values) if mapping.length == 2
             values = Array(values)
           end
-          next if values.empty? or values.first.nil?
+          next if values.empty? || values.first.nil?
           spaced_values = values.join("; ")
           text << "#{endnote_key} #{spaced_values}"
         end
-        return text.join("\n")
+        text.join("\n")
       end
 
       def persistent_url
@@ -65,10 +65,10 @@ module Sufia
           rights: 'rights'
         }
         field_map.each do |element, kev|
-          values = self.send(element)
-          next if values.empty? or values.first.nil?
+          values = send(element)
+          next if values.empty? || values.first.nil?
           values.each do |value|
-            export_text << "rft.#{kev}=#{CGI::escape(value.to_s)}"
+            export_text << "rft.#{kev}=#{CGI.escape(value.to_s)}"
           end
         end
         export_text.join('&') unless export_text.blank?
@@ -79,24 +79,24 @@ module Sufia
         authors_list = []
         authors_list_final = []
 
-        #setup formatted author list
-        authors = get_author_list
+        # setup formatted author list
+        authors = author_list
         authors.each do |author|
           next if author.blank?
           authors_list.push(abbreviate_name(author))
         end
         authors_list.each do |author|
-          if author == authors_list.first #first
+          if author == authors_list.first # first
             authors_list_final.push(author.strip)
-          elsif author == authors_list.last #last
+          elsif author == authors_list.last # last
             authors_list_final.push(", &amp; " + author.strip)
-          else #all others
+          else # all others
             authors_list_final.push(", " + author.strip)
           end
         end
         text << authors_list_final.join
         unless text.blank?
-          if text[-1,1] != "."
+          if text[-1, 1] != "."
             text << ". "
           else
             text << " "
@@ -111,11 +111,7 @@ module Sufia
 
         # Publisher info
         text << setup_pub_info unless setup_pub_info.nil?
-        unless text.blank?
-          if text[-1,1] != "."
-            text += "."
-          end
-        end
+        text += "." if text[-1, 1] != "." unless text.blank?
         text.html_safe
       end
 
@@ -123,22 +119,22 @@ module Sufia
         text = ''
         authors_final = []
 
-        #setup formatted author list
-        authors = get_author_list
+        # setup formatted author list
+        authors = author_list
 
         if authors.length < 4
           authors.each do |author|
-            if author == authors.first #first
+            if author == authors.first # first
               authors_final.push(author)
-            elsif author == authors.last #last
+            elsif author == authors.last # last
               authors_final.push(", and " + name_reverse(author) + ".")
-            else #all others
+            else # all others
               authors_final.push(", " + name_reverse(author))
             end
           end
           text << authors_final.join
           unless text.blank?
-            if text[-1,1] != "."
+            if text[-1, 1] != "."
               text << ". "
             else
               text << " "
@@ -156,15 +152,13 @@ module Sufia
 
         # Get Pub Date
         text << setup_pub_date unless setup_pub_date.nil?
-        if text[-1,1] != "."
-          text << "." unless text.blank?
-        end
+        text << "." unless text.blank? if text[-1, 1] != "."
         text.html_safe
       end
 
       def export_as_chicago_citation
         author_text = ""
-        authors = get_all_authors
+        authors = all_authors
         unless authors.blank?
           if authors.length > 10
             authors.each_with_index do |author, index|
@@ -183,7 +177,7 @@ module Sufia
             end
             author_text << " et al."
           elsif authors.length > 1
-            authors.each_with_index do |author,index|
+            authors.each_with_index do |author, index|
               if index == 0
                 author_text << "#{author}"
                 if author.ends_with?(",")
@@ -202,24 +196,22 @@ module Sufia
           end
         end
         title_info = ""
-        title_info << citation_title(clean_end_punctuation(CGI::escapeHTML(title.first)).strip) unless title.blank?
+        title_info << citation_title(clean_end_punctuation(CGI.escapeHTML(title.first)).strip) unless title.blank?
 
         pub_info = ""
-        place = self.based_near.first
+        place = based_near.first
         publisher = self.publisher.first
         unless place.blank?
-          place = CGI::escapeHTML(place)
+          place = CGI.escapeHTML(place)
           pub_info << place
           pub_info << ": " unless publisher.blank?
         end
         unless publisher.blank?
-          publisher = CGI::escapeHTML(publisher)
+          publisher = CGI.escapeHTML(publisher)
           pub_info << publisher
           pub_info << ", " unless setup_pub_date.nil?
         end
-        unless setup_pub_date.nil?
-          pub_info << setup_pub_date
-        end
+        pub_info << setup_pub_date unless setup_pub_date.nil?
 
         citation = ""
         citation << "#{author_text} " unless author_text.blank?
@@ -231,10 +223,10 @@ module Sufia
       private
 
       def setup_pub_date
-        first_date = self.date_created.first
+        first_date = date_created.first
         unless first_date.blank?
-          first_date = CGI::escapeHTML(first_date)
-          date_value = first_date.gsub(/[^0-9|n\.d\.]/, "")[0,4]
+          first_date = CGI.escapeHTML(first_date)
+          date_value = first_date.gsub(/[^0-9|n\.d\.]/, "")[0, 4]
           return nil if date_value.nil?
         end
         clean_end_punctuation(date_value) if date_value
@@ -242,15 +234,15 @@ module Sufia
 
       def setup_pub_info
         text = ''
-        place = self.based_near.first
+        place = based_near.first
         publisher = self.publisher.first
         unless place.blank?
-          place = CGI::escapeHTML(place)
+          place = CGI.escapeHTML(place)
           text << place
           text << ": " unless publisher.blank?
         end
         unless publisher.blank?
-          publisher = CGI::escapeHTML(publisher)
+          publisher = CGI.escapeHTML(publisher)
           text << publisher
         end
         return nil if text.strip.blank?
@@ -258,7 +250,7 @@ module Sufia
       end
 
       def mla_citation_title(text)
-        no_upcase = ["a","an","and","but","by","for","it","of","the","to","with"]
+        no_upcase = ["a", "an", "and", "but", "by", "for", "it", "of", "the", "to", "with"]
         new_text = []
         word_parts = text.split(" ")
         word_parts.each do |w|
@@ -272,12 +264,12 @@ module Sufia
       end
 
       def citation_title(title_text)
-        prepositions = ["a","about","across","an","and","before","but","by","for","it","of","the","to","with","without"]
+        prepositions = ["a", "about", "across", "an", "and", "before", "but", "by", "for", "it", "of", "the", "to", "with", "without"]
         new_text = []
-        title_text.split(" ").each_with_index do |word,index|
-          if (index == 0 and word != word.upcase) or (word.length > 1 and word != word.upcase and !prepositions.include?(word))
+        title_text.split(" ").each_with_index do |word, index|
+          if (index == 0 && word != word.upcase) || (word.length > 1 && word != word.upcase && !prepositions.include?(word))
             # the split("-") will handle the capitalization of hyphenated words
-            new_text << word.split("-").map!{|w| w.capitalize }.join("-")
+            new_text << word.split("-").map!(&:capitalize).join("-")
           else
             new_text << word
           end
@@ -289,7 +281,7 @@ module Sufia
         text = ''
         title = self.title.first
         unless title.blank?
-          title = CGI::escapeHTML(title)
+          title = CGI.escapeHTML(title)
           title_info = clean_end_punctuation(title.strip)
           text << title_info
         end
@@ -299,26 +291,26 @@ module Sufia
       end
 
       def clean_end_punctuation(text)
-        if [".",",",":",";","/"].include? text[-1,1]
-          return text[0,text.length-1]
+        if [".", ",", ":", ";", "/"].include? text[-1, 1]
+          return text[0, text.length - 1]
         end
         text
       end
 
-      def get_author_list
-        self.creator.map { |author| clean_end_punctuation(CGI::escapeHTML(author)) }.uniq
+      def author_list
+        creator.map { |author| clean_end_punctuation(CGI.escapeHTML(author)) }.uniq
       end
 
-      def get_all_authors
-        authors = self.creator
-        return authors.empty? ? nil : authors.map { |author| CGI::escapeHTML(author) }
+      def all_authors
+        authors = creator
+        authors.empty? ? nil : authors.map { |author| CGI.escapeHTML(author) }
       end
 
       def abbreviate_name(name)
         abbreviated_name = ''
         name = name.join('') if name.is_a? Array
         # make sure we handle "Cher" correctly
-        return name if !name.include?(' ') and !name.include?(',')
+        return name if !name.include?(' ') && !name.include?(',')
         surnames_first = name.include?(',')
         delimiter = surnames_first ? ', ' : ' '
         name_segments = name.split(delimiter)
@@ -335,9 +327,8 @@ module Sufia
         name = clean_end_punctuation(name)
         return name unless name =~ /,/
         temp_name = name.split(", ")
-        return temp_name.last + " " + temp_name.first
+        temp_name.last + " " + temp_name.first
       end
-
     end
   end
 end