hyrax 2.5.1 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52ca5db4f8ce55b87305b9bfbbbe4bfc7464958f5070e3cb4911f04feed87352
-  data.tar.gz: 4f9977600707f112927aed03cc8f985f7b125ca04d13344a3effb66350755ca2
+  metadata.gz: 2d5150722f3ca96a6fafde49d7cb079bc12e74ec0a535ff26ae2fb1e3b4e6ef6
+  data.tar.gz: 2d4dd842e2d4d0f11889c3b31a9d38935942b102af52ee01b4912a9e13075ed5
 SHA512:
-  metadata.gz: ea378dc6fb860157cf4330ed9d82d915123c89da7db61b44412fe44fc18da317806ad0716d08fec07d8b98cec963531607b828a6fab1a771a0576e2d8e649e52
-  data.tar.gz: 304be0cc47238943179bd32d1d843c7a7a7413c4daf4bcc58d9cdba5fcdb7a024e5cb4e7f55b4656872c4f352a36533b5f6d05b21cb6441ce1cdc084c9838d5c
+  metadata.gz: e1aeac1be9a34b0d656baba6757285d70d44ab47a46a9a0ab86196098c5c5c8f0e8548295386c624de94d8fe0f359c1a303226ae9fbb7fd2add8604621b6125c
+  data.tar.gz: 9e2e93f81be52b0ea3c7fadab04046de5d5e8f1ec23d02f65f00d7f342f2a0f4881e6fb66e83888f1f81446cb7ac8961740456aecd4f7c5cde405acffa698b63

data/.circleci/config.yml

@@ -1,195 +1,155 @@
-# Ruby CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-ruby/ for more details
-#
 version: 2.1
-executors:
-  ruby:
-    docker:
-      - image: circleci/ruby:2.5.3
-    working_directory: ~/hyrax
-    environment:
-      BUNDLE_PATH: vendor/bundle
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
-
+orbs:
+  samvera: samvera/circleci-orb@0
 jobs:
   bundle:
-    executor: ruby
+    parameters:
+      ruby_version:
+        type: string
+        default: 2.5.5
+      bundler_version:
+        type: string
+        default: 1.17.3
+      rails_version:
+        type: string
+        default: '5.2.2'
+      cache_version:
+        type: string
+        default: '1-2.x'
+    executor:
+      name: 'samvera/ruby'
+      ruby_version: << parameters.ruby_version >>
+    resource_class: medium+
+    environment:
+      RAILS_VERSION: << parameters.rails_version >>
+      NOKOGIRI_USE_SYSTEM_LIBRARIES: true
     steps:
-    - restore_cache:
-        keys:
-        - v1-source-{{ .Branch }}-{{ .Revision }}
-        - v1-source-{{ .Branch }}-
-        - v1-source-
-
-    - checkout
-
-    - save_cache:
-        key: v1-source-{{ .Branch }}-{{ .Revision }}
-        paths:
-        - ".git"
-
-    - restore_cache:
-        keys:
-        - v1-bundle-{{ checksum "Gemfile" }}--{{ checksum "hyrax.gemspec" }}
-        - v1-bundle
-
-    - run:
-        name: Install dependencies
-        command: bundle check || bundle install
-
-    - save_cache:
-        key: v1-bundle-{{ checksum "Gemfile.lock" }}--{{ checksum "hyrax.gemspec" }}
-        paths:
-        - ~/hyrax/vendor/bundle
-
-    - persist_to_workspace:
-        root: ~/
-        paths:
-        - hyrax/*
-        - hyrax/**/*
+      - samvera/cached_checkout
+      - samvera/bundle_for_gem:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          project: hyrax
+      - persist_to_workspace:
+          root: ~/
+          paths:
+          - project/*
+          - project/**/*
 
   lint:
-    executor: ruby
+    parameters:
+      ruby_version:
+        type: string
+        default: 2.5.5
+      cache_version:
+        type: string
+        default: '1-2.x'
+    executor:
+      name: 'samvera/ruby'
+      ruby_version: << parameters.ruby_version >>
+    resource_class: medium+
     steps:
-    - attach_workspace:
-        at: ~/
-
-    - run:
-        name: Call Rubocop
-        command: bundle exec rubocop
+      - attach_workspace:
+          at: ~/
+      - samvera/rubocop
 
   build:
-    docker:
-    - image: circleci/ruby:2.5.3-node
-
-    working_directory: ~/hyrax
-
+    parameters:
+      ruby_version:
+        type: string
+        default: 2.5.5
+      bundler_version:
+        type: string
+        default: 1.17.3
+      rails_version:
+        type: string
+        default: '5.2.2'
+      cache_version:
+        type: string
+        default: '1-2.x'
+    executor:
+      name: 'samvera/ruby'
+      ruby_version: << parameters.ruby_version >>
+    resource_class: medium+
     environment:
-      BUNDLE_PATH: vendor/bundle
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
-      RAILS_ENV: test
-      RACK_ENV: test
-      FCREPO_TEST_PORT: 8080/fcrepo
+      RAILS_VERSION: << parameters.rails_version >>
       NOKOGIRI_USE_SYSTEM_LIBRARIES: true
       ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test
-      SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
-      COVERALLS_PARALLEL: true
-
     steps:
-    - attach_workspace:
-        at: ~/
-
-    # Update to the latest release of Chrome
-    - run: wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
-    - run: sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-    - run: sudo apt-get update && sudo apt-get -y install google-chrome-stable
-
-    - restore_cache:
-        keys:
-        - v1-test-app-{{ checksum "template.rb" }}--{{ checksum "Gemfile.lock" }}
-
-    - run:
-        name: Check dependencies
-        command: bundle check || bundle install
-
-    - run:
-        name: Generate test app
-        command: (git diff --name-only master | grep -qG 'generators\/hyrax') || bundle exec rake engine_cart:generate
-
-    - run:
-        name: Ensure test app dependencies are installed
-        command: |
-          cd .internal_test_app
-          bundle check || bundle install
-
-    - save_cache:
-        key: v1-test-app-{{ checksum "template.rb" }}--{{ checksum "Gemfile.lock" }}
-        paths:
-        - ".internal_test_app"
-
-    - persist_to_workspace:
-        root: ~/
-        paths:
-        - hyrax/*
-        - hyrax/**/*
+      - attach_workspace:
+          at: ~/
+      - samvera/engine_cart_generate:
+          cache_key: v<< parameters.cache_version >>--internal-test-app-{{ checksum "hyrax.gemspec" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/hyrax/install_generator.rb" }}-<< parameters.rails_version >>-<< parameters.ruby_version >>
+      - samvera/bundle_for_gem:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          cache_version: << parameters.cache_version >>
+          project: hyrax
+      - persist_to_workspace:
+          root: ~/
+          paths:
+          - project/*
+          - project/**/*
 
   test:
-    docker:
-    - image: circleci/ruby:2.5.3-node-browsers-legacy
-    - image: circleci/redis:4
-    - image: ualbertalib/docker-fcrepo4:4.7
-      environment:
-        CATALINA_OPTS: "-Djava.awt.headless=true -Dfile.encoding=UTF-8 -server -Xms512m -Xmx1024m -XX:NewSize=256m -XX:MaxNewSize=256m -XX:PermSize=256m -XX:MaxPermSize=256m -XX:+DisableExplicitGC"
-    - image: solr:7-alpine
-      command: bin/solr -cloud -noprompt -f -p 8985
-
-    working_directory: ~/hyrax
-    parallelism: 4
-
+    parameters:
+      ruby_version:
+        type: string
+        default: 2.5.5
+      bundler_version:
+        type: string
+        default: 1.17.3
+      cache_version:
+        type: string
+        default: '1-2.x'
+    executor:
+      name: 'samvera/ruby_fcrepo_solr_redis'
+      ruby_version: << parameters.ruby_version >>
+    resource_class: medium+
+    parallelism: 10
     environment:
-      BUNDLE_PATH: vendor/bundle
-      BUNDLE_JOBS: 4
-      BUNDLE_RETRY: 3
-      RAILS_ENV: test
-      RACK_ENV: test
-      FCREPO_TEST_PORT: 8080/fcrepo
-      NOKOGIRI_USE_SYSTEM_LIBRARIES: true
-      ENGINE_CART_RAILS_OPTIONS: --skip-git --skip-bundle --skip-listen --skip-spring --skip-yarn --skip-keeps --skip-action-cable --skip-coffee --skip-puma --skip-test
-      SPEC_OPTS: --profile 10 --format RspecJunitFormatter --out /tmp/test-results/rspec.xml --format progress
       COVERALLS_PARALLEL: true
-
     steps:
-    - attach_workspace:
-        at: ~/
-
-    - run:
-        name: Ensure top-level Gemfile.lock is valid
-        command: bundle check || bundle install
-
-    - run:
-        name: Uninstall chromedriver Gems
-        command: gem uninstall -ax chromedriver-helper
-
-    - run:
-        name: Install chromedriver Gems
-        command: gem install chromedriver-helper
-
-    - run:
-        name: Load config into solr
-        command: |
-          cd .internal_test_app/solr/config
-          zip -1 -r solr_hyrax_config.zip ./*
-          curl -H "Content-type:application/octet-stream" --data-binary @solr_hyrax_config.zip "http://localhost:8985/solr/admin/configs?action=UPLOAD&name=hyrax"
-          curl -H 'Content-type: application/json' http://localhost:8985/api/collections/ -d '{create: {name: hydra-test, config: hyrax, numShards: 1}}'
-
-    - run:
-        name: Run rspec in parallel
-        command: |
-          mkdir /tmp/test-results
-          bundle exec rspec $(circleci tests glob "spec/**/*_spec.rb" | circleci tests split --split-by=timings)
-
-    # collect reports
-    - store_test_results:
-        path: /tmp/test-results
-    - store_artifacts:
-        path: /tmp/test-results
-        destination: test-results
+      - attach_workspace:
+          at: ~/
+      - samvera/install_solr_core:
+          solr_config_path: .internal_test_app/solr/config
+      # Rerun bundler in case this is a different ruby version than bundle and build steps
+      - samvera/bundle_for_gem:
+          ruby_version: << parameters.ruby_version >>
+          bundler_version: << parameters.bundler_version >>
+          cache_version: << parameters.cache_version >>
+          project: hyrax
+      - samvera/parallel_rspec
 
 workflows:
   version: 2
   ci:
     jobs:
-      - bundle
+      - bundle:
+          ruby_version: "2.5.5"
+          rails_version: "5.1.7"
+          cache_version: "1-2.x"
       - lint:
+          ruby_version: "2.5.5"
+          cache_version: "1-2.x"
           requires:
             - bundle
       - build:
+          ruby_version: "2.5.5"
+          rails_version: "5.1.7"
+          cache_version: "1-2.x"
           requires:
             - bundle
       - test:
+          name: "ruby2-5-5"
+          ruby_version: "2.5.5"
+          requires:
+            - build
+            - lint
+      - test:
+          name: "ruby2-6-2"
+          ruby_version: "2.6.2"
+          cache_version: "1-2.x"
           requires:
             - build
             - lint

data/README.md

@@ -67,10 +67,6 @@ v2.5.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.
 
-## Quickstart
-
-If you're looking to spin up a vanilla Hyrax application very quickly for demonstration purposes, you may be interested in [the samvera-vagrant project](https://github.com/samvera-labs/samvera-vagrant) which may be used to "kick the tires" of Hyrax and [Hyku](https://github.com/samvera-labs/hyku). It requires VirtualBox and Vagrant.
-
 ## Prerequisites
 
 Prerequisites are required for both creating a Hyrax\-based app and contributing new features to Hyrax. After installing the prerequisites...
@@ -118,7 +114,7 @@ Hyrax includes support for transcoding audio and video files with ffmpeg > 1.0 i
 
 On OSX, you can use Homebrew to install ffmpeg:
 
-`brew install ffmpeg --with-fdk-aac --with-libvpx --with-libvorbis`
+`brew install libvpx ffmpeg`
 
 Otherwise, to compile ffmpeg yourself, see the [ffmpeg compilation guide](https://trac.ffmpeg.org/wiki/CompilationGuide).
 
@@ -162,7 +158,7 @@ NOTE: The steps need to be done in order to create a new Hyrax based app.
 Generate a new Rails application using the template.
 
 ```
-rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.5.1/template.rb
+rails _5.1.6_ new my_app -m https://raw.githubusercontent.com/samvera/hyrax/v2.6.0/template.rb
 ```
 
 Generating a new Rails application using Hyrax's template above takes cares of a number of steps for you, including:

data/app/actors/hyrax/actors/add_to_work_actor.rb

@@ -5,7 +5,8 @@ module Hyrax
       # @return [Boolean] true if create was successful
       def create(env)
         work_ids = env.attributes.delete(:in_works_ids)
-        next_actor.create(env) && add_to_works(env, work_ids)
+
+        can_edit_works?(env, work_ids) && next_actor.create(env) && add_to_works(env, work_ids)
       end
 
       # @param [Hyrax::Actors::Environment] env
@@ -21,6 +22,15 @@ module Hyrax
           env.current_ability.can?(:edit, work) && env.current_ability.can?(:edit, env.curation_concern)
         end
 
+        def can_edit_works?(env, work_ids)
+          unless Array(work_ids).all? { |work_id| env.current_ability.can?(:edit, work_id) }
+            add_permissions_error(env.curation_concern)
+            return false
+          end
+
+          true
+        end
+
         def add_to_works(env, new_work_ids)
           return true if new_work_ids.nil?
           cleanup_ids_to_remove_from_curation_concern(env, new_work_ids)
@@ -39,16 +49,25 @@ module Hyrax
 
         def add_new_work_ids_not_already_in_curation_concern(env, new_work_ids)
           # add to new so long as the depositor for the parent and child matches, otherwise inject an error
-          (new_work_ids - env.curation_concern.in_works_ids).each do |work_id|
-            work = ::ActiveFedora::Base.find(work_id)
+          new_works_for(env, new_work_ids).each do |work|
             if can_edit_both_works?(env, work)
               work.ordered_members << env.curation_concern
               work.save!
             else
-              env.curation_concern.errors[:in_works_ids] << "Works can only be related to each other if user has ability to edit both."
+              add_permissions_error(env.curation_concern)
             end
           end
         end
+
+        def new_works_for(env, new_work_ids)
+          (new_work_ids - env.curation_concern.in_works_ids).map do |work_id|
+            ::ActiveFedora::Base.find(work_id)
+          end
+        end
+
+        def add_permissions_error(work)
+          work.errors[:in_works_ids] << "Works can only be related to each other if user has ability to edit both."
+        end
     end
   end
 end

data/app/actors/hyrax/actors/create_with_remote_files_actor.rb

@@ -64,7 +64,8 @@ module Hyrax
         # Generic utility for creating FileSet from a URL
         # Used in to import files using URLs from a file picker like browse_everything
         def create_file_from_url(env, uri, file_name, auth_header = {})
-          ::FileSet.new(import_url: uri.to_s, label: file_name) do |fs|
+          import_url = URI.decode_www_form_component(uri.to_s)
+          ::FileSet.new(import_url: import_url, label: file_name) do |fs|
             actor = Hyrax::Actors::FileSetActor.new(fs, env.user)
             actor.create_metadata(visibility: env.curation_concern.visibility)
             actor.attach_to_work(env.curation_concern)

data/app/forms/hyrax/forms/workflow_responsibility_form.rb

@@ -12,9 +12,9 @@ module Hyrax
         @model ||= Sipity::WorkflowResponsibility.new
       end
 
-      def to_model
-        model_instance
-      end
+      # def to_model
+      #   model_instance
+      # end
 
       delegate :model_name, :to_key, :workflow_role_id, :persisted?, :save!, to: :model_instance
 

data/app/indexers/hyrax/file_set_indexer.rb

@@ -27,6 +27,7 @@ module Hyrax
         solr_doc['duration_tesim']          = object.duration
         solr_doc['sample_rate_tesim']       = object.sample_rate
         solr_doc['original_checksum_tesim'] = object.original_checksum
+        solr_doc['original_file_id_ssi']    = original_file_id
       end
     end
 
@@ -37,6 +38,11 @@ module Hyrax
         object.original_file.digest.first.to_s
       end
 
+      def original_file_id
+        return unless object.original_file
+        object.original_file.id
+      end
+
       def file_format
         if object.mime_type.present? && object.format_label.present?
           "#{object.mime_type.split('/').last} (#{object.format_label.join(', ')})"

data/app/jobs/import_url_job.rb

@@ -21,17 +21,19 @@ class ImportUrlJob < Hyrax::ApplicationJob
     operation.performing!
     user = User.find_by_user_key(file_set.depositor)
     uri = URI(file_set.import_url)
+    name = file_set.label
+
     @file_set = file_set
     @operation = operation
 
-    unless can_retrieve?(uri)
+    unless BrowseEverything::Retriever.can_retrieve?(uri, headers)
       send_error('Expired URL')
       return false
     end
 
     # @todo Use Hydra::Works::AddExternalFileToFileSet instead of manually
     #       copying the file here. This will be gnarly.
-    copy_remote_file(uri, headers) do |f|
+    copy_remote_file(uri, name, headers) do |f|
       # reload the FileSet once the data is copied since this is a long running task
       file_set.reload
 
@@ -44,25 +46,16 @@ class ImportUrlJob < Hyrax::ApplicationJob
 
   private
 
-    # The previous strategy of using only a HEAD request to check the validity of a
-    # remote URL fails for Amazon S3 pre-signed URLs. S3 URLs are generated for a single
-    # verb only (in this case, GET), and will return a 403 Forbidden response if any
-    # other verb is used. The workaround is to issue a GET request instead, with a
-    # Range: header requesting only the first byte. The successful response status
-    # code is 206 instead of 200, but that is enough to satisfy the #success? method.
-    # @param uri [URI] the uri of the file to be downloaded
-    def can_retrieve?(uri)
-      HTTParty.get(uri, headers: { Range: 'bytes=0-0' }).success?
-    end
-
     # Download file from uri, yields a block with a file in a temporary directory.
     # It is important that the file on disk has the same file name as the URL,
     # because when the file in added into Fedora the file name will get persisted in the
     # metadata.
     # @param uri [URI] the uri of the file to download
+    # @param name [String] the human-readable name of the file
+    # @param headers [Hash] the HTTP headers for the GET request (these may contain an authentication token)
     # @yield [IO] the stream to write to
-    def copy_remote_file(uri, headers = {})
-      filename = File.basename(uri.path)
+    def copy_remote_file(uri, name, headers = {})
+      filename = File.basename(name)
       dir = Dir.mktmpdir
       Rails.logger.debug("ImportUrlJob: Copying <#{uri}> to #{dir}")
 
@@ -92,7 +85,7 @@ class ImportUrlJob < Hyrax::ApplicationJob
     # @param f [IO] the stream to write to
     def write_file(uri, f, headers)
       retriever = BrowseEverything::Retriever.new
-      uri_spec = { 'url' => uri }.merge(headers)
+      uri_spec = ActiveSupport::HashWithIndifferentAccess.new(url: uri, headers: headers)
       retriever.retrieve(uri_spec) do |chunk|
         f.write(chunk)
       end

data/app/jobs/ingest_local_file_job.rb

@@ -14,5 +14,9 @@ class IngestLocalFileJob < Hyrax::ApplicationJob
     else
       Hyrax.config.callback.run(:after_import_local_file_failure, file_set, user, path)
     end
+  rescue SystemCallError
+    # This is generic in order to handle Errno constants raised when accessing files
+    # @see https://ruby-doc.org/core-2.5.3/Errno.html
+    Hyrax.config.callback.run(:after_import_local_file_failure, file_set, user, path)
   end
 end

data/hyrax.gemspec

@@ -37,8 +37,7 @@ SUMMARY
   spec.add_dependency 'blacklight', '~> 6.14'
   spec.add_dependency 'blacklight-gallery', '~> 0.7'
   spec.add_dependency 'breadcrumbs_on_rails', '~> 3.0'
-  # Pin browse-everything to stable version
-  spec.add_dependency 'browse-everything', '< 0.16'
+  spec.add_dependency 'browse-everything', '>= 0.16'
   spec.add_dependency 'carrierwave', '~> 1.0'
   spec.add_dependency 'clipboard-rails', '~> 1.5'
   spec.add_dependency 'dry-equalizer', '~> 0.2'
@@ -50,7 +49,7 @@ SUMMARY
   spec.add_dependency 'flot-rails', '~> 0.0.6'
   spec.add_dependency 'font-awesome-rails', '~> 4.2'
   spec.add_dependency 'hydra-derivatives', '~> 3.3'
-  spec.add_dependency 'hydra-editor', '>= 3.3', '< 5.0'
+  spec.add_dependency 'hydra-editor', '>= 3.3', '< 6.0'
   spec.add_dependency 'hydra-head', '>= 10.6.1'
   spec.add_dependency 'hydra-works', '>= 0.16', '< 2.0'
   spec.add_dependency 'iiif_manifest', '>= 0.3', '< 0.6'
@@ -105,12 +104,13 @@ SUMMARY
   spec.add_development_dependency 'bixby', '~> 1.0.0'
   spec.add_development_dependency 'shoulda-callback-matchers', '~> 1.1.1'
   spec.add_development_dependency 'shoulda-matchers', '~> 3.1'
+  spec.add_development_dependency 'webdrivers', '~> 3.0'
   spec.add_development_dependency 'webmock'
 
   ########################################################
   # Temporarily pinned dependencies. INCLUDE EXPLANATIONS.
   #
-  # simple_form 3.5.1 broke hydra-editor for certain model types;
-  #   see: https://github.com/plataformatec/simple_form/issues/1549
-  spec.add_dependency 'simple_form', '~> 3.2', '<= 3.5.0'
+  # Pin sass-rails to 5.x because rails 5.x apps have this same dependency in their generated Gemfiles
+  # See https://github.com/samvera/hyrax/issues/3919
+  spec.add_dependency 'sass-rails', '~> 5.0'
 end

data/lib/generators/hyrax/install_generator.rb

@@ -38,6 +38,7 @@ module Hyrax
       say_status('info', '[Hyrax] GENERATING HYDRA-HEAD', :blue)
       generate 'hydra:head -f'
       generate "hyrax:models#{options[:force] ? ' -f' : ''}"
+      generate 'browse_everything:config'
     end
 
     def replace_blacklight_layout

data/lib/hyrax/configuration.rb

@@ -189,7 +189,10 @@ module Hyrax
     def whitelisted_ingest_dirs
       @whitelisted_ingest_dirs ||= \
         if defined? BrowseEverything
-          Array.wrap(BrowseEverything.config['file_system'].try(:[], :home)).compact
+          file_system_dirs = Array.wrap(BrowseEverything.config['file_system'].try(:[], :home)).compact
+          # Include the Rails tmp directory for cases where the BrowseEverything provider is required to download the file to a temporary directory first
+          tmp_dir = [Rails.root.join('tmp').to_s]
+          file_system_dirs + tmp_dir
         else
           []
         end

data/lib/hyrax/version.rb

@@ -1,3 +1,3 @@
 module Hyrax
-  VERSION = '2.5.1'.freeze
+  VERSION = '2.6.0'.freeze
 end

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

@@ -44,6 +44,20 @@ RSpec.describe Hyrax::Actors::CreateWithRemoteFilesActor do
     end
   end
 
+  context "with source URIs that are remote and contain encoded parameters" do
+    let(:url1) { "https://dl.dropbox.com/fake/file?param1=%28example%29&param2=%5Bexample2%5D" }
+
+    before do
+      allow(::FileSet).to receive(:new).and_call_original
+    end
+
+    it "preserves the encoded parameters in the URIs" do
+      expect(ImportUrlJob).to receive(:perform_later).with(FileSet, Hyrax::Operation, {}).twice
+      expect(actor.create(environment)).to be true
+      expect(::FileSet).to have_received(:new).with(import_url: "https://dl.dropbox.com/fake/file?param1=%28example%29&param2=%5Bexample2%5D", label: "filepicker-demo.txt.txt")
+    end
+  end
+
   context "with source uris that are remote bearing auth headers" do
     let(:remote_files) do
       [{ url: url1,

data/spec/features/actor_stack_spec.rb

@@ -26,6 +26,35 @@ RSpec.describe Hyrax::DefaultMiddlewareStack, :clean_repo do
         .to true
     end
 
+    context 'when adding to a work' do
+      let(:other_work) { FactoryBot.create(:work, user: user) }
+      let(:attributes) { { 'in_works_ids' => [other_work.id] } }
+
+      context 'when the user cannot edit the parent work' do
+        let(:other_work) { FactoryBot.create(:work, user: other_user) }
+        let(:other_user) { FactoryBot.create(:user) }
+
+        it 'fails' do
+          expect { actor.create(env) }
+            .not_to change { other_work.reload.members.to_a }
+            .from be_empty
+        end
+
+        it 'does not create the work' do
+          expect { actor.create(env) }
+            .not_to change { work.persisted? }
+            .from false
+        end
+      end
+
+      it 'adds the work to the parent' do
+        expect { actor.create(env) }
+          .to change { other_work.reload.members.to_a }
+          .from(be_empty)
+          .to contain_exactly(work)
+      end
+    end
+
     context 'when failing on the way back up the actor stack' do
       before { stack.insert_before(Hyrax::Actors::ModelActor, delayed_failure_actor) }
 

data/spec/indexers/hyrax/file_set_indexer_spec.rb

@@ -92,6 +92,7 @@ RSpec.describe Hyrax::FileSetIndexer do
       expect(subject['file_title_tesim']).to eq ['title']
       expect(subject['duration_tesim']).to eq ['0:1']
       expect(subject['sample_rate_tesim']).to eq ['sample rate']
+      expect(subject['original_file_id_ssi']).to eq file_set.original_file.id
     end
   end
 

data/spec/jobs/import_url_job_spec.rb

@@ -3,10 +3,11 @@ RSpec.describe ImportUrlJob do
 
   let(:file_path) { fixture_path + '/world.png' }
   let(:file_hash) { '/673467823498723948237462429793840923582' }
+  let(:label) { file_path }
 
   let(:file_set) do
     FileSet.new(import_url: "http://example.org#{file_hash}",
-                label: file_path) do |f|
+                label: label) do |f|
       f.apply_depositor_metadata(user.user_key)
     end
   end
@@ -74,7 +75,21 @@ RSpec.describe ImportUrlJob do
 
     it 'leaves the temp directory in place' do
       described_class.perform_now(file_set, operation)
-      expect(File.exist?(File.join(tmpdir, file_hash))).to be true
+      file_name = File.basename(file_set.label)
+      expect(File.exist?(File.join(tmpdir, file_name))).to be true
+    end
+
+    context 'when the FileSet has an existing label' do
+      let(:label) { "example.tif" }
+      before do
+        allow(Rails.logger).to receive(:debug)
+      end
+      it 'uses the FileSet label' do
+        described_class.perform_now(file_set, operation)
+        tmp_file_path = Rails.root.join(tmpdir, label)
+        expect(Rails.logger).to have_received(:debug).with("ImportUrlJob: Closing #{tmp_file_path}")
+        expect(File.exist?(tmp_file_path.to_s)).to be true
+      end
     end
   end
 
@@ -130,4 +145,36 @@ RSpec.describe ImportUrlJob do
       expect(last_message.body).to eq("Error: Timeout")
     end
   end
+
+  context 'when the URL to the remote file has headers' do
+    let(:import_url) { "http://example.org#{file_hash}" }
+    let(:headers) do
+      {
+        "Authorization" => "OAuth <ACCESS_TOKEN>"
+      }
+    end
+    let(:file_set) do
+      FileSet.new(import_url: import_url, label: file_path) do |f|
+        f.apply_depositor_metadata(user.user_key)
+      end
+    end
+    let(:operation) { create(:operation) }
+    let(:import_uri) { URI(import_url) }
+
+    before do
+      allow(BrowseEverything::Retriever).to receive(:can_retrieve?).and_return(true)
+      described_class.perform_now(file_set, operation, headers)
+    end
+
+    it 'submits a request to the cloud server with auth headers' do
+      expect(BrowseEverything::Retriever).to have_received(:can_retrieve?).with(import_uri, headers)
+    end
+
+    it 'retrieves the cloud server resources with the auth headers' do
+      expect(mock_retriever).to have_received(:retrieve).with(
+        "url" => import_uri,
+        "headers" => headers
+      )
+    end
+  end
 end

data/spec/jobs/ingest_local_file_job_spec.rb

@@ -3,6 +3,9 @@ RSpec.describe IngestLocalFileJob do
 
   let(:file_set) { FileSet.new }
   let(:actor) { double }
+  let(:path) do
+    File.join(fixture_path, 'world.png')
+  end
 
   before do
     allow(Hyrax::Actors::FileSetActor).to receive(:new).with(file_set, user).and_return(actor)
@@ -11,6 +14,27 @@ RSpec.describe IngestLocalFileJob do
   it 'has attached a file' do
     expect(FileUtils).not_to receive(:rm)
     expect(actor).to receive(:create_content).and_return(true)
-    described_class.perform_now(file_set, File.join(fixture_path, 'world.png'), user)
+    described_class.perform_now(file_set, path, user)
+  end
+
+  context 'when an error is encountered when trying to save the file to disk' do
+    let(:callback) do
+      instance_double(Hyrax::Callbacks::Registry)
+    end
+    let(:config) do
+      instance_double(Hyrax::Configuration)
+    end
+
+    before do
+      allow(callback).to receive(:run)
+      allow(config).to receive(:callback).and_return(callback)
+      allow(Hyrax).to receive(:config).and_return(config)
+      allow(actor).to receive(:create_content).and_raise(SystemCallError, "example file system error")
+      described_class.perform_now(file_set, path, user)
+    end
+
+    it "invokes the file failure callback" do
+      expect(callback).to have_received(:run).with(:after_import_local_file_failure, file_set, user, path)
+    end
   end
 end

data/spec/lib/hyrax/configuration_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Hyrax::Configuration do
-  subject { described_class.new }
+  subject(:configuration) { described_class.new }
 
   describe '#register_roles' do
     it 'yields a RoleRegistry' do
@@ -82,4 +82,10 @@ RSpec.describe Hyrax::Configuration do
   it { is_expected.to respond_to(:default_nested_relationship_reindexer) }
   it { is_expected.to respond_to(:whitelisted_ingest_dirs) }
   it { is_expected.to respond_to(:whitelisted_ingest_dirs=) }
+
+  describe "#whitelisted_ingest_dirs" do
+    it "provides the Rails tmp directory for temporary downloads for cloud files" do
+      expect(configuration.whitelisted_ingest_dirs).to include(Rails.root.join('tmp').to_s)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -40,7 +40,7 @@ require 'rspec/active_model/mocks'
 require 'capybara/rspec'
 require 'capybara/rails'
 require 'selenium-webdriver'
-require 'chromedriver-helper'
+require 'webdrivers'
 require 'equivalent-xml'
 require 'equivalent-xml/rspec_matchers'
 require 'database_cleaner'
@@ -62,7 +62,7 @@ end
 Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
 
 require 'webmock/rspec'
-WebMock.disable_net_connect!(allow_localhost: true)
+WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
 
 require 'i18n/debug' if ENV['I18N_DEBUG']
 require 'byebug' unless ci_build?
@@ -83,6 +83,10 @@ end
 Capybara.default_driver = :rack_test # This is a faster driver
 Capybara.javascript_driver = :selenium_chrome_headless_sandboxless # This is slower
 
+# FIXME: Pin to older version of chromedriver to avoid issue with clicking
+# non-visible elements
+Webdrivers::Chromedriver.version = '72.0.3626.69'
+
 ActiveJob::Base.queue_adapter = :test
 
 # require 'http_logger'
@@ -192,11 +196,11 @@ RSpec.configure do |config|
 
   config.before(:each, type: :view) do
     initialize_controller_helpers(view)
-    WebMock.disable_net_connect!(allow_localhost: false)
+    WebMock.disable_net_connect!(allow_localhost: false, allow: 'chromedriver.storage.googleapis.com')
   end
 
   config.after(:each, type: :view) do
-    WebMock.disable_net_connect!(allow_localhost: true)
+    WebMock.disable_net_connect!(allow_localhost: true, allow: 'chromedriver.storage.googleapis.com')
   end
 
   config.before(:all, type: :feature) do

data/spec/views/hyrax/file_sets/_versioning.html.erb_spec.rb

@@ -2,6 +2,7 @@ RSpec.describe 'hyrax/file_sets/_versioning.html.erb', type: :view do
   let(:file_set) { stub_model(FileSet) }
 
   before do
+    allow(file_set).to receive(:files).and_return([])
     allow(view).to receive(:curation_concern).and_return(file_set)
     assign(:version_list, [])
     render

data/spec/views/hyrax/my/collections/_list_collections.html.erb_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
       expect(rendered).to have_css '.collection_type', text: 'User Collection'
       expect(rendered).to have_selector '.expanded-details', text: 'Collection Description'
       expect(rendered).not_to have_selector 'span.fa-cubes'
-      expect(rendered).to have_selector '.thumbnail-wrapper > img[alt="Collection"]'
+      expect(rendered).to have_selector '.thumbnail-wrapper > img'
       expect(rendered).to include Date.parse(modified_date).to_formatted_s(:standard)
     end
   end
@@ -102,7 +102,7 @@ RSpec.describe 'hyrax/my/collections/_list_collections.html.erb', type: :view do
       expect(rendered).to have_css '.collection_type', text: 'Admin Set'
       expect(rendered).to have_selector '.expanded-details', text: 'Admin Description'
       expect(rendered).not_to have_selector 'span.fa-cubes'
-      expect(rendered).to have_selector '.thumbnail-wrapper > img[alt="Collection"]'
+      expect(rendered).to have_selector '.thumbnail-wrapper > img'
       expect(rendered).to include Date.parse(modified_date).to_formatted_s(:standard)
     end
   end

data/template.rb

@@ -1,6 +1,6 @@
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '2.5.1'
+gem 'hyrax', '2.6.0'
 run 'bundle install'
 generate 'hyrax:install', '-f'
 rails_command 'db:migrate'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hyrax
 version: !ruby/object:Gem::Version
-  version: 2.5.1
+  version: 2.6.0
 platform: ruby
 authors:
 - Justin Coyne
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-29 00:00:00.000000000 Z
+date: 2019-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,14 +124,14 @@ dependencies:
   name: browse-everything
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.16'
 - !ruby/object:Gem::Dependency
@@ -283,7 +283,7 @@ dependencies:
         version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -293,7 +293,7 @@ dependencies:
         version: '3.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: hydra-head
   requirement: !ruby/object:Gem::Requirement
@@ -1034,6 +1034,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -1049,25 +1063,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simple_form
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: '5.0'
 description: Hyrax is a featureful Samvera front-end based on the latest and greatest
   Samvera software components.
 email: