sufia 6.3.0 → 6.4.0

data/app/assets/stylesheets/sufia/_file-show.scss

@@ -22,3 +22,7 @@
   -webkit-column-width: 20em;
   column-width: 20em;
 }
+
+.img-responsive, figure {
+  display: inline-block;
+}

data/app/assets/stylesheets/sufia/_settings.scss

@@ -5,6 +5,7 @@
 
 $basic-black: #000;
 $blue-dark: #036;
+$blue-default: #337AB7;
 $blue-medium: #1C5798;
 $blue-medium-bright: #2674CA;
 $teal: #2CAEB7;
@@ -79,3 +80,5 @@ $view-select-text-hover: $blue-medium-bright;
 // File Show Page
 $file-show-term-color: $gray-dark;
 $heading-border-color: $gray-light;
+$link-color: $blue-default;
+$link-color-hover: $gray-dark;

data/app/controllers/api/items_controller.rb

@@ -57,12 +57,16 @@ module API
       end
 
       def validate_item
-        return render plain: 'no item parameter', status: :bad_request if params[:item].blank?
-        Sufia::Arkivo::SchemaValidator.new(params[:item]).call
+        return render plain: 'no item parameter', status: :bad_request if post_data.blank?
+        Sufia::Arkivo::SchemaValidator.new(post_data).call
       rescue Sufia::Arkivo::InvalidItem => exception
         return render plain: "invalid item parameter: #{exception.message}", status: :bad_request
       else
-        @item = JSON.parse(params[:item])
+        @item = JSON.parse(post_data)
+      end
+
+      def post_data
+        request.raw_post
       end
 
       def authorize_token

data/app/controllers/concerns/sufia/admin/depositor_stats.rb

@@ -19,7 +19,7 @@ module Sufia::Admin::DepositorStats
     start_datetime = DateTime.parse(deposit_stats[:start_date]) unless deposit_stats[:start_date].blank?
     end_datetime = DateTime.parse(deposit_stats[:end_date]).end_of_day unless deposit_stats[:end_date].blank?
 
-    query = GenericFile.build_date_query(start_datetime, end_datetime) unless start_datetime.blank?
+    query = ::GenericFile.build_date_query(start_datetime, end_datetime) unless start_datetime.blank?
     sb = DepositSearchBuilder.new([:include_depositor_facet], self)
     facet_results = repository.search(sb.merge(q: query).query)
     facets = facet_results["facet_counts"]["facet_fields"]["depositor_ssim"]

data/app/controllers/concerns/sufia/admin/stats_behavior.rb

@@ -8,87 +8,17 @@ module Sufia
       end
 
       def index
-        # total user count
-        @users_count = ::User.count
+        stats_filters = params.fetch(:stats_filters, {})
 
-        # The most recent users to join
-        @users_stats = params.fetch(:users_stats, {})
-        @recent_users = recent_users
+        # initialize the presenter
+        @presenter = AdminStatsPresenter.new(stats_filters, params.fetch(:limit, "5").to_i)
 
-        # Query Solr for top depositors
-        @active_users = top_depositors
+        # get deposit stats
+        @presenter.deposit_stats = stats_filters
+        @presenter.depositors = depositors(stats_filters)
 
-        # Count of documents by permissions
-        @files_count = document_by_permission
-
-        # Query Solr for top file formats
-        @top_formats = top_formats
-
-        @deposit_stats = params.fetch(:deposit_stats, {})
-        @depositors = depositors(@deposit_stats)
         render 'index'
       end
-
-      private
-
-        def top_depositors_count
-          count = params[:dep_count].to_i
-          count.in?(5..20) ? count : 5
-        end
-
-        def document_by_permission
-          return document_by_date_by_permission if @users_stats[:file_start_date]
-
-          files_count = {}
-          files_count[:total] = ::GenericFile.count
-          files_count[:public] = ::GenericFile.where_public.count
-          files_count[:registered] = ::GenericFile.where_registered.count
-          files_count[:private] = files_count[:total] - (files_count[:registered] + files_count[:public])
-          files_count
-        end
-
-        def document_by_date_by_permission
-          start_date = DateTime.parse(@users_stats[:file_start_date])
-          end_date = DateTime.parse(@users_stats[:file_end_date]).end_of_day unless @users_stats[:file_end_date].blank?
-          files_count = {}
-          files_count[:total] = ::GenericFile.find_by_date_created(start_date, end_date).count
-          files_count[:public] = ::GenericFile.find_by_date_created(start_date, end_date).merge(::GenericFile.where_public).count
-          files_count[:registered] = ::GenericFile.find_by_date_created(start_date, end_date).merge(::GenericFile.where_registered).count
-          files_count[:private] = files_count[:total] - (files_count[:registered] + files_count[:public])
-          files_count
-        end
-
-        def top_depositors
-          depositor_key = Solrizer.solr_name('depositor', :stored_searchable, type: :string)
-          top_data(depositor_key, top_depositors_count)
-        end
-
-        def top_formats
-          format_key = Solrizer.solr_name('file_format', Solrizer::Descriptor.new(:string, :indexed, :multivalued))
-          top_data(format_key, 5)
-        end
-
-        def top_data(key, limit)
-          query_url = "#{ActiveFedora.solr_config[:url]}/terms?terms.fl=#{key}&terms.sort=count&terms.limit=#{limit}&wt=json&omitHeader=true"
-          # Parse JSON response (looks like {"terms":{"depositor_tesim":["mjg36",3]}} for depositor)
-          json = open(query_url).read
-          begin
-            tuples = JSON.parse(json)['terms'][key]
-          rescue
-            []
-          end
-          # Change to hash where keys = logins and values = counts
-          Hash[*tuples]
-        end
-
-        def recent_users
-          # no dates return the top 5
-          return ::User.order('created_at DESC').limit(5) if @users_stats[:start_date].blank?
-
-          start_date = DateTime.parse @users_stats[:start_date]
-          end_date = DateTime.parse(@users_stats[:end_date]).end_of_day unless @users_stats[:end_date].blank?
-          ::User.recent_users start_date, end_date
-        end
     end
   end
 end

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

@@ -22,8 +22,7 @@ module Sufia
       @batch = Batch.find_or_create(params[:id])
       @batch.status = ["processing"]
       @batch.save
-      file_attributes = edit_form_class.model_attributes(params[:generic_file])
-      Sufia.queue.push(BatchUpdateJob.new(current_user.user_key, params[:id], params[:title], file_attributes, params[:visibility]))
+      Sufia.queue.push(batch_update_job)
       flash[:notice] = 'Your files are being processed by ' + t('sufia.product_name') + ' in the background. The metadata and access controls you specified are being applied. Files will be marked <span class="label label-danger" title="Private">Private</span> until this process is complete (shouldn\'t take too long, hang in there!). You may need to refresh your dashboard to see these updates.'
       if uploading_on_behalf_of? @batch
         redirect_to sufia.dashboard_shares_path
@@ -49,5 +48,14 @@ module Sufia
         return false if file.nil? || file.on_behalf_of.blank?
         current_user.user_key != file.on_behalf_of
       end
+
+      def batch_update_job
+        @batch_update_job ||= BatchUpdateJob.new(
+          current_user.user_key,
+          params[:id],
+          params[:title],
+          edit_form_class.model_attributes(params[:generic_file]),
+          params[:visibility])
+      end
   end
 end

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

@@ -11,6 +11,7 @@ module Sufia
       if @contact_form.respond_to?(:deliver_now) ? @contact_form.deliver_now : @contact_form.deliver
         flash.now[:notice] = 'Thank you for your message!'
         after_deliver
+        @contact_form = ContactForm.new
         render :new
       else
         flash.now[:error] = 'Sorry, this message was not sent successfully. '

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

@@ -9,6 +9,8 @@ module Sufia
     extend ActiveSupport::Concern
     extend Sufia::FilesController::UploadCompleteBehavior
     include Sufia::Breadcrumbs
+    include Hydra::Catalog
+    include Hydra::Collections::SelectsCollections
 
     included do
       include Hydra::Controller::ControllerBehavior
@@ -38,6 +40,9 @@ module Sufia
       before_action :authenticate_user!, except: [:show, :citation, :stats]
       before_action :has_access?, except: [:show]
       before_action :build_breadcrumbs, only: [:show, :edit, :stats]
+      before_action only: [:new] do
+        find_collections_with_edit_access(true, -1, t("sufia.upload.collection.select_default_option"))
+      end
       load_resource only: [:audit]
       load_and_authorize_resource except: [:index, :audit, :show]
 
@@ -59,6 +64,7 @@ module Sufia
 
     # routed to /files/new
     def new
+      set_variables_for_new_form
       @batch_id = ActiveFedora::Noid::Service.new.mint
     end
 
@@ -152,6 +158,10 @@ module Sufia
 
     protected
 
+      def set_variables_for_new_form
+        @collection_id = params[:collection] if @user_collections.collect(&:id).include? params[:collection]
+      end
+
       def set_variables_for_edit_form
         @form = edit_form
         @groups = current_user.groups
@@ -227,7 +237,7 @@ module Sufia
 
         update_metadata_from_upload_screen
         actor.create_metadata(params[:batch_id])
-        if actor.create_content(file, file.original_filename, file_path, file.content_type)
+        if actor.create_content(file, file.original_filename, file_path, file.content_type, params[:collection])
           respond_to do |format|
             format.html do
               render 'jq_upload', formats: 'json', content_type: 'text/html'

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

@@ -4,7 +4,7 @@ module Sufia::HomepageController
   included do
     # Adds Hydra behaviors into the application controller
     include Hydra::Controller::ControllerBehavior
-    include Blacklight::Catalog::SearchContext
+    include Blacklight::SearchContext
     include Sufia::Controller
     include Blacklight::SearchHelper
     include Hydra::Controller::SearchBuilder

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

@@ -52,6 +52,8 @@ module Sufia
       @batch_size_on_other_page = batch_size - count_on_page
       @batch_part_on_other_page = (@batch_size_on_other_page) > 0
 
+      @add_files_to_collection = params.fetch(:add_files_to_collection, '')
+
       respond_to do |format|
         format.html {}
         format.rss  { render layout: false }

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

@@ -2,9 +2,9 @@ module Sufia::UsersControllerBehavior
   extend ActiveSupport::Concern
 
   included do
-    include Blacklight::Catalog::SearchContext
+    include Blacklight::SearchContext
     layout "sufia-one-column"
-    prepend_before_filter :find_user, except: [:index, :search, :notifications_number]
+    prepend_before_action :find_user, except: [:index, :search, :notifications_number]
     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]

data/app/helpers/generic_file_helper.rb

@@ -13,7 +13,7 @@ module GenericFileHelper
     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 }
     else
-      label = download_image_tag(title) + title
+      label = download_image_tag(title)
       link_to label, sufia.download_path(@generic_file), target: "_blank", title: title, id: "file_download", data: { label: @generic_file.id }
     end
   end
@@ -34,10 +34,13 @@ module GenericFileHelper
   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}"
+      content_tag :figure do
+        if title.nil?
+          concat image_tag "default.png", alt: "No preview available", class: "img-responsive"
+        else
+          concat image_tag sufia.download_path(@generic_file, file: 'thumbnail'), class: "img-responsive", alt: "#{title} of #{@generic_file.title.first}"
+        end
+        concat content_tag :figcaption, "Download the full sized image"
       end
     end
 

data/app/jobs/content_delete_event_job.rb

@@ -1,15 +1,20 @@
+# A specific job to log a file deletion to a user's activity stream
+#
+# @attr_reader deleted_file_id The id of the file that has been deleted by the user
 class ContentDeleteEventJob < EventJob
-  def run
-    action = "User #{link_to_profile depositor_id} has deleted file '#{generic_file_id}'"
-    timestamp = Time.now.to_i
-    depositor = User.find_by_user_key(depositor_id)
-    # Create the event
-    event = depositor.create_event(action, timestamp)
-    # Log the event to the depositor's profile stream
+  attr_reader :deleted_file_id
+
+  def initialize(deleted_file_id, depositor_id)
+    super(depositor_id)
+    @deleted_file_id = deleted_file_id
+  end
+
+  def action
+    @action ||= "User #{link_to_profile depositor_id} has deleted file '#{deleted_file_id}'"
+  end
+
+  # override to log the event to the users profile stream instead of the user's stream
+  def log_user_event
     depositor.log_profile_event(event)
-    # Fan out the event to all followers
-    depositor.followers.each do |follower|
-      follower.log_event(event)
-    end
   end
 end

data/app/jobs/content_deposit_event_job.rb

@@ -1,18 +1,6 @@
-class ContentDepositEventJob < EventJob
-  def run
-    gf = GenericFile.find(generic_file_id)
-    action = "User #{link_to_profile depositor_id} has deposited #{link_to gf.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(gf)}"
-    timestamp = Time.now.to_i
-    depositor = User.find_by_user_key(depositor_id)
-    # Create the event
-    event = depositor.create_event(action, timestamp)
-    # Log the event to the depositor's profile stream
-    depositor.log_profile_event(event)
-    # Log the event to the GF's stream
-    gf.log_event(event)
-    # Fan out the event to all followers who have access
-    depositor.followers.select { |user| user.can? :read, gf }.each do |follower|
-      follower.log_event(event)
-    end
+# A specific job to log a file deposit to a user's activity stream
+class ContentDepositEventJob < ContentEventJob
+  def action
+    "User #{link_to_profile depositor_id} has deposited #{link_to generic_file.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(generic_file)}"
   end
 end

data/app/jobs/content_depositor_change_event_job.rb

@@ -1,4 +1,11 @@
-class ContentDepositorChangeEventJob < EventJob
+# A specific job to log a file deposit change to a user's activity stream
+#
+# This is a bit wierd becuase the job performs the depositor transfer along with logging the job
+#
+# @attr [String] id identifier of the file to be transfered
+# @attr [String] login the user key of the user the file is being transfered to.
+# @attr [Boolean] reset (false) should the access controls be reset. This means revoking edit access from the depositor
+class ContentDepositorChangeEventJob < ContentEventJob
   def queue_name
     :proxy_deposit
   end
@@ -9,34 +16,39 @@ class ContentDepositorChangeEventJob < EventJob
   # @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)
+    super(id, login)
     self.id = id
     self.login = login
     self.reset = reset
   end
 
   def run
-    # TODO: This should be in its own job, not this event job
-    file = ::GenericFile.find(id)
-    file.proxy_depositor = file.depositor
-    file.clear_permissions! if reset
-    file.apply_depositor_metadata(login)
-    file.save!
+    super
 
-    action = "User #{link_to_profile file.proxy_depositor} has transferred #{link_to file.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(file)} to user #{link_to_profile login}"
-    timestamp = Time.now.to_i
-    depositor = ::User.find_by_user_key(file.depositor)
-    proxy_depositor = ::User.find_by_user_key(file.proxy_depositor)
-    # Create the event
-    event = proxy_depositor.create_event(action, timestamp)
-    # Log the event to the GF's stream
-    file.log_event(event)
     # log the event to the proxy depositor's profile
+    proxy_depositor = ::User.find_by_user_key(generic_file.proxy_depositor)
     proxy_depositor.log_profile_event(event)
-    # log the event to the depositor's dashboard
-    depositor.log_event(event)
-    # Fan out the event to the depositor's followers who have access
-    depositor.followers.select { |user| user.can? :read, file }.each do |follower|
-      follower.log_event(event)
+  end
+
+  def action
+    "User #{link_to_profile generic_file.proxy_depositor} has transferred #{link_to generic_file.title.first, Sufia::Engine.routes.url_helpers.generic_file_path(generic_file)} to user #{link_to_profile login}"
+  end
+
+  # overriding default to load from fedora and change the depositor
+  def generic_file
+    # TODO: This should be in its own job, not this event job
+    @generic_file ||= begin
+      file = ::GenericFile.find(id)
+      file.proxy_depositor = file.depositor
+      file.clear_permissions! if reset
+      file.apply_depositor_metadata(login)
+      file.save!
+      file
     end
   end
+
+  # overriding default to log the event to the depositor instead of their profile
+  def log_user_event
+    depositor.log_event(event)
+  end
 end

data/app/jobs/content_event_job.rb

@@ -0,0 +1,39 @@
+# A generic job for sending events about a generic files to a user and their followers.
+#
+# @attr [String] generic_file_id  the id of the file the event is specified for
+#
+class ContentEventJob < EventJob
+  attr_accessor :generic_file_id
+
+  def initialize(generic_file_id, depositor_id)
+    super(depositor_id)
+    @generic_file_id = generic_file_id
+  end
+
+  def run
+    super
+
+    log_generic_file_event
+  end
+
+  def generic_file
+    @generic_file ||= GenericFile.load_instance_from_solr(generic_file_id)
+  end
+
+  # Log the event to the GF's stream
+  def log_generic_file_event
+    generic_file.log_event(event) unless generic_file.nil?
+  end
+
+  # override to check file permissions before logging to followers
+  def log_to_followers
+    depositor.followers.select { |user| user.can?(:read, generic_file) }.each do |follower|
+      follower.log_event(event)
+    end
+  end
+
+  # log the event to the users profile stream
+  def log_user_event
+    depositor.log_profile_event(event)
+  end
+end