sufia 6.2.0 → 6.3.0

data/app/controllers/concerns/sufia/homepage_controller.rb

@@ -18,18 +18,18 @@ module Sufia::HomepageController
     @featured_researcher ||= ContentBlock.create(name: ContentBlock::RESEARCHER)
     @marketing_text = ContentBlock.find_or_create_by(name: ContentBlock::MARKETING)
     @featured_work_list = FeaturedWorkList.new
+    @announcement_text = ContentBlock.find_or_create_by(name: ContentBlock::ANNOUNCEMENT)
     recent
   end
 
   protected
 
-  def recent
-    # grab any recent documents
-    (_, @recent_documents) = search_results({q: '', sort:sort_field, rows: 4}, search_params_logic)
-  end
-
-  def sort_field
-    "#{Solrizer.solr_name('system_create', :stored_sortable, type: :date)} desc"
-  end
+    def recent
+      # grab any recent documents
+      (_, @recent_documents) = search_results({ q: '', sort: sort_field, rows: 4 }, search_params_logic)
+    end
 
+    def sort_field
+      "#{Solrizer.solr_name('system_create', :stored_sortable, type: :date)} desc"
+    end
 end

data/app/controllers/concerns/sufia/my_controller_behavior.rb

@@ -10,13 +10,13 @@ module Sufia
     included do
       include Blacklight::Configurable
 
-      self.copy_blacklight_config_from(CatalogController)
-      self.blacklight_config.search_builder_class = Sufia::MySearchBuilder
+      copy_blacklight_config_from(CatalogController)
+      blacklight_config.search_builder_class = Sufia::MySearchBuilder
 
-      before_filter :authenticate_user!
-      before_filter :enforce_show_permissions, only: :show
-      before_filter :enforce_viewing_context_for_show_requests, only: :show
-      before_filter :find_collections_with_edit_access, only: :index
+      before_action :authenticate_user!
+      before_action :enforce_show_permissions, only: :show
+      before_action :enforce_viewing_context_for_show_requests, only: :show
+      before_action :find_collections_with_edit_access, only: :index
 
       self.search_params_logic += [:add_access_controls_to_solr_params, :add_advanced_parse_q_to_solr]
 
@@ -33,12 +33,16 @@ module Sufia
       (@response, @document_list) = search_results(params, search_params_logic)
       @user = current_user
       @events = @user.events(100)
-      @last_event_timestamp = @user.events.first[:timestamp].to_i || 0 rescue 0
+      @last_event_timestamp = begin
+                                @user.events.first[:timestamp].to_i || 0
+                              rescue
+                                0
+                              end
       @filters = params[:f] || []
 
       # set up some parameters for allowing the batch controls to show appropiately
       @max_batch_size = 80
-      count_on_page = @document_list.count {|doc| batch.index(doc.id)}
+      count_on_page = @document_list.count { |doc| batch.index(doc.id) }
       @disable_select_all = @document_list.count > @max_batch_size
       batch_size = batch.uniq.size
       @result_set_size = @response.response["numFound"]
@@ -49,11 +53,10 @@ module Sufia
       @batch_part_on_other_page = (@batch_size_on_other_page) > 0
 
       respond_to do |format|
-        format.html { }
+        format.html {}
         format.rss  { render layout: false }
         format.atom { render layout: false }
       end
     end
-
   end
 end

data/app/controllers/concerns/sufia/single_use_links_controller_behavior.rb

@@ -2,19 +2,17 @@ module Sufia
   module SingleUseLinksControllerBehavior
     extend ActiveSupport::Concern
     included do
-
-      before_filter :authenticate_user!
-      before_filter :authorize_user!
+      before_action :authenticate_user!
+      before_action :authorize_user!
       # Catch permission errors
       rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
-        if current_user and current_user.persisted?
+        if current_user && current_user.persisted?
           redirect_to root_url, alert: "You do not have sufficient privileges to create links to this document"
         else
           session["user_return_to"] = request.url
           redirect_to new_user_session_url, alert: exception.message
         end
       end
-
     end
 
     def new_download
@@ -23,7 +21,7 @@ module Sufia
 
       respond_to do |format|
         format.html
-        format.js  { render js: @link }
+        format.js { render js: @link }
       end
     end
 
@@ -33,19 +31,18 @@ module Sufia
 
       respond_to do |format|
         format.html
-        format.js  { render js: @link }
+        format.js { render js: @link }
       end
     end
 
-
     protected
-    def authorize_user!
-      authorize! :edit, asset
-    end
 
-    def asset
-      @asset ||= ActiveFedora::Base.load_instance_from_solr(params[:id])
-    end
+      def authorize_user!
+        authorize! :edit, asset
+      end
 
+      def asset
+        @asset ||= ActiveFedora::Base.load_instance_from_solr(params[:id])
+      end
   end
 end

data/app/controllers/concerns/sufia/single_use_links_viewer_controller_behavior.rb

@@ -5,7 +5,7 @@ module Sufia
     extend ActiveSupport::Concern
     include Sufia::DownloadsControllerBehavior
     included do
-      skip_before_filter :load_file, except: :download
+      skip_before_action :load_file, except: :download
       rescue_from Sufia::SingleUseError, with: :render_single_use_error
       rescue_from CanCan::AccessDenied, with: :render_single_use_error
       rescue_from ActiveRecord::RecordNotFound, with: :render_single_use_error
@@ -21,7 +21,7 @@ module Sufia
     def show
       raise not_found_exception unless single_use_link.path == sufia.polymorphic_path(@asset)
 
-      #show the file
+      # show the file
       @presenter = presenter
 
       # create a dowload link that is single use for the user since we do not just want to show metadata we want to access it too
@@ -31,28 +31,34 @@ module Sufia
 
     protected
 
-    def presenter
-      presenter_class.new(@asset)
-    end
+      def content_options
+        super.tap do |options|
+          options[:disposition] = 'attachment' if action_name == 'download'
+        end
+      end
 
-    def authorize_download!
-      authorize! :read, asset
-    end
+      def presenter
+        presenter_class.new(@asset)
+      end
 
-    def single_use_link
-      @single_use_link ||= SingleUseLink.find_by_downloadKey!(params[:id])
-    end
+      def authorize_download!
+        authorize! :read, asset
+      end
 
-    def not_found_exception
-      Sufia::SingleUseError.new('Single-Use Link Not Found')
-    end
+      def single_use_link
+        @single_use_link ||= SingleUseLink.find_by_downloadKey!(params[:id])
+      end
 
-    def asset
-      @asset ||= ActiveFedora::Base.find(single_use_link.itemId)
-    end
+      def not_found_exception
+        Sufia::SingleUseError.new('Single-Use Link Not Found')
+      end
 
-    def current_ability
-      @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, single_use_link
-    end
+      def asset
+        @asset ||= ActiveFedora::Base.find(single_use_link.itemId)
+      end
+
+      def current_ability
+        @current_ability ||= SingleUseLinksViewerController::Ability.new current_user, single_use_link
+      end
   end
-end 
+end

data/app/controllers/concerns/sufia/transfers_controller_behavior.rb

@@ -5,11 +5,11 @@ module Sufia
     included do
       before_action :load_proxy_deposit_request, only: :create
       load_and_authorize_resource :proxy_deposit_request, parent: false, except: :index
-      before_action :get_id_and_authorize_depositor, only: [:new, :create]
+      before_action :authorize_depositor_by_id, only: [:new, :create]
       # Catch permission errors
-      # TODO we should make this a module in Sufia
+      # TODO: we should make this a module in Sufia
       rescue_from CanCan::AccessDenied do |exception|
-        if current_user and current_user.persisted?
+        if current_user && current_user.persisted?
           redirect_to root_url, alert: exception.message
         else
           session["user_return_to"] = request.url
@@ -32,7 +32,7 @@ module Sufia
     end
 
     def index
-      @incoming = ProxyDepositRequest.where(receiving_user_id: current_user.id).reject &:deleted_file?
+      @incoming = ProxyDepositRequest.where(receiving_user_id: current_user.id).reject(&:deleted_file?)
       @outgoing = ProxyDepositRequest.where(sending_user_id: current_user.id)
     end
 
@@ -56,20 +56,20 @@ module Sufia
 
     private
 
-    def get_id_and_authorize_depositor
-      @id = params[:id]
-      authorize! :transfer, @id
-      @proxy_deposit_request.generic_file_id = @id
-    rescue CanCan::AccessDenied
-      redirect_to root_url, alert: 'You are not authorized to transfer this file'
-    end
+      def authorize_depositor_by_id
+        @id = params[:id]
+        authorize! :transfer, @id
+        @proxy_deposit_request.generic_file_id = @id
+      rescue CanCan::AccessDenied
+        redirect_to root_url, alert: 'You are not authorized to transfer this file'
+      end
 
-    def load_proxy_deposit_request
-      @proxy_deposit_request = ProxyDepositRequest.new(proxy_deposit_request_params)
-    end
+      def load_proxy_deposit_request
+        @proxy_deposit_request = ProxyDepositRequest.new(proxy_deposit_request_params)
+      end
 
-    def proxy_deposit_request_params
-      params.require(:proxy_deposit_request).permit(:transfer_to)
-    end
+      def proxy_deposit_request_params
+        params.require(:proxy_deposit_request).permit(:transfer_to)
+      end
   end
 end

data/app/controllers/concerns/sufia/users_controller_behavior.rb

@@ -5,27 +5,25 @@ module Sufia::UsersControllerBehavior
     include Blacklight::Catalog::SearchContext
     layout "sufia-one-column"
     prepend_before_filter :find_user, except: [:index, :search, :notifications_number]
-    before_filter :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]
-    before_filter :user_not_current_user, only: [:follow, :unfollow]
+    before_action :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]
+    before_action :user_not_current_user, only: [:follow, :unfollow]
     authorize_resource only: [:edit, :update, :toggle_trophy]
     # Catch permission errors
     rescue_from CanCan::AccessDenied, with: :deny_access
   end
 
   def index
-    sort_val = get_sort
-    query = params[:uq].blank? ? nil : "%"+params[:uq].downcase+"%"
+    query = params[:uq].blank? ? nil : "%" + params[:uq].downcase + "%"
     base = User.where(*base_query)
     unless query.blank?
       base = base.where("#{Devise.authentication_keys.first} like lower(?) OR display_name like lower(?)", query, query)
     end
-    @users = base.references(:trophies).order(sort_val).page(params[:page]).per(10)
+    @users = base.references(:trophies).order(sort_value).page(params[:page]).per(10)
 
     respond_to do |format|
       format.html
       format.json { render json: @users.to_json }
     end
-
   end
 
   # Display user profile
@@ -56,8 +54,8 @@ module Sufia::UsersControllerBehavior
       redirect_to sufia.edit_profile_path(@user.to_param), alert: @user.errors.full_messages
       return
     end
-    # TODO this should be moved to TrophiesController
-    params.keys.select {|k, v| k.starts_with? 'remove_trophy_' }.each do |smash_trophy|
+    # TODO: this should be moved to TrophiesController
+    params.keys.select { |k, _v| k.starts_with? 'remove_trophy_' }.each do |smash_trophy|
       smash_trophy = smash_trophy.sub(/^remove_trophy_/, '')
       current_user.trophies.where(generic_file_id: smash_trophy).destroy_all
     end
@@ -70,21 +68,21 @@ module Sufia::UsersControllerBehavior
   end
 
   def toggle_trophy
-     unless current_user.can? :edit, params[:file_id]
-       redirect_to root_path, alert: "You do not have permissions to the file"
-       return false
-     end
-     # TODO  make sure current user has access to file
-     t = current_user.trophies.where(generic_file_id: params[:file_id]).first
-     if t
-       t.destroy
-       #TODO do this better says Mike
-       return false if t.persisted?
-     else
-       t = current_user.trophies.create(generic_file_id: params[:file_id])
-       return false unless t.persisted?
-     end
-     render json: t
+    unless current_user.can? :edit, params[:file_id]
+      redirect_to root_path, alert: "You do not have permissions to the file"
+      return false
+    end
+    # TODO: make sure current user has access to file
+    t = current_user.trophies.where(generic_file_id: params[:file_id]).first
+    if t
+      t.destroy
+      # TODO: do this better says Mike
+      return false if t.persisted?
+    else
+      t = current_user.trophies.create(generic_file_id: params[:file_id])
+      return false unless t.persisted?
+    end
+    render json: t
   end
 
   # Follow a user
@@ -93,7 +91,7 @@ module Sufia::UsersControllerBehavior
       current_user.follow(@user)
       Sufia.queue.push(UserFollowEventJob.new(current_user.user_key, @user.user_key))
     end
-    redirect_to sufia.profile_path(@user.to_param), notice: "You are following #{@user.to_s}"
+    redirect_to sufia.profile_path(@user.to_param), notice: "You are following #{@user}"
   end
 
   # Unfollow a user
@@ -102,43 +100,45 @@ module Sufia::UsersControllerBehavior
       current_user.stop_following(@user)
       Sufia.queue.push(UserUnfollowEventJob.new(current_user.user_key, @user.user_key))
     end
-    redirect_to sufia.profile_path(@user.to_param), notice: "You are no longer following #{@user.to_s}"
+    redirect_to sufia.profile_path(@user.to_param), notice: "You are no longer following #{@user}"
   end
 
   protected
 
-  def user_params
-    params.require(:user).permit(:email, :login, :display_name, :address, :admin_area,
-      :department, :title, :office, :chat_id, :website, :affiliation,
-      :telephone, :avatar, :group_list, :groups_last_update, :facebook_handle,
-      :twitter_handle, :googleplus_handle, :linkedin_handle, :remove_avatar, :orcid)
-  end
+    def user_params
+      params.require(:user).permit(:email, :login, :display_name, :address, :admin_area,
+                                   :department, :title, :office, :chat_id, :website, :affiliation,
+                                   :telephone, :avatar, :group_list, :groups_last_update, :facebook_handle,
+                                   :twitter_handle, :googleplus_handle, :linkedin_handle, :remove_avatar, :orcid)
+    end
 
-  # You can override base_query to return a list of arguments
-  def base_query
-    [nil]
-  end
+    # You can override base_query to return a list of arguments
+    def base_query
+      [nil]
+    end
 
-  def find_user
-    @user = User.from_url_component(params[:id])
-    redirect_to root_path, alert: "User '#{params[:id]}' does not exist" if @user.nil?
-  end
+    def find_user
+      @user = User.from_url_component(params[:id])
+      redirect_to root_path, alert: "User '#{params[:id]}' does not exist" if @user.nil?
+    end
 
-  def user_not_current_user
-    redirect_to sufia.profile_path(@user.to_param), alert: "You cannot follow or unfollow yourself" if @user == current_user
-  end
+    def user_not_current_user
+      redirect_to sufia.profile_path(@user.to_param), alert: "You cannot follow or unfollow yourself" if @user == current_user
+    end
 
-  def get_sort
-    sort = params[:sort].blank? ? "name" : params[:sort]
-    sort_val = case sort
-           when "name"  then "display_name"
-           when "name desc"   then "display_name DESC"
-           else sort
-           end
-    return sort_val
-  end
+    def sort_value
+      sort = params[:sort].blank? ? "name" : params[:sort]
+      case sort
+      when "name"
+        "display_name"
+      when "name desc"
+        "display_name DESC"
+      else
+        sort
+      end
+    end
 
-  def deny_access(exception)
-    redirect_to sufia.profile_path(@user.to_param), alert: "Permission denied: cannot access this page."
-  end
+    def deny_access(_exception)
+      redirect_to sufia.profile_path(@user.to_param), alert: "Permission denied: cannot access this page."
+    end
 end

data/app/controllers/contact_form_controller.rb

@@ -1,3 +1,3 @@
 class ContactFormController < ApplicationController
   include Sufia::ContactFormControllerBehavior
-end 
+end

data/app/controllers/content_blocks_controller.rb

@@ -1,6 +1,6 @@
 class ContentBlocksController < ApplicationController
   load_and_authorize_resource except: :index
-  before_filter :load_featured_researchers, only: :index
+  before_action :load_featured_researchers, only: :index
   authorize_resource only: :index
 
   def index
@@ -16,18 +16,17 @@ class ContentBlocksController < ApplicationController
     redirect_to :back
   end
 
-protected
+  protected
 
-  def create_params
-    params.require(:content_block).permit([:name, :value, :external_key])
-  end
-
-  def update_params
-    params.require(:content_block).permit([:value, :external_key])
-  end
+    def create_params
+      params.require(:content_block).permit([:name, :value, :external_key])
+    end
 
-  def load_featured_researchers
-    @content_blocks = ContentBlock.recent_researchers.page(params[:page])
-  end
+    def update_params
+      params.require(:content_block).permit([:value, :external_key])
+    end
 
+    def load_featured_researchers
+      @content_blocks = ContentBlock.recent_researchers.page(params[:page])
+    end
 end