hyrax 3.0.0.pre.beta2 → 3.0.0.pre.beta3

data/hyrax.gemspec

@@ -31,14 +31,13 @@ SUMMARY
   # http://guides.rubyonrails.org/maintenance_policy.html
   spec.add_dependency 'rails', '~> 5.0'
 
-  spec.add_dependency 'active-fedora', '~> 12.0'
+  spec.add_dependency 'active-fedora', '~> 13.0'
   spec.add_dependency 'almond-rails', '~> 0.1'
   spec.add_dependency 'awesome_nested_set', '~> 3.1'
   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,10 +49,10 @@ 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-head', '>= 10.6.1'
+  spec.add_dependency 'hydra-editor', '~> 5.0'
+  spec.add_dependency 'hydra-head', '>= 10.7.0'
   spec.add_dependency 'hydra-works', '>= 0.16', '< 2.0'
-  spec.add_dependency 'iiif_manifest', '>= 0.3', '< 0.6'
+  spec.add_dependency 'iiif_manifest', '>= 0.3', '< 0.7'
   spec.add_dependency 'jquery-datatables-rails', '~> 3.4'
   spec.add_dependency 'jquery-ui-rails', '~> 6.0'
   spec.add_dependency 'json-schema' # for Arkivo
@@ -68,7 +67,6 @@ SUMMARY
   spec.add_dependency 'oauth2', '~> 1.2'
   spec.add_dependency 'posix-spawn'
   spec.add_dependency 'power_converter', '~> 0.1', '>= 0.1.2'
-  spec.add_dependency 'pul_uv_rails', '~> 2.0'
   spec.add_dependency 'qa', '>= 2', '< 4' # questioning_authority
   spec.add_dependency 'rails_autolink', '~> 1.1'
   spec.add_dependency 'rdf-rdfxml' # controlled vocabulary importer
@@ -79,7 +77,7 @@ SUMMARY
   spec.add_dependency 'select2-rails', '~> 3.5'
   spec.add_dependency 'signet'
   spec.add_dependency 'tinymce-rails', '~> 4.1'
-  spec.add_dependency 'valkyrie', '~> 2.0.0-rc3'
+  spec.add_dependency 'valkyrie', '~> 1.6'
 
   # temporary pin to 2.17 due to failures caused in 2.18.0
   spec.add_development_dependency "capybara", '~> 2.4', '< 2.18.0'
@@ -106,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/config_generator.rb

@@ -11,6 +11,7 @@ class Hyrax::ConfigGenerator < Rails::Generators::Base
     * Mini-magick
     * TinyMCE
     * i18n
+    * Valkyrie index
        """
 
   source_root File.expand_path('../templates', __FILE__)
@@ -36,6 +37,11 @@ class Hyrax::ConfigGenerator < Rails::Generators::Base
     copy_file 'config/initializers/redis_config.rb'
   end
 
+  def configure_valkyrie_index
+    copy_file 'config/valkyrie_index.yml'
+    copy_file 'config/solr_wrapper_valkyrie_test.yml'
+  end
+
   def create_initializer_config_file
     copy_file 'config/initializers/hyrax.rb'
   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
@@ -173,6 +174,10 @@ module Hyrax
       generate 'hyrax:riiif' unless options[:'skip-riiif']
     end
 
+    def universalviewer_files
+      rake('hyrax:universal_viewer:install')
+    end
+
     # Blacklight::Controller will by default add an after_action filter to discard all flash messages on xhr requests.
     # This has caused problems when we perform a post-redirect-get cycle using xhr and turbolinks.
     # This injector will modify the generated ApplicationController to skip this action.

data/lib/generators/hyrax/riiif_generator.rb

@@ -16,7 +16,7 @@ class Hyrax::RiiifGenerator < Rails::Generators::Base
   end
 
   def add_to_gemfile
-    gem 'riiif', '~> 2.0'
+    gem 'riiif', '~> 2.1'
 
     Bundler.with_clean_env do
       run "bundle install"
@@ -33,7 +33,7 @@ class Hyrax::RiiifGenerator < Rails::Generators::Base
 
   def override_image_url_builder_in_hyrax_config
     insert_into_file 'config/initializers/hyrax.rb', before: /^  # config.iiif_image_url_builder/ do
-      "  config.iiif_image_url_builder = lambda do |file_id, base_url, size|\n" \
+      "  config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|\n" \
       "    Riiif::Engine.routes.url_helpers.image_url(file_id, host: base_url, size: size)\n" \
       "  end\n"
     end

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

@@ -6,11 +6,11 @@ class CatalogController < ApplicationController
   before_action :enforce_show_permissions, only: :show
 
   def self.uploaded_field
-    solr_name('system_create', :stored_sortable, type: :date)
+    "system_create_dtsi"
   end
 
   def self.modified_field
-    solr_name('system_modified', :stored_sortable, type: :date)
+    "system_modified_dtsi"
   end
 
   configure_blacklight do |config|
@@ -28,27 +28,27 @@ class CatalogController < ApplicationController
     }
 
     # solr field configuration for document/show views
-    config.index.title_field = solr_name("title", :stored_searchable)
-    config.index.display_type_field = solr_name("has_model", :symbol)
+    config.index.title_field = "title_tesim"
+    config.index.display_type_field = "has_model_ssim"
     config.index.thumbnail_field = 'thumbnail_path_ss'
 
     # solr fields that will be treated as facets by the blacklight application
     #   The ordering of the field names is the order of the display
-    config.add_facet_field solr_name("human_readable_type", :facetable), label: "Type", limit: 5
-    config.add_facet_field solr_name("resource_type", :facetable), label: "Resource Type", limit: 5
-    config.add_facet_field solr_name("creator", :facetable), limit: 5
-    config.add_facet_field solr_name("contributor", :facetable), label: "Contributor", limit: 5
-    config.add_facet_field solr_name("keyword", :facetable), limit: 5
-    config.add_facet_field solr_name("subject", :facetable), limit: 5
-    config.add_facet_field solr_name("language", :facetable), limit: 5
-    config.add_facet_field solr_name("based_near_label", :facetable), limit: 5
-    config.add_facet_field solr_name("publisher", :facetable), limit: 5
-    config.add_facet_field solr_name("file_format", :facetable), limit: 5
-    config.add_facet_field solr_name('member_of_collection_ids', :symbol), limit: 5, label: 'Collections', helper_method: :collection_title_by_id
+    config.add_facet_field "human_readable_type_sim", label: "Type", limit: 5
+    config.add_facet_field "resource_type_sim", label: "Resource Type", limit: 5
+    config.add_facet_field "creator_sim", limit: 5
+    config.add_facet_field "contributor_sim", label: "Contributor", limit: 5
+    config.add_facet_field "keyword_sim", limit: 5
+    config.add_facet_field "subject_sim", limit: 5
+    config.add_facet_field "language_sim", limit: 5
+    config.add_facet_field "based_near_label_sim", limit: 5
+    config.add_facet_field "publisher_sim", limit: 5
+    config.add_facet_field "file_format_sim", limit: 5
+    config.add_facet_field "member_of_collection_ids_ssim", limit: 5, label: 'Collections', helper_method: :collection_title_by_id
 
     # 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), if: false
+    config.add_facet_field "generic_type_sim", 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
@@ -57,47 +57,47 @@ class CatalogController < ApplicationController
 
     # solr fields to be displayed in the index (search results) view
     #   The ordering of the field names is the order of the display
-    config.add_index_field solr_name("title", :stored_searchable), label: "Title", itemprop: 'name', if: false
-    config.add_index_field solr_name("description", :stored_searchable), itemprop: 'description', helper_method: :iconify_auto_link
-    config.add_index_field solr_name("keyword", :stored_searchable), itemprop: 'keywords', link_to_search: solr_name("keyword", :facetable)
-    config.add_index_field solr_name("subject", :stored_searchable), itemprop: 'about', link_to_search: solr_name("subject", :facetable)
-    config.add_index_field solr_name("creator", :stored_searchable), itemprop: 'creator', link_to_search: solr_name("creator", :facetable)
-    config.add_index_field solr_name("contributor", :stored_searchable), itemprop: 'contributor', link_to_search: solr_name("contributor", :facetable)
-    config.add_index_field solr_name("proxy_depositor", :symbol), label: "Depositor", helper_method: :link_to_profile
-    config.add_index_field solr_name("depositor"), label: "Owner", helper_method: :link_to_profile
-    config.add_index_field solr_name("publisher", :stored_searchable), itemprop: 'publisher', link_to_search: solr_name("publisher", :facetable)
-    config.add_index_field solr_name("based_near_label", :stored_searchable), itemprop: 'contentLocation', link_to_search: solr_name("based_near_label", :facetable)
-    config.add_index_field solr_name("language", :stored_searchable), itemprop: 'inLanguage', link_to_search: solr_name("language", :facetable)
-    config.add_index_field solr_name("date_uploaded", :stored_sortable, type: :date), itemprop: 'datePublished', helper_method: :human_readable_date
-    config.add_index_field solr_name("date_modified", :stored_sortable, type: :date), itemprop: 'dateModified', helper_method: :human_readable_date
-    config.add_index_field solr_name("date_created", :stored_searchable), itemprop: 'dateCreated'
-    config.add_index_field solr_name("rights_statement", :stored_searchable), helper_method: :rights_statement_links
-    config.add_index_field solr_name("license", :stored_searchable), helper_method: :license_links
-    config.add_index_field solr_name("resource_type", :stored_searchable), label: "Resource Type", link_to_search: solr_name("resource_type", :facetable)
-    config.add_index_field solr_name("file_format", :stored_searchable), link_to_search: solr_name("file_format", :facetable)
-    config.add_index_field solr_name("identifier", :stored_searchable), helper_method: :index_field_link, field_name: 'identifier'
-    config.add_index_field solr_name("embargo_release_date", :stored_sortable, type: :date), label: "Embargo release date", helper_method: :human_readable_date
-    config.add_index_field solr_name("lease_expiration_date", :stored_sortable, type: :date), label: "Lease expiration date", helper_method: :human_readable_date
+    config.add_index_field "title_tesim", label: "Title", itemprop: 'name', if: false
+    config.add_index_field "description_tesim", itemprop: 'description', helper_method: :iconify_auto_link
+    config.add_index_field "keyword_tesim", itemprop: 'keywords', link_to_search: "keyword_sim"
+    config.add_index_field "subject_tesim", itemprop: 'about', link_to_search: "subject_sim"
+    config.add_index_field "creator_tesim", itemprop: 'creator', link_to_search: "creator_sim"
+    config.add_index_field "contributor_tesim", itemprop: 'contributor', link_to_search: "contributor_sim"
+    config.add_index_field "proxy_depositor_ssim", label: "Depositor", helper_method: :link_to_profile
+    config.add_index_field "depositor_tesim", label: "Owner", helper_method: :link_to_profile
+    config.add_index_field "publisher_tesim", itemprop: 'publisher', link_to_search: "publisher_sim"
+    config.add_index_field "based_near_label_tesim", itemprop: 'contentLocation', link_to_search: "based_near_label_sim"
+    config.add_index_field "language_tesim", itemprop: 'inLanguage', link_to_search: "language_sim"
+    config.add_index_field "date_uploaded_dtsi", itemprop: 'datePublished', helper_method: :human_readable_date
+    config.add_index_field "date_modified_dtsi", itemprop: 'dateModified', helper_method: :human_readable_date
+    config.add_index_field "date_created_tesim", itemprop: 'dateCreated'
+    config.add_index_field "rights_statement_tesim", helper_method: :rights_statement_links
+    config.add_index_field "license_tesim", helper_method: :license_links
+    config.add_index_field "resource_type_tesim", label: "Resource Type", link_to_search: "resource_type_sim"
+    config.add_index_field "file_format_tesim", link_to_search: "file_format_sim"
+    config.add_index_field "identifier_tesim", helper_method: :index_field_link, field_name: 'identifier'
+    config.add_index_field Hydra.config.permissions.embargo.release_date, label: "Embargo release date", helper_method: :human_readable_date
+    config.add_index_field Hydra.config.permissions.lease.expiration_date, label: "Lease expiration date", helper_method: :human_readable_date
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
-    config.add_show_field solr_name("title", :stored_searchable)
-    config.add_show_field solr_name("description", :stored_searchable)
-    config.add_show_field solr_name("keyword", :stored_searchable)
-    config.add_show_field solr_name("subject", :stored_searchable)
-    config.add_show_field solr_name("creator", :stored_searchable)
-    config.add_show_field solr_name("contributor", :stored_searchable)
-    config.add_show_field solr_name("publisher", :stored_searchable)
-    config.add_show_field solr_name("based_near_label", :stored_searchable)
-    config.add_show_field solr_name("language", :stored_searchable)
-    config.add_show_field solr_name("date_uploaded", :stored_searchable)
-    config.add_show_field solr_name("date_modified", :stored_searchable)
-    config.add_show_field solr_name("date_created", :stored_searchable)
-    config.add_show_field solr_name("rights_statement", :stored_searchable)
-    config.add_show_field solr_name("license", :stored_searchable)
-    config.add_show_field solr_name("resource_type", :stored_searchable), label: "Resource Type"
-    config.add_show_field solr_name("format", :stored_searchable)
-    config.add_show_field solr_name("identifier", :stored_searchable)
+    config.add_show_field "title_tesim"
+    config.add_show_field "description_tesim"
+    config.add_show_field "keyword_tesim"
+    config.add_show_field "subject_tesim"
+    config.add_show_field "creator_tesim"
+    config.add_show_field "contributor_tesim"
+    config.add_show_field "publisher_tesim"
+    config.add_show_field "based_near_label_tesim"
+    config.add_show_field "language_tesim"
+    config.add_show_field "date_uploaded_tesim"
+    config.add_show_field "date_modified_tesim"
+    config.add_show_field "date_created_tesim"
+    config.add_show_field "rights_statement_tesim"
+    config.add_show_field "license_tesim"
+    config.add_show_field "resource_type_tesim", label: "Resource Type"
+    config.add_show_field "format_tesim"
+    config.add_show_field "identifier_tesim"
 
     # "fielded" search configuration. Used by pulldown among other places.
     # For supported keys in hash, see rdoc for Blacklight::SearchFields
@@ -118,7 +118,7 @@ class CatalogController < ApplicationController
     # since we aren't specifying it otherwise.
     config.add_search_field('all_fields', label: 'All Fields') do |field|
       all_names = config.show_fields.values.map(&:field).join(" ")
-      title_name = solr_name("title", :stored_searchable)
+      title_name = "title_tesim"
       field.solr_parameters = {
         qf: "#{all_names} file_format_tesim all_text_timv",
         pf: title_name.to_s
@@ -137,7 +137,7 @@ class CatalogController < ApplicationController
       # syntax, as eg {! qf=$title_qf }. This is neccesary to use
       # Solr parameter de-referencing like $title_qf.
       # See: http://wiki.apache.org/solr/LocalParams
-      solr_name = solr_name("contributor", :stored_searchable)
+      solr_name = "contributor_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -145,7 +145,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('creator') do |field|
-      solr_name = solr_name("creator", :stored_searchable)
+      solr_name = "creator_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -153,7 +153,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('title') do |field|
-      solr_name = solr_name("title", :stored_searchable)
+      solr_name = "title_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -162,7 +162,7 @@ class CatalogController < ApplicationController
 
     config.add_search_field('description') do |field|
       field.label = "Description"
-      solr_name = solr_name("description", :stored_searchable)
+      solr_name = "description_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -170,7 +170,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('publisher') do |field|
-      solr_name = solr_name("publisher", :stored_searchable)
+      solr_name = "publisher_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -178,7 +178,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('date_created') do |field|
-      solr_name = solr_name("created", :stored_searchable)
+      solr_name = "created_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -186,7 +186,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('subject') do |field|
-      solr_name = solr_name("subject", :stored_searchable)
+      solr_name = "subject_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -194,7 +194,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('language') do |field|
-      solr_name = solr_name("language", :stored_searchable)
+      solr_name = "language_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -202,7 +202,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('resource_type') do |field|
-      solr_name = solr_name("resource_type", :stored_searchable)
+      solr_name = "resource_type_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -210,7 +210,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('format') do |field|
-      solr_name = solr_name("format", :stored_searchable)
+      solr_name = "format_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -218,7 +218,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('identifier') do |field|
-      solr_name = solr_name("id", :stored_searchable)
+      solr_name = "id_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -227,7 +227,7 @@ class CatalogController < ApplicationController
 
     config.add_search_field('based_near') do |field|
       field.label = "Location"
-      solr_name = solr_name("based_near_label", :stored_searchable)
+      solr_name = "based_near_label_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -235,7 +235,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('keyword') do |field|
-      solr_name = solr_name("keyword", :stored_searchable)
+      solr_name = "keyword_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -243,7 +243,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('depositor') do |field|
-      solr_name = solr_name("depositor", :symbol)
+      solr_name = "depositor_ssim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -251,7 +251,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('rights_statement') do |field|
-      solr_name = solr_name("rights_statement", :stored_searchable)
+      solr_name = "rights_statement_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name
@@ -259,7 +259,7 @@ class CatalogController < ApplicationController
     end
 
     config.add_search_field('license') do |field|
-      solr_name = solr_name("license", :stored_searchable)
+      solr_name = "license_tesim"
       field.solr_local_parameters = {
         qf: solr_name,
         pf: solr_name

data/lib/generators/hyrax/templates/config/analytics.yml

@@ -2,8 +2,8 @@
 # To integrate your app with Google Analytics, uncomment the lines below and add your API key information.
 #
 # analytics:
-#   app_name: GOOGLE_OAUTH_APP_NAME
-#   app_version: GOOGLE_OAUTH_APP_VERSION
-#   privkey_path: GOOGLE_OAUTH_PRIVATE_KEY_PATH
-#   privkey_secret: GOOGLE_OAUTH_PRIVATE_KEY_SECRET
-#   client_email: GOOGLE_OAUTH_CLIENT_EMAIL
+#   app_name: <%= ENV['GOOGLE_OAUTH_APP_NAME']
+#   app_version: <%= ENV['GOOGLE_OAUTH_APP_VERSION']
+#   privkey_path: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_PATH']
+#   privkey_secret: <%= ENV['GOOGLE_OAUTH_PRIVATE_KEY_SECRET']
+#   client_email: <%= ENV['GOOGLE_OAUTH_CLIENT_EMAIL']

data/lib/generators/hyrax/templates/config/initializers/hyrax.rb

@@ -137,7 +137,7 @@ Hyrax.config do |config|
   # config.iiif_image_server = false
 
   # Returns a URL that resolves to an image provided by a IIIF image server
-  # config.iiif_image_url_builder = lambda do |file_id, base_url, size|
+  # config.iiif_image_url_builder = lambda do |file_id, base_url, size, format|
   #   "#{base_url}/downloads/#{file_id.split('/').first}"
   # end
 
@@ -231,6 +231,16 @@ Hyrax.config do |config|
   # config.translate_uri_to_id = lambda do |id|
   #                                "#{ActiveFedora.fedora.host}#{ActiveFedora.fedora.base_path}/#{Noid::Rails.treeify(id)}"
   #                              end
+  # config.resource_id_to_uri_transformer = lambda do |resource, base_url|
+  #                                           file_id = CGI.escape(resource.file_identifiers.first.to_s)
+  #                                           fs_id = CGI.escape(resource.file_set_id.to_s)
+  #                                           "#{base_url}#{::Noid::Rails.treeify(fs_id)}/files/#{file_id}"
+  #                                         end
+
+  # When your application is ready to use the valkyrie index instead of the one
+  # maintained by active fedora, you will need to set this to true. You will
+  # also need to update your Blacklight configuration.
+  # config.query_index_from_valkyrie = false
 
   ## Fedora import/export tool
   #