hyrax 3.6.0 → 4.0.0.beta1

data/lib/hyrax/specs/capybara.rb

@@ -17,6 +17,8 @@ require 'capybara-screenshot/rspec'
 require 'selenium-webdriver'
 require 'webdrivers' unless ENV['IN_DOCKER'].present? || ENV['HUB_URL'].present?
 
+Capybara.save_path = ENV['CI'] ? "/tmp/test-results" : Rails.root.join('tmp', 'capybara')
+
 if ENV['IN_DOCKER'].present? || ENV['HUB_URL'].present?
   args = %w[disable-gpu no-sandbox whitelisted-ips window-size=1400,1400]
   args.push('headless') if ActiveModel::Type::Boolean.new.cast(ENV['CHROME_HEADLESS_MODE'])
@@ -67,8 +69,8 @@ Capybara::Screenshot.register_driver(:selenium_chrome_headless_sandboxless) do |
   driver.browser.save_screenshot(path)
 end
 
-Capybara::Screenshot.autosave_on_failure = false
-Capybara::Screenshot.prune_strategy = { keep: 10 }
+Capybara::Screenshot.autosave_on_failure = true
+Capybara::Screenshot.prune_strategy = :keep_last_run
 
 # Save CircleCI artifacts
 
@@ -79,7 +81,7 @@ def save_timestamped_page_and_screenshot(page, meta)
   time_now = Time.zone.now
   timestamp = "#{time_now.strftime('%Y-%m-%d-%H-%M-%S.')}#{'%03d' % (time_now.usec / 1000).to_i}"
 
-  artifact_dir = ENV['CI'] ? "/tmp/test-results" : Rails.root.join('tmp', 'capybara')
+  artifact_dir = Capybara.save_path
 
   screenshot_name = "screenshot-#{filename}-#{line_number}-#{timestamp}.png"
   screenshot_path = "#{artifact_dir}/#{screenshot_name}"

data/lib/hyrax/specs/shared_specs/factories/strategies/valkyrie_resource.rb

@@ -3,12 +3,6 @@
 # @example
 #   let(:resource) { FactoryBot.valkyrie_create(:hyrax_work) }
 class ValkyrieCreateStrategy
-  def initialize
-    @strategy = FactoryBot.strategy_by_name(:create).new
-  end
-
-  delegate :association, to: :@strategy
-
   def result(evaluation)
     evaluation.notify(:after_build, evaluation.object)
     evaluation.notify(:before_create, evaluation.object)

data/lib/hyrax/specs/shared_specs/indexers.rb

@@ -266,11 +266,6 @@ RSpec.shared_examples 'a Collection indexer' do
         .to include(generic_type_sim: a_collection_containing_exactly('Collection'))
     end
 
-    it 'indexes member_of_collection_ids' do
-      expect(indexer.to_solr)
-        .to include(member_of_collection_ids_ssim: resource.member_of_collection_ids)
-    end
-
     it 'indexes depositor' do
       expect(indexer.to_solr)
         .to include(depositor_ssim: [resource.depositor],

data/lib/hyrax/transactions/container.rb

@@ -52,17 +52,6 @@ module Hyrax
       require 'hyrax/transactions/steps/update_work_members'
       require 'hyrax/transactions/steps/validate'
 
-      # The following transactions and steps are deprecated.
-      require 'hyrax/transactions/create_work'
-      require 'hyrax/transactions/destroy_work'
-      require 'hyrax/transactions/update_work'
-      require 'hyrax/transactions/steps/apply_collection_permission_template'
-      require 'hyrax/transactions/steps/apply_permission_template'
-      require 'hyrax/transactions/steps/apply_visibility'
-      require 'hyrax/transactions/steps/destroy_work'
-      require 'hyrax/transactions/steps/ensure_permission_template'
-      require 'hyrax/transactions/steps/save_work'
-
       extend Dry::Container::Mixin
 
       # Disable BlockLength rule for DSL code
@@ -240,49 +229,6 @@ module Hyrax
           Steps::UpdateWorkMembers.new
         end
       end
-
-      # legacy AF works processing by transactions is deprecated
-      namespace 'work' do |ops|
-        ops.register 'apply_collection_permission_template' do
-          Steps::ApplyCollectionPermissionTemplate.new
-        end
-
-        ops.register 'apply_permission_template' do
-          Steps::ApplyPermissionTemplate.new
-        end
-
-        ops.register 'apply_visibility' do
-          Steps::ApplyVisibility.new
-        end
-
-        ops.register 'destroy_work' do
-          Steps::DestroyWork.new
-        end
-
-        ops.register 'ensure_admin_set' do
-          Steps::EnsureAdminSet.new
-        end
-
-        ops.register 'ensure_permission_template' do
-          Steps::EnsurePermissionTemplate.new
-        end
-
-        ops.register 'save_work' do
-          Steps::SaveWork.new
-        end
-
-        ops.register 'set_default_admin_set' do
-          Steps::SetDefaultAdminSet.new
-        end
-
-        ops.register 'set_modified_date' do
-          Steps::SetModifiedDate.new
-        end
-
-        ops.register 'set_uploaded_date_unless_present' do
-          Steps::SetUploadedDateUnlessPresent.new
-        end
-      end
       # rubocop:enable Metrics/BlockLength
     end
   end

data/lib/hyrax/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hyrax
-  VERSION = '3.6.0'
+  VERSION = '4.0.0.beta1'
 end

data/lib/valkyrie/indexing/solr/indexing_adapter.rb

@@ -79,7 +79,7 @@ module Valkyrie
                    end
 
           # if any configuration is missing, derive it from Blacklight
-          config = blacklight_based_config.merge(config)
+          config = blacklight_based_config.with_indifferent_access.merge(config)
 
           "http://#{config['host']}:#{config['port']}/solr/#{config['core']}"
         end

data/lib/wings/valkyrie/persister.rb

@@ -74,7 +74,8 @@ module Wings
 
         def initialize(msg = nil, obj:)
           self.obj = obj
-          msg = "Failed to save object {obj}.\n" + msg
+
+          msg = "Failed to save object #{obj}.\n" + msg
           super(msg)
         end
       end

data/lib/wings/valkyrie/storage.rb

@@ -73,7 +73,7 @@ module Wings
             version_graph.query([uri, RDF::Vocab::Fcrepo4.created, :created])
                          .first_object
                          .object
-          Version.new(id: cast_to_valkyrie_id(uri.to_s), created: timestamp, adapter: self)
+          Version.new(cast_to_valkyrie_id(uri.to_s), timestamp, self)
         end.sort
       end
 
@@ -86,7 +86,7 @@ module Wings
       # this implementation uses an orderable {#version_token}. in practice
       # the token is the fcrepo created date for the version, as extracted from
       # the versions graph.
-      Version = Struct.new("Version", :id, :created, :adapter, keyword_init: true) do
+      Version = Struct.new(:id, :version_token, :adapter) do
         include Comparable
 
         ##
@@ -95,10 +95,6 @@ module Wings
           adapter.find_by(id: id)
         end
 
-        def version_token
-          created
-        end
-
         def <=>(other)
           raise ArgumentError unless other.respond_to?(:version_token)
           version_token <=> other.version_token

data/package.json

@@ -0,0 +1,11 @@
+{
+  "devDependencies": {
+    "dotenv": "^16.0.1",
+    "jasmine-core": "^3.99",
+    "karma": "^6.3.20",
+    "karma-chrome-launcher": "^3.1.1",
+    "karma-coffee-preprocessor": "^1.0.1",
+    "karma-jasmine": "^4.0.2",
+    "karma-spec-reporter": "^0.0.34"
+  }
+}

data/tasks/hyrax_dev.rake

@@ -34,6 +34,38 @@ task :i18n_sorter do
   end
 end
 
+Rake::Task["engine_cart:generate"].clear
+
+namespace :engine_cart do
+  desc "Create the test rails app"
+  task generate: [:setup] do
+    if EngineCart.fingerprint_expired?
+
+      # Create a new test rails app
+      Rake::Task['engine_cart:create_test_rails_app'].invoke
+      Rake::Task['engine_cart:inject_gemfile_extras'].invoke
+
+      # Copy our test app generators into the app and prepare it
+      Bundler.clean_system "cp -r #{EngineCart.templates_path}/lib/generators #{EngineCart.destination}/lib" if File.exist? "#{EngineCart.templates_path}/lib/generators"
+
+      within_test_app do
+        unless (system("bundle install --quiet") || system("bundle update --quiet")) &&
+               system("(bundle exec rails g | grep test_app) && bundle exec rails generate test_app") &&
+               system("bundle exec rake db:migrate") &&
+               system("bundle exec rake db:test:prepare")
+          raise "EngineCart failed on with: #{$CHILD_STATUS}"
+        end
+      end
+
+      Bundler.clean_system "bundle install --quiet"
+
+      EngineCart.write_fingerprint
+
+      puts "Done generating test app"
+    end
+  end
+end
+
 if Gem.loaded_specs.key? 'engine_cart'
   namespace :engine_cart do
     # This generate task should only add its action to an existing engine_cart:generate task

data/template.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 # Hack for https://github.com/rails/rails/issues/35153
 gsub_file 'Gemfile', /^gem ["']sqlite3["']$/, 'gem "sqlite3", "~> 1.3.0"'
-gem 'hyrax', '3.6.0'
+gem 'hyrax', '4.0.0.beta1'
 run 'bundle install'
 generate 'hyrax:install', '-f'

data/vendor/assets/javascripts/dataTables.bootstrap4.js

@@ -0,0 +1,184 @@
+/*! DataTables Bootstrap 4 integration
+ * ©2011-2017 SpryMedia Ltd - datatables.net/license
+ */
+
+/**
+ * DataTables integration for Bootstrap 4. This requires Bootstrap 4 and
+ * DataTables 1.10 or newer.
+ *
+ * This file sets the defaults and adds options to DataTables to style its
+ * controls using Bootstrap. See http://datatables.net/manual/styling/bootstrap
+ * for further information.
+ */
+(function( factory ){
+	if ( typeof define === 'function' && define.amd ) {
+		// AMD
+		define( ['jquery', 'datatables.net'], function ( $ ) {
+			return factory( $, window, document );
+		} );
+	}
+	else if ( typeof exports === 'object' ) {
+		// CommonJS
+		module.exports = function (root, $) {
+			if ( ! root ) {
+				root = window;
+			}
+
+			if ( ! $ || ! $.fn.dataTable ) {
+				// Require DataTables, which attaches to jQuery, including
+				// jQuery if needed and have a $ property so we can access the
+				// jQuery object that is used
+				$ = require('datatables.net')(root, $).$;
+			}
+
+			return factory( $, root, root.document );
+		};
+	}
+	else {
+		// Browser
+		factory( jQuery, window, document );
+	}
+}(function( $, window, document, undefined ) {
+'use strict';
+var DataTable = $.fn.dataTable;
+
+
+/* Set the defaults for DataTables initialisation */
+$.extend( true, DataTable.defaults, {
+	dom:
+		"<'row'<'col-sm-12 col-md-6'l><'col-sm-12 col-md-6'f>>" +
+		"<'row'<'col-sm-12'tr>>" +
+		"<'row'<'col-sm-12 col-md-5'i><'col-sm-12 col-md-7'p>>",
+	renderer: 'bootstrap'
+} );
+
+
+/* Default class modification */
+$.extend( DataTable.ext.classes, {
+	sWrapper:      "dataTables_wrapper dt-bootstrap4",
+	sFilterInput:  "form-control form-control-sm",
+	sLengthSelect: "custom-select custom-select-sm form-control form-control-sm",
+	sProcessing:   "dataTables_processing card",
+	sPageButton:   "paginate_button page-item"
+} );
+
+
+/* Bootstrap paging button renderer */
+DataTable.ext.renderer.pageButton.bootstrap = function ( settings, host, idx, buttons, page, pages ) {
+	var api     = new DataTable.Api( settings );
+	var classes = settings.oClasses;
+	var lang    = settings.oLanguage.oPaginate;
+	var aria = settings.oLanguage.oAria.paginate || {};
+	var btnDisplay, btnClass, counter=0;
+
+	var attach = function( container, buttons ) {
+		var i, ien, node, button;
+		var clickHandler = function ( e ) {
+			e.preventDefault();
+			if ( !$(e.currentTarget).hasClass('disabled') && api.page() != e.data.action ) {
+				api.page( e.data.action ).draw( 'page' );
+			}
+		};
+
+		for ( i=0, ien=buttons.length ; i<ien ; i++ ) {
+			button = buttons[i];
+
+			if ( Array.isArray( button ) ) {
+				attach( container, button );
+			}
+			else {
+				btnDisplay = '';
+				btnClass = '';
+
+				switch ( button ) {
+					case 'ellipsis':
+						btnDisplay = '&#x2026;';
+						btnClass = 'disabled';
+						break;
+
+					case 'first':
+						btnDisplay = lang.sFirst;
+						btnClass = button + (page > 0 ?
+							'' : ' disabled');
+						break;
+
+					case 'previous':
+						btnDisplay = lang.sPrevious;
+						btnClass = button + (page > 0 ?
+							'' : ' disabled');
+						break;
+
+					case 'next':
+						btnDisplay = lang.sNext;
+						btnClass = button + (page < pages-1 ?
+							'' : ' disabled');
+						break;
+
+					case 'last':
+						btnDisplay = lang.sLast;
+						btnClass = button + (page < pages-1 ?
+							'' : ' disabled');
+						break;
+
+					default:
+						btnDisplay = button + 1;
+						btnClass = page === button ?
+							'active' : '';
+						break;
+				}
+
+				if ( btnDisplay ) {
+					node = $('<li>', {
+							'class': classes.sPageButton+' '+btnClass,
+							'id': idx === 0 && typeof button === 'string' ?
+								settings.sTableId +'_'+ button :
+								null
+						} )
+						.append( $('<a>', {
+								'href': '#',
+								'aria-controls': settings.sTableId,
+								'aria-label': aria[ button ],
+								'data-dt-idx': counter,
+								'tabindex': settings.iTabIndex,
+								'class': 'page-link'
+							} )
+							.html( btnDisplay )
+						)
+						.appendTo( container );
+
+					settings.oApi._fnBindAction(
+						node, {action: button}, clickHandler
+					);
+
+					counter++;
+				}
+			}
+		}
+	};
+
+	// IE9 throws an 'unknown error' if document.activeElement is used
+	// inside an iframe or frame. 
+	var activeEl;
+
+	try {
+		// Because this approach is destroying and recreating the paging
+		// elements, focus is lost on the select button which is bad for
+		// accessibility. So we want to restore focus once the draw has
+		// completed
+		activeEl = $(host).find(document.activeElement).data('dt-idx');
+	}
+	catch (e) {}
+
+	attach(
+		$(host).empty().html('<ul class="pagination"/>').children('ul'),
+		buttons
+	);
+
+	if ( activeEl !== undefined ) {
+		$(host).find( '[data-dt-idx='+activeEl+']' ).trigger('focus');
+	}
+};
+
+
+return DataTable;
+}));

data/vendor/assets/javascripts/fileupload/jquery.fileupload-ui.js

@@ -83,7 +83,7 @@
 
             // Callback to retrieve the list of files from the server response:
             getFilesFromResponse: function (data) {
-                if (data.result && $.isArray(data.result.files)) {
+                if (data.result && Array.isArray(data.result.files)) {
                     return data.result.files;
                 }
                 return [];

data/vendor/assets/javascripts/fileupload/jquery.fileupload.js

@@ -322,7 +322,7 @@
             if ($.type(options.formData) === 'function') {
                 return options.formData(options.form);
             }
-            if ($.isArray(options.formData)) {
+            if (Array.isArray(options.formData)) {
                 return options.formData;
             }
             if ($.type(options.formData) === 'object') {
@@ -562,7 +562,7 @@
                 if (!paramName.length) {
                     paramName = [fileInput.prop('name') || 'files[]'];
                 }
-            } else if (!$.isArray(paramName)) {
+            } else if (!Array.isArray(paramName)) {
                 paramName = [paramName];
             }
             return paramName;

data/vendor/assets/javascripts/fileupload/jquery.iframe-transport.js

@@ -74,7 +74,7 @@
                             '" name="iframe-transport-' + counter + '"></iframe>'
                     ).bind('load', function () {
                         var fileInputClones,
-                            paramNames = $.isArray(options.paramName) ?
+                            paramNames = Array.isArray(options.paramName) ?
                                     options.paramName : [options.paramName];
                         iframe
                             .unbind('load')