Merge involved authorities preparation

.haml-lint.yml

@@ -1,3 +1,6 @@
+exclude:
+  - lib/templates/haml/scaffold/_form.html.haml
+
 linters:
   LineLength:
     max: 120

.rubocop.yml

@@ -6,6 +6,8 @@ AllCops:
     - config/environments/*
     - db/migrate/*
     - db/schema.rb
+    - config/initializers/simple_form.rb
+    - config/initializers/simple_form_bootstrap.rb
 
 require:
   - rubocop-rails

Gemfile

@@ -4,8 +4,8 @@ ruby '3.2.1'
 
 source 'http://rubygems.org'
 
-gem 'rails', '~> 6'
-gem 'rails-i18n' # , git: 'https://github.com/svenfuchs/rails-i18n.git' # , branch: 'rails-4-x' # For 4.x
+gem 'rails', '~> 6.1.7.7'
+gem 'rails-i18n', '~> 6.0' # version should match major version of Rails
 gem 'actionview'
 
 gem 'sass-rails', '~> 6.0.0'
@@ -33,6 +33,8 @@ gem 'rack-cors', require: 'rack/cors'
 gem 'diffy'
 gem 'aws-sdk-s3' # for Active Storage
 
+gem 'simple_form', '~> 5.3.0'
+
 gem 'kt-paperclip', git: 'https://github.com/kreeti/kt-paperclip.git' # for Ruby 3.2 compatibility, until https://github.com/kreeti/kt-paperclip/pull/98 is officially released
 #gem 'kt-paperclip', '7.1.1' # , '~>5.2' # for cloud files like author images 6.x requires aws >3.x
 # gem 'impressionist' # latest released gem incompatible with Ruby 3.x

Gemfile.lock

@@ -555,9 +555,9 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    rails-i18n (7.0.9)
+    rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
-      railties (>= 6.0.0, < 8)
+      railties (>= 6.0.0, < 7)
     rails-jquery-autocomplete (1.0.5)
       rails (>= 3.2)
     rails-ujs (0.1.0)
@@ -686,6 +686,9 @@ GEM
       connection_pool (>= 2.3.0)
       rack (>= 2.2.4)
       redis-client (>= 0.19.0)
+    simple_form (5.3.0)
+      actionpack (>= 5.2)
+      activemodel (>= 5.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -823,9 +826,9 @@ DEPENDENCIES
   puma_worker_killer
   rack-attack
   rack-cors
-  rails (~> 6)
+  rails (~> 6.1.7.7)
   rails-controller-testing (~> 1.0.5)
-  rails-i18n
+  rails-i18n (~> 6.0)
   rails-jquery-autocomplete (>= 1.0.5)
   rails-ujs
   responders
@@ -843,6 +846,7 @@ DEPENDENCIES
   rvm1-capistrano3
   sass-rails (~> 6.0.0)
   sidekiq (~> 7.2)
+  simple_form (~> 5.3.0)
   simplecov
   spring
   spring-commands-rspec

app/controllers/html_dirs_controller.rb

@@ -17,23 +17,6 @@ def index
     end
   end
 
-  #def guess_author
-  #  @html_dir = HtmlDir.find(params[:id])
-  #  @viaf_list = guess_authors_viaf(@html_dir.author)
-  #  respond_to do |format|
-  #    format.json { render json: @viaf_list }
-  #  end
-  #end
-
-  #def associate_viaf
-  #  @html_dir = HtmlDir.find(params[:id])
-  #  person = Person.create_or_get_person_by_viaf(params[:viaf])
-  #  @html_dir.person = person
-  #  @html_dir.save!
-  #  person.public_domain = @html_dir.public_domain
-  #  person.save!
-  #  redirect_to @html_dir, notice: t(:associated_with_viaf, viaf: params[:viaf])
-  #end
   # GET /html_dirs/1
   # GET /html_dirs/1.json
   def show

app/models/person.rb

@@ -60,25 +60,6 @@ class Person < ApplicationRecord
   # class variable
   @@popular_authors = nil
 
-  def self.person_by_viaf(viaf_id)
-    Person.find_by_viaf_id(viaf_id)
-  end
-
-  #def self.create_or_get_person_by_viaf(viaf_id)
-  #  p = Person.person_by_viaf(viaf_id)
-  #  if p.nil?
-  #    viaf_record = viaf_record_by_id(viaf_id)
-  #    fail Exception if viaf_record.nil?
-  #    #debugger
-  #    bdate = viaf_record['birthDate'].nil? ? '?' : viaf_record['birthDate'].encode('utf-8')
-  #    ddate = viaf_record['deathDate'].nil? ? '?' : viaf_record['deathDate'].encode('utf-8')
-  #    datestr = bdate+'-'+ddate
-  #    p = Person.new(dates: datestr, name: viaf_record['labels'][0].encode('utf-8'), viaf_id: viaf_id, birthdate: bdate, deathdate: ddate)
-  #    p.save!
-  #  end
-  #  p
-  #end
-
   def publish!
     # set all person's works to status published
     all_works_including_unpublished.each do |m| # be cautious about publishing joint works, because the *other* author(s) or translators may yet be unpublished!

config/environments/test.rb

@@ -35,7 +35,6 @@
   # config.active_record.schema_format = :sql
 
   config.i18n.raise_on_missing_translations = true
-  config.i18n.exception_handler = Proc.new { |exception| raise exception.to_exception }
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

config/initializers/simple_form.rb

@@ -0,0 +1,179 @@
+# frozen_string_literal: true
+#
+# Uncomment this and change the path if necessary to include your own
+# components.
+# See https://github.com/plataformatec/simple_form#custom-components to know
+# more about custom components.
+# Dir[Rails.root.join('lib/components/**/*.rb')].each { |f| require f }
+#
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  # Wrappers are used by the form builder to generate a
+  # complete input. You can remove any component from the
+  # wrapper, change the order or even add your own to the
+  # stack. The options given below are used to wrap the
+  # whole input.
+  config.wrappers :default, class: :input,
+    hint_class: :field_with_hint, error_class: :field_with_errors, valid_class: :field_without_errors do |b|
+    ## Extensions enabled by default
+    # Any of these extensions can be disabled for a
+    # given input by passing: `f.input EXTENSION_NAME => false`.
+    # You can make any of these extensions optional by
+    # renaming `b.use` to `b.optional`.
+
+    # Determines whether to use HTML5 (:email, :url, ...)
+    # and required attributes
+    b.use :html5
+
+    # Calculates placeholders automatically from I18n
+    # You can also pass a string as f.input placeholder: "Placeholder"
+    b.use :placeholder
+
+    ## Optional extensions
+    # They are disabled unless you pass `f.input EXTENSION_NAME => true`
+    # to the input. If so, they will retrieve the values from the model
+    # if any exists. If you want to enable any of those
+    # extensions by default, you can change `b.optional` to `b.use`.
+
+    # Calculates maxlength from length validations for string inputs
+    # and/or database column lengths
+    b.optional :maxlength
+
+    # Calculate minlength from length validations for string inputs
+    b.optional :minlength
+
+    # Calculates pattern from format validations for string inputs
+    b.optional :pattern
+
+    # Calculates min and max from length validations for numeric inputs
+    b.optional :min_max
+
+    # Calculates readonly automatically from readonly attributes
+    b.optional :readonly
+
+    ## Inputs
+    # b.use :input, class: 'input', error_class: 'is-invalid', valid_class: 'is-valid'
+    b.use :label_input
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
+
+    ## full_messages_for
+    # If you want to display the full error message for the attribute, you can
+    # use the component :full_error, like:
+    #
+    # b.use :full_error, wrap_with: { tag: :span, class: :error }
+  end
+
+  # The default wrapper to be used by the FormBuilder.
+  config.default_wrapper = :default
+
+  # Define the way to render check boxes / radio buttons with labels.
+  # Defaults to :nested for bootstrap config.
+  #   inline: input + label
+  #   nested: label > input
+  config.boolean_style = :nested
+
+  # Default class for buttons
+  config.button_class = 'btn'
+
+  # Method used to tidy up errors. Specify any Rails Array method.
+  # :first lists the first message for each field.
+  # Use :to_sentence to list all errors for each field.
+  # config.error_method = :first
+
+  # Default tag used for error notification helper.
+  config.error_notification_tag = :div
+
+  # CSS class to add for error notification helper.
+  config.error_notification_class = 'error_notification'
+
+  # Series of attempts to detect a default label method for collection.
+  # config.collection_label_methods = [ :to_label, :name, :title, :to_s ]
+
+  # Series of attempts to detect a default value method for collection.
+  # config.collection_value_methods = [ :id, :to_s ]
+
+  # You can wrap a collection of radio/check boxes in a pre-defined tag, defaulting to none.
+  # config.collection_wrapper_tag = nil
+
+  # You can define the class to use on all collection wrappers. Defaulting to none.
+  # config.collection_wrapper_class = nil
+
+  # You can wrap each item in a collection of radio/check boxes with a tag,
+  # defaulting to :span.
+  # config.item_wrapper_tag = :span
+
+  # You can define a class to use in all item wrappers. Defaulting to none.
+  # config.item_wrapper_class = nil
+
+  # How the label text should be generated altogether with the required text.
+  # config.label_text = lambda { |label, required, explicit_label| "#{required} #{label}" }
+
+  # You can define the class to use on all labels. Default is nil.
+  # config.label_class = nil
+
+  # You can define the default class to be used on forms. Can be overriden
+  # with `html: { :class }`. Defaulting to none.
+  # config.default_form_class = nil
+
+  # You can define which elements should obtain additional classes
+  # config.generate_additional_classes_for = [:wrapper, :label, :input]
+
+  # Whether attributes are required by default (or not). Default is true.
+  # config.required_by_default = true
+
+  # Tell browsers whether to use the native HTML5 validations (novalidate form option).
+  # These validations are enabled in SimpleForm's internal config but disabled by default
+  # in this configuration, which is recommended due to some quirks from different browsers.
+  # To stop SimpleForm from generating the novalidate option, enabling the HTML5 validations,
+  # change this configuration to true.
+  config.browser_validations = false
+
+  # Collection of methods to detect if a file type was given.
+  # config.file_methods = [ :mounted_as, :file?, :public_filename, :attached? ]
+
+  # Custom mappings for input types. This should be a hash containing a regexp
+  # to match as key, and the input type that will be used when the field name
+  # matches the regexp as value.
+  # config.input_mappings = { /count/ => :integer }
+
+  # Custom wrappers for input types. This should be a hash containing an input
+  # type as key and the wrapper that will be used for all inputs with specified type.
+  # config.wrapper_mappings = { string: :prepend }
+
+  # Namespaces where SimpleForm should look for custom input classes that
+  # override default inputs.
+  # config.custom_inputs_namespaces << "CustomInputs"
+
+  # Default priority for time_zone inputs.
+  # config.time_zone_priority = nil
+
+  # Default priority for country inputs.
+  # config.country_priority = nil
+
+  # When false, do not use translations for labels.
+  # config.translate_labels = true
+
+  # Automatically discover new inputs in Rails' autoload path.
+  # config.inputs_discovery = true
+
+  # Cache SimpleForm inputs discovery
+  # config.cache_discovery = !Rails.env.development?
+
+  # Default class for inputs
+  # config.input_class = nil
+
+  # Define the default class of the input wrapper of the boolean input.
+  config.boolean_label_class = 'checkbox'
+
+  # Defines if the default input wrapper class should be included in radio
+  # collection wrappers.
+  # config.include_default_input_wrapper_class = true
+
+  # Defines which i18n scope will be used in Simple Form.
+  # config.i18n_scope = 'simple_form'
+
+  # Defines validation classes to the input_field. By default it's nil.
+  # config.input_field_valid_class = 'is-valid'
+  # config.input_field_error_class = 'is-invalid'
+end