sufia 3.7.2 → 4.0.0.beta1

data/app/assets/stylesheets/usage-stats.css

@@ -0,0 +1,30 @@
+/*
+* For usage statistics
+*/
+
+.stats-container {
+  box-sizing: border-box;
+  width: 850px;
+  height: 450px;
+  padding: 20px 15px 15px 15px;
+  margin: 15px auto 30px auto;
+  border: 1px solid #ddd;
+  background: #fff;
+  background: linear-gradient(#f6f6f6 0, #fff 50px);
+  background: -o-linear-gradient(#f6f6f6 0, #fff 50px);
+  background: -ms-linear-gradient(#f6f6f6 0, #fff 50px);
+  background: -moz-linear-gradient(#f6f6f6 0, #fff 50px);
+  background: -webkit-linear-gradient(#f6f6f6 0, #fff 50px);
+  box-shadow: 0 3px 10px rgba(0,0,0,0.15);
+  -o-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+  -ms-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+  -moz-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+  -webkit-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+}
+
+.stats-placeholder {
+  width: 100%;
+  height: 100%;
+  font-size: 14px;
+  line-height: 1.2em;
+}

data/app/controllers/batch_controller.rb

@@ -1,6 +1,5 @@
 class BatchController < ApplicationController
   include Hydra::Controller::ControllerBehavior
-  include Hydra::Controller::UploadBehavior
   include Sufia::Noid # for normalize_identifier method
   layout "sufia-one-column"
 

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

@@ -0,0 +1,64 @@
+module Sufia
+  module Catalog
+    extend ActiveSupport::Concern
+    included do
+      self.solr_search_params_logic += [:only_generic_files]
+    end
+
+    def index
+      setup_front_page unless has_search_parameters? 
+      super
+    end
+
+    protected
+      def setup_front_page
+        @featured_researcher = ContentBlock.find_or_create_by(name: 'featured_researcher')
+        @featured_work_list = FeaturedWorkList.new
+        recent
+        recent_me # also grab my recent docs too
+      end
+
+      def recent
+        if user_signed_in?
+          # grab other people's documents
+          (_, @recent_documents) = get_search_results(:q =>filter_not_mine,
+                                            :sort=>sort_field, :rows=>4)
+        else
+          # grab any documents we do not know who you are
+          (_, @recent_documents) = get_search_results(:q =>'', :sort=>sort_field, :rows=>4)
+        end
+      end
+
+      def recent_me
+        if user_signed_in?
+          (_, @recent_user_documents) = get_search_results(:q =>filter_mine,
+                                            :sort=>sort_field, :rows=>4)
+        end
+      end
+
+      def filter_not_mine
+        "{!lucene q.op=AND df=#{depositor}}-#{current_user.user_key}"
+      end
+
+      def filter_mine
+        "{!lucene q.op=AND df=#{depositor}}#{current_user.user_key}"
+      end
+
+      def depositor
+        Solrizer.solr_name('depositor', :stored_searchable, type: :string)
+      end
+
+      def sort_field
+        "#{Solrizer.solr_name('system_create', :sortable)} desc"
+      end
+
+      # Limits search results just to GenericFiles
+      # @param solr_parameters the current solr parameters
+      # @param user_parameters the current user-subitted parameters
+      def only_generic_files(solr_parameters, user_parameters)
+        solr_parameters[:fq] ||= []
+        solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:\"info:fedora/afmodel:GenericFile\""
+      end
+
+  end
+end

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

@@ -7,24 +7,22 @@ module Sufia
     include Blacklight::Catalog
 
     included do
-      include Blacklight::Configurable # comply with BL 3.7
+      include Blacklight::Configurable
       include ActionView::Helpers::DateHelper
-      # This is needed as of BL 3.7
+
       self.copy_blacklight_config_from(CatalogController)
 
       include BlacklightAdvancedSearch::ParseBasicQ
       include BlacklightAdvancedSearch::Controller
-    
-    
+
       before_filter :authenticate_user!
       before_filter :enforce_show_permissions, :only=>:show
       before_filter :enforce_viewing_context_for_show_requests, :only=>:show
-    
+
       # This applies appropriate access controls to all solr queries (the internal method of this is overidden bellow to only include edit files)
       self.solr_search_params_logic += [:add_access_controls_to_solr_params]
-      # This filters out objects that you want to exclude from search results, like FileAssets
-      self.solr_search_params_logic += [:exclude_unwanted_models]
 
+      layout 'sufia-dashboard'
     end
 
     def index
@@ -33,13 +31,13 @@ module Sufia
       @events = @user.events(100)
       @last_event_timestamp = @user.events.first[:timestamp].to_i || 0 rescue 0
       @filters = params[:f] || []
-  
+
       respond_to do |format|
         format.html { }
         format.rss  { render :layout => false }
         format.atom { render :layout => false }
       end
-  
+
       # 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)}
@@ -50,9 +48,9 @@ module Sufia
       @all_checked = (count_on_page == @document_list.count)
       @entire_result_set_selected = @response.response["numFound"] == batch_size
       @batch_size_on_other_page = batch_size - count_on_page
-      @batch_part_on_other_page = (@batch_size_on_other_page) > 0    
+      @batch_part_on_other_page = (@batch_size_on_other_page) > 0
     end
-      
+
     def activity
       # reverse events since we're prepending rows. without reverse, old events wind up first
       events = current_user.events.reverse
@@ -61,13 +59,18 @@ module Sufia
       # return the event, a formatted date string, and a numerical timestamp
       render :json => events.map { |event| [event[:action], "#{time_ago_in_words(Time.at(event[:timestamp].to_i))} ago", event[:timestamp].to_i] }
     rescue
-      render :json => [] 
+      render :json => []
+    end
+
+    def search_action_url *args
+      sufia.dashboard_index_path *args
     end
-  
+
     protected
     # show only files with edit permissions in lib/hydra/access_controls_enforcement.rb apply_gated_discovery
     def discovery_permissions
       ["edit"]
     end
+
   end
 end

data/app/controllers/content_blocks_controller.rb

@@ -0,0 +1,8 @@
+class ContentBlocksController < ApplicationController
+  load_and_authorize_resource
+
+  def update
+    @content_block.update(params.require(:content_block).permit(:value))
+    redirect_to :back
+  end
+end

data/app/controllers/featured_work_lists_controller.rb

@@ -0,0 +1,16 @@
+class FeaturedWorkListsController < ApplicationController
+  def create
+    authorize! :update, FeaturedWork
+    FeaturedWorkList.new.featured_works_attributes = list_params[:featured_works_attributes]
+    respond_to do |format|
+      format.html { redirect_to root_path }
+      format.json { head :no_content }
+    end
+  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

@@ -0,0 +1,26 @@
+class FeaturedWorksController < ApplicationController
+
+  def create
+    authorize! :create, FeaturedWork
+    @featured_work = FeaturedWork.new(generic_file_id: params[:id])
+
+    respond_to do |format|
+      if @featured_work.save
+        format.json { render json: @featured_work, status: :created }
+      else
+        format.json { render json: @featured_work.errors, status: :unprocessable_entity }
+      end        
+    end
+  end
+
+  def destroy
+    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/mailbox_controller.rb

@@ -20,7 +20,7 @@ class MailboxController < ApplicationController
 
   def destroy
     if current_user
-      msg = Conversation.find(params[:id])
+      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])

data/app/controllers/pages_controller.rb

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

data/app/controllers/single_use_links_viewer_controller.rb

@@ -7,8 +7,6 @@ class SingleUseLinksViewerController < ApplicationController
   skip_filter :normalize_identifier
   skip_before_filter :load_datastream, :except => :download
 
-  before_filter :authorize_single_use_link!
-
   class Ability
     include CanCan::Ability
 
@@ -31,11 +29,10 @@ class SingleUseLinksViewerController < ApplicationController
   rescue_from CanCan::AccessDenied, :with => :render_single_use_error
   rescue_from ActiveRecord::RecordNotFound, :with => :render_single_use_error
 
-
   def download
     # send the data content
     raise not_found_exception unless single_use_link.path == sufia.download_path(:id => @asset)
-    send_content(asset)
+    send_content
   end
 
   def show
@@ -51,7 +48,7 @@ class SingleUseLinksViewerController < ApplicationController
 
   protected
 
-  def authorize_single_use_link!
+  def authorize_download!
     authorize! :read, @asset
   end
 

data/app/controllers/tinymce_assets_controller.rb

@@ -0,0 +1,12 @@
+class TinymceAssetsController < ApplicationController
+  def create
+    authorize! :create, TinymceAsset
+    image = TinymceAsset.create params.permit(:file)
+
+    render json: {
+      image: {
+        url: image.file.url
+      }
+    }, content_type: "text/html"
+  end
+end

data/app/helpers/content_block_helper.rb

@@ -0,0 +1,21 @@
+module ContentBlockHelper
+
+  def editable_content_block(content_block)
+    return raw(content_block.value) unless can? :update, content_block
+    capture do
+      concat content_tag(:div, id: dom_id(content_block, 'preview')) { 
+        concat raw(content_block.value) 
+        concat button_tag "Edit", class: "btn btn-primary", data: {
+          behavior: 'reveal-editor', target: '#' + dom_id(content_block, 'edit')
+        }
+      } 
+      concat form_for([sufia, content_block] ) { |f|
+        concat f.text_area :value, class: "tinymce", rows: 20, cols: 120
+        concat f.submit 'Save', class: "btn btn-primary"
+      } 
+
+      concat tinymce_assets
+      concat tinymce
+    end
+  end
+end

data/app/helpers/generic_file_helper.rb

@@ -16,7 +16,7 @@ module GenericFileHelper
     link_to '#', id: "generic_file_#{key.to_s}_help", rel: 'popover', 
       'data-content' => metadata_help(key),
       'data-original-title' => get_label(key) do
-        content_tag 'i', '', class: "icon-question-sign icon-large"
+        content_tag 'i', '', class: "glyphicon glyphicon-question-sign icon-large"
     end
   end
 
@@ -75,7 +75,7 @@ module GenericFileHelper
    # TODO, there could be more than one element with this id on the page, but the fuctionality doesn't work without it.
    content_tag('button', class: "#{html_class} btn", id: "additional_#{key}_submit", name: "additional_#{key}") do
      (symbol + 
-     content_tag('span', class: 'accessible-hidden') do
+     content_tag('span', class: 'sr-only') do
        "add another #{key.to_s}"
      end).html_safe
    end

data/app/helpers/sufia_helper.rb

@@ -32,10 +32,14 @@ module SufiaHelper
     link_to(field, add_facet_params(field_string, field).merge!({"controller" => "catalog", :action=> "index"}))
   end
 
-  def link_to_facet_list(list, field_string, emptyText="No value entered", separator=", ")
-    facet_field = Solrizer.solr_name(field_string, :facetable)
-    return list.map{ |item| link_to_facet(item, facet_field) }.join(separator) unless list.blank?
-    return emptyText
+  # @param values [Array] The values to display
+  # @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=", ")
+    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)
   end
 
 

data/app/helpers/trophy_helper.rb

@@ -1,12 +1,20 @@
 # -*- coding: utf-8 -*-
 module TrophyHelper
- def display_trophy_link(user, noid)
-   trophyclass = "trophy-off"
-   trophytitle= "Highlight File on Profile"
-   if user.trophies.map(&:generic_file_id).include? noid
-     trophyclass = "trophy-on"
-   end
+ def display_trophy_link(user, noid, args={}, &block)
+   trophy = user.trophies.where(generic_file_id: noid).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]
 
-   link_to raw("<i class='#{trophyclass} icon-trophy'></i> #{trophytitle}"),"", :class=> 'trophy-class', :title => trophytitle, :id => noid,  :remote=>true # link to trophy
+   args[:data][:url] = sufia.trophy_profile_path(user, file_id: noid)
+   link_to '#', class: args[:class], data: args[:data] do
+     yield(text)
+   end
  end
 end

data/app/models/content_block.rb

@@ -0,0 +1,2 @@
+class ContentBlock < ActiveRecord::Base
+end

data/app/models/featured_work_list.rb

@@ -0,0 +1,42 @@
+class FeaturedWorkList
+  include ActiveModel::Model
+
+  def featured_works_attributes=(attributes_collection)
+    attributes_collection = attributes_collection.sort_by { |i, _| i.to_i }.map { |_, attributes| attributes } if attributes_collection.is_a? Hash
+    attributes_collection.each do |attributes|
+      attributes = attributes.with_indifferent_access
+      raise "Missing id" if attributes['id'].blank?
+      existing_record = FeaturedWork.find(attributes['id'])
+      existing_record.update(attributes.except('id'))
+    end
+  end
+
+  delegate :query, :construct_query_for_pids, to: ActiveFedora::SolrService
+
+  def featured_works
+    return @works if @works
+    @works = FeaturedWork.all
+    add_solr_document_to_works
+    @works
+  end
+
+  private
+    def add_solr_document_to_works
+      solr_docs.each do |doc|
+        work_with_pid(doc['id']).generic_file_solr_document = SolrDocument.new(doc)
+      end
+    end
+
+    def pids
+      @works.pluck(:generic_file_id).map { |noid| Sufia::Noid.namespaceize(noid) }
+    end
+
+    def solr_docs
+      query(construct_query_for_pids(pids))
+    end
+
+    def work_with_pid(pid)
+      @works.find { |w| Sufia::Noid.namespaceize(w.generic_file_id) == pid}
+    end
+  
+end

data/app/models/tinymce_asset.rb

@@ -0,0 +1,3 @@
+class TinymceAsset < ActiveRecord::Base
+  mount_uploader :file, TinymceAssetUploader
+end