sufia 5.0.0 → 6.0.0.beta1

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

@@ -16,7 +16,7 @@
 // Use import here instead of require so we can use the Sass variables defined in Bootstrap and Blacklight
 // TODO: Probably should use import throughout and move all of Sufia's stylesheets into a single named directory.
 @import 'sufia/settings','sufia/header','sufia/styles','sufia/file-listing','sufia/collections','sufia/batch-edit',
-'sufia/dashboard','sufia/home-page','sufia/featured','sufia/tagcloud','sufia/usage-stats','sufia/catalog','sufia/buttons','sufia/proxy-rights', 'sufia/multi_value_fields';
+'sufia/dashboard','sufia/home-page','sufia/featured','sufia/tagcloud','sufia/usage-stats','sufia/catalog','sufia/buttons','sufia/proxy-rights';
 
 #browse-everything {
   top:10%;
@@ -35,11 +35,6 @@
   padding-top: 10px;
 }
 
-.profile img.orcid {
-  float: left;
-  margin-right: 2px;
-}
-
 /* This class is to workaround an issue in which Bootstrap requires a div to display a tooltip
  * on a disabled button. Using a span instead of a div would be ideal but unfortunately it does
  * not render the tooltip correctly in all browsers (e.g. in Chrome the tooltip is detected in

data/app/assets/stylesheets/sufia/_batch-edit.scss

@@ -19,11 +19,3 @@
   padding-top: 5px;
 }
 
-.glyphicon-chevron-right-helper.collapsed .chevron {
-  @extend .glyphicon-chevron-right;
-}
-.glyphicon-chevron-right-helper .chevron {
-  @extend .glyphicon;
-  @extend .glyphicon-chevron-down;
-}
-

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

@@ -18,16 +18,6 @@
     background-color: $badge-background-color;
     color: $badge-font-color;
   }
-  .badge-optional {
-    background-color: $badge-optional-background-color;
-    border-radius: 2px;
-    color: $badge-font-color;
-    padding: 0 .25em;
-  }
-  .views-downloads-dashboard {
-    list-style-type: none;
-    padding-left: 0;
-  }
   .panel-default > .panel-heading {
     background-color: $panel-background-color;
   }
@@ -92,10 +82,6 @@ div.heading-tile .glyphicon {
   padding: 1.5em 0 1.5em 1em;
 }
 
-#footer {
-  margin-top: 0;
-}
-
 .transfer_link {
   margin-top: 8px;
 }
@@ -119,4 +105,4 @@ div.heading-tile .glyphicon {
 #activity .panel-body{
   overflow: scroll;
   max-height: 20em;
-}
+}

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

@@ -41,7 +41,7 @@ h4 .small {
 }
 
 .file_listing_thumbnail {
-  @extend .media-object !optional;
+  @extend .media-object;
   width: 64px;
 }
 

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

@@ -23,7 +23,6 @@ $teal: #2CAEB7;
 $vermilion: #F30;
 
 $badge-background-color: $highlight-yellow;
-$badge-optional-background-color: $gray-medium;
 $badge-font-color: $classic-white;
 $content-wrapper-background-color: $cream-light;
 $dashboard-background-color: $classic-white;

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

@@ -14,9 +14,6 @@ module Sufia
        @generic_file.depositor = current_user.user_key
        @terms = @generic_file.terms_for_editing - [:title, :format, :resource_type]
 
-       # do we want to show the original values for anything...
-       @show_file = ::GenericFile.new
-       @show_file.depositor = current_user.user_key
        h  = {}
        @names = []
        permissions = []
@@ -32,13 +29,9 @@ module Sufia
           permissions = (permissions + gf.permissions).uniq
        end
 
-       initialize_fields(h, @show_file)
+       initialize_fields(h, @generic_file)
 
-       # map the permissions to parameter like input so that the assign will work
-       # todo sort the access level some how...
-       perm_param ={'user'=>{},'group'=>{"public"=>"read"}}
-       permissions.each{ |perm| perm_param[perm[:type]][perm[:name]] = perm[:access]}
-       @show_file.permissions = HashWithIndifferentAccess.new(perm_param)
+       @generic_file.permissions_attributes = [{type: 'group', name: 'public', access: 'read'}]
     end
 
     def after_update
@@ -47,7 +40,7 @@ module Sufia
 
     def after_destroy_collection
       redirect_to_return_controller unless request.xhr?
-    end 
+    end
 
     def update_document(obj)
       super

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

@@ -20,10 +20,11 @@
       case request.referer
       when /catalog/
         add_breadcrumb I18n.t('sufia.bread_crumb.search_results'), request.referer
+      when /dashboard/
+        default_trail
+        add_breadcrumb_for_controller    
       else
         default_trail
-        add_breadcrumb_for_controller
-        add_breadcrumb_for_action
       end
     end
 
@@ -36,11 +37,5 @@
       end
     end
 
-    def add_breadcrumb_for_action
-      if /edit|stats/ =~ action_name && controller_name == "generic_files"
-        add_breadcrumb I18n.t("sufia.generic_file.browse_view"), sufia.generic_file_path(Sufia::Noid.noidify params["id"])
-      end
-    end
-
   end
 end

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

@@ -12,7 +12,7 @@ module Sufia
       # @param user_parameters the current user-subitted parameters
       def only_generic_files_and_collections(solr_parameters, user_parameters)
         solr_parameters[:fq] ||= []
-        solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:(\"info:fedora/afmodel:GenericFile\" \"info:fedora/afmodel:Collection\")"
+        solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:(\"GenericFile\" \"Collection\")"
       end
   end
 end

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

@@ -13,7 +13,9 @@ module Sufia::Controller
   end
 
   def normalize_identifier
-    params[:id] = Sufia::Noid.namespaceize(params[:id])
+    # nop
+    # If you want to override you can do something like this:
+    # params[:id] = Sufia::Noid.namespaceize(params[:id])
   end
 
   def render_404(exception)

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

@@ -9,7 +9,7 @@ module Sufia
     end
 
     def datastream_name
-      if datastream.dsid == self.class.default_content_dsid
+      if !params[:datastream_id] || params[:datastream_id] == self.class.default_content_dsid
         params[:filename] || asset.label
       else
         params[:datastream_id]

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

@@ -27,7 +27,7 @@ module Sufia::FilesController
           actor = Sufia::GenericFile::Actor.new(gf, current_user)
           actor.create_metadata(params[:batch_id])
           gf.save!
-          Sufia.queue.push(ImportUrlJob.new(gf.pid))
+          Sufia.queue.push(ImportUrlJob.new(gf.id))
         end
       end
 

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

@@ -45,13 +45,14 @@ module Sufia
 
     # routed to /files/new
     def new
-      @batch_noid = Sufia::Noid.noidify(Sufia::IdService.mint)
+      @batch_noid = Batch.create.noid
     end
 
     # routed to /files/:id/edit
     def edit
       @generic_file.initialize_fields
       @groups = current_user.groups
+      @version_list = Sufia::VersionListPresenter.new(@generic_file.content.versions.all)
     end
 
     # routed to /files/:id/stats
@@ -102,6 +103,7 @@ module Sufia
       respond_to do |format|
         format.html {
           @events = @generic_file.events(100)
+          @audit_status = audit_service.human_readable_audit_status
         }
         format.endnote { render text: @generic_file.export_as_endnote }
       end
@@ -109,7 +111,7 @@ module Sufia
 
     # routed to /files/:id/audit (POST)
     def audit
-      render json: @generic_file.audit
+      render json: audit_service.audit
     end
 
     # routed to /files/:id (PUT)
@@ -120,6 +122,8 @@ module Sufia
         update_file
       elsif params.has_key? :generic_file
         update_metadata
+      elsif params.has_key? :visibility
+        update_visibility
       end
 
       if success
@@ -136,8 +140,12 @@ module Sufia
 
     protected
 
+    def audit_service
+      Sufia::GenericFileAuditService.new(@generic_file)
+    end
+
     def wants_to_revert?
-      params.has_key?(:revision) && params[:revision] != @generic_file.content.latest_version.versionID
+      params.has_key?(:revision) && params[:revision] != @generic_file.content.latest_version.label
     end
 
     def actor
@@ -145,7 +153,7 @@ module Sufia
     end
 
     def update_version
-      actor.revert_content(params[:revision], datastream_id)
+      actor.revert_content(params[:revision])
     end
 
     def update_file
@@ -157,6 +165,10 @@ module Sufia
       actor.update_metadata(params[:generic_file], params[:visibility])
     end
 
+    def update_visibility
+      actor.update_metadata({}, params[:visibility])
+    end
+
     def json_error(error, name=nil, additional_arguments={})
       args = {error: error}
       args[:name] = name if name

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

@@ -35,7 +35,7 @@ module Sufia::HomepageController
   # @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\""
+    solr_parameters[:fq] << "#{Solrizer.solr_name("has_model", :symbol)}:\"GenericFile\""
   end
 
 end

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

@@ -68,14 +68,14 @@ module Sufia
     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)
+        ActiveFedora::SolrQueryBuilder.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)
+        ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: ::GenericFile.to_class_uri)
       ]
     end
 

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

@@ -57,11 +57,10 @@ module Sufia
     private
 
     def get_pid_and_authorize_depositor
-      @pid = Sufia::Noid.namespaceize(params[:id])
-      authorize! :edit, @pid
-      raise Hydra::AccessDenied unless ::GenericFile.load_instance_from_solr(@pid).depositor == current_user.user_key
+      @pid = params[:id]
+      authorize! :transfer, @pid
       @proxy_deposit_request.pid = @pid
-    rescue
+    rescue CanCan::AccessDenied
       redirect_to root_url, alert: 'You are not authorized to transfer this file'
     end
 

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

@@ -49,7 +49,7 @@ module Sufia::UsersControllerBehavior
   def update
     if params[:user]
       @user.update_attributes(params.require(:user).permit(*User.permitted_attributes))
-      @user.populate_attributes if update_directory?
+      @user.populate_attributes if ActiveRecord::ConnectionAdapters::Column.value_to_boolean(params[:user][:update_directory])
     end
 
     unless @user.save
@@ -65,13 +65,8 @@ module Sufia::UsersControllerBehavior
     redirect_to sufia.profile_path(@user.to_param), notice: "Your profile has been updated"
   end
 
-  def update_directory?
-    ['1', 'true'].include? params[:user][:update_directory]
-  end
-
   def toggle_trophy
-     id = Sufia::Noid.namespaceize params[:file_id]
-     unless current_user.can? :edit, id
+     unless current_user.can? :edit, params[:file_id]
        redirect_to root_path, alert: "You do not have permissions to the file"
        return false
      end

data/app/controllers/my/collections_controller.rb

@@ -8,7 +8,7 @@ module My
     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)
+        ActiveFedora::SolrQueryBuilder.construct_query_for_rel(has_model: Collection.to_class_uri)
       ]
     end
 
@@ -16,12 +16,11 @@ module My
       super
       @selected_tab = :collections
     end
-  
+
     protected
-    
+
     def search_action_url *args
       sufia.dashboard_collections_url *args
     end
-
   end
 end

data/app/controllers/my/highlights_controller.rb

@@ -6,10 +6,10 @@ module My
     ]
 
     def show_only_highlighted_files(solr_parameters, user_parameters)
-      pids = current_user.trophies.pluck(:generic_file_id).map{|id| Sufia::Noid.namespaceize(id)}
+      ids = current_user.trophies.pluck(:generic_file_id)
       solr_parameters[:fq] ||= []
       solr_parameters[:fq] += [
-        ActiveFedora::SolrService.construct_query_for_pids(pids)
+        ActiveFedora::SolrQueryBuilder.construct_query_for_ids(ids)
       ]
     end
 

data/app/controllers/my/shares_controller.rb

@@ -8,7 +8,7 @@ module My
     def show_only_shared_files(solr_parameters, user_parameters)
       solr_parameters[:fq] ||= []
       solr_parameters[:fq] += [
-        "-" + ActiveFedora::SolrService.construct_query_for_rel(depositor: current_user.user_key)
+        "-" + ActiveFedora::SolrQueryBuilder.construct_query_for_rel(depositor: current_user.user_key)
       ]
     end
 
@@ -16,9 +16,9 @@ module My
       super
       @selected_tab = :shared
     end
-  
+
     protected
-    
+
     def search_action_url *args
       sufia.dashboard_shares_url *args
     end

data/app/controllers/single_use_links_controller.rb

@@ -1,13 +1,10 @@
-require 'sufia/single_use_error'
-
 class SingleUseLinksController < ApplicationController
   prepend_before_filter :normalize_identifier
-  before_filter :load_asset
   before_filter :authenticate_user!
   before_filter :authorize_user!
 
   def new_download
-    @su = SingleUseLink.create itemId: params[:id], path: sufia.download_path(id: @asset)
+    @su = SingleUseLink.create itemId: params[:id], path: sufia.download_path(id: asset)
     @link = sufia.download_single_use_link_path(@su.downloadKey)
 
     respond_to do |format|
@@ -17,7 +14,7 @@ class SingleUseLinksController < ApplicationController
   end
 
   def new_show
-    @su = SingleUseLink.create itemId: params[:id], path: sufia.polymorphic_path(@asset)
+    @su = SingleUseLink.create itemId: params[:id], path: sufia.polymorphic_path(asset)
     @link = sufia.show_single_use_link_path(@su.downloadKey)
 
     respond_to do |format|
@@ -38,11 +35,10 @@ class SingleUseLinksController < ApplicationController
 
   protected
   def authorize_user!
-    authorize! :edit, @asset
+    authorize! :edit, asset
   end
 
-  def load_asset
-    @asset = ActiveFedora::Base.load_instance_from_solr(params[:id])
+  def asset
+    @asset ||= ActiveFedora::Base.load_instance_from_solr(params[:id])
   end
-
 end

data/app/controllers/single_use_links_viewer_controller.rb

@@ -19,7 +19,7 @@ class SingleUseLinksViewerController < ApplicationController
 
       can :read, ActiveFedora::Base do |obj|
         single_use_link.valid? and
-          single_use_link.itemId == obj.pid and single_use_link.destroy!
+          single_use_link.itemId == obj.id and single_use_link.destroy!
       end if single_use_link
 
     end
@@ -49,7 +49,7 @@ class SingleUseLinksViewerController < ApplicationController
   protected
 
   def authorize_download!
-    authorize! :read, @asset
+    authorize! :read, asset
   end
 
   def single_use_link
@@ -60,8 +60,8 @@ class SingleUseLinksViewerController < ApplicationController
     Sufia::SingleUseError.new('Single-Use Link Not Found')
   end
 
-  def load_asset
-    @asset = ActiveFedora::Base.load_instance_from_solr(single_use_link.itemId)
+  def asset
+    @asset ||= ActiveFedora::Base.find(single_use_link.itemId)
   end
 
   def current_ability