sufia 7.3.0.rc1 → 7.3.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8da2d85b23ab091afabbe8a3fc3f547fff86b94
-  data.tar.gz: 149f28dc13a30a9141d30b3035c0afaa4cd087a6
+  metadata.gz: '009b9b30b853cbfba6072849c4ac71f9a0523b4d'
+  data.tar.gz: 0cc820c3c594a6cfb415f072eda5f00f7f59af51
 SHA512:
-  metadata.gz: 7dfb177dad78057657aecbabcb3afc5f72d821ec24b98e6d6d2a87795f7e14c23c400e80b8818eac2252850d414d3b912c4ab354ee2dc28a2b15d0dd69e31f5a
-  data.tar.gz: 6dd363cc82aabe925013a2e8bf2de2d2c77651dd29ac10c8cabd19bbac949dda976abfd9913a0c4c89e0dbbb8b4f5fa0a72d0c466add9b4d2f038d291d5d68dd
+  metadata.gz: 7e745682238c01ef3eb98b1642ced091da5ea8e39ba4fc22a437efe835dedd02cdeedbd662abdb66c9b4f3c28318951d19bf7824347f9958b528066d213c180b
+  data.tar.gz: 269da7a4d986f1f38963333ae3b3c8b541e20bcb3b9ad744fe57d622bcb21cf3f290f2ad1854e23504306418c759704ad66a9bf297a77fd5b8a437bbde727cf3

data/.travis.yml

@@ -22,7 +22,7 @@ env:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
   matrix:
     - "RAILS_VERSION=4.2.7.1"
-    - "RAILS_VERSION=5.0.0.1"
+    - "RAILS_VERSION=5.0.1"
 notifications:
   irc:
     channels:

data/README.md

@@ -26,9 +26,9 @@ Jump in: [![Slack Status](http://slack.projecthydra.org/badge.svg)](http://slack
       * [Derivatives](#derivatives)
     * [Environments](#environments)
     * [Ruby](#ruby)
-  * [Creating a Sufia\-based app](#creating-a-sufia-based-app)
     * [Redis](#redis)
     * [Rails](#rails)
+  * [Creating a Sufia\-based app](#creating-a-sufia-based-app)
     * [Generate a primary work type](#generate-a-primary-work-type)
     * [Start servers](#start-servers)
   * [Managing a Sufia\-based app](#managing-a-sufia-based-app)
@@ -55,7 +55,7 @@ If you have questions or need help, please email [the Hydra community tech list]
 # Getting started
 
 This document contains instructions specific to setting up an app with __Sufia
-v7.2.0__. If you are looking for instructions on installing a different
+v7.3.0__. If you are looking for instructions on installing a different
 version, be sure to select the appropriate branch or tag from the drop-down
 menu above.
 
@@ -105,8 +105,6 @@ First, you'll need a working Ruby installation. You can install this via your op
 
 We recommend either Ruby 2.3 or the latest 2.2 version.
 
-# Creating a Sufia-based app
-
 ## Redis
 
 [Redis](http://redis.io/) is a key-value store that Sufia uses to provide activity streams on repository objects and users, and to prevent race conditions as a global mutex when modifying order-persisting objects.
@@ -114,12 +112,18 @@ We recommend either Ruby 2.3 or the latest 2.2 version.
 Starting up Redis will depend on your operating system, and may in fact already be started on your system. You may want to consult the [Redis documentation](http://redis.io/documentation) for help doing this.
 
 ## Rails
-
-Generate a new Rails application. We recommend the latest Rails 5.0 or 4.2 release.
+We recommend the latest Rails 5.0 release.
 
 ```
 # If you don't already have Rails at your disposal...
-gem install rails -v 5.0.0.1
+gem install rails -v 5.0.1
+```
+
+# Creating a Sufia-based app
+
+Generate a new Rails application using the template.
+
+```
 rails new my_app -m https://raw.githubusercontent.com/projecthydra/sufia/master/template.rb
 ```
 

data/app/actors/sufia/default_admin_set_actor.rb

@@ -17,8 +17,15 @@ module Sufia
     private
 
       def ensure_admin_set_attribute!(attributes)
-        return if attributes[:admin_set_id].present?
-        attributes[:admin_set_id] = default_admin_set_id
+        if attributes[:admin_set_id].present?
+          ensure_permission_template!(admin_set_id: attributes[:admin_set_id])
+        else
+          attributes[:admin_set_id] = default_admin_set_id
+        end
+      end
+
+      def ensure_permission_template!(admin_set_id:)
+        Sufia::PermissionTemplate.find_or_create_by!(admin_set_id: admin_set_id)
       end
 
       DEFAULT_ID = 'admin_set/default'.freeze

data/app/assets/javascripts/sufia/batch_select_all.js

@@ -56,7 +56,7 @@
   // state == true for on
   function select_page ( state) {
     // check everything on the current page on or off based on state
-    $("#check_all").attr('checked', state);
+    $("#check_all").prop('checked', state); 
     check_all_page();  
   }
 

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

@@ -123,7 +123,7 @@ ul.collapsing > li > a {
   padding-left: 40px;
 }
 
-.collapse-toggle {
+.admin-sidebar .collapse-toggle {
   margin-bottom: 0;
 
   &::after {

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

@@ -113,7 +113,14 @@ input.batch_document_selector {
 
 input#check_all {
   padding: 0;
-  margin: 3px 3px 3px 10px;
+  margin: 3px 0 3px 10px;
+}
+
+.check-all {
+  white-space: nowrap;
+  .caret {
+    margin-left: 0;
+  }
 }
 
 .constraints-container {

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

@@ -18,3 +18,5 @@
     transition: background-color 0.1s ease-out;
   }
 }
+
+.files .name span { word-break: break-all; }

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

@@ -3,6 +3,7 @@ module Sufia
     extend ActiveSupport::Concern
     included do
       before_action :build_contact_form
+      layout 'homepage'
     end
 
     def new

data/app/controllers/pages_controller.rb

@@ -1,4 +1,6 @@
 class PagesController < ApplicationController
+  layout 'homepage'
+
   def show
     @page = ContentBlock.find_or_create_by(name: params[:id])
   end

data/app/controllers/sufia/admin/features_controller.rb

@@ -2,11 +2,17 @@ module Sufia
   module Admin
     class FeaturesController < Flipflop::FeaturesController
       layout 'admin'
+
       before_action do
         authorize! :manage, Sufia::Feature
+      end
+
+      # overriding so we can have a layout https://github.com/voormedia/flipflop/issues/18
+      def index
         add_breadcrumb t(:'sufia.controls.home'), root_path
         add_breadcrumb t(:'sufia.toolbar.admin.menu'), sufia.admin_path
         add_breadcrumb t(:'sufia.admin.sidebar.settings'), sufia.admin_features_path
+        super
       end
     end
   end

data/app/services/sufia/workflow/complete_notification.rb

@@ -1,22 +1,7 @@
 module Sufia
   module Workflow
-    class CompleteNotification < AbstractNotification
-      protected
-
-        def subject
-          'Deposit has been approved'
-        end
-
-        def message
-          "#{title} (#{work_id}) was approved by #{user.user_key}. #{comment}"
-        end
-
-      private
-
-        def users_to_notify
-          user_key = ActiveFedora::Base.find(work_id).depositor
-          super << ::User.find_by(email: user_key)
-        end
+    class CompleteNotification < DepositedNotification
+      deprecation_deprecate initialize: "use DepositedNotification.initialize instead"
     end
   end
 end

data/app/services/sufia/workflow/deposited_notification.rb

@@ -0,0 +1,22 @@
+module Sufia
+  module Workflow
+    class DepositedNotification < AbstractNotification
+      protected
+
+        def subject
+          'Deposit has been approved'
+        end
+
+        def message
+          "#{title} (#{work_id}) was approved by #{user.user_key}. #{comment}"
+        end
+
+      private
+
+        def users_to_notify
+          user_key = ActiveFedora::Base.find(work_id).depositor
+          super << ::User.find_by(email: user_key)
+        end
+    end
+  end
+end

data/app/uploaders/sufia/uploaded_file_uploader.rb

@@ -6,10 +6,18 @@ module Sufia
       base_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
     end
 
+    def cache_dir
+      cache_path + "#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+
     private
 
       def base_path
         Sufia.config.upload_path.call
       end
+
+      def cache_path
+        Sufia.config.cache_path.call
+      end
   end
 end

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

@@ -1,7 +1,7 @@
 <div class="dropdown batch_document_selector_all" >
   <%= check_box_tag 'check_all', 'yes', @all_checked, disabled: @disable_select_all %>
   <% if !@disable_select_all %>
-    <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="sr-only">Select to access selection options</span><span class="glyphicon glyphicon-cog"></span></a>
+    <a class="dropdown-toggle"  data-toggle="dropdown" href="#"><span class="sr-only">Select to access selection options</span><span class="caret"></span></a>
     <ul class="dropdown-menu">
       <%= render "batch_edits_actions" %>
     </ul>

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

@@ -1,5 +1,6 @@
 <%= form_tag search_form_action, method: :get, id: "search-form-header", role: "search" do %>
   <%= render_hash_as_hidden_fields(search_state.params_for_search.except(:q, :search_field, :qt, :page, :utf8)) %>
+  <%= hidden_field_tag :search_field, 'all_fields' %>
   <div class="input-group">
 
     <label class="sr-only" for="search-field-header"><%= t("sufia.search.form.q.label") %></label>

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

@@ -1,6 +1,5 @@
 <%= presenter.attribute_to_html(:creator, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:contributor, render_as: :faceted) %>
-<%= presenter.attribute_to_html(:admin_set, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:subject, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:publisher, render_as: :faceted) %>
 <%= presenter.attribute_to_html(:language, render_as: :faceted) %>

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

@@ -21,3 +21,5 @@
     <% end %>
   <% end %>
 <% end %>
+
+<%= presenter.attribute_to_html(:admin_set, render_as: :faceted) %>

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

@@ -1,2 +1,6 @@
-<li data-behavior="batch-edit-select-none" data-state="on"><a href="#"><i class="glyphicon glyphicon-ok"></i> Select None</a></li>
-<li data-behavior="batch-edit-select-page" data-state="off"><a href="#"><i class=""></i> Select Current Page</a></li>
+<li data-behavior="batch-edit-select-page" data-state="off">
+  <a href="#"><%= t("sufia.dashboard.my.action.select_all") %></a>
+</li>
+<li data-behavior="batch-edit-select-none" data-state="on">
+  <a href="#"><%= t("sufia.dashboard.my.action.select_none") %></a>
+</li>

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

@@ -3,7 +3,7 @@
   <% unless params[:display_type] == 'list' %>
     <thead>
     <tr>
-      <th><label for="check_all" class="sr-only"><%= t("sufia.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
+      <th class="check-all"><label for="check_all" class="sr-only"><%= t("sufia.dashboard.my.sr.check_all_label") %></label><%= render_check_all %></th>
       <th><%= t("sufia.dashboard.my.heading.title") %></th>
       <th class="sorts-dash"><i id="<%= CatalogController.uploaded_field %>" class="<%= params[:sort] == "#{CatalogController.uploaded_field} desc" ? 'caret' : params[:sort] == "#{CatalogController.uploaded_field} asc" ? 'caret up' : ''%>"></i><%= t("sufia.dashboard.my.heading.date_uploaded") %></th>
       <th><%= t("sufia.dashboard.my.heading.visibility") %></th>

data/app/views/sufia/admin/_sidebar.html.erb

@@ -1,4 +1,4 @@
-<ul class="nav nav-pills nav-stacked">
+<ul class="admin-sidebar nav nav-pills nav-stacked">
   <li class="<%= 'active' if current_page? sufia.admin_stats_path %>">
     <%= link_to sufia.admin_stats_path do %>
       <span class="fa fa-bar-chart"></span> <%= t('sufia.admin.sidebar.statistics') %>

data/app/views/sufia/admin/features/index.html.erb

@@ -16,7 +16,18 @@
               </tr>
             </thead>
             <tbody>
-            <% @feature_set.features.each do |feature| -%>
+            <% @feature_set.grouped_features.each do |group, features| -%>
+              <% if @feature_set.grouped? -%>
+                <tr class="group">
+                  <td></td>
+                  <td class="name" colspan="<%= 2 + @feature_set.strategies.size -%>">
+                    <h2>
+                      <%= t(group ? group.name : :default, scope: [:flipflop, :groups], default: group ? group.title : nil) -%>
+                    </h2>
+                  </td>
+                </tr>
+              <% end -%>
+              <% features.each do |feature| %>
               <tr data-feature="<%= feature.name.dasherize.parameterize %>">
                 <td class="status">
                   <span class="<%= @feature_set.status(feature) -%>"><%= @feature_set.status(feature) -%></span>
@@ -47,6 +58,7 @@
                   </td>
                 <% end -%>
               </tr>
+              <% end -%>
             <% end -%>
             </tbody>
           </table>

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

@@ -4,12 +4,12 @@
 
 <div class="list-group-item">
   <span class="badge"><%= number_of_collections(user) %></span>
-  <span class="glyphicon glyphicon-folder-open"></span> <%= link_to_field('depositor', user.to_s, t("sufia.dashboard.stats.collections"), human_readable_type: "Collection") %>
+  <span class="glyphicon glyphicon-folder-open"></span> <%= link_to_field('depositor', user.to_s, t("sufia.dashboard.stats.collections"), generic_type: "Collection") %>
 </div>
 
 <div class="list-group-item">
   <span class="badge"><%= number_of_works(user) %></span>
-  <span class="glyphicon glyphicon-upload"></span> <%= link_to_field('depositor', user.to_s, t("sufia.dashboard.stats.works"),  human_readable_type: "Work") %>
+  <span class="glyphicon glyphicon-upload"></span> <%= link_to_field('depositor', user.to_s, t("sufia.dashboard.stats.works"),  generic_type: "Work") %>
 
   <ul class="views-downloads-dashboard list-unstyled">
       <li><span class="badge badge-optional"><%= user.total_file_views %></span> <%= t("sufia.dashboard.stats.file_views").pluralize(user.total_file_views) %></li>

data/config/locales/sufia.en.yml

@@ -197,6 +197,8 @@ en:
           transfer:                "Transfer Ownership of Work"
           work_confirmation:       "Deleting a work from %{application_name} is permanent. Click OK to delete this work from %{application_name}, or Cancel to cancel this operation"
           collection_confirmation: "Deleting a collection from %{application_name} is permanent. Click OK to delete this collection from %{application_name}, or Cancel to cancel this operation"
+          select_all:              "Select Current Page"
+          select_none:             "Select None"
 
     messages:
       success:
@@ -240,7 +242,7 @@ en:
     works:
       create:
         header: "Add New %{type}"
-        after_create_html: "Your files are being processed by %{application_name} in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
+        after_create_html: "Your files are being processed by %{application_name} in the background. The metadata and access controls you specified are being applied. You may need to refresh this page to see these updates."
       edit:
         breadcrumb: 'Edit'
       form:
@@ -311,7 +313,7 @@ en:
       show:
         download: "Download the file"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2016 Project Hydra</strong> Licensed under the Apache License, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; 2017 Project Hydra</strong> Licensed under the Apache License, Version 2.0"
     admin:
       admin_sets:
         edit:
@@ -504,6 +506,7 @@ en:
     search:
       fields:
         show:
+          admin_set: "In Admin Set:"
           based_near: Location
           contributor: Contributors
           keyword: Keyword

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

@@ -46,6 +46,10 @@ class CatalogController < ApplicationController
     config.add_facet_field solr_name("publisher", :facetable), label: "Publisher", limit: 5
     config.add_facet_field solr_name("file_format", :facetable), label: "File Format", limit: 5
 
+    # The generic_type isn't displayed on the facet list
+    # It's used to give a label to the filter that comes from the user profile
+    config.add_facet_field solr_name("generic_type", :facetable), label: "Type", if: false
+
     # Have BL send all facet field names to Solr, which has been the default
     # previously. Simply remove these lines if you'd rather use Solr request
     # handler defaults, or have no facets.

data/lib/generators/sufia/templates/config/locales/sufia.en.yml

@@ -8,4 +8,4 @@ en:
     directory:
       suffix:           "@example.org"
     footer:
-      copyright_html: "<strong>Copyright &copy; 2016 Project Hydra</strong> Licensed under the Apache License, Version 2.0"
+      copyright_html: "<strong>Copyright &copy; 2017 Project Hydra</strong> Licensed under the Apache License, Version 2.0"

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

@@ -93,8 +93,9 @@ Sufia.config do |config|
   # config.banner_image = 'https://cloud.githubusercontent.com/assets/92044/18370978/88ecac20-75f6-11e6-8399-6536640ef695.jpg'
 
   # Temporary path to hold uploads before they are ingested into FCrepo.
-  # This must be a lambda that returns a Pathname
+  # These must be lambdas that return a Pathname. Can be configured separately
   #  config.upload_path = ->() { Rails.root + 'tmp' + 'uploads' }
+  #  config.cache_path = ->() { Rails.root + 'tmp' + 'uploads' + 'cache' }
 
   # Location on local file system where derivatives will be stored.
   # If you use a multi-server architecture, this MUST be a shared volume.

data/lib/generators/sufia/templates/workflow.json.erb

@@ -21,7 +21,7 @@
                     ]
                 }, {
                     "name": "request_changes",
-                    "from_states": [{"names": ["complete", "pending_review"], "roles": ["approving"]}],
+                    "from_states": [{"names": ["deposited", "pending_review"], "roles": ["approving"]}],
                     "transition_to": "changes_required",
                     "notifications": [
                         {
@@ -36,11 +36,11 @@
                 }, {
                     "name": "approve",
                     "from_states": [{"names": ["pending_review"], "roles": ["approving"]}],
-                    "transition_to": "complete",
+                    "transition_to": "deposited",
                     "notifications": [
                         {
                             "notification_type": "email",
-                            "name": "Sufia::Workflow::CompleteNotification",
+                            "name": "Sufia::Workflow::DepositedNotification",
                             "to": ["approving"]
                         }
                     ],
@@ -58,6 +58,12 @@
                             "to": ["approving"]
                         }
                     ]
+                }, {
+                    "name": "comment_only",
+                    "from_states": [
+                        { "names": ["pending_review", "deposited"], "roles": ["approving"] },
+                        { "names": ["changes_required"], "roles": ["depositing"] }
+                    ]
                 }
             ]
         }

data/lib/sufia/configuration.rb

@@ -84,12 +84,16 @@ module Sufia
       @audit_user_key ||= 'audituser@example.com'
     end
 
-    # TODO: this is called working_path in curation_concerns
     attr_writer :upload_path
     def upload_path
       @upload_path ||= ->() { Rails.root + 'tmp' + 'uploads' }
     end
 
+    attr_writer :cache_path
+    def cache_path
+      @cache_path ||= ->() { Rails.root + 'tmp' + 'uploads' + 'cache' }
+    end
+
     # Should a button with "Share my work" show on the front page to all users (even those not logged in)?
     attr_writer :always_display_share_button
     def always_display_share_button

data/lib/sufia/engine.rb

@@ -35,8 +35,8 @@ module Sufia
     end
 
     initializer 'configure' do
-      # Set the path for the flipflop config:
-      Flipflop::Engine.config_file = Sufia::Engine.root + "config/features.rb"
+      # Allow flipflop to load config/features.rb from the Hyrax gem:
+      Flipflop::FeatureLoader.current.append(self)
 
       Sufia.config.tap do |c|
         Hydra::Derivatives.ffmpeg_path    = c.ffmpeg_path

data/lib/sufia/version.rb

@@ -1,3 +1,3 @@
 module Sufia
-  VERSION = '7.3.0.rc1'.freeze
+  VERSION = '7.3.0.rc2'.freeze
 end

data/lib/tasks/migrate.rake

@@ -4,5 +4,23 @@ namespace :sufia do
       require 'sufia/move_all_works_to_admin_set'
       MoveAllWorksToAdminSet.run(AdminSet.find(Sufia::DefaultAdminSetActor::DEFAULT_ID))
     end
+
+    desc "Migrate data from 7.2.x to 7.3.0"
+    task from_7_2_x_to_7_3_0_release: :environment do
+      logger = Logger.new(STDOUT)
+      logger.level = Logger::DEBUG
+      logger.info(%(Starting migration to Sufia 7.3.0 in preparation for Hyrax 1.0.0))
+      Sipity::Workflow.transaction do
+        logger.info(%(Migrating "complete" state to "deposited" state for all "one_step_mediated_deposit" workflows. See https://github.com/projecthydra/sufia/commit/711bb49892aa54fe190a45434f6b2d0364d69c7a for changes))
+        Sipity::Workflow.where(name: 'one_step_mediated_deposit').each do |workflow|
+          workflow.workflow_states.where(name: 'complete').each do |state|
+            logger.info(%(Updating name for #{state.class} ID=#{state.id} from 'complete' to 'deposited'))
+            state.update!(name: 'deposited')
+          end
+        end
+      end
+
+      logger.info(%(Completed migration to Sufia 7.3.0))
+    end
   end
 end

data/spec/actors/sufia/default_admin_set_actor_spec.rb

@@ -34,9 +34,11 @@ RSpec.describe Sufia::DefaultAdminSetActor do
     context "when admin_set_id is provided" do
       let(:attributes) { { admin_set_id: admin_set.id } }
 
-      it "uses the provided id and returns true" do
+      it "uses the provided id, ensures a permission template, and returns true" do
         expect(next_actor).to receive(:create).with(attributes).and_return(true)
-        expect(actor.create(attributes)).to be true
+        expect do
+          expect(actor.create(attributes)).to be true
+        end.to change { Sufia::PermissionTemplate.count }.by(1)
       end
     end
   end

data/spec/controllers/curation_concerns/generic_works_controller_spec.rb

@@ -122,7 +122,7 @@ describe CurationConcerns::GenericWorksController do
         },
         uploaded_files: ['777', '888']
       }
-      expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
+      expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. You may need to refresh this page to see these updates."
       expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
     end
 
@@ -182,7 +182,7 @@ describe CurationConcerns::GenericWorksController do
             parent_id: work.id,
             generic_work: { title: ['First title'] }
           }
-          expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. Files will be marked <span class=\"label label-danger\" title=\"Private\">Private</span> until this process is complete (shouldn't take too long, hang in there!). You may need to refresh this page to see these updates."
+          expect(flash[:notice]).to eq "Your files are being processed by Sufia in the background. The metadata and access controls you specified are being applied. You may need to refresh this page to see these updates."
           expect(response).to redirect_to main_app.curation_concerns_generic_work_path(work)
         end
       end

data/spec/features/batch_edit_spec.rb

@@ -120,7 +120,7 @@ describe 'Batch management of works', type: :feature do
 
   def fill_in_field_wait(id)
     within "#form_#{id}" do
-      expect(page).to have_content 'Changes Saved', wait: Capybara.default_max_wait_time * 4
+      expect(page).to have_content 'Changes Saved', wait: Capybara.default_max_wait_time * 5
     end
   end
 

data/spec/helpers/batch_edits_helper_spec.rb

@@ -1,5 +1,6 @@
 describe BatchEditsHelper, type: :helper do
   describe "#render_check_all" do
+    subject { helper.render_check_all }
     before do
       view.lookup_context.prefixes = ['my']
     end
@@ -7,28 +8,34 @@ describe BatchEditsHelper, type: :helper do
     context "with my works" do
       it "shows the check all dropdown" do
         allow(controller).to receive(:params).and_return(controller: "my/works")
-        expect(helper.render_check_all).to have_css("span.glyphicon-cog")
+        expect(subject).to have_css("span.caret")
+        expect(subject).to have_content t("sufia.dashboard.my.action.select_all")
+        expect(subject).to have_content t("sufia.dashboard.my.action.select_none")
       end
     end
 
     context "with my shares" do
       it "shows the check all dropdown" do
         allow(controller).to receive(:params).and_return(controller: "my/shares")
-        expect(helper.render_check_all).to have_css("span.glyphicon-cog")
+        expect(subject).to have_css("span.caret")
+        expect(subject).to have_content t("sufia.dashboard.my.action.select_all")
+        expect(subject).to have_content t("sufia.dashboard.my.action.select_none")
       end
     end
 
     context "with my highlights" do
       it "shows the check all dropdown" do
         allow(controller).to receive(:params).and_return(controller: "my/shares")
-        expect(helper.render_check_all).to have_css("span.glyphicon-cog")
+        expect(subject).to have_css("span.caret")
+        expect(subject).to have_content t("sufia.dashboard.my.action.select_all")
+        expect(subject).to have_content t("sufia.dashboard.my.action.select_none")
       end
     end
 
     context "with my collections" do
       it "does not show the check all dropdown" do
         allow(controller).to receive(:params).and_return(controller: "my/collections")
-        expect(helper.render_check_all).to be_nil
+        expect(subject).to be_nil
       end
     end
 
@@ -36,7 +43,7 @@ describe BatchEditsHelper, type: :helper do
       it "does not show the check all dropdown" do
         allow(helper).to receive(:params).and_return(controller: "foo")
         assign(:disable_select_all, true)
-        expect(helper.render_check_all).to have_css("input[disabled=disabled]")
+        expect(subject).to have_css("input[disabled=disabled]")
       end
     end
   end

data/spec/lib/sufia/configuration_spec.rb

@@ -16,6 +16,7 @@ describe Sufia::Configuration do
   it { is_expected.to respond_to(:batch_user_key) }
   it { is_expected.to respond_to(:audit_user_key) }
   it { is_expected.to respond_to(:upload_path) }
+  it { is_expected.to respond_to(:cache_path) }
   it { is_expected.to respond_to(:always_display_share_button) }
   it { is_expected.to respond_to(:google_analytics_id) }
   it { is_expected.to respond_to(:analytic_start_date) }

data/spec/services/sufia/workflow/complete_notification_spec.rb

@@ -1,32 +1,10 @@
 require 'spec_helper'
 
 RSpec.describe Sufia::Workflow::CompleteNotification do
-  let(:approver) { create(:user) }
-  let(:depositor) { create(:user) }
-  let(:to_user) { create(:user) }
-  let(:cc_user) { create(:user) }
-  let(:work) { create(:generic_work, user: depositor) }
-  let(:entity) { create(:sipity_entity, proxy_for_global_id: work.to_global_id.to_s) }
-  let(:comment) { double("comment", comment: 'A pleasant read') }
-  let(:recipients) { { 'to' => [to_user], 'cc' => [cc_user] } }
-
-  describe ".send_notification" do
-    it 'sends a message to all users' do
-      expect(approver).to receive(:send_message).once.and_call_original
-
-      expect { described_class.send_notification(entity: entity, user: approver, comment: comment, recipients: recipients) }
-        .to change { depositor.mailbox.inbox.count }.by(1)
-        .and change { to_user.mailbox.inbox.count }.by(1)
-        .and change { cc_user.mailbox.inbox.count }.by(1)
-    end
-    context 'without carbon-copied users' do
-      let(:recipients) { { 'to' => [to_user] } }
-      it 'sends a message to the to user(s)' do
-        expect(approver).to receive(:send_message).once.and_call_original
-        expect { described_class.send_notification(entity: entity, user: approver, comment: comment, recipients: recipients) }
-          .to change { depositor.mailbox.inbox.count }.by(1)
-          .and change { to_user.mailbox.inbox.count }.by(1)
-      end
-    end
+  let(:entity) { double(:sipity_entity, proxy_for_global_id: '1234', proxy_for: double(title: 'title')) }
+  let(:comment) { nil }
+  it 'is deprecated' do
+    expect(Deprecation).to receive(:warn).with(described_class, /^initialize is deprecated/, kind_of(Array))
+    described_class.new(entity, nil, double, {})
   end
 end

data/spec/services/sufia/workflow/deposited_notification_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+RSpec.describe Sufia::Workflow::DepositedNotification do
+  let(:approver) { create(:user) }
+  let(:depositor) { create(:user) }
+  let(:to_user) { create(:user) }
+  let(:cc_user) { create(:user) }
+  let(:work) { create(:generic_work, user: depositor) }
+  let(:entity) { create(:sipity_entity, proxy_for_global_id: work.to_global_id.to_s) }
+  let(:comment) { double("comment", comment: 'A pleasant read') }
+  let(:recipients) { { 'to' => [to_user], 'cc' => [cc_user] } }
+
+  describe ".send_notification" do
+    it 'sends a message to all users' do
+      expect(approver).to receive(:send_message).once.and_call_original
+
+      expect { described_class.send_notification(entity: entity, user: approver, comment: comment, recipients: recipients) }
+        .to change { depositor.mailbox.inbox.count }.by(1)
+        .and change { to_user.mailbox.inbox.count }.by(1)
+        .and change { cc_user.mailbox.inbox.count }.by(1)
+    end
+    context 'without carbon-copied users' do
+      let(:recipients) { { 'to' => [to_user] } }
+      it 'sends a message to the to user(s)' do
+        expect(approver).to receive(:send_message).once.and_call_original
+        expect { described_class.send_notification(entity: entity, user: approver, comment: comment, recipients: recipients) }
+          .to change { depositor.mailbox.inbox.count }.by(1)
+          .and change { to_user.mailbox.inbox.count }.by(1)
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -52,7 +52,7 @@ Capybara.default_max_wait_time = ENV['TRAVIS'] ? 30 : 15
 # Found in this thread: https://github.com/teampoltergeist/poltergeist/issues/375
 poltergeist_options = {
   js_errors: true,
-  timeout: 30,
+  timeout: 60,
   logger: nil,
   phantomjs_logger: StringIO.new,
   phantomjs_options: [

data/spec/test_app_templates/Gemfile.extra

@@ -1,5 +1,4 @@
 # Use this file to reference specific commits of gems.
-gem 'flipflop', git: 'https://github.com/jcoyne/flipflop.git', branch: 'hydra'
 
 group :development do
   gem 'better_errors'

data/spec/views/catalog/_search_form.html.erb_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+
+RSpec.describe 'catalog/_search_form.html.erb', type: :view do
+  before do
+    allow(view).to receive(:search_form_action).and_return("/catalog")
+    allow(view).to receive(:search_state).and_return(search_state)
+    allow(view).to receive(:current_search_parameters).and_return(nil)
+    allow(view).to receive(:current_user).and_return(nil)
+
+    render
+  end
+  let(:search_state) { double('SearchState', params_for_search: {}) }
+  let(:page) { Capybara::Node::Simple.new(rendered) }
+
+  it "has a hidden search_field input" do
+    expect(page).to have_selector("[name='search_field'][value='all_fields']", visible: false)
+  end
+end

data/spec/views/curation_concerns/base/_relationships.html.erb_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'curation_concerns/base/relationships', type: :view do
   let(:ability) { double }
-  let(:solr_doc) { double(id: '123', human_readable_type: 'Work') }
+  let(:solr_doc) { double(id: '123', human_readable_type: 'Work', admin_set: nil) }
   let(:presenter) { Sufia::WorkShowPresenter.new(solr_doc, ability) }
   let(:generic_work) { GenericWork.new(id: '456', title: ['Containing work']) }
   let(:collection) { Collection.new(id: '345', title: ['Containing collection']) }
@@ -86,4 +86,12 @@ describe 'curation_concerns/base/relationships', type: :view do
       expect(page).not_to have_content "There are no Generic work relationships."
     end
   end
+
+  context 'with admin sets' do
+    it 'renders using attribute_to_html' do
+      allow(solr_doc).to receive(:member_of_collection_ids).and_return([])
+      expect(presenter).to receive(:attribute_to_html).with(:admin_set, render_as: :faceted)
+      render 'curation_concerns/base/relationships', presenter: presenter
+    end
+  end
 end

data/spec/views/sufia/admin/features/index.html.erb_spec.rb

@@ -0,0 +1,14 @@
+describe "sufia/admin/features/index.html.erb", type: :view do
+  let(:ability) { instance_double("Ability") }
+  let(:feature_set) do
+    Flipflop::FeaturesController::FeaturesPresenter.new(Flipflop::FeatureSet.current)
+  end
+  before do
+    allow(controller).to receive(:current_ability).and_return(ability)
+    assign(:feature_set, feature_set)
+  end
+  it "shows list of features" do
+    render
+    expect(rendered).to have_content('enabled')
+  end
+end

data/sufia.gemspec

@@ -6,7 +6,7 @@ require 'sufia/version'
 Gem::Specification.new do |spec|
   spec.authors       = ["Justin Coyne", 'Michael J. Giarlo', "Carolyn Cole", "Matt Zumwalt", 'Jeremy Friesen']
   spec.email         = ["justin@curationexperts.com", 'leftwing@alumni.rutgers.edu', "jeremy.n.friesen@gmail.com"]
-  spec.description   = 'Sufia extends the robust Hydra framework to provide a user interface around common repository features and social features. Sufia offers self-deposit and proxy deposit workflows with plans to develop one or more mediated deposit workflows in 2016. Sufia delivers its rich and growing set of features via a modern, responsive UI'
+  spec.description   = 'Sufia extends the robust Hydra framework to provide a user interface around common repository features and social features. Sufia offers self-deposit, proxy deposit, and configurable mediated deposit workflows. Sufia delivers its rich and growing set of features via a modern, responsive UI'
   spec.summary       = "Sufia was originally extracted from ScholarSphere developed by Penn State University. It's now used and maintained by an active community of adopters."
   spec.homepage      = "http://sufia.io/"
 
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.version       = Sufia::VERSION
   spec.license       = 'Apache2'
 
-  spec.add_dependency 'curation_concerns', '~> 1.7.4'
+  spec.add_dependency 'curation_concerns', '~> 1.7.5'
   spec.add_dependency 'hydra-head', '>= 10.4.0'
   spec.add_dependency 'hydra-batch-edit', '~> 2.0'
   spec.add_dependency 'browse-everything', '>= 0.10.3'
@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'almond-rails', '~> 0.0.1'
   spec.add_dependency 'qa', '~> 0.8' # questioning_authority
-  spec.add_dependency 'flipflop', '~> 2.2'
+  spec.add_dependency 'flipflop', '~> 2.3'
   spec.add_dependency 'jquery-datatables-rails', '~> 3.4.0'
   spec.add_dependency 'rdf-rdfxml'
 

data/template.rb

@@ -1,5 +1,4 @@
-gem 'sufia', '7.2.0'
-gem 'flipflop', github: 'jcoyne/flipflop', branch: 'hydra'
+gem 'sufia', '7.3.0.rc1'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sufia
 version: !ruby/object:Gem::Version
-  version: 7.3.0.rc1
+  version: 7.3.0.rc2
 platform: ruby
 authors:
 - Justin Coyne
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-09 00:00:00.000000000 Z
+date: 2017-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curation_concerns
@@ -20,14 +20,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.4
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -384,14 +384,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: jquery-datatables-rails
   requirement: !ruby/object:Gem::Requirement
@@ -665,10 +665,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Sufia extends the robust Hydra framework to provide a user interface
-  around common repository features and social features. Sufia offers self-deposit
-  and proxy deposit workflows with plans to develop one or more mediated deposit workflows
-  in 2016. Sufia delivers its rich and growing set of features via a modern, responsive
-  UI
+  around common repository features and social features. Sufia offers self-deposit,
+  proxy deposit, and configurable mediated deposit workflows. Sufia delivers its rich
+  and growing set of features via a modern, responsive UI
 email:
 - justin@curationexperts.com
 - leftwing@alumni.rutgers.edu
@@ -1005,6 +1004,7 @@ files:
 - app/services/sufia/workflow/abstract_notification.rb
 - app/services/sufia/workflow/changes_required_notification.rb
 - app/services/sufia/workflow/complete_notification.rb
+- app/services/sufia/workflow/deposited_notification.rb
 - app/services/sufia/workflow/pending_review_notification.rb
 - app/services/sufia/workflow/workflow_by_admin_set_strategy.rb
 - app/uploaders/sufia/avatar_uploader.rb
@@ -1600,6 +1600,7 @@ files:
 - spec/services/sufia/user_stat_importer_spec.rb
 - spec/services/sufia/workflow/changes_required_notification_spec.rb
 - spec/services/sufia/workflow/complete_notification_spec.rb
+- spec/services/sufia/workflow/deposited_notification_spec.rb
 - spec/services/sufia/workflow/pending_review_notification_spec.rb
 - spec/services/sufia/workflow/workflow_by_admin_set_strategy_spec.rb
 - spec/spec_helper.rb
@@ -1619,6 +1620,7 @@ files:
 - spec/views/batch_edits/check_all_spec.rb
 - spec/views/batch_edits/edit.html.erb_spec.rb
 - spec/views/catalog/_index_list_default.html.erb_spec.rb
+- spec/views/catalog/_search_form.html.erb_spec.rb
 - spec/views/catalog/_thumbnail_list_collection.html.erb_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
 - spec/views/citations/work.html.erb_spec.rb
@@ -1671,6 +1673,7 @@ files:
 - spec/views/sufia/admin/admin_sets/_form_participants.html.erb_spec.rb
 - spec/views/sufia/admin/admin_sets/_form_visibility.html.erb_spec.rb
 - spec/views/sufia/admin/admin_sets/index.html.erb_spec.rb
+- spec/views/sufia/admin/features/index.html.erb_spec.rb
 - spec/views/sufia/admin/stats/show.html.erb_spec.rb
 - spec/views/sufia/batch_uploads/_form.html.erb_spec.rb
 - spec/views/sufia/homepage/_announcement.html.erb_spec.rb
@@ -1723,7 +1726,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Sufia was originally extracted from ScholarSphere developed by Penn State
@@ -1972,6 +1975,7 @@ test_files:
 - spec/services/sufia/user_stat_importer_spec.rb
 - spec/services/sufia/workflow/changes_required_notification_spec.rb
 - spec/services/sufia/workflow/complete_notification_spec.rb
+- spec/services/sufia/workflow/deposited_notification_spec.rb
 - spec/services/sufia/workflow/pending_review_notification_spec.rb
 - spec/services/sufia/workflow/workflow_by_admin_set_strategy_spec.rb
 - spec/spec_helper.rb
@@ -1991,6 +1995,7 @@ test_files:
 - spec/views/batch_edits/check_all_spec.rb
 - spec/views/batch_edits/edit.html.erb_spec.rb
 - spec/views/catalog/_index_list_default.html.erb_spec.rb
+- spec/views/catalog/_search_form.html.erb_spec.rb
 - spec/views/catalog/_thumbnail_list_collection.html.erb_spec.rb
 - spec/views/catalog/index.html.erb_spec.rb
 - spec/views/citations/work.html.erb_spec.rb
@@ -2043,6 +2048,7 @@ test_files:
 - spec/views/sufia/admin/admin_sets/_form_participants.html.erb_spec.rb
 - spec/views/sufia/admin/admin_sets/_form_visibility.html.erb_spec.rb
 - spec/views/sufia/admin/admin_sets/index.html.erb_spec.rb
+- spec/views/sufia/admin/features/index.html.erb_spec.rb
 - spec/views/sufia/admin/stats/show.html.erb_spec.rb
 - spec/views/sufia/batch_uploads/_form.html.erb_spec.rb
 - spec/views/sufia/homepage/_announcement.html.erb_spec.rb