sufia 6.2.0 → 6.3.0

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -1,12 +1,12 @@
 module Sufia
   module SufiaHelperBehavior
-    def orcid_label(style_class='')
-      "#{image_tag 'orcid.png', { alt: t('sufia.user_profile.orcid.alt'), class: style_class }} #{t('sufia.user_profile.orcid.label')}".html_safe
+    def orcid_label(style_class = '')
+      "#{image_tag 'orcid.png', alt: t('sufia.user_profile.orcid.alt'), class: style_class} #{t('sufia.user_profile.orcid.label')}".html_safe
     end
 
-    def zotero_label(opts={})
+    def zotero_label(opts = {})
       html_class = opts[:html_class] || ''
-      "#{image_tag 'zotero.png', { alt: t('sufia.user_profile.zotero.alt'), class: html_class }} #{t('sufia.user_profile.zotero.label')}".html_safe
+      "#{image_tag 'zotero.png', alt: t('sufia.user_profile.zotero.alt'), class: html_class} #{t('sufia.user_profile.zotero.label')}".html_safe
     end
 
     def zotero_profile_url(zotero_user_id)
@@ -14,7 +14,7 @@ module Sufia
     end
 
     def error_messages_for(object)
-      if object.try(:errors) and object.errors.full_messages.any?
+      if object.try(:errors) && object.errors.full_messages.any?
         content_tag(:div, class: 'alert alert-block alert-error validation-errors') do
           content_tag(:h4, I18n.t('sufia.errors.header', model: object.class.model_name.human.downcase), class: 'alert-heading') +
             content_tag(:ul) do
@@ -41,7 +41,7 @@ module Sufia
     #   config.index.thumbnail_method = :sufia_thumbnail_tag
     def sufia_thumbnail_tag(document, options)
       # collection
-      if (document.collection?)
+      if document.collection?
         content_tag(:span, "", class: "glyphicon glyphicon-th collection-icon-search")
 
       # file
@@ -54,7 +54,7 @@ module Sufia
           else
             "default.png"
           end
-        options[:alt] = " "
+        options[:alt] = ""
         image_tag path, options
       end
     end
@@ -83,7 +83,9 @@ module Sufia
 
     def display_user_name(recent_document)
       return "no display name" unless recent_document.depositor
-      ::User.find_by_user_key(recent_document.depositor).name rescue recent_document.depositor
+      ::User.find_by_user_key(recent_document.depositor).name
+    rescue
+      recent_document.depositor
     end
 
     def number_of_deposits(user)
@@ -98,14 +100,14 @@ module Sufia
     # @param solr_field [String] The name of the solr field to link to without its suffix (:facetable)
     # @param empty_message [String] ('No value entered') The message to display if no values are passed in.
     # @param separator [String] (', ') The value to join with.
-    def link_to_facet_list(values, solr_field, empty_message="No value entered", separator=", ")
+    def link_to_facet_list(values, solr_field, empty_message = "No value entered", separator = ", ")
       return empty_message if values.blank?
       facet_field = Solrizer.solr_name(solr_field, :facetable)
-      safe_join(values.map{ |item| link_to_facet(item, facet_field) }, separator)
+      safe_join(values.map { |item| link_to_facet(item, facet_field) }, separator)
     end
 
     def link_to_field(fieldname, fieldvalue, displayvalue = nil)
-      p = { search_field: 'advanced', fieldname => '"'+fieldvalue+'"' }
+      p = { search_field: 'advanced', fieldname => '"' + fieldvalue + '"' }
       link_url = catalog_index_path(p)
       display = displayvalue.blank? ? fieldvalue : displayvalue
       link_to(display, link_url)
@@ -165,12 +167,12 @@ module Sufia
       end
     end
 
-    def render_visibility_link document
-      link_to render_visibility_label(document), sufia.edit_generic_file_path(document, {anchor: "permissions_display"}),
-        id: "permission_"+document.id, class: "visibility-link"
+    def render_visibility_link(document)
+      link_to render_visibility_label(document), sufia.edit_generic_file_path(document, anchor: "permissions_display"),
+              id: "permission_" + document.id, class: "visibility-link"
     end
 
-    def render_visibility_label document
+    def render_visibility_label(document)
       if document.registered?
         content_tag :span, t('sufia.institution_name'), class: "label label-info", title: t('sufia.institution_name')
       elsif document.public?
@@ -189,20 +191,19 @@ module Sufia
 
     private
 
-    def search_action_for_dashboard
-      case params[:controller]
-      when "my/files"
-        sufia.dashboard_files_path
-      when "my/collections"
-        sufia.dashboard_collections_path
-      when "my/shares"
-        sufia.dashboard_shares_path
-      when "my/highlights"
-        sufia.dashboard_highlights_path
-      else
-        sufia.dashboard_files_path
+      def search_action_for_dashboard
+        case params[:controller]
+        when "my/files"
+          sufia.dashboard_files_path
+        when "my/collections"
+          sufia.dashboard_collections_path
+        when "my/shares"
+          sufia.dashboard_shares_path
+        when "my/highlights"
+          sufia.dashboard_highlights_path
+        else
+          sufia.dashboard_files_path
+        end
       end
-    end
-
   end
 end

data/app/helpers/trophy_helper.rb

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 module TrophyHelper
- def display_trophy_link(user, id, args={}, &block)
-   trophy = user.trophies.where(generic_file_id: id).first
-   trophyclass = trophy ? "trophy-on" : "trophy-off"
+  def display_trophy_link(user, id, args = {}, &_block)
+    trophy = user.trophies.where(generic_file_id: id).first
+    trophyclass = trophy ? "trophy-on" : "trophy-off"
 
-   args[:add_text] ||= "Highlight File on Profile"
-   args[:remove_text] ||= "Unhighlight File"
-   text = trophy ? args[:remove_text] : args[:add_text]
-   args[:class] = [args[:class], "trophy-class #{trophyclass}"].compact.join(' ')
-   args[:data] ||= {}
-   args[:data]['add-text'] = args[:add_text]
-   args[:data]['remove-text'] = args[:remove_text]
+    args[:add_text] ||= "Highlight File on Profile"
+    args[:remove_text] ||= "Unhighlight File"
+    text = trophy ? args[:remove_text] : args[:add_text]
+    args[:class] = [args[:class], "trophy-class #{trophyclass}"].compact.join(' ')
+    args[:data] ||= {}
+    args[:data]['add-text'] = args[:add_text]
+    args[:data]['remove-text'] = args[:remove_text]
 
-   args[:data][:url] = sufia.trophy_profile_path(user, file_id: id)
-   link_to '#', class: args[:class], data: args[:data] do
-     yield(text)
-   end
- end
+    args[:data][:url] = sufia.trophy_profile_path(user, file_id: id)
+    link_to '#', class: args[:class], data: args[:data] do
+      yield(text)
+    end
+  end
 end

data/app/inputs/select_with_modal_help_input.rb

@@ -1,12 +1,13 @@
 class SelectWithModalHelpInput < MultiValueWithHelpInput
   def link_to_help
     template.link_to "##{attribute_name}Modal", id: "#{input_class}_help_modal", rel: 'button',
-            data: { toggle: 'modal' }, :'aria-label' => aria_label do
+                                                data: { toggle: 'modal' }, 'aria-label' => aria_label do
       help_icon
     end
   end
 
   private
+
     def select_options
       @select_options ||= begin
         collection = options.delete(:collection) || self.class.boolean_collection
@@ -14,7 +15,7 @@ class SelectWithModalHelpInput < MultiValueWithHelpInput
       end
     end
 
-    def build_field(value, index)
+    def build_field(value, _index)
       html_options = input_html_options.dup
 
       if @rendered_first_element
@@ -32,5 +33,4 @@ class SelectWithModalHelpInput < MultiValueWithHelpInput
       html_options.merge!(options.slice(:include_blank))
       template.select_tag(attribute_name, template.options_for_select(select_options, value), html_options)
     end
-
 end

data/app/inputs/with_help_icon.rb

@@ -4,23 +4,23 @@ module WithHelpIcon
   end
 
   protected
+
     def link_to_help
       template.link_to '#', id: "#{input_class}_help", rel: 'popover'.freeze,
-              :'data-content' => metadata_help, :'data-original-title' => raw_label_text,
-              :'aria-label' => aria_label do
+                            'data-content' => metadata_help, 'data-original-title' => raw_label_text,
+                            'aria-label' => aria_label do
         help_icon
       end
     end
 
     def help_icon
-      template.content_tag 'i', nil, :"aria-hidden" => true, class: "help-icon"
+      template.content_tag 'i', nil, "aria-hidden" => true, class: "help-icon"
     end
 
     def metadata_help
       translate_from_namespace(:metadata_help) || attribute_name.to_s.humanize
     end
 
-
     def aria_label
       translate_from_namespace(:aria_label) || default_aria_label
     end

data/app/jobs/content_delete_event_job.rb

@@ -1,5 +1,4 @@
 class ContentDeleteEventJob < EventJob
-
   def run
     action = "User #{link_to_profile depositor_id} has deleted file '#{generic_file_id}'"
     timestamp = Time.now.to_i

data/app/jobs/content_depositor_change_event_job.rb

@@ -1,5 +1,4 @@
 class ContentDepositorChangeEventJob < EventJob
-
   def queue_name
     :proxy_deposit
   end
@@ -9,7 +8,7 @@ class ContentDepositorChangeEventJob < EventJob
   # @param [String] id identifier of the file to be transfered
   # @param [String] login the user key of the user the file is being transfered to.
   # @param [Boolean] reset (false) should the access controls be reset. This means revoking edit access from the depositor
-  def initialize(id, login, reset=false)
+  def initialize(id, login, reset = false)
     self.id = id
     self.login = login
     self.reset = reset

data/app/jobs/event_job.rb

@@ -15,5 +15,4 @@ class EventJob
     self.generic_file_id = generic_file_id
     self.depositor_id = depositor_id
   end
-
 end

data/app/jobs/user_unfollow_event_job.rb

@@ -5,6 +5,7 @@ class UserUnfollowEventJob < EventJob
     self.unfollower_id = unfollower_id
     self.unfollowee_id = unfollowee_id
   end
+
   def run
     action = "User #{link_to_profile unfollower_id} has unfollowed #{link_to_profile unfollowee_id}"
     timestamp = Time.now.to_i

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

@@ -68,7 +68,7 @@ module Sufia
     end
 
     def file_format
-       Array(self[Solrizer.solr_name('file_format')]).first
+      Array(self[Solrizer.solr_name('file_format')]).first
     end
 
     def creator
@@ -102,6 +102,5 @@ module Sufia
     def collection?
       hydra_model == 'Collection'
     end
-
   end
 end

data/app/models/contact_form.rb

@@ -2,12 +2,12 @@ require 'mail_form'
 
 class ContactForm < MailForm::Base
   ISSUE_TYPES = [
-      ["Depositing content", "Depositing content"],
-      ["Making changes to my content", "Making changes to my content"],
-      ["Browsing and searching", "Browsing and searching"],
-      ["Reporting a problem", "Reporting a problem"],
-      ["General inquiry or request", "General inquiry or request"]
-    ]
+    ["Depositing content", "Depositing content"],
+    ["Making changes to my content", "Making changes to my content"],
+    ["Browsing and searching", "Browsing and searching"],
+    ["Reporting a problem", "Reporting a problem"],
+    ["General inquiry or request", "General inquiry or request"]
+  ]
   attribute :contact_method, captcha: true
   attribute :category, validate: true
   attribute :name, validate: true

data/app/models/content_block.rb

@@ -1,7 +1,7 @@
 class ContentBlock < ActiveRecord::Base
-
   MARKETING  = 'marketing_text'
   RESEARCHER = 'featured_researcher'
+  ANNOUNCEMENT = 'announcement_text'
 
   def self.recent_researchers
     where(name: RESEARCHER).order('created_at DESC')
@@ -18,5 +18,4 @@ class ContentBlock < ActiveRecord::Base
   def external_key_name
     self.class.external_keys.fetch(name) { 'External Key' }
   end
-
 end

data/app/models/featured_work_list.rb

@@ -21,11 +21,10 @@ class FeaturedWorkList
     end
   end
 
-  def empty?
-    featured_works.empty?
-  end
+  delegate :empty?, to: :featured_works
 
   private
+
     def add_solr_document_to_works
       solr_docs.each do |doc|
         work_with_id(doc['id']).generic_file_solr_document = SolrDocument.new(doc)
@@ -41,7 +40,6 @@ class FeaturedWorkList
     end
 
     def work_with_id(id)
-      @works.find { |w| w.generic_file_id == id}
+      @works.find { |w| w.generic_file_id == id }
     end
-
 end

data/app/models/user_mailbox.rb

@@ -0,0 +1,44 @@
+class UserMailbox
+  attr_reader :user
+
+  def initialize(user)
+    @user = user
+  end
+
+  def inbox
+    messages = user.mailbox.inbox
+    messages.each { |m| m.mark_as_read(user) }
+  end
+
+  def delete_all
+    user.mailbox.inbox.each do |msg|
+      delete_message(msg)
+    end
+    empty_trash(user)
+  end
+
+  def destroy(message_id)
+    msg = Mailboxer::Conversation.find(message_id)
+    return "You do not have privileges to delete the notification..." unless msg.participants.include? user
+    delete_message(msg)
+    empty_trash(msg.participants[0])
+    nil
+  end
+
+  private
+
+    def delete_message(msg)
+      msg.move_to_trash(msg.participants[0])
+      msg.move_to_trash(msg.participants[1])
+    end
+
+    def empty_trash(user)
+      user.mailbox.trash.each do |conv|
+        conv.messages.each do |notify|
+          notify.receipts.each(&:delete)
+          notify.delete
+        end
+        conv.delete
+      end
+    end
+end

data/app/presenters/sufia/collection_presenter.rb

@@ -19,12 +19,12 @@ module Sufia
 
     def [](key)
       case key
-        when :size
-          size
-        when :total_items
-          total_items
-        else
-          super
+      when :size
+        size
+      when :total_items
+        total_items
+      else
+        super
       end
     end
 
@@ -35,7 +35,5 @@ module Sufia
     def total_items
       model.members.count
     end
-
   end
 end
-

data/app/presenters/sufia/generic_file_presenter.rb

@@ -4,7 +4,7 @@ module Sufia
     self.model_class = ::GenericFile
     # Terms is the list of fields displayed by app/views/generic_files/_show_descriptions.html.erb
     self.terms = [:resource_type, :title, :creator, :contributor, :description, :tag, :rights,
-       :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url]
+                  :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url]
 
     # Depositor and permissions are not displayed in app/views/generic_files/_show_descriptions.html.erb
     # so don't include them in `terms'.
@@ -22,7 +22,7 @@ module Sufia
     # Add a schema.org itemtype
     def itemtype
       # Look up the first non-empty resource type value in a hash from the config
-      Sufia.config.resource_types_to_schema[resource_type.to_a.reject { |type| type.empty? }.first] || 'http://schema.org/CreativeWork'
+      Sufia.config.resource_types_to_schema[resource_type.to_a.reject(&:empty?).first] || 'http://schema.org/CreativeWork'
     rescue
       'http://schema.org/CreativeWork'
     end

data/app/presenters/sufia/presenter_renderer.rb

@@ -7,7 +7,7 @@ module Sufia
       @view_context = view_context
     end
 
-    def value(field_name, locals={})
+    def value(field_name, locals = {})
       render_show_field_partial(field_name, locals)
     end
 
@@ -15,7 +15,7 @@ module Sufia
       t(:"#{model_name.param_key}.#{field}", scope: label_scope, default: field.to_s.humanize).presence
     end
 
-    def fields(terms, &block)
+    def fields(terms, &_block)
       @view_context.safe_join(terms.map { |term| yield self, term })
     end
 

data/app/presenters/sufia/version_list_presenter.rb

@@ -9,7 +9,7 @@ module Sufia
     private
 
       def wrapped_list
-        @wrapped_list ||= @raw_list.map { |v| Sufia::VersionPresenter.new(v) }.sort { |a,b| b.version.created <=> a.version.created }.tap { |l| l.first.try(:current!) }
+        @wrapped_list ||= @raw_list.map { |v| Sufia::VersionPresenter.new(v) }.sort { |a, b| b.version.created <=> a.version.created }.tap { |l| l.first.try(:current!) }
       end
   end
 end

data/app/presenters/sufia/version_presenter.rb

@@ -1,6 +1,6 @@
 module Sufia
   class VersionPresenter
-    attr_reader :version
+    attr_reader :version, :current
 
     def initialize(version)
       @version = version
@@ -8,15 +8,12 @@ module Sufia
     end
 
     delegate :label, :uri, to: :version
+    alias_method :current?, :current
 
     def current!
       @current = true
     end
 
-    def current?
-      @current
-    end
-
     def created
       @created ||= version.created.to_time.to_formatted_s(:long_ordinal)
       @created
@@ -24,7 +21,7 @@ module Sufia
 
     def committer
       vc = VersionCommitter.where(version_id: @version.uri)
-      return vc.empty? ? nil : vc.first.committer_login
+      vc.empty? ? nil : vc.first.committer_login
     end
   end
 end