hyrax 2.0.0.beta4 → 2.0.0.beta5

data/app/services/hyrax/statistics/works/count.rb

@@ -43,7 +43,7 @@ module Hyrax
         private
 
           def query_service
-            @query_service ||= Hyrax::QueryService.new
+            @query_service ||= Hyrax::Statistics::QueryService.new
           end
 
           def by_date_and_permission

data/app/services/hyrax/workflow/status_list_service.rb

@@ -50,7 +50,7 @@ module Hyrax
         def roles_for_user
           Sipity::Workflow.all.flat_map do |wf|
             workflow_roles_for_user_and_workflow(wf).map do |wf_role|
-              "#{wf.name}-#{wf_role.role.name}"
+              "#{wf.permission_template.admin_set_id}-#{wf.name}-#{wf_role.role.name}"
             end
           end
         end

data/app/views/hyrax/base/_form.html.erb

@@ -4,12 +4,13 @@
                               'param-key' => @form.model_name.param_key },
                       multipart: true
                     } do |f| %>
-  <% if f.object.errors.include?(:base) %>
+  <% if f.object.errors.any? %>
     <div class="alert alert-danger alert-dismissable" role="alert">
       <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
       <%= f.object.errors.full_messages_for(:base).send(SimpleForm.error_method) %>
       <%= render 'form_in_works_error', f: f %>
       <%= render 'form_ordered_members_error', f: f %>
+      <%= render 'form_visibility_error', f: f %>
     </div>
   <% end %>
   <% if Flipflop.batch_upload? && f.object.new_record? %>

data/app/views/hyrax/base/_form_files.html.erb

@@ -14,14 +14,12 @@
                     <span>Add files...</span>
                     <input type="file" name="files[]" multiple>
                 </span>
-                <% if browser_supports_directory_upload? %>
                 <!-- The fileinput-button span is used to style the file input field as button -->
                 <span id="addfolder" class="btn btn-success fileinput-button">
                     <span class="glyphicon glyphicon-plus"></span>
                     <span>Add folder...</span>
                     <input type="file" name="files[]" multiple directory webkitdirectory>
                 </span>
-                <% end %>
                 <button type="reset" class="btn btn-warning cancel hidden">
                     <span class="glyphicon glyphicon-ban-circle"></span>
                     <span>Cancel upload</span>

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

@@ -21,7 +21,7 @@
     <div class="set-access-controls list-group-item">
       <%= render 'form_visibility_component', f: f %>
     </div>
-    <% unless current_user.can_make_deposits_for.empty? %>
+    <% if Flipflop.proxy_deposit? && current_user.can_make_deposits_for.any? %>
         <div class="list-group-item">
           <%= f.input :on_behalf_of, collection: current_user.can_make_deposits_for.map(&:user_key), prompt: "Yourself" %>
         </div>

data/app/views/hyrax/base/_form_visibility_error.html.erb

@@ -0,0 +1,3 @@
+<%= f.full_error(:visibility) %>
+<%= f.full_error(:embargo_release_date) %>
+<%= f.full_error(:visibility_after_embargo) %>

data/app/views/hyrax/base/_show_actions.html.erb

@@ -1,6 +1,6 @@
 <div class="show-actions">
   <% if Hyrax.config.analytics? %>
-    <%= link_to "Analytics", presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
+    <%= link_to "Analytics", presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %>
   <% end %>
   <% if presenter.editor? %>
       <%= link_to "Edit", edit_polymorphic_path([main_app, presenter]), class: 'btn btn-default' %>

data/app/views/hyrax/dashboard/collections/_show_actions.html.erb

@@ -14,7 +14,7 @@
 
     <% if can? :destroy, presenter.solr_document %>
       <%= link_to t('hyrax.collection.actions.delete.label'),
-                  collection_path(presenter),
+                  hyrax.dashboard_collection_path(presenter),
                   title: t('hyrax.collection.actions.delete.desc'),
                   class: 'btn btn-danger',
                   data: { confirm: t('hyrax.collection.actions.delete.confirmation'),

data/app/views/hyrax/dashboard/profiles/_edit_primary.html.erb

@@ -57,4 +57,7 @@
 
   <%= f.button '<i class="glyphicon glyphicon-save"></i> Save Profile'.html_safe, type: 'submit', class: "btn btn-primary" %>
 <% end %>
-<%= render 'hyrax/dashboard/_index_partials/proxy_rights', user: @user %>
+
+<% if Flipflop.proxy_deposit? %>
+  <%= render 'hyrax/dashboard/_index_partials/proxy_rights', user: @user %>
+<% end %>

data/app/views/hyrax/dashboard/show_user.html.erb

@@ -26,7 +26,9 @@
     <h3 class="panel-title "><%= t("hyrax.dashboard.manage_proxies") %></h3>
   </div>
   <div class="panel-body">
-    <%= render 'hyrax/dashboard/_index_partials/proxy_rights', user: current_user %>
+    <% if Flipflop.proxy_deposit? %>
+      <%= render 'hyrax/dashboard/_index_partials/proxy_rights', user: current_user %>
+    <% end %>
   </div>
 </div>
 

data/app/views/hyrax/file_sets/_show_actions.html.erb

@@ -1,6 +1,6 @@
 <div class="form-actions">
   <% if Hyrax.config.analytics? %>
-    <%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default' %>
+    <%= link_to "Analytics", @presenter.stats_path, id: 'stats', class: 'btn btn-default', data: { turbolinks: false } %>
   <% end %>
 
   <% if @presenter.editor? %>

data/app/views/hyrax/homepage/_recent_document.html.erb

@@ -2,7 +2,7 @@
       <td class="col-sm-2">
         <%= link_to_profile recent_document.depositor("no depositor value") %>
         <%= link_to [main_app, recent_document] do %>
-          <%= render_thumbnail_tag recent_document, { width: 45 }, false %>
+          <%= render_thumbnail_tag recent_document, { width: 45 }, suppress_link: true %>
         <% end %>
       </td>
       <td>

data/config/locales/hyrax.de.yml

@@ -140,6 +140,7 @@ de:
                 2yrs: 2 Jahre nach der Deponierung
                 3yrs: 3 Jahre nach der Deponierung
                 6mos: 6 Monate nach der Deponierung
+                select: Wählen Sie die Sperrfrist aus.
           visibility:
             description: 'Nach dem Release-Datum können die Arbeiten in diesem Admin-Set eingesehen und heruntergeladen werden durch:'
             everyone: Jeder - alle Arbeiten in diesem Admin-Set werden öffentlich sein
@@ -166,8 +167,8 @@ de:
             success: Das Design wurde erfolgreich aktualisiert
       features:
         index:
-          feature: Features
-          header: Features
+          action: Aktion
+          description: Beschreibung
           feature: Charakteristisch
           header: Charakteristik
       sidebar:
@@ -186,8 +187,8 @@ de:
         tasks: Aufgaben
         technical: Charakteristik
         transfers: Transfers
-        user_activity: Ihre Tätigkeit
         user_activity: Ihre Aktivitäten
+        users: Benutzer verwalten
         workflow_review: Review-Rückmeldung
         workflow_roles: Workflow-Rollen
         works: Arbeiten
@@ -204,13 +205,13 @@ de:
             unpublished: Unveröffentlicht
         user_deposits:
           end_label: Ende [Voreinstellung]
-          start_label: Beginn
+          heading: Von Benutzern hinterlegte Dateien anzeigen
           start_label: Beginnend
         works:
           headers:
             main: Statistik Arbeiten
             total: 'Arbeiten gesamt:'
-            visibility: Summen nach Freigabe- und Sichtbarkeitsbeschränkungen 
+            visibility: Summen nach Freigabe- und Sichtbarkeitsbeschränkungen
       users:
         index:
           access_label: Letzter Zugriff
@@ -285,7 +286,7 @@ de:
         requirements: Bedarf
       items:
         actions: Aktionen
-        date_uploaded: Datum Upload 
+        date_uploaded: Datum Upload
         empty: Diese %{type} hat keine Dateien zugeordnet. Klicken Sie auf "Bearbeiten", um weitere Dateien hinzuzufügen.
         header: Artikel
         thumbnail: Miniaturansicht
@@ -354,7 +355,7 @@ de:
         create: Sammlung erstellen
         create_new: Zu neuer Sammlung hinzufügen
         no_collections: Sie haben keinen Zugang zu vorhandenen Sammlungen. Sie können eine neue Sammlung erstellen.
-        update: Sammlung updaten
+        select_heading: 'Wählen Sie die Sammlung aus, um Ihre Dateien hinzuzufügen:'
         title: Zur Sammlung hinzufügen
         update: Update-Sammlung
     collections:
@@ -857,7 +858,7 @@ de:
         related_url: Zugehörige URL
         title: Titel
         visibility_after_embargo: Dann öffnen sie es bis zu
-        visibility_after_lease: Zugriffsbeschränkung nach diesem Zeitraum 
+        visibility_after_lease: Zugriffsbeschränkung nach diesem Zeitraum
         visibility_during_embargo: Beschränkt auf
         visibility_during_lease: Ist vorhanden für
       proxy_deposit_request:

data/hyrax.gemspec

@@ -55,7 +55,7 @@ EOF
   # Pin more tightly because 0.x gems are potentially unstable
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'almond-rails', '~> 0.1'
-  spec.add_dependency 'qa', '~> 1.0' # questioning_authority
+  spec.add_dependency 'qa', '~> 2.0' # questioning_authority
   spec.add_dependency 'flipflop', '~> 2.3'
   spec.add_dependency 'jquery-datatables-rails', '~> 3.4'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
@@ -75,7 +75,7 @@ EOF
   spec.add_dependency 'active-fedora', '>= 11.3.1'
   spec.add_dependency 'linkeddata' # Required for getting values from geonames
 
-  spec.add_development_dependency 'engine_cart', '~> 1.0'
+  spec.add_development_dependency 'engine_cart', '~> 1.2'
   spec.add_development_dependency 'mida', '~> 0.3'
   spec.add_development_dependency 'database_cleaner', '~> 1.3'
   spec.add_development_dependency 'solr_wrapper', '~> 1.1'

data/lib/generators/hyrax/config_generator.rb

@@ -24,10 +24,8 @@ class Hyrax::ConfigGenerator < Rails::Generators::Base
   end
 
   def simple_form_initializers
-    copy_file 'config/initializers/simple_form.rb',
-              'config/initializers/simple_form.rb'
-    copy_file 'config/initializers/simple_form_bootstrap.rb',
-              'config/initializers/simple_form_bootstrap.rb'
+    copy_file 'config/initializers/simple_form.rb'
+    copy_file 'config/initializers/simple_form_bootstrap.rb'
   end
 
   def configure_endnote
@@ -36,30 +34,30 @@ class Hyrax::ConfigGenerator < Rails::Generators::Base
   end
 
   def configure_redis
-    copy_file 'config/redis.yml', 'config/redis.yml'
-    copy_file 'config/redis_config.rb', 'config/initializers/redis_config.rb'
+    copy_file 'config/redis.yml'
+    copy_file 'config/initializers/redis_config.rb'
   end
 
   def create_initializer_config_file
-    copy_file 'config/hyrax.rb', 'config/initializers/hyrax.rb'
+    copy_file 'config/initializers/hyrax.rb'
   end
 
   # Add mini-magick configuration
   def minimagick_config
-    copy_file 'config/mini_magick.rb', 'config/initializers/mini_magick.rb'
+    copy_file 'config/initializers/mini_magick.rb'
   end
 
   def tinymce_config
-    copy_file "config/tinymce.yml", "config/tinymce.yml"
+    copy_file 'config/tinymce.yml'
   end
 
   def inject_i18n
-    copy_file "config/locales/hyrax.en.yml", "config/locales/hyrax.en.yml"
-    copy_file "config/locales/hyrax.es.yml", "config/locales/hyrax.es.yml"
-    copy_file "config/locales/hyrax.zh.yml", "config/locales/hyrax.zh.yml"
-    copy_file "config/locales/hyrax.de.yml", "config/locales/hyrax.de.yml"
-    copy_file "config/locales/hyrax.fr.yml", "config/locales/hyrax.fr.yml"
-    copy_file "config/locales/hyrax.it.yml", "config/locales/hyrax.it.yml"
-    copy_file "config/locales/hyrax.pt-BR.yml", "config/locales/hyrax.pt-BR.yml"
+    copy_file 'config/locales/hyrax.en.yml'
+    copy_file 'config/locales/hyrax.es.yml'
+    copy_file 'config/locales/hyrax.zh.yml'
+    copy_file 'config/locales/hyrax.de.yml'
+    copy_file 'config/locales/hyrax.fr.yml'
+    copy_file 'config/locales/hyrax.it.yml'
+    copy_file 'config/locales/hyrax.pt-BR.yml'
   end
 end

data/lib/generators/hyrax/templates/config/{hyrax.rb → initializers/hyrax.rb}

@@ -11,6 +11,11 @@ Hyrax.config do |config|
   # @see Hyrax::Configuration for additional details and defaults.
   # config.default_active_workflow_name = 'default'
 
+  # Which RDF term should be used to relate objects to an admin set?
+  # If this is a new repository, you may want to set a custom predicate term here to
+  # avoid clashes if you plan to use the default (dct:isPartOf) for other relations.
+  # config.admin_set_predicate = ::RDF::DC.isPartOf
+
   # Email recipient of messages sent via the contact form
   # config.contact_email = "repo-admin@example.org"
 
@@ -196,6 +201,22 @@ Hyrax.config do |config|
   rescue Errno::ENOENT
     config.browse_everything = nil
   end
+
+  ## Whitelist all directories which can be used to ingest from the local file
+  # system.
+  #
+  # Any file, and only those, that is anywhere under one of the specified
+  # directories can be used by CreateWithRemoteFilesActor to add local files
+  # to works. Files uploaded by the user are handled separately and the
+  # temporary directory for those need not be included here.
+  #
+  # Default value includes BrowseEverything.config['file_system'][:home] if it
+  # is set, otherwise default is an empty list. You should only need to change
+  # this if you have custom ingestions using CreateWithRemoteFilesActor to
+  # ingest files from the file system that are not part of the BrowseEverything
+  # mount point.
+  #
+  # config.whitelisted_ingest_dirs = []
 end
 
 Date::DATE_FORMATS[:standard] = "%m/%d/%Y"

data/lib/hyrax.rb

@@ -23,11 +23,12 @@ module Hyrax
 
   eager_autoload do
     autoload :Arkivo
+    autoload :Collections
     autoload :Configuration
+    autoload :ControlledVocabularies
     autoload :RedisEventStore
     autoload :ResourceSync
     autoload :Zotero
-    autoload :Collections
   end
 
   # @api public

data/lib/hyrax/configuration.rb

@@ -97,10 +97,6 @@ module Hyrax
     def max_days_between_fixity_checks
       @max_days_between_fixity_checks ||= 7
     end
-    alias max_days_between_audits max_days_between_fixity_checks
-    deprecation_deprecate max_days_between_audits: "use max_days_between_fixity_checks instead"
-    alias max_days_between_audits= max_days_between_fixity_checks=
-    deprecation_deprecate :max_days_between_audits= => "use max_days_between_fixity_checks= instead"
 
     attr_writer :enable_noids
     def enable_noids?
@@ -180,6 +176,18 @@ module Hyrax
       @bagit_dir ||= "tmp/descriptions"
     end
 
+    # @!attribute [w] whitelisted_ingest_dirs
+    #   List of directories which can be used for local file system ingestion.
+    attr_writer :whitelisted_ingest_dirs
+    def whitelisted_ingest_dirs
+      @whitelisted_ingest_dirs ||= \
+        if defined? BrowseEverything
+          Array.wrap(BrowseEverything.config['file_system'].try(:[], :home)).compact
+        else
+          []
+        end
+    end
+
     callback.enable :after_create_concern, :after_create_fileset,
                     :after_update_content, :after_revert_content,
                     :after_update_metadata, :after_import_local_file_success,
@@ -297,6 +305,11 @@ module Hyrax
       @active_deposit_agreement_acceptance
     end
 
+    attr_writer :admin_set_predicate
+    def admin_set_predicate
+      @admin_set_predicate ||= ::RDF::Vocab::DC.isPartOf
+    end
+
     attr_writer :work_requires_files
     def work_requires_files?
       return true if @work_requires_files.nil?
@@ -331,12 +344,6 @@ module Hyrax
       @display_share_button_when_not_logged_in
     end
 
-    alias always_display_share_button= display_share_button_when_not_logged_in=
-    deprecation_deprecate :always_display_share_button= => "use display_share_button_when_not_logged_in= instead"
-
-    alias always_display_share_button? display_share_button_when_not_logged_in?
-    deprecation_deprecate always_display_share_button?: "use display_share_button_when_not_logged_in? instead"
-
     attr_writer :google_analytics_id
     def google_analytics_id
       @google_analytics_id ||= nil

data/lib/hyrax/controlled_vocabularies.rb

@@ -0,0 +1,9 @@
+module Hyrax
+  module ControlledVocabularies
+    extend ActiveSupport::Autoload
+
+    eager_autoload do
+      autoload :Location
+    end
+  end
+end

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.0.0.beta4'.freeze
+  VERSION = '2.0.0.beta5'.freeze
 end

data/spec/actors/hyrax/actors/create_with_remote_files_actor_spec.rb

@@ -51,11 +51,25 @@ RSpec.describe Hyrax::Actors::CreateWithRemoteFilesActor do
          file_name: "here.txt" }]
     end
 
+    before do
+      allow(Hyrax.config).to receive(:whitelisted_ingest_dirs).and_return(["/local/file/"])
+    end
+
     it "attaches files" do
       expect(IngestLocalFileJob).to receive(:perform_later).with(FileSet, "/local/file/here.txt", user)
       expect(actor.create(environment)).to be true
     end
 
+    context "with files from non-whitelisted directories" do
+      let(:file) { "file:///local/otherdir/test.txt" }
+
+      it "doesn't attach files" do
+        expect(actor).to receive(:validate_remote_url).and_call_original
+        expect(IngestLocalFileJob).not_to receive(:perform_later)
+        expect(actor.create(environment)).to be false
+      end
+    end
+
     context "with spaces" do
       let(:file) { "file:///local/file/ pigs .txt" }
 
@@ -65,4 +79,26 @@ RSpec.describe Hyrax::Actors::CreateWithRemoteFilesActor do
       end
     end
   end
+
+  describe "#validate_remote_url" do
+    before do
+      allow(Hyrax.config).to receive(:whitelisted_ingest_dirs).and_return(['/test/', '/local/file/'])
+    end
+
+    it "accepts file: urls in whitelisted directories" do
+      expect(actor.send(:validate_remote_url, "file:///local/file/test.txt")).to be true
+      expect(actor.send(:validate_remote_url, "file:///local/file/subdirectory/test.txt")).to be true
+      expect(actor.send(:validate_remote_url, "file:///test/test.txt")).to be true
+    end
+
+    it "rejects file: urls outside whitelisted directories" do
+      expect(actor.send(:validate_remote_url, "file:///tmp/test.txt")).to be false
+      expect(actor.send(:validate_remote_url, "file:///test/../tmp/test.txt")).to be false
+      expect(actor.send(:validate_remote_url, "file:///test/")).to be false
+    end
+
+    it "accepts other types of urls" do
+      expect(actor.send(:validate_remote_url, "https://example.com/test.txt")).to be true
+    end
+  end
 end