sufia 7.0.0.beta4 → 7.0.0.rc1

data/app/presenters/work_usage.rb

@@ -3,19 +3,20 @@
 # and prepares it for visualization in /app/views/stats/work.html.erb
 
 class WorkUsage
-  attr_accessor :id, :created, :path, :pageviews
+  attr_accessor :id, :created, :pageviews, :work
 
   def initialize(id)
-    work = ::GenericWork.find(id)
+    @work = CurationConcerns::WorkRelation.new.find(id)
     user = User.find_by(email: work.depositor)
     user_id = user ? user.id : nil
 
     self.id = id
-    self.path = Rails.application.routes.url_helpers.curation_concerns_generic_work_path(id)
     self.created = date_for_analytics(work)
-    self.pageviews = WorkViewStat.to_flots WorkViewStat.statistics(id, created, user_id)
+    self.pageviews = WorkViewStat.to_flots WorkViewStat.statistics(work, created, user_id)
   end
 
+  delegate :to_s, to: :work
+
   def total_pageviews
     pageviews.reduce(0) { |total, result| total + result[1].to_i }
   end

data/app/search_builders/deposit_search_builder.rb

@@ -1,6 +1,7 @@
 class DepositSearchBuilder < ::SearchBuilder
   # includes the depositor_facet to get information on deposits.
-  #  use caution when combining this with other searches as it sets the rows to zero to just get the facet information
+  # use caution when combining this with other searches as it sets the rows to
+  # zero to just get the facet information
   # @param solr_parameters the current solr parameters
   def include_depositor_facet(solr_parameters)
     solr_parameters[:"facet.field"].concat([DepositSearchBuilder.depositor_field])
@@ -10,8 +11,8 @@ class DepositSearchBuilder < ::SearchBuilder
     # the number of users in the database
     solr_parameters[:"facet.limit"] = ::User.count
 
-    # only get file information
-    solr_parameters[:fq] = "has_model_ssim:GenericWork"
+    # only get work information
+    solr_parameters[:fq] = CurationConcerns::WorkRelation.new.search_model_clause
 
     # we only want the facte counts not the actual data
     solr_parameters[:rows] = 0

data/app/search_builders/parent_collection_search_builder.rb

@@ -1,4 +1,4 @@
-# Given the id of a GenericWork, finds its parent collections
+# Given the id of a work, find the collections it is a member of
 class ParentCollectionSearchBuilder < CurationConcerns::CollectionSearchBuilder
   delegate :item, to: :scope
 

data/app/services/sufia/collection_member_service.rb

@@ -8,7 +8,7 @@ module Sufia
 
     copy_blacklight_config_from(CatalogController)
 
-    # @param [SolrDocument] item represents a GenericWork
+    # @param [SolrDocument] item represents a work
     def self.run(item)
       new(item).list_collections
     end

data/app/services/sufia/user_stat_importer.rb

@@ -5,7 +5,11 @@ module Sufia
     UserRecord = Struct.new("UserRecord", :id, :user_key, :last_stats_update)
 
     def initialize(options = {})
-      @verbose = options[:verbose]
+      if options[:verbose]
+        stdout_logger = Logger.new(Logger.new(STDOUT))
+        stdout_logger.level = Logger::INFO
+        Rails.logger.extend(ActiveSupport::Logger.broadcast(stdout_logger))
+      end
       @logging = options[:logging]
       @delay_secs = options[:delay_secs].to_f
       @number_of_retries = options[:number_of_retries].to_i
@@ -44,10 +48,11 @@ module Sufia
 
       def process_files(stats, user, start_date)
         file_ids_for_user(user).each do |file_id|
-          view_stats = rescue_and_retry("Retried FileViewStat on #{user} for file #{file_id} too many times.") { FileViewStat.statistics(file_id, start_date, user.id) }
+          file = FileSet.find(file_id)
+          view_stats = rescue_and_retry("Retried FileViewStat on #{user} for file #{file_id} too many times.") { FileViewStat.statistics(file, start_date, user.id) }
           stats = tally_results(view_stats, :views, stats) unless view_stats.blank?
           delay
-          dl_stats = rescue_and_retry("Retried FileDownloadStat on #{user} for file #{file_id} too many times.") { FileDownloadStat.statistics(file_id, start_date, user.id) }
+          dl_stats = rescue_and_retry("Retried FileDownloadStat on #{user} for file #{file_id} too many times.") { FileDownloadStat.statistics(file, start_date, user.id) }
           stats = tally_results(dl_stats, :downloads, stats) unless dl_stats.blank?
           delay
         end
@@ -55,7 +60,8 @@ module Sufia
 
       def process_works(stats, user, start_date)
         work_ids_for_user(user).each do |work_id|
-          work_stats = rescue_and_retry("Retried WorkViewStat on #{user} for work #{work_id} too many times.") { WorkViewStat.statistics(work_id, start_date, user.id) }
+          work = CurationConcerns::WorkRelation.new.find(work_id)
+          work_stats = rescue_and_retry("Retried WorkViewStat on #{user} for work #{work_id} too many times.") { WorkViewStat.statistics(work, start_date, user.id) }
           stats = tally_results(work_stats, :work_views, stats) unless work_stats.blank?
           delay
         end
@@ -101,7 +107,7 @@ module Sufia
 
       def work_ids_for_user(user)
         ids = []
-        ::GenericWork.search_in_batches("#{depositor_field}:\"#{user.user_key}\"", fl: "id") do |group|
+        CurationConcerns::WorkRelation.new.search_in_batches("#{depositor_field}:\"#{user.user_key}\"", fl: "id") do |group|
           ids.concat group.map { |doc| doc["id"] }
         end
         ids
@@ -140,7 +146,6 @@ module Sufia
       end
 
       def log_message(message)
-        puts message if @verbose
         Rails.logger.info "#{self.class}: #{message}" if @logging
       end
   end

data/app/views/_controls.html.erb

@@ -1,13 +1,15 @@
 <nav class="navbar navbar-default navbar-static-top" role="navigation">
   <div class="container-fluid">
-    <ul class="nav navbar-nav col-sm-5 col-md-6">
-      <li <%= 'class=active' if current_page?(sufia.root_path) %>><%= link_to 'Home', sufia.root_path, :'data-no-turbolink'=>"true" %></li>
-      <li <%= 'class=active' if current_page?(sufia.about_path) %>><%= link_to 'About', sufia.about_path, :'data-no-turbolink'=>"true" %></li>
-      <li <%= 'class=active' if action_name == "help" %>><a href="<%= sufia.static_path('help') %>">Help</a></li>
-      <li <%= 'class=active' if current_page?(sufia.contact_path) %>><a href="<%= sufia.contact_path %>">Contact</a></li>
-    </ul><!-- /.nav -->
-    <div class="navbar-right row col-sm-7 col-md-6">
-      <%= render partial: 'catalog/search_form' %>
+    <div class="row">
+      <ul class="nav navbar-nav col-sm-5 col-md-6">
+        <li <%= 'class=active' if current_page?(sufia.root_path) %>><%= link_to 'Home', sufia.root_path, :'data-no-turbolink'=>"true" %></li>
+        <li <%= 'class=active' if current_page?(sufia.about_path) %>><%= link_to 'About', sufia.about_path, :'data-no-turbolink'=>"true" %></li>
+        <li <%= 'class=active' if action_name == "help" %>><a href="<%= sufia.static_path('help') %>">Help</a></li>
+        <li <%= 'class=active' if current_page?(sufia.contact_path) %>><a href="<%= sufia.contact_path %>">Contact</a></li>
+      </ul><!-- /.nav -->
+      <div class="navbar-right col-sm-7 col-md-6">
+        <%= render partial: 'catalog/search_form' %>
+      </div>
     </div>
   </div>
-</nav><!-- /.navbar -->
+</nav><!-- /.navbar -->

data/app/views/batch_edits/edit.html.erb

@@ -16,8 +16,14 @@
       <div class="tab-pane active" id="descriptions_display">
         <% @form.terms.each do |term| %>
           <div class="row">
-            <%= simple_form_for @form.model, url: batch_edits_path, method: :put, remote: true,
-              builder: Sufia::FormBuilder, html: { id: "form_#{term.to_s}", class: "ajax-form"} do |f| %>
+            <%= simple_form_for @form.model,
+                                url: batch_edits_path,
+                                method: :put,
+                                remote: true,
+                                builder: Sufia::FormBuilder,
+                                html: { id: "form_#{term.to_s}",
+                                        class: "ajax-form" },
+                                data: { model: @form.model_name.param_key } do |f| %>
               <div class="col-xs-12 col-sm-4">
                 <a class="accordion-toggle grey glyphicon-chevron-right-helper collapsed" data-toggle="collapse" href="#collapse_<%= term %>" id="expand_link_<%=term.to_s%>">
                   <%= f.input_label term %> <span class="chevron"></span>

data/app/views/catalog/_index_list_default.html.erb

@@ -1,10 +1,11 @@
     <div class="col-sm-9">
       <table class="table">
+        <% doc_presenter = index_presenter(document) %>
         <% index_fields(document).each do |field_name, field| -%>
           <% if should_render_index_field? document, field %>
             <tr>
               <th><span class="attribute-label h4"><%= render_index_field_label document, field: field_name %></span></th>
-              <td><%= render_index_field_value document, field: field_name %></td>
+              <td><%= doc_presenter.field_value field_name %></td>
             </tr>
           <% end %>
         <% end %>

data/app/views/curation_concerns/base/_form_metadata.html.erb

@@ -7,7 +7,7 @@
             <%= render_edit_field_partial(term, f: f) %>
           <% end %>
         </div>
-        <%= link_to t('sufia.generic_works.edit.additional_fields'),
+        <%= link_to t('sufia.works.edit.additional_fields'),
                     '#extended-terms',
                     class: 'btn btn-default',
                     data: { toggle: 'collapse' },

data/app/views/curation_concerns/base/_form_progress.html.erb

@@ -1,7 +1,7 @@
 <aside id="form-progress" class="form-progress panel panel-default">
   <div class="panel-heading">
 
-    <h2><%= t("sufia.#{controller_name}.progress.header") %></h2>
+    <h2><%= t("sufia.works.progress.header") %></h2>
   </div>
   <div class="list-group">
     <div class="list-group-item">

data/app/views/curation_concerns/base/_form_relationships.html.erb

@@ -1,4 +1,4 @@
-<h3><%= t("sufia.#{controller_name}.#{action_name}.in_collections") %></h3>
+<h3><%= t("sufia.works.#{action_name}.in_collections") %></h3>
 <div id="collection-widget">
   <%= f.input :collection_ids, as: :select,
       collection: available_collections(nil),

data/app/views/curation_concerns/base/_guts4form.html.erb

@@ -12,7 +12,7 @@
           <li role="presentation">
         <% end %>
             <a href="#<%= tab %>" aria-controls="<%= tab %>" role="tab" data-toggle="tab">
-              <%= t("sufia.generic_works.edit.tab.#{tab}") %>
+              <%= t("sufia.works.edit.tab.#{tab}") %>
             </a>
           </li>
       <% end %>
@@ -20,7 +20,7 @@
 
     <!-- Tab panes -->
     <div class="tab-content">
-      <% tabs.each_with_index do | tab, i | %>
+      <% (tabs - ['share']).each_with_index do | tab, i | %>
         <% if i == 0 %>
           <div role="tabpanel" class="tab-pane active" id="<%= tab %>">
         <% else %>
@@ -30,6 +30,10 @@
         <%= render "form_#{tab}", f: f %>
         </div>
       <% end %>
+
+      <div role="tabpanel" class="tab-pane" id="share" data-param-key="<%= f.object.model_name.param_key %>">
+          <%= render "form_share", f: f %>
+      </div>
     </div>
   </div>
 

data/app/views/curation_concerns/base/_items.html.erb

@@ -15,5 +15,5 @@
     </tbody>
   </table>
 <% elsif can? :edit, presenter.id %>
-  <p class="text-center"><em><%= t('.empty', type: presenter.human_readable_type) %></em></p>
+    <div class="alert alert-warning" role="alert"><%= t('.empty', type: presenter.human_readable_type) %></div>
 <% end %>

data/app/views/curation_concerns/base/edit.html.erb

@@ -1,6 +1,6 @@
 <% provide :page_title, curation_concern_page_title(curation_concern) %>
 <% provide :page_header do %>
-  <h1><%= t("sufia.#{controller_name}.#{action_name}.header") %></h1>
+  <h1><%= t("sufia.works.#{action_name}.header") %></h1>
 <% end %>
 
 <%= render 'form' %>

data/app/views/curation_concerns/base/new.html.erb

@@ -1,6 +1,6 @@
 <% provide :page_title, curation_concern_page_title(curation_concern) %>
 <% provide :page_header do %>
-  <h1><%= t("sufia.#{controller_name}.#{action_name}.header") %></h1>
+  <h1><%= t("sufia.works.#{action_name}.header") %></h1>
 <% end %>
 
 <%= render 'form' %>

data/app/views/curation_concerns/file_sets/_permission.html.erb

@@ -1,5 +1,9 @@
   <div id="permissions_display" class="tab-pane">
-    <%= simple_form_for [main_app, file_set], html: { multipart: true, id: 'permission' } do |f| %>
+    <%= simple_form_for [main_app, file_set],
+                        html: { multipart: true,
+                                id: 'permission',
+                                data: { param_key: file_set.model_name.param_key }
+                              } do |f| %>
       <%= hidden_field_tag('redirect_tab', 'permissions') %>
       <%= render "permission_form", f: f %>
       <div id="permissions_submit">

data/app/views/curation_concerns/file_sets/media_display/_default.html.erb

@@ -1,3 +1,3 @@
 <div class="no-preview">
-  <%= t('sufia.generic_works.show.no_preview') %>
+  <%= t('sufia.works.show.no_preview') %>
 </div>

data/app/views/curation_concerns/file_sets/show.html.erb

@@ -4,7 +4,7 @@
   <div class="row">
     <div class="col-xs-12 col-sm-4">
       <%= media_display @presenter %>
-      <%= render 'show_actions', presenter: @presenter, parent: parent %>
+      <%= render 'show_actions', presenter: @presenter %>
     </div>
     <div itemscope itemtype="<%= @presenter.itemtype %>" class="col-xs-12 col-sm-8">
       <header>

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

@@ -1,5 +1,5 @@
 <div class="col-xs-12 heading-row">
-  <% if can?(:create, GenericWork) %>
+  <% if can?(:create, Sufia.primary_work_type) %>
     <div class="col-xs-6 col-sm-2 heading-tile">
       <% classification = CurationConcerns::QuickClassificationQuery.new(current_user) %>
       <% classification.each do |concern| %>

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

@@ -0,0 +1,8 @@
+<%= f.input key,
+            as: :multi_value,
+            input_html: {
+              class: 'form-control',
+              data: { 'autocomplete-url' => "/authorities/search/geonames",
+                      'autocomplete' => key }
+            },
+            required: f.object.required?(key) %>

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

@@ -0,0 +1,8 @@
+<%= f.input key,
+            as: :multi_value,
+            input_html: {
+              class: 'form-control',
+              data: { 'autocomplete-url' => "/authorities/search/local/languages",
+                      'autocomplete' => key }
+            },
+            required: f.object.required?(key) %>

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

@@ -0,0 +1,8 @@
+<%= f.input key,
+            as: :multi_value,
+            input_html: {
+              class: 'form-control',
+              data: { 'autocomplete-url' => "/authorities/search/local/subjects",
+                      'autocomplete' => key }
+            },
+            required: f.object.required?(key) %>

data/app/views/stats/work.html.erb

@@ -3,7 +3,7 @@
   var stats = <%= @stats.to_flot.to_json.html_safe %>;
 <% end %>
 
-<%= content_tag :h1, @generic_work, class: "lower" %>
+<%= content_tag :h1, @stats, class: "lower" %>
 
 <div class="row">
   <div class="col-sm-12">

data/app/views/sufia/batch_uploads/_form.html.erb

@@ -1,6 +1,6 @@
 <%= simple_form_for [sufia, @form], html: { multipart: true } do |f| %>
   <% content_for :files_tab do %>
-    <p class="switch-upload-type">To create a single work for all the files, go to <%= link_to "New Work", new_curation_concerns_generic_work_path %></p>
+    <p class="switch-upload-type">To create a single work for all the files, go to <%= link_to "New Work", [:new, Sufia.primary_work_type.model_name.singular_route_key] %></p>
         <p class="instructions"><%= t("sufia.batch_uploads.files.instructions") %></p>
   <% end %>
   <%= render 'curation_concerns/base/guts4form', f: f, tabs: %w[files metadata relationships share] do %>

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

@@ -1,7 +1,7 @@
 <div class="home_call_action col-xs-12 col-sm-4 pull-right">
   <% if @presenter.display_share_button? %>
     <div class="home_share_work">
-      <%= link_to new_curation_concerns_generic_work_path, class: "btn btn-primary btn-lg btn-block", id: "contribute_link" do %>
+      <%= link_to [:new, Sufia.primary_work_type.model_name.singular_route_key], class: "btn btn-primary btn-lg btn-block", id: "contribute_link" do %>
         <i class="glyphicon glyphicon-upload"></i> <%= t('sufia.share_button') %>
       <% end %>
       <p class="text-center"><a href="/terms/">Terms of Use</a></p>

data/app/views/sufia/homepage/_sortable_featured.html.erb

@@ -1,6 +1,6 @@
 <% presenter = f.object.presenter %>
 <li class="dd-item dd3-item featured-item" data-id="<%= presenter.id %>">
-  <div class="dd-handle dd3-handle"><%= t :drag %></div>
+  <div class="dd-handle dd3-handle"><%= t 'sufia.homepage.featured_works.drag' %></div>
   <div class="dd3-content panel panel-default">
     <%= f.hidden_field :id %>
     <%= f.hidden_field :order, data: { property: "order" } %>

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

@@ -1,6 +1,8 @@
 <h1>Transfer ownership of "<%= @proxy_deposit_request.to_s %>"</h1>
 <span class="sr-only">Select a user to transfer <%= @proxy_deposit_request.to_s %> to, add optional comments and then press transfer.</span>
-<%= form_for @proxy_deposit_request, url: sufia.work_transfers_path(@generic_work), html: {class: 'form-horizontal', id: 'new_transfer'} do |f| %>
+<%= form_for @proxy_deposit_request,
+             url: sufia.work_transfers_path(@work),
+             html: { class: 'form-horizontal', id: 'new_transfer' } do |f| %>
   <%= error_messages_for(f.object) %>
   <div class="control-group">
     <%= f.label :transfer_to, "User", class: 'control-label' %>

data/app/views/users/_contributions.html.erb

@@ -5,7 +5,7 @@
         <tr id="trophyrow_<%= t.id %>">
           <td>
             <%= link_to t do %>
-              <%= image_tag t.indexing_service.thumbnail_path, { width: 90 } %>
+              <%= image_tag t.thumbnail_path, width: 90 %>
             <% end %>
           </td>
           <td>

data/config/locales/sufia.en.yml

@@ -68,6 +68,7 @@ en:
         tab_label:          'Featured Works'
         title:              'Featured Works'
         no_works:           'No works have been featured'
+        drag:               'Drag'
       recently_uploaded:
         depositor:          'Depositor'
         details:            'Details'
@@ -204,7 +205,7 @@ en:
       help:
         title: "Filename will be the default title. Please provide a more meaningful title, and filenames will still be preserved by the system."
         resource_type: "You may select multiple types to apply to all files"
-    generic_works:
+    works:
       new:
         header: Add New Work
         in_collections: This Work in Collections
@@ -346,7 +347,7 @@ en:
         attribute_values_label: Values
       items:
         header: Items
-        empty:  "This %{type} has no files associated with it. You can add one using the \"Attach a File\" button below."
+        empty:  "This %{type} has no files associated with it. Click \"edit\" to add more files."
       citations:
         header: 'Citations:'
     visibility:

data/config/routes.rb

@@ -118,9 +118,6 @@ Sufia::Engine.routes.draw do
   # advanced routes for advanced search
   get 'search' => 'advanced#index', as: :advanced
 
-  # Authority vocabulary queries route
-  get 'authorities/:model/:term' => 'authorities#query'
-
   # Contact form routes
   post 'contact' => 'contact_form#create', as: :contact_form_index
   get 'contact' => 'contact_form#new'
@@ -161,10 +158,6 @@ Sufia::Engine.routes.draw do
   # Static page routes (workaround)
   get ':action' => 'static#:action', constraints: { action: /help|terms|zotero|mendeley|agreement|subject_libraries|versions/ }, as: :static
 
-  # Single use link errors
-  get 'single_use_link/not_found' => 'errors#single_use_error'
-  get 'single_use_link/expired' => 'errors#single_use_error'
-
   # Catch-all (for routing errors)
   unless Rails.env.development? || Rails.env.test?
     match '*error' => 'errors#routing', via: [:get, :post]

data/lib/generators/sufia/install_generator.rb

@@ -30,11 +30,6 @@ module Sufia
       generate "curation_concerns:install --skip-assets -f" unless options[:skip_curation_concerns]
     end
 
-    def run_curation_concerns_work_generator
-      say_status("info", "GENERATING DEFAULT GENERICWORK MODEL", :blue)
-      generate 'curation_concerns:work GenericWork'
-    end
-
     # Setup the database migrations
     def copy_migrations
       rake 'sufia:install:migrations'
@@ -57,13 +52,6 @@ module Sufia
       end
     end
 
-    def inject_sufia_work_behavior
-      insert_into_file 'app/models/generic_work.rb', after: 'include ::CurationConcerns::BasicMetadata' do
-        "\n  include Sufia::WorkBehavior" \
-        "\n  self.human_readable_type = 'Work'"
-      end
-    end
-
     def inject_sufia_file_set_behavior
       insert_into_file 'app/models/file_set.rb', after: 'include ::CurationConcerns::FileSetBehavior' do
         "\n  include Sufia::FileSetBehavior"
@@ -157,18 +145,6 @@ module Sufia
       end
     end
 
-    def inject_sufia_form
-      file_path = "app/forms/curation_concerns/generic_work_form.rb"
-      if File.exist?(file_path)
-        gsub_file file_path, /CurationConcerns::Forms::WorkForm/, "Sufia::Forms::WorkForm"
-        inject_into_file file_path, after: /model_class = ::GenericWork/ do
-          "\n    self.terms += [:resource_type]\n"
-        end
-      else
-        puts "     \e[31mFailure\e[0m  Sufia requires a GenericWorkForm object. This generator assumes that the model is defined in the file #{file_path}, which does not exist."
-      end
-    end
-
     def install_sufia_700
       generate "sufia:upgrade700"
     end