sufia 6.2.0 → 6.3.0

data/app/controllers/directory_controller.rb

@@ -1,8 +1,7 @@
 class DirectoryController < ApplicationController
-
   # Stub method.  Override this in your application if you want directory lookups
   def user
-    #render json: User.directory_attributes(params[:uid])
+    # render json: User.directory_attributes(params[:uid])
     render json: ''
   end
 
@@ -25,7 +24,7 @@ class DirectoryController < ApplicationController
 
   # Stub method.  Override this in your application if you want directory lookups
   def group
-    #render json: Group.exists?(params[:cn])
+    # render json: Group.exists?(params[:cn])
     render json: false
   end
 end

data/app/controllers/featured_work_lists_controller.rb

@@ -9,8 +9,8 @@ class FeaturedWorkListsController < ApplicationController
   end
 
   protected
+
     def list_params
       params.require(:featured_work_list).permit(featured_works_attributes: [:id, :order])
     end
 end
-

data/app/controllers/featured_works_controller.rb

@@ -1,5 +1,4 @@
 class FeaturedWorksController < ApplicationController
-
   def create
     authorize! :create, FeaturedWork
     @featured_work = FeaturedWork.new(generic_file_id: params[:id])
@@ -9,7 +8,7 @@ class FeaturedWorksController < ApplicationController
         format.json { render json: @featured_work, status: :created }
       else
         format.json { render json: @featured_work.errors, status: :unprocessable_entity }
-      end        
+      end
     end
   end
 
@@ -17,10 +16,9 @@ class FeaturedWorksController < ApplicationController
     authorize! :destroy, FeaturedWork
     @featured_work = FeaturedWork.find_by(generic_file_id: params[:id])
     @featured_work.destroy
-      
+
     respond_to do |format|
       format.json { head :no_content }
     end
   end
-
 end

data/app/controllers/homepage_controller.rb

@@ -1,4 +1,3 @@
 class HomepageController < ApplicationController
   include Sufia::HomepageController
-
-end
+end

data/app/controllers/mailbox_controller.rb

@@ -1,44 +1,24 @@
 class MailboxController < ApplicationController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
 
   def index
-    if user_signed_in?
-      @messages = current_user.mailbox.inbox
-      @messages.each{|m| m.mark_as_read(current_user)}
-    else
-      @messages =[]
-    end 
+    @messages = user_mailbox.inbox
   end
 
-  def delete_all     
-     current_user.mailbox.inbox.each do |msg|
-        delete_message(msg)
-     end
-     empty_trash(current_user)
-     redirect_to sufia.notifications_path
+  def delete_all
+    alert = user_mailbox.delete_all
+    redirect_to sufia.notifications_path, alert: alert
   end
 
   def destroy
-    if current_user
-      msg = Mailboxer::Conversation.find(params[:id])
-      if (msg.participants[0] == current_user) || (msg.participants[1] == current_user)
-         delete_message(msg)
-         empty_trash(msg.participants[0])
-      end
-    else 
-      flash[:alert] = "You do not have privileges to delete the notification..."
-    end
-    redirect_to sufia.notifications_path
+    message_id = params[:id]
+    alert = user_mailbox.destroy(message_id)
+    redirect_to sufia.notifications_path, alert: alert
   end
 
-private 
+  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 { |conv| conv.messages.each {|notify| notify.receipts.each { |receipt| receipt.delete}; notify.delete}; conv.delete}
-  end
+    def user_mailbox
+      UserMailbox.new(current_user)
+    end
 end

data/app/controllers/my/collections_controller.rb

@@ -1,6 +1,5 @@
 module My
   class CollectionsController < MyController
-
     self.search_params_logic += [
       :show_only_resources_deposited_by_current_user,
       :show_only_collections
@@ -13,8 +12,8 @@ module My
 
     protected
 
-    def search_action_url *args
-      sufia.dashboard_collections_url *args
-    end
+      def search_action_url(*args)
+        sufia.dashboard_collections_url(*args)
+      end
   end
 end

data/app/controllers/my/files_controller.rb

@@ -1,6 +1,5 @@
 module My
   class FilesController < MyController
-
     self.search_params_logic += [
       :show_only_resources_deposited_by_current_user,
       :show_only_generic_files
@@ -12,10 +11,9 @@ module My
     end
 
     protected
-    
-    def search_action_url *args
-      sufia.dashboard_files_url *args
-    end
-  
+
+      def search_action_url(*args)
+        sufia.dashboard_files_url(*args)
+      end
   end
 end

data/app/controllers/my/highlights_controller.rb

@@ -1,6 +1,5 @@
 module My
   class HighlightsController < MyController
-
     self.search_params_logic += [
       :show_only_highlighted_files
     ]
@@ -9,12 +8,11 @@ module My
       super
       @selected_tab = :highlighted
     end
-  
+
     protected
-    
-    def search_action_url *args
-      sufia.dashboard_highlights_url *args
-    end
 
+      def search_action_url(*args)
+        sufia.dashboard_highlights_url(*args)
+      end
   end
 end

data/app/controllers/my/shares_controller.rb

@@ -1,6 +1,5 @@
 module My
   class SharesController < MyController
-
     self.search_params_logic += [
       :show_only_shared_files,
       :show_only_generic_files
@@ -13,9 +12,8 @@ module My
 
     protected
 
-    def search_action_url *args
-      sufia.dashboard_shares_url *args
-    end
-
+      def search_action_url(*args)
+        sufia.dashboard_shares_url(*args)
+      end
   end
 end

data/app/controllers/pages_controller.rb

@@ -1,7 +1,5 @@
 class PagesController < ApplicationController
-
   def show
-    @page = ContentBlock.find_or_create_by( name: params[:id])
+    @page = ContentBlock.find_or_create_by(name: params[:id])
   end
-
 end

data/app/controllers/single_use_links_controller.rb

@@ -1,4 +1,3 @@
 class SingleUseLinksController < ApplicationController
   include Sufia::SingleUseLinksControllerBehavior
 end
-

data/app/controllers/single_use_links_viewer_controller.rb

@@ -16,5 +16,4 @@ class SingleUseLinksViewerController < ApplicationController
       end if single_use_link
     end
   end
-
 end

data/app/controllers/static_controller.rb

@@ -8,6 +8,7 @@ class StaticController < ApplicationController
       format.js { render layout: false }
     end
   end
+
   def mendeley
     respond_to do |format|
       format.html

data/app/forms/sufia/forms/collection_edit_form.rb

@@ -4,13 +4,13 @@ module Sufia
       include HydraEditor::Form
       self.model_class = ::Collection
       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]
 
       # Test to see if the given field is required
       # @param [Symbol] key a field
       # @return [Boolean] is it required or not
       def required?(key)
-        model_class.validators_on(key).any?{|v| v.kind_of? ActiveModel::Validations::PresenceValidator}
+        model_class.validators_on(key).any? { |v| v.is_a? ActiveModel::Validations::PresenceValidator }
       end
     end
   end

data/app/helpers/batch_edits_helper.rb

@@ -6,8 +6,6 @@ module BatchEditsHelper
   end
 
   def render_check_all
-    unless params[:controller].match("my/collections")
-      render partial: 'batch_edits/check_all'
-    end
+    render partial: 'batch_edits/check_all' unless params[:controller].match("my/collections")
   end
 end

data/app/helpers/content_block_helper.rb

@@ -1,13 +1,12 @@
 module ContentBlockHelper
-
-  def editable_content_block(content_block, show_new=false)
+  def editable_content_block(content_block, show_new = false)
     return raw(content_block.value) unless can? :update, content_block
     capture do
       concat content_tag(:div, id: dom_id(content_block, 'preview'), class: 'content_block_preview') {
-        concat raw(content_block.value) 
+        concat raw(content_block.value)
         concat edit_button(content_block)
         concat new_button(content_block) if show_new
-      } 
+      }
       concat edit_form(content_block)
       concat new_form(content_block.name) if show_new
     end
@@ -17,19 +16,19 @@ module ContentBlockHelper
     button_tag "Edit", class: 'btn btn-primary', data: { behavior: 'reveal-editor', target: '#' + dom_id(content_block, 'edit') }
   end
 
-  def new_button(content_block)
+  def new_button(_content_block)
     button_tag "New", class: 'btn btn-primary', data: { behavior: 'reveal-editor', target: '#' + 'new_content_block' }
   end
 
-  def edit_form(content_block, editing_field_id=nil)
+  def edit_form(content_block, editing_field_id = nil)
     editing_field_id ||= "text_area_#{content_block.name}"
-    form_for([sufia, content_block], html: { class: 'tinymce-form' }) { |f|
+    form_for([sufia, content_block], html: { class: 'tinymce-form' }) do |f|
       concat hidden_field_tag 'content_block[name]', content_block.name
       concat f.text_area :value, id: editing_field_id, class: "tinymce", rows: 20, cols: 120
       concat f.label :external_key, content_block.external_key_name
       concat f.text_field :external_key, class: key_field_class(content_block.name)
       concat content_tag(:div) { f.submit 'Save', class: "btn btn-primary" }
-    }
+    end
   end
 
   def key_field_class(content_block_type)

data/app/helpers/generic_file_helper.rb

@@ -4,49 +4,48 @@ module GenericFileHelper
     gf.to_s
   end
 
-  def present_terms(presenter, terms=:all, &block)
+  def present_terms(presenter, terms = :all, &block)
     terms = presenter.terms if terms == :all
     Sufia::PresenterRenderer.new(presenter, self).fields(terms, &block)
   end
 
-  def render_download_icon title = nil
+  def render_download_icon(title = nil)
     if title.nil?
-      link_to download_image_tag, sufia.download_path(@generic_file), { target: "_blank", title: "Download the document", id: "file_download", data: { label: @generic_file.id } }
+      link_to download_image_tag, sufia.download_path(@generic_file), target: "_blank", title: "Download the document", id: "file_download", data: { label: @generic_file.id }
     else
-      link_to (download_image_tag(title) + title), sufia.download_path(@generic_file), { target: "_blank", title: title, id: "file_download", data: { label: @generic_file.id } }
+      label = download_image_tag(title) + title
+      link_to label, sufia.download_path(@generic_file), target: "_blank", title: title, id: "file_download", data: { label: @generic_file.id }
     end
   end
 
-  def render_download_link text = nil
-    link_to (text || "Download"), sufia.download_path(@generic_file), { id: "file_download", target: "_new", data: { label: @generic_file.id } }
+  def render_download_link(text = nil)
+    label = text || 'Download'
+    link_to label, sufia.download_path(@generic_file), id: "file_download", target: "_new", data: { label: @generic_file.id }
   end
 
-  def render_collection_list gf
-    unless gf.collections.empty?
-      ("Is part of: " + gf.collections.map { |c| link_to(c.title, collections.collection_path(c)) }.join(", ")).html_safe
-    end
+  def render_collection_list(gf)
+    ("Is part of: " + gf.collections.map { |c| link_to(c.title, collections.collection_path(c)) }.join(", ")).html_safe unless gf.collections.empty?
   end
 
-  def display_multiple value
+  def display_multiple(value)
     auto_link(value.join(" | "))
   end
 
   private
 
-  def download_image_tag title = nil
-    if title.nil?
-      image_tag "default.png", { alt: "No preview available", class: "img-responsive" }
-    else
-      image_tag sufia.download_path(@generic_file, file: 'thumbnail'), { class: "img-responsive", alt: "#{title} of #{@generic_file.title.first}" }
+    def download_image_tag(title = nil)
+      if title.nil?
+        image_tag "default.png", alt: "No preview available", class: "img-responsive"
+      else
+        image_tag sufia.download_path(@generic_file, file: 'thumbnail'), class: "img-responsive", alt: "#{title} of #{@generic_file.title.first}"
+      end
     end
-  end
 
-  def render_visibility_badge
-    if can? :edit, @generic_file
-      render_visibility_link @generic_file
-    else
-      render_visibility_label @generic_file
+    def render_visibility_badge
+      if can? :edit, @generic_file
+        render_visibility_link @generic_file
+      else
+        render_visibility_label @generic_file
+      end
     end
-  end
-
 end

data/app/helpers/sufia/blacklight_override.rb

@@ -4,24 +4,23 @@ module Sufia
       false
     end
 
-    def url_for_document doc, options = {}
-      if (doc.is_a?(SolrDocument) && doc.hydra_model == 'Collection')
+    def url_for_document(doc, _options = {})
+      if doc.is_a?(SolrDocument) && doc.hydra_model == 'Collection'
         [collections, doc]
       else
         [sufia, doc]
       end
     end
-  
+
     def render_constraints_query(localized_params = params)
       # So simple don't need a view template, we can just do it here.
       scope = localized_params.delete(:route_set) || self
       return "".html_safe if localized_params[:q].blank?
 
       render_constraint_element(constraint_query_label(localized_params),
-            localized_params[:q],
-            :classes => ["query"],
-            :remove => scope.url_for(localized_params.merge(:q=>nil, :action=>'index')))
+                                localized_params[:q],
+                                classes: ["query"],
+                                remove: scope.url_for(localized_params.merge(q: nil, action: 'index')))
     end
-
   end
 end

data/app/helpers/sufia/dashboard_helper_behavior.rb

@@ -20,7 +20,7 @@ module Sufia
       if @activity.empty?
         t('sufia.dashboard.no_activity')
       else
-        render partial: 'users/activity_log', locals: {events: @activity}
+        render partial: 'users/activity_log', locals: { events: @activity }
       end
     end
 
@@ -40,11 +40,11 @@ module Sufia
       params[:controller].match(/^my\/files/)
     end
 
-    def number_of_files user=current_user
+    def number_of_files(user = current_user)
       ::GenericFile.where(Solrizer.solr_name('depositor', :symbol) => user.user_key).count
     end
 
-    def number_of_collections user=current_user
+    def number_of_collections(user = current_user)
       ::Collection.where(Solrizer.solr_name('depositor', :symbol) => user.user_key).count
     end
 
@@ -53,10 +53,7 @@ module Sufia
     end
 
     def link_to_additional_notifications
-      if @notifications.count > Sufia.config.max_notifications_for_dashboard
-        link_to t('sufia.dashboard.additional_notifications'), sufia.notifications_path
-      end
+      link_to t('sufia.dashboard.additional_notifications'), sufia.notifications_path if @notifications.count > Sufia.config.max_notifications_for_dashboard
     end
-
   end
 end

data/app/helpers/sufia/permissions_helper.rb

@@ -1,6 +1,5 @@
 module Sufia
   module PermissionsHelper
-
     def visibility_help
       help_link('generic_files/visibility', 'Visibility', 'Useage information for visibility')
     end
@@ -12,8 +11,8 @@ module Sufia
     private
 
       def help_link(file, title, aria_label)
-        link_to help_icon, '#', rel: 'popover', :'data-content' => capture_content(file),
-          :'data-original-title' => title, :'aria-label' => aria_label
+        link_to help_icon, '#', rel: 'popover', 'data-content' => capture_content(file),
+                                'data-original-title' => title, 'aria-label' => aria_label
       end
 
       def capture_content(file)
@@ -23,7 +22,7 @@ module Sufia
       end
 
       def help_icon
-        content_tag 'i', '', :'aria-hidden' => true, class: 'help-icon'
+        content_tag 'i', '', 'aria-hidden' => true, class: 'help-icon'
       end
   end
 end