sufia 6.0.0.beta1 → 6.0.0.rc1

data/app/controllers/batch_edits_controller.rb

@@ -1,5 +1,5 @@
-class BatchEditsController < ApplicationController  
+class BatchEditsController < ApplicationController
    include Hydra::BatchEditBehavior
    include GenericFileHelper
    include Sufia::BatchEditsControllerBehavior
-end   
+end

data/app/controllers/collections_controller.rb

@@ -14,7 +14,23 @@ class CollectionsController < ApplicationController
 
   layout "sufia-one-column"
 
-  protected 
+  def show
+    super
+    @presenter = presenter
+  end
+
+  protected
+
+  def presenter
+    Sufia::CollectionPresenter.new(@collection)
+  end
+
+  def collection_params
+    params.require(:collection).permit(:title, :description, :members, part_of: [],
+      contributor: [], creator: [], publisher: [], date_created: [], subject: [],
+      language: [], rights: [], resource_type: [], identifier: [], based_near: [],
+      tag: [], related_url: [])
+  end
 
   def query_collection_members
     flash[:notice]=nil if flash[:notice] == "Select something first"
@@ -33,9 +49,9 @@ class CollectionsController < ApplicationController
       format.json { render json: {id: id}, status: :destroyed, location: @collection }
     end
   end
-  
+
   def initialize_fields_for_edit
-    @collection.initialize_fields
+    @form = Sufia::Forms::CollectionEditForm.new(@collection)
   end
 
   def _prefixes

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

@@ -12,7 +12,7 @@ module Sufia
        super
        @generic_file = ::GenericFile.new
        @generic_file.depositor = current_user.user_key
-       @terms = @generic_file.terms_for_editing - [:title, :format, :resource_type]
+       @terms = terms - [:title, :format, :resource_type]
 
        h  = {}
        @names = []
@@ -21,7 +21,7 @@ module Sufia
        # For each of the files in the batch, set the attributes to be the concatination of all the attributes
        batch.each do |doc_id|
           gf = ::GenericFile.load_instance_from_solr(doc_id)
-          gf.terms_for_editing.each do |key|
+          terms.each do |key|
             h[key] ||= []
             h[key] = (h[key] + gf.send(key)).uniq
           end
@@ -35,7 +35,11 @@ module Sufia
     end
 
     def after_update
-      redirect_to_return_controller unless request.xhr?
+
+      respond_to do |format|
+        format.json { head :no_content }
+        format.html { redirect_to_return_controller }
+      end
     end
 
     def after_destroy_collection
@@ -43,49 +47,46 @@ module Sufia
     end
 
     def update_document(obj)
-      super
+      obj.attributes = generic_file_params
       obj.date_modified = Time.now.ctime
       obj.visibility = params[:visibility]
     end
 
     def update
-      # keep the batch around if we are doing ajax calls
-      batch_sav = batch.dup if request.xhr?
-      catalog_index_path = sufia.dashboard_index_path
-      type = params["update_type"]
-      if type == "update"
-        super
-      elsif type == "delete_all"
-        batch.each do |doc_id|
-          gf = ::GenericFile.find(doc_id)
-          gf.destroy
-        end
-        after_update
-      end
-
-      # reset the batch around if we are doing ajax calls
-      if request.xhr?
-        self.batch = batch_sav.dup
-        @key = params["key"]
-        if @key != "permissions"
-          @vals = params["generic_file"][@key]
-        else
-          @vals = [""]
-        end
-        render :update_edit
+      case params["update_type"]
+        when "update"
+          super
+        when "delete_all"
+          destroy_batch
       end
     end
 
     protected
 
+    def destroy_batch
+      batch.each do |doc_id|
+        gf = ::GenericFile.find(doc_id)
+        gf.destroy
+      end
+      after_update
+    end
+
     # override this method if you need to initialize more complex RDF assertions (b-nodes)
     def initialize_fields(attributes, file)
-       file.terms_for_editing.each do |key|
+       terms.each do |key|
          # if value is empty, we create an one element array to loop over for output
          file[key] = attributes[key].empty? ? [''] : attributes[key]
        end
     end
 
+    def terms
+      Forms::BatchEditForm.terms
+    end
+
+    def generic_file_params
+      Forms::BatchEditForm.model_attributes(params[:generic_file])
+    end
+
     def redirect_to_return_controller
       if params[:return_controller]
         redirect_to sufia.url_for(controller: params[:return_controller], only_path: true)

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

@@ -20,11 +20,10 @@
       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
 
@@ -37,5 +36,11 @@
       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/files_controller_behavior.rb

@@ -50,9 +50,9 @@ module Sufia
 
     # routed to /files/:id/edit
     def edit
-      @generic_file.initialize_fields
+      @form = edit_form
       @groups = current_user.groups
-      @version_list = Sufia::VersionListPresenter.new(@generic_file.content.versions.all)
+      @version_list = version_list
     end
 
     # routed to /files/:id/stats
@@ -103,6 +103,7 @@ module Sufia
       respond_to do |format|
         format.html {
           @events = @generic_file.events(100)
+          @presenter = presenter
           @audit_status = audit_service.human_readable_audit_status
         }
         format.endnote { render text: @generic_file.export_as_endnote }
@@ -140,6 +141,18 @@ module Sufia
 
     protected
 
+    def presenter
+      Sufia::GenericFilePresenter.new(@generic_file)
+    end
+
+    def version_list
+      Sufia::VersionListPresenter.new(@generic_file.content.versions.all)
+    end
+
+    def edit_form
+      Sufia::Forms::GenericFileEditForm.new(@generic_file)
+    end
+
     def audit_service
       Sufia::GenericFileAuditService.new(@generic_file)
     end
@@ -162,7 +175,8 @@ module Sufia
 
     # this is provided so that implementing application can override this behavior and map params to different attributes
     def update_metadata
-      actor.update_metadata(params[:generic_file], params[:visibility])
+      file_attributes = Sufia::Forms::GenericFileEditForm.model_attributes(params[:generic_file])
+      actor.update_metadata(file_attributes, params[:visibility])
     end
 
     def update_visibility
@@ -185,12 +199,10 @@ module Sufia
       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
+            render 'jq_upload', formats: 'json', content_type: 'text/html'
           }
           format.json {
-            render json: [@generic_file.to_jq_upload]
+            render 'jq_upload'
           }
         end
       else

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

@@ -48,8 +48,8 @@ module Sufia::UsersControllerBehavior
   # Process changes from profile form
   def update
     if params[:user]
-      @user.update_attributes(params.require(:user).permit(*User.permitted_attributes))
-      @user.populate_attributes if ActiveRecord::ConnectionAdapters::Column.value_to_boolean(params[:user][:update_directory])
+      @user.attributes = user_params
+      @user.populate_attributes if update_directory?
     end
 
     unless @user.save
@@ -65,6 +65,10 @@ 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
      unless current_user.can? :edit, params[:file_id]
        redirect_to root_path, alert: "You do not have permissions to the file"
@@ -103,6 +107,14 @@ module Sufia::UsersControllerBehavior
 
   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
+
+
   # You can override base_query to return a list of arguments
   def base_query
     [nil]

data/app/controllers/single_use_links_viewer_controller.rb

@@ -39,7 +39,7 @@ class SingleUseLinksViewerController < ApplicationController
     raise not_found_exception unless single_use_link.path == sufia.polymorphic_path(@asset)
 
     #show the file
-    @terms = @asset.terms_for_display
+    @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
     @su = single_use_link.create_for_path sufia.download_path(id: @asset)
@@ -48,6 +48,10 @@ class SingleUseLinksViewerController < ApplicationController
 
   protected
 
+  def presenter
+    Sufia::GenericFilePresenter.new(@asset)
+  end
+
   def authorize_download!
     authorize! :read, asset
   end

data/app/forms/sufia/forms/batch_edit_form.rb

@@ -0,0 +1,6 @@
+module Sufia
+  module Forms
+    class BatchEditForm < GenericFileEditForm
+    end
+  end
+end

data/app/forms/sufia/forms/collection_edit_form.rb

@@ -0,0 +1,17 @@
+module Sufia
+  module Forms
+    class CollectionEditForm
+      include HydraEditor::Form
+      self.model_class = ::Collection
+      self.terms = [:resource_type, :title, :creator, :contributor, :description, :tag, :rights,
+                  :publisher, :date_created, :subject, :language, :identifier, :based_near, :related_url]
+
+      # Test to see if the given field is required
+      # @param [Symbol] key a field
+      # @return [Boolean] is it required or not
+      def required?(key)
+        model_class.validators_on(key).any?{|v| v.kind_of? ActiveModel::Validations::PresenceValidator}
+      end
+    end
+  end
+end

data/app/forms/sufia/forms/generic_file_edit_form.rb

@@ -0,0 +1,16 @@
+module Sufia
+  module Forms
+    class GenericFileEditForm < GenericFilePresenter
+      include HydraEditor::Form
+      self.required_fields = [:title, :creator, :tag, :rights]
+
+      # This is required so that fields_for will draw a nested form.
+      # See ActionView::Helpers#nested_attributes_association?
+      #   https://github.com/rails/rails/blob/a04c0619617118433db6e01b67d5d082eaaa0189/actionview/lib/action_view/helpers/form_helper.rb#L1890
+      def permissions_attributes= attributes
+        model.permissions_attributes= attributes
+      end
+
+    end
+  end
+end

data/app/helpers/generic_file_helper.rb

@@ -4,20 +4,9 @@ module GenericFileHelper
     gf.to_s
   end
 
-  def required?(key)
-    [:title, :creator, :tag, :rights].include?(key)
-  end
-
-  def render_show_field_partial(key, locals)
-    render_show_field_partial_with_action('generic_files', key, locals)
-  end
-
-  def render_edit_field_partial(key, locals)
-    render_edit_field_partial_with_action('generic_files', key, locals)
-  end
-
-  def render_batch_edit_field_partial(key, locals)
-    render_edit_field_partial_with_action('batch_edit', key, locals)
+  def present_terms(presenter, terms=:all, &block)
+    terms = presenter.terms if terms == :all
+    Sufia::PresenterRenderer.new(presenter, self).fields(terms, &block)
   end
 
   def render_download_icon title = nil
@@ -40,39 +29,6 @@ module GenericFileHelper
 
   private
 
-  def render_edit_field_partial_with_action(action, key, locals)
-    ["#{action}/edit_fields/#{key}", "#{action}/edit_fields/default"].each do |str|
-      # XXX rather than handling this logic through exceptions, maybe there's a Rails internals method
-      # for determining if a partial template exists..
-      begin
-        return render partial: str, locals: locals.merge({ key: key })
-      rescue ActionView::MissingTemplate
-        nil
-      end
-    end
-  end
-
-  def render_show_field_partial_with_action(action, key, locals)
-    ["#{action}/show_fields/#{key}", "#{action}/show_fields/default"].each do |str|
-      # XXX rather than handling this logic through exceptions, maybe there's a Rails internals method
-      # for determining if a partial template exists..
-      begin
-        return render partial: str, locals: locals.merge({ key: key })
-      rescue ActionView::MissingTemplate
-        nil
-      end
-    end
-  end
-
-  def more_or_less_button(key, html_class, symbol)
-    # 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: 'sr-only') do
-        "add another #{key.to_s}"
-      end).html_safe
-    end
-  end
-
   def download_image_tag title = nil
     if title.nil?
       image_tag "default.png", { alt: "No preview available", class: "img-responsive" }

data/app/helpers/sufia/permissions_helper.rb

@@ -0,0 +1,29 @@
+module Sufia
+  module PermissionsHelper
+
+    def visibility_help
+      help_link('generic_files/visibility', 'Visibility', 'Useage information for visibility')
+    end
+
+    def share_with_help
+      help_link('generic_files/share_with', 'Share With', 'Useage information for sharing')
+    end
+
+    private
+
+      def help_link(file, title, aria_label)
+        link_to help_icon, '#', rel: 'popover', :'data-content' => capture_content(file),
+          :'data-original-title' => title, :'aria-label' => aria_label
+      end
+
+      def capture_content(file)
+        capture do
+          render file
+        end
+      end
+
+      def help_icon
+        content_tag 'i', '', :'aria-hidden' => true, class: 'help-icon'
+      end
+  end
+end

data/app/helpers/sufia/sufia_helper_behavior.rb

@@ -1,5 +1,9 @@
 module Sufia
   module SufiaHelperBehavior
+    def orcid_label(style_class='')
+      "#{image_tag 'orcid.png', { alt: t('sufia.user_profile.orcid.alt'), class: style_class }} #{t('sufia.user_profile.orcid.label')}".html_safe
+    end
+
     def error_messages_for(object)
       if object.try(:errors) and object.errors.full_messages.any?
         content_tag(:div, class: 'alert alert-block alert-error validation-errors') do
@@ -164,6 +168,13 @@ module Sufia
       end
     end
 
+    def user_display_name_and_key(user_key)
+      user = ::User.find_by_user_key(user_key)
+      return user_key if user.nil?
+
+      user.respond_to?(:name) ? "#{user.name} (#{user_key})" : user_key
+    end
+
     private
 
     def search_action_for_dashboard