blacklight 9.0.0.beta8 → 9.1.0

data/lib/generators/blacklight/assets_generator.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   class AssetsGenerator < Rails::Generators::Base
-    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '5.3.5'), desc: "Set the generated app's bootstrap version"
+    class_option :'bootstrap-version', type: :string, default: ENV.fetch('BOOTSTRAP_VERSION', '5.3.8'), desc: "Set the generated app's bootstrap version"
 
     def run_asset_pipeline_specific_generator
       generated_options = "--bootstrap-version='#{options[:'bootstrap-version']}'" if options[:'bootstrap-version']

data/lib/generators/blacklight/controller_generator.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   class ControllerGenerator < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument :controller_name, type: :string, default: "catalog"
 

data/lib/generators/blacklight/document_generator.rb

@@ -6,7 +6,7 @@ module Blacklight
   class DocumentGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument :model_name, type: :string, default: "solr_document"
 

data/lib/generators/blacklight/install_generator.rb

@@ -2,7 +2,7 @@
 
 module Blacklight
   class Install < Rails::Generators::Base
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument     :model_name, type: :string, default: "user"
     argument     :controller_name, type: :string, default: "catalog"
@@ -10,6 +10,7 @@ module Blacklight
     argument     :search_builder_name, type: :string, default: "search_builder"
 
     class_option :devise, type: :boolean, default: false, aliases: "-d", desc: "Use Devise as authentication logic."
+    class_option :authentication, type: :boolean, default: false, desc: "Use Rails' built-in authentication generator."
     class_option :marc, type: :boolean, default: false, aliases: "-m", desc: "Generate MARC-based demo."
     class_option :'bootstrap-version', type: :string, default: nil, desc: "Set the generated app's bootstrap version"
     class_option :'skip-assets', type: :boolean, default: false, desc: "Skip generating javascript and css assets into the application"
@@ -62,9 +63,10 @@ module Blacklight
 
     def generate_blacklight_user
       generator_args = [model_name]
-      if options[:devise]
-        generator_args << "--devise #{options[:devise]}"
-      end
+      raise Thor::Error, "Choose either --devise or --authentication, not both." if options[:devise] && options[:authentication]
+
+      generator_args << "--devise" if options[:devise]
+      generator_args << "--authentication" if options[:authentication]
 
       generate 'blacklight:user', generator_args.join(" ")
     end

data/lib/generators/blacklight/models_generator.rb

@@ -8,7 +8,7 @@ module Blacklight
   class ModelsGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     desc <<-EOS
     This generator makes the following changes to your application:

data/lib/generators/blacklight/search_builder_generator.rb

@@ -6,7 +6,7 @@ module Blacklight
   class SearchBuilderGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('templates', __dir__)
 
     argument :model_name, type: :string, default: "search_builder"
 

data/lib/generators/blacklight/solr_generator.rb

@@ -4,7 +4,7 @@ require 'rails/generators'
 
 module Blacklight
   class SolrGenerator < Rails::Generators::Base
-    source_root ::File.expand_path('../templates', __FILE__)
+    source_root ::File.expand_path('templates', __dir__)
 
     desc <<-EOF
       This generator makes the following changes to your application:

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

@@ -12,9 +12,12 @@ class <%= controller_name.classify %>Controller < ApplicationController
   # rescue_from Blacklight::Exceptions::InvalidRequest, with: :my_handling_method
 
   configure_blacklight do |config|
-    ## Specify the style of markup to be generated (may be 4 or 5)
+    ## Specify the style of markup to be generated
     # config.bootstrap_version = 5
     #
+    ## Show or hide the light/dark mode theme switcher component
+    # config.dark_mode_support = true
+    #
     ## Class for sending and receiving requests from a search index
     # config.repository_class = Blacklight::Solr::Repository
     #
@@ -36,12 +39,20 @@ class <%= controller_name.classify %>Controller < ApplicationController
     ## Optional fine-tuning for advanced search, e.g., set different limits for
     ## different facets.
     # config.advanced_search.form_solr_parameters = {}
-
+    #
+    ## What type of HTTP request to make to solr. Use `:post' to support requests longer than the URI length limit.
+    ## (default is `:get')
+    # config.http_method = :post
+    #
     ## Default parameters to send to solr for all search-like requests. See also SearchBuilder#processed_parameters
     config.default_solr_params = {
       rows: 10
     }
 
+    # If you add any inputs to the search form, you must specify them so that they are not stripped out as unpermitted.
+    # By default this includes the fields required for basic search and advanced search.
+    # config.search_state_fields += [:search_type]
+
     # solr path which will be added to solr base url before the other solr params.
     #config.solr_path = 'select'
     #config.document_solr_path = 'get'
@@ -164,6 +175,14 @@ class <%= controller_name.classify %>Controller < ApplicationController
 
     # solr fields to be displayed in the show (single result) view
     #   The ordering of the field names is the order of the display
+    #   You can configure some components related to the show field:
+    #     - component: should have a similar API to
+    #       Blacklight::MetadataFieldComponent, and describes how
+    #       the values should be displayed
+    #     - layout_component: should have a similar API to
+    #       Blacklight::MetadataFieldLayoutComponent, and describes
+    #       how the overall layout of the field (both label and
+    #       values) should be displayed
     config.add_show_field 'title_tsim', label: 'Title'
     config.add_show_field 'title_vern_ssim', label: 'Title'
     config.add_show_field 'subtitle_tsim', label: 'Subtitle'