sufia 6.0.0.rc4 → 6.0.0

data/app/views/dashboard/_index_partials/_heading_actions.html.erb

@@ -1,16 +1,20 @@
 <div class="col-xs-12 heading-row">
-  <div class="col-xs-6 col-sm-3 heading-tile">
-    <%= link_to sufia.new_generic_file_path do %>
-        <span class="glyphicon glyphicon-upload"></span>
-        <%= t("sufia.dashboard.upload") %>
-    <% end %>
-  </div>
-  <div class="col-xs-6 col-sm-3 heading-tile">
-    <%= link_to collections.new_collection_path, id: "hydra-collection-add" do %>
-        <span class="glyphicon glyphicon-plus"></span>
-        <%= t("sufia.dashboard.create_collection") %>
-    <% end %>
-  </div>
+  <% if can?(:create, GenericFile) %>
+    <div class="col-xs-6 col-sm-3 heading-tile">
+      <%= link_to sufia.new_generic_file_path do %>
+          <span class="glyphicon glyphicon-upload"></span>
+          <%= t("sufia.dashboard.upload") %>
+      <% end %>
+    </div>
+  <% end %>
+  <% if can?(:create, Collection) %>
+    <div class="col-xs-6 col-sm-3 heading-tile">
+      <%= link_to collections.new_collection_path, id: "hydra-collection-add" do %>
+          <span class="glyphicon glyphicon-plus"></span>
+          <%= t("sufia.dashboard.create_collection") %>
+      <% end %>
+    </div>
+  <% end  %>
   <div class="col-xs-6 col-sm-3 heading-tile">
     <%= link_to sufia.dashboard_collections_path, id: "hydra-collection-view" do %>
         <span class="glyphicon glyphicon-th"></span>

data/app/views/generic_files/_browse_everything.html.erb

@@ -1,5 +1,7 @@
 <%= render partial: 'generic_files/upload/agreement' %>
-<%= render partial: 'generic_files/upload/alerts' %>
+<div class="alert alert-success">
+  <%=  t("sufia.upload.cloud_timeout_message", contact_href: link_to(t("sufia.upload.alert.contact_href_text"), sufia.contact_form_index_path)) %>
+</div>
 <div class="well">
   <%= form_tag(sufia.generic_files_path, id: 'browse_everything_form', method: 'post') do %>
       <%= render partial: 'generic_files/upload/tos_checkbox' %>

data/app/views/generic_files/_local_file_import.html.erb

@@ -1,3 +1,2 @@
 <%= render partial: 'generic_files/upload/agreement' %>
-<%= render partial: 'generic_files/upload/alerts' %>
 <%= render partial: 'generic_files/upload/local_file_import_chooser' %>

data/app/views/generic_files/_multiple_upload.html.erb

@@ -1,4 +1,3 @@
 <%= render partial: 'generic_files/upload/agreement' %>
-<%= render partial: 'generic_files/upload/alerts' %>
 <%= render partial: 'generic_files/upload/form' %>
 <%= render partial: 'generic_files/upload/script_templates' %>

data/app/views/generic_files/_show_descriptions.html.erb

@@ -1,12 +1,7 @@
-
-<h2 class="non lower">Descriptions</h2>
-<table class="table table-striped"><!-- class="verticalheadings"> -->
-  <tbody>
-  <% present_terms(@presenter) do |r, term| %>
-      <tr>
-        <th><%= r.label(term) %></th>
-        <td><%= r.value(term) %></td>
-      </tr>
+<h2>Descriptions</h2>
+<dl class="dl-horizontal file-show-term file-show-descriptions">
+  <% present_terms(@presenter,@presenter.terms - [:title, :description]) do |r, term| %>
+  <dt><%= r.label(term) %></dt>
+      <dd><%= r.value(term) %></dd>
   <% end %>
-  </tbody>
-</table> <!-- /verticalheadings -->
+</dl>

data/app/views/generic_files/_show_details.html.erb

@@ -1,69 +1,45 @@
-    <h2 class="non lower">File Details</h2>
-    <table class="table table-striped">
-      <tbody>
-        <tr>
-          <th>Depositor</th>
-          <td itemprop="accountablePerson" itemscope itemtype="http://schema.org/Person"><span itemprop="name"><%= link_to_profile @generic_file.depositor %></span></td>
-        </tr>
-        <tr>
-          <th>Date Uploaded</th>
-          <td itemprop="datePublished">
-            <%= @generic_file.date_uploaded %>
-          </td>
-        </tr>
-        <tr>
-          <th>Date Modified</th>
-          <td itemprop="dateModified">
-            <%= @generic_file.date_modified %>
-          </td>
-        </tr>
-        <tr>
-          <th>Audit Status</th>
-          <td><%= @audit_status %></td>
-        </tr>
-<% unless @generic_file.related_files.empty? %>
-        <tr>
-          <th>Related Files</th>
-          <td>
-              <div class="related-files">
-                  <dl><dt>
-	              <% @generic_file.related_files.each do |f| %>
-	                <dd><%= link_to(f.label, sufia.generic_file_url(f)) %></dd>
-	              <% end %>
-                  </dt></dl>
-              </div>
-          </td>
-        </tr>
-<% end %>
-<tr>
-          <th>Characterization</th>
-          <td>
-            <%= "not yet characterized" if @generic_file.characterization_terms.values.flatten.map(&:empty?).reduce(true) { |sum, value| sum && value } %>
-            <% @generic_file.characterization_terms.each_pair do |term, values| %>
-            <div>
-              <% label = term.to_s %>
-              <% if label == "format_label" %>
-                 <% label = "File Format"  %>
-                 <% values = @generic_file.file_format %>
-              <% end %>
-              <% label = label.humanize %>
-              <% if values.is_a? Array %>
-                <% length = values.length %>
-                <% length = Sufia.config.fits_message_length-1  if term == :status_message && values.length > Sufia.config.fits_message_length-1  %>
-                <% values[0..length].each_with_index do |value, idx| %>
+<h2>File Details</h2>
+<dl class="dl-horizontal file-show-term file-show-details">
+  <dt>Depositor</dt>
+  <dd itemprop="accountablePerson" itemscope itemtype="http://schema.org/Person"><span itemprop="name"><%= link_to_profile @generic_file.depositor %></span></dd>
+  <dt>Date Uploaded</dt>
+  <dd itemprop="datePublished"><%= @generic_file.date_uploaded %></dd>
+  <dt>Date Modified</dt>
+  <dd itemprop="dateModified"><%= @generic_file.date_modified %></dd>
+  <dt>Audit Status</dt>
+  <dd><%= @audit_status %></dd>
+  <% unless @generic_file.related_files.empty? %>
+  <dt>Related Files</dt>
+      <% @generic_file.related_files.each do |f| %>
+          <dd><%= link_to(f.label, sufia.generic_file_url(f)) %></dd>
+      <% end %>
+  <% end %>
+  <dt>Characterization</dt>
+  <dd>
+    <%= "not yet characterized" if @generic_file.characterization_terms.values.flatten.map(&:empty?).reduce(true) { |sum, value| sum && value } %>
+    <% @generic_file.characterization_terms.each_pair do |term, values| %>
+        <div>
+          <% label = term.to_s %>
+          <% if label == "format_label" %>
+              <% label = "File Format"  %>
+              <% values = @generic_file.file_format %>
+          <% end %>
+          <% label = label.humanize %>
+          <% if values.is_a? Array %>
+              <% length = values.length %>
+              <% length = Sufia.config.fits_message_length-1  if term == :status_message && values.length > Sufia.config.fits_message_length-1  %>
+              <% values[0..length].each_with_index do |value, idx| %>
                   <% next if value.empty? %>
                   <%= "#{label}: #{value.truncate(250)}" %>
                   <%= "<br />".html_safe unless idx == length %>
-                <% end %>
-                <% if length != values.length %>
-                   <%= render partial: "generic_files/extra_fields_modal", locals: {name: term, values: values, start: Sufia.config.fits_message_length}%>
-                <% end %>
-              <% else %>
-                <%= "#{label}: #{values.truncate(250)}" %><br />
               <% end %>
-            </div>
-            <% end %>
-          </td>
-        </tr>
-      </tbody>
-    </table> <!-- /verticalheadings -->
+              <% if length != values.length %>
+                  <%= render partial: "generic_files/extra_fields_modal", locals: {name: term, values: values, start: Sufia.config.fits_message_length}%>
+              <% end %>
+          <% else %>
+              <%= "#{label}: #{values.truncate(250)}" %><br />
+          <% end %>
+        </div>
+    <% end %>
+  </dd>
+</dl>

data/app/views/generic_files/new.html.erb

@@ -1,4 +1,5 @@
 <h2>Upload</h2>
+<%= render partial: 'generic_files/upload/alerts' %>
 <%# using partials rather than inlining, so implementers can add or change stuff on this page without much duplication %>
 <ul class="nav nav-tabs" role="tablist" title="Data Source Selectors" id="upload_tabs">
   <li class="active" id="computer_tab" title="<%= t('sufia.upload.my_computer.sr_tab_label')+' '+ t('sufia.upload.my_computer.tab_label') %>"><a role="tab" href="#local" data-toggle="tab"><i class="glyphicon glyphicon-folder-open" aria-hidden="true"></i> <%= t('sufia.upload.my_computer.tab_label')%></a></li>

data/app/views/generic_files/show.html.erb

@@ -47,7 +47,8 @@
     <%= render 'show_collections' %>
   </div>
   <div itemscope itemtype="<%= @presenter.itemtype %>" class="col-xs-12 col-sm-8">
-    <h1 class="visibility"><%= @presenter.title.first %> <%= render_visibility_badge %></h1>
+    <h1 class="visibility"><%= display_multiple @presenter.title %> <%= render_visibility_badge %></h1>
+    <p class="genericfile_description"><%= display_multiple @presenter.description %></p>
     <%= render 'show_descriptions' %>
     <%= render 'show_details' %>
     <%= render 'users/activity_log', events: @events %>

data/app/views/generic_files/upload/_alerts.html.erb

@@ -1,17 +1,9 @@
-<div class="alert alert-info hide" id="success">
-  You have successfully uploaded some of your files.  Either continue to upload or edit use the links below to abandon the rest of your added files.
-  <p>
-  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_id), class: 'btn' %>
-  </p>
+<div class="alert alert-warning" id="fail">
+  <%= t("sufia.upload.alert.fail_html", reload_href: link_to(t("sufia.upload.alert.fail_restart_href_text"), sufia.new_generic_file_path), contact_href: link_to(t("sufia.upload.alert.contact_href_text"), sufia.contact_form_index_path)) %>
 </div>
 
-<div class="alert hide" id="fail">
-  There was a problem during upload. Please click the &quot;Start Upload&quot; button or <%= link_to 'start over', sufia.new_generic_file_path %>
+<div class="alert alert-warning" id="partial_fail">
+  <%= t("sufia.upload.alert.partial_fail_html", metadata_href: link_to(t("sufia.upload.alert.partial_fail_metadata_href_text"), GenericFilesController.upload_complete_path(@batch_id), class: 'btn'), contact_href: link_to(t("sufia.upload.alert.contact_href_text"), sufia.contact_form_index_path)) %>
 </div>
 
-<div class="alert hide" id="partial_fail">
-  One or more files did not upload successfully. To continue using the files uploaded use one of the links below.<br />
-  <%= link_to 'Add Descriptions', GenericFilesController.upload_complete_path(@batch_id), class: 'btn' %>
-</div>
-
-<div class="alert hide" id="errmsg"> </div>
+<div class="alert alert-warning" id="errmsg"> </div>

data/app/views/homepage/_home_header.html.erb

@@ -1,12 +1,11 @@
 <div class="home_call_action col-xs-12 col-sm-4 pull-right">
-  <div class="home_share_work">
-    <%= link_to "<i class=\"glyphicon glyphicon-upload\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, class: "btn btn-primary btn-lg btn-block", id: "contribute_link" %>
-    <p class="text-center"><a href="/terms/">Terms of Use</a></p>
-  </div><!-- /.home_share_work -->
+  <% if can?(:view_share_work, GenericFile) %>
+    <div class="home_share_work">
+      <%= link_to "<i class=\"glyphicon glyphicon-upload\"></i> #{t('sufia.share_button')}".html_safe, sufia.new_generic_file_path, class: "btn btn-primary btn-lg btn-block", id: "contribute_link" %>
+      <p class="text-center"><a href="/terms/">Terms of Use</a></p>
+    </div><!-- /.home_share_work -->
+  <% end %>
 </div><!-- /.col-xs-3 -->
 <div class="col-xs-12 col-sm-8">
   <%= render partial: "marketing" %>
 </div>
-
-
-

data/app/views/my/_index_partials/_list_collections.html.erb

@@ -5,7 +5,7 @@
   <td width="41%">
     <div class="media">
       <%= link_to [collections, document], class: "pull-left", "aria-hidden" => true do %>
-        <span class="glyphicon glyphicon-th collection-icon-small">
+          <%= image_tag "site_images/collection-icon.svg", class: "collection-icon-small" %>
       <% end %>
       <div class="media-body">
         <div class="media-heading">

data/app/views/my/index.html.erb

@@ -33,8 +33,8 @@
 <%= render partial: 'document_list' %>
 
 <% content_for :sidebar do %>
-  <%= link_to t("sufia.dashboard.upload"), sufia.new_generic_file_path, class: "btn btn-primary" %>
-  <%= link_to t("sufia.dashboard.create_collection"), collections.new_collection_path, id: "hydra-collection-add", class: "btn btn-primary" %>
+  <%= link_to t('sufia.dashboard.upload_html'), sufia.new_generic_file_path, class: "btn btn-primary" %>
+  <%= link_to t('sufia.dashboard.create_collection_html'), collections.new_collection_path, id: "hydra-collection-add", class: "btn btn-primary" %>
   <%= render partial: 'facets', locals: {current_tab: current_tab} %>
 <% end %>
 

data/app/views/records/edit_fields/_resource_type.html.erb

@@ -1,2 +1,2 @@
 <%= f.input :resource_type, as: :select_with_help, collection: Sufia.config.resource_types,
-    input_html: { class: 'form-control', multiple: true, required: true } %>
+    input_html: { class: 'form-control', multiple: true } %>

data/config/initializers/sufia_events.rb

@@ -14,7 +14,6 @@ Sufia.config.after_update_metadata = lambda { |generic_file, user|
   Sufia.queue.push(ContentUpdateEventJob.new(generic_file.id, user.user_key))
 }
 
-Sufia.config.after_destroy = lambda { |pid, user|
-  Sufia.queue.push(ContentDeleteEventJob.new(pid, user.user_key))
+Sufia.config.after_destroy = lambda { |id, user|
+  Sufia.queue.push(ContentDeleteEventJob.new(id, user.user_key))
 }
-

data/config/locales/sufia.en.yml

@@ -47,6 +47,13 @@ en:
       local_ingest:
         tab_label: "Network/Server Location"
       processing: "File is being processed; you may edit when processing has completed"
+      alert:
+        fail_html: "There was a problem during upload, none of your files uploaded correctly. Please %{reload_href}.  Use the %{contact_href} to report the error if it persists."
+        fail_restart_href_text: "start over"
+        contact_href_text: "contact form"
+        partial_fail_html: "One or more files did not upload successfully. To continue using the files that uploaded %{metadata_href}. <br /> Use the %{contact_href} to report the error if it persists."
+        partial_fail_metadata_href_text: "edit their metadata"
+      cloud_timeout_message: "Please note that if you upload a large number of files within a short period of time, the cloud provider may not be able to accommodate your request. If you experience any errors uploading from the cloud, let us know via the %{contact_href}."
     homepage:
       featured_works:
         tab_label:          'Featured Works'
@@ -59,8 +66,8 @@ en:
     dashboard:
       title:                    "My Dashboard"
       greeting:                 "Hello, "
-      upload:                   "Upload"
-      create_collection:        "Create Collection"
+      upload_html:                   '<span class="glyphicon glyphicon-upload"></span> Upload'
+      create_collection_html:        '<span class="glyphicon glyphicon-plus"></span> Create Collection'
       view_collections:         "View Collections"
       view_files:               "View Files"
       user_activity:            "User Activity"
@@ -121,6 +128,8 @@ en:
     visibility:
       open: "Open Access"
       private: "Private"
+      open_title_attr: "Change the visibility of this resource"
+      private_title_attr: "Change the visibility of this resource"
     user_profile:
       no_followers: "No one is following you."
       no_following: "You are not following anyone."

data/lib/generators/sufia/install_generator.rb

@@ -77,7 +77,7 @@ module Sufia
 
     # The engine routes have to come after the devise routes so that /users/sign_in will work
     def inject_routes
-      gsub_file 'config/routes.rb', 'root :to => "catalog#index"', ''
+      gsub_file 'config/routes.rb',  /root (:to =>|to:) "catalog#index"/, ''
 
       routing_code = "\n  Hydra::BatchEdit.add_routes(self)\n" +
         "  # This must be the very last route in the file because it has a catch-all route for 404 errors.
@@ -101,6 +101,10 @@ module Sufia
       end
     end
 
+    def install_sufia_600
+      generate "sufia:upgrade600"
+    end
+
     def install_blacklight_gallery
       generate "blacklight_gallery:install"
     end

data/lib/generators/sufia/templates/catalog_controller.rb

@@ -8,16 +8,14 @@ require 'parslet'
 require 'parsing_nesting/tree'
 
 class CatalogController < ApplicationController
-  include Blacklight::Catalog
-  # Extend Blacklight::Catalog with Hydra behaviors (primarily editing).
+  include Hydra::Catalog
   include Hydra::Controller::ControllerBehavior
-  include BlacklightAdvancedSearch::ParseBasicQ
   include Sufia::Catalog
 
   # These before_filters apply the hydra access controls
   before_filter :enforce_show_permissions, only: :show
   # This applies appropriate access controls to all solr queries
-  CatalogController.solr_search_params_logic += [:add_access_controls_to_solr_params]
+  CatalogController.search_params_logic += [:add_access_controls_to_solr_params, :add_advanced_parse_q_to_solr]
 
   skip_before_filter :default_html_head
 
@@ -304,7 +302,7 @@ class CatalogController < ApplicationController
     # whether the sort is ascending or descending (it must be asc or desc
     # except in the relevancy case).
     # label is key, solr field is value
-    config.add_sort_field "score desc, #{uploaded_field} desc", label: "relevance \u25BC"
+    config.add_sort_field "score desc, #{uploaded_field} desc", label: "relevance"
     config.add_sort_field "#{uploaded_field} desc", label: "date uploaded \u25BC"
     config.add_sort_field "#{uploaded_field} asc", label: "date uploaded \u25B2"
     config.add_sort_field "#{modified_field} desc", label: "date modified \u25BC"

data/lib/generators/sufia/upgrade600_generator.rb

@@ -0,0 +1,26 @@
+# -*- encoding : utf-8 -*-
+require 'rails/generators'
+
+class Sufia::Upgrade600Generator < Rails::Generators::Base
+
+  source_root File.expand_path('../templates', __FILE__)
+
+  desc """
+This generator for upgrading sufia to 6.0 makes the following changes to your application:
+ 1. Adds Sufia::SearchBuilder to SearchBuilder
+       """
+
+  def insert_builder
+    insert_into_file 'app/models/search_builder.rb', after: /include Blacklight::Solr::SearchBuilderBehavior/ do
+      # First line should be generated by Hydra. projecthydra/hydra-head#255
+      "\n  include Hydra::AccessControlsEnforcement" +
+      "\n  include Sufia::SearchBuilder\n"
+    end
+  end
+
+  def migrations
+    generate "sufia:models:upgrade600"
+  end
+
+end
+

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = "6.0.0.rc4"
+  VERSION = "6.0.0"
 end

data/spec/actors/generic_file/actor_spec.rb

@@ -20,6 +20,20 @@ describe Sufia::GenericFile::Actor do
       actor.create_content(uploaded_file, 'world.png', 'content', 'image/png')
     end
 
+    context "when generic_file.title is empty and generic_file.label is not" do
+      let(:file)       { "world.png" }
+      let(:long_name)  { "an absurdly long title that goes on way to long and messes up the display of the page which should not need to be this big in order to show this impossibly long, long, long, oh so long string" }
+      let(:short_name) { "Nice Short Name" }
+      let(:actor)      { Sufia::GenericFile::Actor.new(generic_file, user) }
+      before do
+        allow(generic_file).to receive(:label).and_return(short_name)
+        allow(Sufia.queue).to receive(:push)
+        actor.create_content(fixture_file_upload(file), long_name, 'content', 'image/png')
+      end 
+      subject { generic_file.title }
+      it { is_expected.to eql [short_name] }
+    end
+
     context "with two existing versions from different users" do
 
       let(:file1)       { "world.png" }

data/spec/controllers/collections_controller_spec.rb

@@ -30,6 +30,15 @@ describe CollectionsController do
       }.to change{ Collection.count }.by(1)
     end
 
+    it "should remove blank strings from params before creating Collection" do
+      expect {
+        post :create, collection: {
+          title: "My First Collection ", creator: [""] }
+      }.to change{ Collection.count }.by(1)
+      expect(assigns[:collection].title).to eq("My First Collection ")
+      expect(assigns[:collection].creator).to eq([])
+    end
+
     it "should create a Collection with files I can access" do
       @asset1 = GenericFile.new(title: ["First of the Assets"])
       @asset1.apply_depositor_metadata(user.user_key)
@@ -48,12 +57,12 @@ describe CollectionsController do
       expect(collection.members).to match_array [@asset1, @asset2]
     end
 
-    it "should add docs to collection if batch ids provided and add the collection id to the documents int he colledction" do
+    it "should add docs to the collection if a batch id is provided and add the collection id to the documents in the collection" do
       @asset1 = GenericFile.new(title: ["First of the Assets"])
       @asset1.apply_depositor_metadata(user.user_key)
       @asset1.save
       post :create, batch_document_ids: [@asset1.id],
-        collection: { title: "My Secong Collection ", description: "The Description\r\n\r\nand more" }
+        collection: { title: "My Second Collection ", description: "The Description\r\n\r\nand more" }
       expect(assigns[:collection].members).to eq [@asset1]
       asset_results = ActiveFedora::SolrService.instance.conn.get "select", params:{fq:["id:\"#{@asset1.id}\""],fl:['id',Solrizer.solr_name(:collection)]}
       expect(asset_results["response"]["numFound"]).to eq 1
@@ -113,6 +122,14 @@ describe CollectionsController do
         collection.reload
         expect(collection.creator).to eq ['Emily']
       end
+
+      it "should remove blank strings from params before updating Collection metadata" do
+        put :update, id: collection, collection: {
+          title: "My Next Collection ", creator: [""] }
+        expect(assigns[:collection].title).to eq("My Next Collection ")
+        expect(assigns[:collection].creator).to eq([])
+      end
+
     end
   end