sufia 4.0.0.beta2 → 4.0.0.beta3

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

@@ -6,6 +6,8 @@ module Sufia
     include Hydra::BatchEditBehavior
     include Blacklight::Catalog
 
+    include Hydra::Collections::SelectsCollections
+  
     included do
       include Blacklight::Configurable
       include ActionView::Helpers::DateHelper
@@ -16,8 +18,12 @@ module Sufia
       include BlacklightAdvancedSearch::Controller
 
       before_filter :authenticate_user!
-      before_filter :enforce_show_permissions, :only=>:show
-      before_filter :enforce_viewing_context_for_show_requests, :only=>:show
+      before_filter :enforce_show_permissions, only: :show
+      before_filter :enforce_viewing_context_for_show_requests, only: :show
+
+      # not filtering further with a specific access level since the catalog controller already gets the colections with edit access
+      #  if we include other access levels in this controller we will need to modify this.
+      before_filter :find_collections, only: :index
 
       # 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]
@@ -34,8 +40,8 @@ module Sufia
 
       respond_to do |format|
         format.html { }
-        format.rss  { render :layout => false }
-        format.atom { render :layout => false }
+        format.rss  { render layout: false }
+        format.atom { render layout: false }
       end
 
       # set up some parameters for allowing the batch controls to show appropiately
@@ -57,11 +63,19 @@ module Sufia
       # filter events to include only those that have occurred since params[:since]
       events.select! { |event| event[:timestamp].to_i > params[:since].to_i } if params[:since]
       # 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] }
+      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
+
+    # TODO: This can be removed after we upgrade to hydra-collections 2.0.1 or greater
+    def add_collection_filter(solr_parameters, user_parameters)
+      super(solr_parameters, user_parameters)
+      solr_parameters[:rows] = 100
     end
 
+
+
     def search_action_url *args
       sufia.dashboard_index_path *args
     end
@@ -72,5 +86,19 @@ module Sufia
       ["edit"]
     end
 
+    def show_only_files_deposited_by_current_user(solr_parameters, user_parameters)
+      solr_parameters[:fq] ||= []
+      solr_parameters[:fq] += [
+        ActiveFedora::SolrService.construct_query_for_rel(depositor: current_user.user_key)
+      ]
+    end
+
+    def show_only_generic_files(solr_parameters, user_parameters)
+      solr_parameters[:fq] ||= []
+      solr_parameters[:fq] += [
+        ActiveFedora::SolrService.construct_query_for_rel(has_model: ::GenericFile.to_class_uri)
+      ]
+    end
+
   end
 end

data/app/controllers/concerns/sufia/files_controller/browse_everything.rb

@@ -0,0 +1,35 @@
+module Sufia::FilesController
+  module BrowseEverything
+    include ActiveSupport::Concern
+
+    def create 
+      if params[:selected_files].present?
+        create_from_browse_everything(params)
+      else
+        super
+      end
+    end
+
+    protected
+
+      def create_from_browse_everything(params)
+        params[:selected_files].each_pair do |index, file_info| 
+          next if file_info.blank? || file_info["url"].blank?
+          create_file_from_url(file_info["url"])
+        end
+        redirect_to self.class.upload_complete_path( params[:batch_id])
+      end
+      
+      # Generic utility for creating GenericFile from a URL
+      # Used in to import files using URLs from a file picker like browse_everything 
+      def create_file_from_url(url, batch_id=nil)
+        generic_file = ::GenericFile.new(import_url: url, label: File.basename(url)).tap do |gf|
+          actor = Sufia::GenericFile::Actor.new(gf, current_user)
+          actor.create_metadata(params[:batch_id])
+          gf.save!
+          Sufia.queue.push(ImportUrlJob.new(gf.pid))
+        end
+      end
+
+  end
+end

data/{lib → app/controllers/concerns}/sufia/files_controller/local_ingest_behavior.rb

@@ -1,5 +1,15 @@
 module Sufia
   module FilesController::LocalIngestBehavior
+    include ActiveSupport::Concern
+
+    def create
+      if params[:local_file].present?
+        perform_local_ingest
+      else
+        super
+      end
+    end
+
   
     private
     
@@ -41,14 +51,16 @@ module Sufia
     end
 
     def ingest_one(filename, unarranged)
-      # do not remove :: 
-      @generic_file = ::GenericFile.new
       basename = File.basename(filename)
-      @generic_file.label = basename
-      @generic_file.relative_path = filename if filename != basename
-      create_metadata(@generic_file)
-      Sufia.queue.push(IngestLocalFileJob.new(@generic_file.id, current_user.directory, filename, current_user.user_key))
+      # do not remove ::
+      generic_file = ::GenericFile.new(label: basename).tap do |gf|
+        gf.relative_path = filename if filename != basename
+        actor = Sufia::GenericFile::Actor.new(gf, current_user)
+        actor.create_metadata(params[:batch_id])
+        gf.save!
+        Sufia.queue.push(IngestLocalFileJob.new(gf.id, current_user.directory, filename, current_user.user_key))
+      end
     end
     
   end # /FilesController::LocalIngestBehavior
-end # /Sufia
+end # /Sufia

data/{lib → app/controllers/concerns}/sufia/files_controller/upload_complete_behavior.rb

@@ -5,7 +5,7 @@ module Sufia
     end
 
     def destroy_complete_path(params)
-      Sufia::Engine.routes.url_helpers.dashboard_index_path
+      Sufia::Engine.routes.url_helpers.dashboard_files_path
     end
 
   end # /FilesController::UploadCompleteBehavior

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

@@ -0,0 +1,219 @@
+module Sufia
+  module FilesController
+    extend ActiveSupport::Autoload
+    autoload :BrowseEverything
+    autoload :LocalIngestBehavior
+    autoload :UploadCompleteBehavior
+  end
+  module FilesControllerBehavior
+    extend ActiveSupport::Concern
+    extend Sufia::FilesController::UploadCompleteBehavior
+
+    included do
+      include Hydra::Controller::ControllerBehavior
+      include Blacklight::Configurable
+      include Sufia::Noid # for normalize_identifier method
+      include Sufia::FilesController::BrowseEverything
+      include Sufia::FilesController::LocalIngestBehavior
+      extend Sufia::FilesController::UploadCompleteBehavior
+
+      layout "sufia-one-column"
+
+      self.copy_blacklight_config_from(CatalogController)
+
+      # Catch permission errors
+      rescue_from Hydra::AccessDenied, CanCan::AccessDenied do |exception|
+        if exception.action == :edit
+          redirect_to(sufia.url_for({action: 'show'}), alert: "You do not have sufficient privileges to edit this document")
+        elsif current_user and current_user.persisted?
+          redirect_to root_url, alert: exception.message
+        else
+          session["user_return_to"] = request.url
+          redirect_to new_user_session_url, alert: exception.message
+        end
+      end
+
+      # actions: audit, index, create, new, edit, show, update,
+      #          destroy, permissions, citation, stats
+      before_filter :authenticate_user!, except: [:show, :citation]
+      before_filter :has_access?, except: [:show]
+      prepend_before_filter :normalize_identifier, except: [:index, :create, :new]
+      load_resource only: [:audit]
+      load_and_authorize_resource except: [:index, :audit]
+    end
+
+    # routed to /files/new
+    def new
+      @batch_noid = Sufia::Noid.noidify(Sufia::IdService.mint)
+    end
+
+    # routed to /files/:id/edit
+    def edit
+      @generic_file.initialize_fields
+      @groups = current_user.groups
+    end
+
+    # routed to /files/:id/stats
+    def stats
+      @stats = FileUsage.new(params[:id])
+    end
+
+    # routed to /files/:id (DELETE)
+    def destroy
+      pid = @generic_file.noid
+      @generic_file.destroy
+      Sufia.queue.push(ContentDeleteEventJob.new(pid, current_user.user_key))
+      redirect_to self.class.destroy_complete_path(params), notice:
+        render_to_string(partial: 'generic_files/asset_deleted_flash', locals: { generic_file: @generic_file })
+    end
+
+    # routed to /files (POST)
+    def create
+      create_from_upload(params)
+    end
+
+    def create_from_upload(params)
+      # check error condition No files
+      return json_error("Error! No file to save") if !params.has_key?(:files)
+
+      file = params[:files].detect {|f| f.respond_to?(:original_filename) }
+      if !file
+        json_error "Error! No file for upload", 'unknown file', status: :unprocessable_entity
+      elsif (empty_file?(file))
+        json_error "Error! Zero Length File!", file.original_filename
+      elsif (!terms_accepted?)
+        json_error "You must accept the terms of service!", file.original_filename
+      else
+        process_file(file)
+      end
+    rescue => error
+      logger.error "GenericFilesController::create rescued #{error.class}\n\t#{error.to_s}\n #{error.backtrace.join("\n")}\n\n"
+      json_error "Error occurred while creating generic file."
+    ensure
+      # remove the tempfile (only if it is a temp file)
+      file.tempfile.delete if file.respond_to?(:tempfile)
+    end
+
+    # routed to /files/:id/citation
+    def citation
+    end
+
+    # routed to /files/:id
+    def show
+      respond_to do |format|
+        format.html {
+          @events = @generic_file.events(100)
+        }
+        format.endnote { render text: @generic_file.export_as_endnote }
+      end
+    end
+
+    # routed to /files/:id/audit (POST)
+    def audit
+      render json: @generic_file.audit
+    end
+
+    # routed to /files/:id (PUT)
+    def update
+      success = if params.has_key?(:revision) && params[:revision] != @generic_file.content.latest_version.versionID
+        update_version
+      elsif params.has_key? :filedata
+        update_file
+      elsif params.has_key? :generic_file
+        update_metadata
+      end
+
+      if success
+        redirect_to sufia.edit_generic_file_path(tab: params[:redirect_tab]), notice:
+          render_to_string(partial: 'generic_files/asset_updated_flash', locals: { generic_file: @generic_file })
+      else
+        render action: 'edit'
+      end
+    rescue => error
+      flash[:error] = error.message
+      logger.error "GenericFilesController::update rescued #{error.class}\n\t#{error.message}\n #{error.backtrace.join("\n")}\n\n"
+      render action: 'edit'
+    end
+
+    protected
+
+    def actor
+      @actor ||= Sufia::GenericFile::Actor.new(@generic_file, current_user)
+    end
+
+    def update_version
+      if actor.revert_content(params[:revision], datastream_id)
+        Sufia.queue.push(ContentRestoredVersionEventJob.new(@generic_file.pid, current_user.user_key, params[:revision]))
+      end
+    end
+
+    def update_file
+      if actor.update_content(params[:filedata], datastream_id)
+        Sufia.queue.push(ContentNewVersionEventJob.new(@generic_file.pid, current_user.user_key))
+      end
+    end
+
+    # this is provided so that implementing application can override this behavior and map params to different attributes
+    def update_metadata
+      if actor.update_metadata(params[:generic_file], params[:visibility])
+        Sufia.queue.push(ContentUpdateEventJob.new(@generic_file.pid, current_user.user_key))
+      end
+    end
+
+    def json_error(error, name=nil, additional_arguments={})
+      args = {error: error}
+      args[:name] = name if name
+      render additional_arguments.merge(json: [args])
+    end
+
+    def empty_file?(file)
+      (file.respond_to?(:tempfile) && file.tempfile.size == 0) || (file.respond_to?(:size) && file.size == 0)
+    end
+
+    def process_file(file)
+      update_metadata_from_upload_screen
+      actor.create_metadata(params[:batch_id])
+      if actor.create_content(file, file.original_filename, datastream_id)
+        respond_to do |format|
+          format.html {
+            render json: [@generic_file.to_jq_upload],
+            content_type: 'text/html',
+            layout: false
+          }
+          format.json {
+            render json: [@generic_file.to_jq_upload]
+          }
+        end
+      else
+        msg = @generic_file.errors.full_messages.join(', ')
+        flash[:error] = msg
+        json_error "Error creating generic file: #{msg}"
+      end
+    end
+
+    # override this method if you want to change how the terms are accepted on upload.
+    def terms_accepted?
+      params[:terms_of_service] == '1'
+    end
+
+    # override this method if you need to initialize more complex RDF assertions (b-nodes)
+    # @deprecated use @generic_file.initialize_fields instead
+    def initialize_fields(file)
+      file.initialize_fields
+    end
+
+    ActiveSupport::Deprecation.deprecate_methods(FilesControllerBehavior, :initialize_fields)
+
+    # The name of the datastream where we store the file data
+    def datastream_id
+      'content'
+    end
+
+    # this is provided so that implementing application can override this behavior and map params to different attributes
+    # called when creating or updating metadata
+    def update_metadata_from_upload_screen
+      # Relative path is set by the jquery uploader when uploading a directory
+      @generic_file.relative_path = params[:relative_path] if params[:relative_path]
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Sufia::HomepageController
+  extend ActiveSupport::Concern
+
+  included do
+    # Adds Hydra behaviors into the application controller
+    include Hydra::Controller::ControllerBehavior
+    include Blacklight::Catalog::SearchContext
+    include Sufia::Controller
+    include Blacklight::SolrHelper
+
+    self.solr_search_params_logic += [:only_generic_files]
+    layout 'homepage'
+  end
+
+  def index
+    @featured_researcher = ContentBlock.find_or_create_by(name: 'featured_researcher')
+    @marketing_text = ContentBlock.find_or_create_by(name: 'marketing_text')
+    @featured_work_list = FeaturedWorkList.new
+    recent
+  end
+
+  protected
+
+  def recent
+    # grab any recent documents
+    (_, @recent_documents) = get_search_results(q: '', sort:sort_field, rows: 4)
+  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

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

@@ -2,8 +2,9 @@ module Sufia::UsersControllerBehavior
   extend ActiveSupport::Concern
 
   included do
+    include Blacklight::Catalog::SearchContext
     layout "sufia-one-column"
-    prepend_before_filter :find_user, :except => [:index, :search, :notifications_number]
+    prepend_before_filter :find_user, except: [:index, :search, :notifications_number]
     before_filter :authenticate_user!, only: [:edit, :update, :follow, :unfollow, :toggle_trophy]
     before_filter :user_is_current_user, only: [:edit, :update, :toggle_trophy]
 
@@ -79,7 +80,7 @@ module Sufia::UsersControllerBehavior
        t = current_user.trophies.create(generic_file_id: params[:file_id])
        return false unless t.persisted?
      end
-     render :json => t
+     render json: t
   end 
 
 

data/app/controllers/dashboard/collections_controller.rb

@@ -0,0 +1,19 @@
+module Dashboard
+  class CollectionsController < ListsController
+    self.solr_search_params_logic += [
+      :show_only_collections
+    ]
+
+    def show_only_collections(solr_parameters, user_parameters)
+      solr_parameters[:fq] ||= []
+      solr_parameters[:fq] += [
+        ActiveFedora::SolrService.construct_query_for_rel(has_model: Collection.to_class_uri)
+      ]
+    end
+
+    def index
+      super
+      @selected_tab = :collections
+    end
+  end
+end