arclight 0.4.0 → 1.0.0.beta1

data/lib/arclight/traject/ead2_config.rb

@@ -5,7 +5,6 @@ require 'traject'
 require 'traject/nokogiri_reader'
 require 'traject_plus'
 require 'traject_plus/macros'
-require 'arclight/exceptions'
 require 'arclight/level_label'
 require 'arclight/normalized_date'
 require 'arclight/normalized_title'
@@ -14,7 +13,6 @@ require 'active_support/core_ext/array/wrap'
 require 'arclight/digital_object'
 require 'arclight/year_range'
 require 'arclight/repository'
-require 'arclight/missing_id_strategy'
 require 'arclight/traject/nokogiri_namespaceless_reader'
 
 # rubocop:disable Style/MixinUsage
@@ -55,8 +53,9 @@ DID_SEARCHABLE_NOTES_FIELDS = %w[
 settings do
   provide 'reader_class_name', 'Arclight::Traject::NokogiriNamespacelessReader'
   provide 'solr_writer.commit_on_close', 'true'
-  provide 'repository', ENV['REPOSITORY_ID']
+  provide 'repository', ENV.fetch('REPOSITORY_ID', nil)
   provide 'logger', Logger.new($stderr)
+  provide 'component_traject_config', File.join(__dir__, 'ead2_component_config.rb')
 end
 
 each_record do |_record, context|
@@ -69,12 +68,14 @@ end
 
 # ==================
 # Top level document
+#
+# NOTE: All fields should be stored in Solr
 # ==================
 
 to_field 'id', extract_xpath('/ead/eadheader/eadid'), strip, gsub('.', '-')
-to_field 'title_filing_si', extract_xpath('/ead/eadheader/filedesc/titlestmt/titleproper[@type="filing"]')
+to_field 'title_filing_ssi', extract_xpath('/ead/eadheader/filedesc/titlestmt/titleproper[@type="filing"]')
 to_field 'title_ssm', extract_xpath('/ead/archdesc/did/unittitle')
-to_field 'title_teim', extract_xpath('/ead/archdesc/did/unittitle')
+to_field 'title_tesim', extract_xpath('/ead/archdesc/did/unittitle')
 to_field 'ead_ssi', extract_xpath('/ead/eadheader/eadid')
 
 to_field 'unitdate_ssm', extract_xpath('/ead/archdesc/did/unitdate')
@@ -88,7 +89,7 @@ to_field 'level_ssm' do |_record, accumulator|
 end
 
 # Keep the original top-level archdesc/@level for Level facet in addition to 'Collection'
-to_field 'level_sim' do |record, accumulator|
+to_field 'level_ssim' do |record, accumulator|
   level = record.at_xpath('/ead/archdesc').attribute('level')&.value
   other_level = record.at_xpath('/ead/archdesc').attribute('otherlevel')&.value
 
@@ -97,8 +98,7 @@ to_field 'level_sim' do |record, accumulator|
 end
 
 to_field 'unitid_ssm', extract_xpath('/ead/archdesc/did/unitid')
-to_field 'unitid_teim', extract_xpath('/ead/archdesc/did/unitid')
-to_field 'collection_unitid_ssm', extract_xpath('/ead/archdesc/did/unitid')
+to_field 'unitid_tesim', extract_xpath('/ead/archdesc/did/unitid')
 
 to_field 'normalized_title_ssm' do |_record, accumulator, context|
   dates = Arclight::NormalizedDate.new(
@@ -118,16 +118,11 @@ to_field 'normalized_date_ssm' do |_record, accumulator, context|
   ).to_s
 end
 
-to_field 'collection_ssm' do |_record, accumulator, context|
-  accumulator.concat context.output_hash.fetch('normalized_title_ssm', [])
-end
-to_field 'collection_sim' do |_record, accumulator, context|
-  accumulator.concat context.output_hash.fetch('normalized_title_ssm', [])
-end
-to_field 'collection_ssi' do |_record, accumulator, context|
+to_field 'collection_title_tesim' do |_record, accumulator, context|
   accumulator.concat context.output_hash.fetch('normalized_title_ssm', [])
 end
-to_field 'collection_title_tesim' do |_record, accumulator, context|
+
+to_field 'collection_ssim' do |_record, accumulator, context|
   accumulator.concat context.output_hash.fetch('normalized_title_ssm', [])
 end
 
@@ -135,39 +130,30 @@ to_field 'repository_ssm' do |_record, accumulator, context|
   accumulator << context.clipboard[:repository]
 end
 
-to_field 'repository_sim' do |_record, accumulator, context|
+to_field 'repository_ssim' do |_record, accumulator, context|
   accumulator << context.clipboard[:repository]
 end
 
 to_field 'geogname_ssm', extract_xpath('/ead/archdesc/controlaccess/geogname')
-to_field 'geogname_sim', extract_xpath('/ead/archdesc/controlaccess/geogname')
+to_field 'geogname_ssim', extract_xpath('/ead/archdesc/controlaccess/geogname')
 
 to_field 'creator_ssm', extract_xpath('/ead/archdesc/did/origination')
-to_field 'creator_sim', extract_xpath('/ead/archdesc/did/origination')
 to_field 'creator_ssim', extract_xpath('/ead/archdesc/did/origination')
 to_field 'creator_sort' do |record, accumulator|
   accumulator << record.xpath('/ead/archdesc/did/origination').map { |c| c.text.strip }.join(', ')
 end
 
-to_field 'creator_persname_ssm', extract_xpath('/ead/archdesc/did/origination/persname')
 to_field 'creator_persname_ssim', extract_xpath('/ead/archdesc/did/origination/persname')
-to_field 'creator_corpname_ssm', extract_xpath('/ead/archdesc/did/origination/corpname')
-to_field 'creator_corpname_sim', extract_xpath('/ead/archdesc/did/origination/corpname')
 to_field 'creator_corpname_ssim', extract_xpath('/ead/archdesc/did/origination/corpname')
-to_field 'creator_famname_ssm', extract_xpath('/ead/archdesc/did/origination/famname')
 to_field 'creator_famname_ssim', extract_xpath('/ead/archdesc/did/origination/famname')
 
-to_field 'persname_sim', extract_xpath('//persname')
-
 to_field 'creators_ssim' do |_record, accumulator, context|
-  accumulator.concat context.output_hash['creator_persname_ssm'] if context.output_hash['creator_persname_ssm']
-  accumulator.concat context.output_hash['creator_corpname_ssm'] if context.output_hash['creator_corpname_ssm']
-  accumulator.concat context.output_hash['creator_famname_ssm'] if context.output_hash['creator_famname_ssm']
+  accumulator.concat context.output_hash['creator_persname_ssim'] if context.output_hash['creator_persname_ssim']
+  accumulator.concat context.output_hash['creator_corpname_ssim'] if context.output_hash['creator_corpname_ssim']
+  accumulator.concat context.output_hash['creator_famname_ssim'] if context.output_hash['creator_famname_ssim']
 end
 
-to_field 'places_sim', extract_xpath('/ead/archdesc/controlaccess/geogname')
 to_field 'places_ssim', extract_xpath('/ead/archdesc/controlaccess/geogname')
-to_field 'places_ssm', extract_xpath('/ead/archdesc/controlaccess/geogname')
 
 to_field 'access_terms_ssm', extract_xpath('/ead/archdesc/userestrict/*[local-name()!="head"]')
 
@@ -200,11 +186,10 @@ to_field 'digital_objects_ssm', extract_xpath('/ead/archdesc/did/dao|/ead/archde
 end
 
 to_field 'extent_ssm', extract_xpath('/ead/archdesc/did/physdesc/extent')
-to_field 'extent_teim', extract_xpath('/ead/archdesc/did/physdesc/extent')
-to_field 'genreform_sim', extract_xpath('/ead/archdesc/controlaccess/genreform')
-to_field 'genreform_ssm', extract_xpath('/ead/archdesc/controlaccess/genreform')
+to_field 'extent_tesim', extract_xpath('/ead/archdesc/did/physdesc/extent')
+to_field 'genreform_ssim', extract_xpath('/ead/archdesc/controlaccess/genreform')
 
-to_field 'date_range_sim', extract_xpath('/ead/archdesc/did/unitdate/@normal', to_text: false) do |_record, accumulator|
+to_field 'date_range_ssim', extract_xpath('/ead/archdesc/did/unitdate/@normal', to_text: false) do |_record, accumulator|
   range = Arclight::YearRange.new
   next range.years if accumulator.blank?
 
@@ -214,282 +199,76 @@ to_field 'date_range_sim', extract_xpath('/ead/archdesc/did/unitdate/@normal', t
 end
 
 SEARCHABLE_NOTES_FIELDS.map do |selector|
-  to_field "#{selector}_ssm", extract_xpath("/ead/archdesc/#{selector}/*[local-name()!='head']", to_text: false)
+  to_field "#{selector}_html_tesm", extract_xpath("/ead/archdesc/#{selector}/*[local-name()!='head']", to_text: false) do |_record, accumulator|
+    accumulator.map!(&:to_html)
+  end
   to_field "#{selector}_heading_ssm", extract_xpath("/ead/archdesc/#{selector}/head") unless selector == 'prefercite'
-  to_field "#{selector}_teim", extract_xpath("/ead/archdesc/#{selector}/*[local-name()!='head']")
+  to_field "#{selector}_tesim", extract_xpath("/ead/archdesc/#{selector}/*[local-name()!='head']")
 end
 
 DID_SEARCHABLE_NOTES_FIELDS.map do |selector|
-  to_field "#{selector}_ssm", extract_xpath("/ead/archdesc/did/#{selector}", to_text: false)
+  to_field "#{selector}_html_tesm", extract_xpath("/ead/archdesc/did/#{selector}", to_text: false)
 end
 
 NAME_ELEMENTS.map do |selector|
   to_field 'names_coll_ssim', extract_xpath("/ead/archdesc/controlaccess/#{selector}")
-  to_field 'names_ssim', extract_xpath("//#{selector}")
-  to_field "#{selector}_ssm", extract_xpath("//#{selector}")
+  to_field 'names_ssim', extract_xpath("//#{selector}"), unique
+  to_field "#{selector}_ssim", extract_xpath("//#{selector}"), unique
 end
 
-to_field 'corpname_sim', extract_xpath('//corpname')
-
-to_field 'language_sim', extract_xpath('/ead/archdesc/did/langmaterial')
-to_field 'language_ssm', extract_xpath('/ead/archdesc/did/langmaterial')
+to_field 'language_ssim', extract_xpath('/ead/archdesc/did/langmaterial')
 
 to_field 'descrules_ssm', extract_xpath('/ead/eadheader/profiledesc/descrules')
 
-# =============================
-# Each component child document
-# <c> <c01> <c12>
-# =============================
-
-compose 'components', ->(record, accumulator, _context) { accumulator.concat record.xpath('//*[is_component(.)]', NokogiriXpathExtensions.new) } do
-  to_field 'ref_ssi' do |record, accumulator, context|
-    accumulator << if record.attribute('id').blank?
-                     strategy = Arclight::MissingIdStrategy.selected
-                     hexdigest = strategy.new(record).to_hexdigest
-                     parent_id = context.clipboard[:parent].output_hash['id'].first
-                     logger.warn('MISSING ID WARNING') do
-                       [
-                         "A component in #{parent_id} did not have an ID so one was minted using the #{strategy} strategy.",
-                         "The ID of this document will be #{parent_id}#{hexdigest}."
-                       ].join(' ')
-                     end
-                     record['id'] = hexdigest
-                     hexdigest
-                   else
-                     record.attribute('id')&.value&.strip&.gsub('.', '-')
-                   end
-  end
-  to_field 'ref_ssm' do |_record, accumulator, context|
-    accumulator.concat context.output_hash['ref_ssi']
-  end
-
-  to_field 'id' do |_record, accumulator, context|
-    accumulator << [
-      context.clipboard[:parent].output_hash['id'],
-      context.output_hash['ref_ssi']
-    ].join('')
-  end
-
-  to_field 'ead_ssi' do |_record, accumulator, context|
-    accumulator << context.clipboard[:parent].output_hash['ead_ssi'].first
-  end
-
-  to_field 'title_filing_si', extract_xpath('./did/unittitle'), first_only
-  to_field 'title_ssm', extract_xpath('./did/unittitle')
-  to_field 'title_teim', extract_xpath('./did/unittitle')
-
-  to_field 'unitdate_bulk_ssim', extract_xpath('./did/unitdate[@type="bulk"]')
-  to_field 'unitdate_inclusive_ssm', extract_xpath('./did/unitdate[@type="inclusive"]')
-  to_field 'unitdate_other_ssim', extract_xpath('./did/unitdate[not(@type)]')
-
-  to_field 'normalized_title_ssm' do |_record, accumulator, context|
-    dates = Arclight::NormalizedDate.new(
-      context.output_hash['unitdate_inclusive_ssm'],
-      context.output_hash['unitdate_bulk_ssim'],
-      context.output_hash['unitdate_other_ssim']
-    ).to_s
-    title = context.output_hash['title_ssm']&.first
-    accumulator << Arclight::NormalizedTitle.new(title, dates).to_s
-  end
-
-  to_field 'normalized_date_ssm' do |_record, accumulator, context|
-    accumulator << Arclight::NormalizedDate.new(
-      context.output_hash['unitdate_inclusive_ssm'],
-      context.output_hash['unitdate_bulk_ssim'],
-      context.output_hash['unitdate_other_ssim']
-    ).to_s
-  end
-
-  to_field 'component_level_isim' do |record, accumulator|
-    accumulator << 1 + NokogiriXpathExtensions.new.is_component(record.ancestors).count
-  end
-
-  to_field 'parent_ssim' do |record, accumulator, context|
-    accumulator << context.clipboard[:parent].output_hash['id'].first
-    accumulator.concat NokogiriXpathExtensions.new.is_component(record.ancestors).reverse.map { |n| n.attribute('id')&.value }
-  end
-
-  to_field 'parent_ssi' do |_record, accumulator, context|
-    accumulator << context.output_hash['parent_ssim'].last
-  end
-
-  to_field 'parent_unittitles_ssm' do |_rec, accumulator, context|
-    # top level document
-    accumulator.concat context.clipboard[:parent].output_hash['normalized_title_ssm']
-    parent_ssim = context.output_hash['parent_ssim']
-    components = context.clipboard[:parent].output_hash['components']
-
-    # other components
-    if parent_ssim && components
-      ancestors = parent_ssim.drop(1).map { |x| [x] }
-      accumulator.concat components.select { |c| ancestors.include? c['ref_ssi'] }.flat_map { |c| c['normalized_title_ssm'] }
-    end
-  end
-
-  to_field 'parent_unittitles_teim' do |_record, accumulator, context|
-    accumulator.concat context.output_hash['parent_unittitles_ssm']
-  end
-
-  to_field 'parent_levels_ssm' do |_record, accumulator, context|
-    ## Top level document
-    accumulator.concat context.clipboard[:parent].output_hash['level_ssm']
-    ## Other components
-    context.output_hash['parent_ssim']&.drop(1)&.each do |id|
-      accumulator.concat Array
-        .wrap(context.clipboard[:parent].output_hash['components'])
-        .select { |c| c['ref_ssi'] == [id] }.map { |c| c['level_ssm'] }.flatten
-    end
-  end
-
-  to_field 'unitid_ssm', extract_xpath('./did/unitid')
-  to_field 'collection_unitid_ssm' do |_record, accumulator, context|
-    accumulator.concat Array.wrap(context.clipboard[:parent].output_hash['unitid_ssm'])
-  end
-  to_field 'repository_ssm' do |_record, accumulator, context|
-    accumulator << context.clipboard[:parent].clipboard[:repository]
-  end
-  to_field 'repository_sim' do |_record, accumulator, context|
-    accumulator << context.clipboard[:parent].clipboard[:repository]
-  end
-  to_field 'collection_ssm' do |_record, accumulator, context|
-    accumulator.concat context.clipboard[:parent].output_hash['normalized_title_ssm']
-  end
-  to_field 'collection_sim' do |_record, accumulator, context|
-    accumulator.concat context.clipboard[:parent].output_hash['normalized_title_ssm']
-  end
-  to_field 'collection_ssi' do |_record, accumulator, context|
-    accumulator.concat context.clipboard[:parent].output_hash['normalized_title_ssm']
-  end
-
-  to_field 'extent_ssm', extract_xpath('./did/physdesc/extent')
-  to_field 'extent_teim', extract_xpath('./did/physdesc/extent')
-
-  to_field 'creator_ssm', extract_xpath('./did/origination')
-  to_field 'creator_ssim', extract_xpath('./did/origination')
-  to_field 'creators_ssim', extract_xpath('./did/origination')
-  to_field 'creator_sort' do |record, accumulator|
-    accumulator << record.xpath('./did/origination').map(&:text).join(', ')
-  end
-  to_field 'collection_creator_ssm' do |_record, accumulator, context|
-    accumulator.concat Array.wrap(context.clipboard[:parent].output_hash['creator_ssm'])
-  end
-  to_field 'has_online_content_ssim', extract_xpath('.//dao') do |_record, accumulator|
-    accumulator.replace([accumulator.any?])
-  end
-  to_field 'child_component_count_isim' do |record, accumulator|
-    accumulator << NokogiriXpathExtensions.new.is_component(record.children).count
-  end
-
-  to_field 'ref_ssm' do |record, accumulator|
-    accumulator << record.attribute('id')
-  end
-
-  to_field 'level_ssm' do |record, accumulator|
-    level = record.attribute('level')&.value
-    other_level = record.attribute('otherlevel')&.value
-    accumulator << Arclight::LevelLabel.new(level, other_level).to_s
-  end
+# count all descendant components from the top-level
+to_field 'total_component_count_is', first_only do |record, accumulator|
+  accumulator << record.xpath('//c|//c01|//c02|//c03|//c04|//c05|//c06|//c07|//c08|//c09|//c10|//c11|//c12').count
+end
 
-  to_field 'level_sim' do |_record, accumulator, context|
-    next unless context.output_hash['level_ssm']
+# count all digital objects from the top-level
+to_field 'online_item_count_is', first_only do |record, accumulator|
+  accumulator << record.xpath('//dao').count
+end
 
-    accumulator.concat context.output_hash['level_ssm']&.map(&:capitalize)
-  end
+to_field 'component_level_isim' do |_record, accumulator, _context|
+  accumulator << 0
+end
 
-  to_field 'sort_ii' do |_record, accumulator, context|
-    accumulator.replace([context.position])
-  end
+to_field 'sort_isi' do |_record, accumulator, _context|
+  accumulator << 0
+end
 
-  # Get the <accessrestrict> from the closest ancestor that has one (includes top-level)
-  to_field 'parent_access_restrict_ssm' do |record, accumulator|
-    accumulator.concat Array
-      .wrap(record.xpath('(./ancestor::*/accessrestrict)[last()]/*[local-name()!="head"]')
-      .map(&:text))
-  end
+# =============================
+# Each component child document
+# <c> <c01> <c12>
+# =============================
 
-  # Get the <userestrict> from self OR the closest ancestor that has one (includes top-level)
-  to_field 'parent_access_terms_ssm' do |record, accumulator|
-    accumulator.concat Array
-      .wrap(record.xpath('(./ancestor-or-self::*/userestrict)[last()]/*[local-name()!="head"]')
-      .map(&:text))
-  end
+to_field 'components' do |record, accumulator, context|
+  child_components = record.xpath("/ead/archdesc/dsc/c|#{('/ead/archdesc/dsc/c01'..'/ead/archdesc/dsc/c12').to_a.join('|')}")
+  next unless child_components.any?
 
-  to_field 'digital_objects_ssm', extract_xpath('./dao|./did/dao', to_text: false) do |_record, accumulator|
-    accumulator.map! do |dao|
-      label = dao.attributes['title']&.value ||
-              dao.xpath('daodesc/p')&.text
-      href = (dao.attributes['href'] || dao.attributes['xlink:href'])&.value
-      Arclight::DigitalObject.new(label: label, href: href).to_json
+  counter = Class.new do
+    def increment
+      @counter ||= 0
+      @counter += 1
     end
-  end
-
-  to_field 'date_range_sim', extract_xpath('./did/unitdate/@normal', to_text: false) do |_record, accumulator|
-    range = Arclight::YearRange.new
-    next range.years if accumulator.blank?
-
-    ranges = accumulator.map(&:to_s)
-    range << range.parse_ranges(ranges)
-    accumulator.replace range.years
-  end
-
-  NAME_ELEMENTS.map do |selector|
-    to_field 'names_ssim', extract_xpath("./controlaccess/#{selector}")
-    to_field "#{selector}_ssm", extract_xpath(".//#{selector}")
-  end
-
-  to_field 'geogname_sim', extract_xpath('./controlaccess/geogname')
-  to_field 'geogname_ssm', extract_xpath('./controlaccess/geogname')
-  to_field 'places_ssim', extract_xpath('./controlaccess/geogname')
-
-  to_field 'access_subjects_ssim', extract_xpath('./controlaccess', to_text: false) do |_record, accumulator|
-    accumulator.map! do |element|
-      %w[subject function occupation genreform].map do |selector|
-        element.xpath(".//#{selector}").map(&:text)
-      end
-    end.flatten!
-  end
-
-  to_field 'access_subjects_ssm' do |_record, accumulator, context|
-    accumulator.concat(context.output_hash.fetch('access_subjects_ssim', []))
-  end
-
-  to_field 'acqinfo_ssim', extract_xpath('/ead/archdesc/acqinfo/*[local-name()!="head"]')
-  to_field 'acqinfo_ssim', extract_xpath('/ead/archdesc/descgrp/acqinfo/*[local-name()!="head"]')
-  to_field 'acqinfo_ssim', extract_xpath('./acqinfo/*[local-name()!="head"]')
-  to_field 'acqinfo_ssim', extract_xpath('./descgrp/acqinfo/*[local-name()!="head"]')
-
-  to_field 'language_ssm', extract_xpath('./did/langmaterial')
-  to_field 'containers_ssim' do |record, accumulator|
-    record.xpath('./did/container').each do |node|
-      accumulator << [node.attribute('type'), node.text].join(' ').strip
+  end.new
+
+  component_indexer = Traject::Indexer::NokogiriIndexer.new.tap do |i|
+    i.settings do
+      provide :parent, context
+      provide :root, context
+      provide :counter, counter
+      provide :depth, 1
+      provide :logger, context.settings[:logger]
+      provide :component_traject_config, context.settings[:component_traject_config]
     end
-  end
 
-  SEARCHABLE_NOTES_FIELDS.map do |selector|
-    to_field "#{selector}_ssm", extract_xpath("./#{selector}/*[local-name()!='head']", to_text: false)
-    to_field "#{selector}_heading_ssm", extract_xpath("./#{selector}/head")
-    to_field "#{selector}_teim", extract_xpath("./#{selector}/*[local-name()!='head']")
-  end
-  DID_SEARCHABLE_NOTES_FIELDS.map do |selector|
-    to_field "#{selector}_ssm", extract_xpath("./did/#{selector}", to_text: false)
+    i.load_config_file(context.settings[:component_traject_config])
   end
-  to_field 'did_note_ssm', extract_xpath('./did/note')
-end
 
-each_record do |_record, context|
-  context.output_hash['components'] &&= context.output_hash['components'].select { |c| c.keys.any? }
-end
-
-##
-# Used for evaluating xpath components to find
-class NokogiriXpathExtensions
-  # rubocop:disable Naming/PredicateName, Style/FormatString
-  def is_component(node_set)
-    node_set.find_all do |node|
-      component_elements = (1..12).map { |i| "c#{'%02d' % i}" }
-      component_elements.push 'c'
-      component_elements.include? node.name
-    end
+  child_components.each do |child_component|
+    output = component_indexer.map_record(child_component)
+    accumulator << output if output.keys.any?
   end
-  # rubocop:enable Naming/PredicateName, Style/FormatString
 end

data/lib/arclight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arclight
-  VERSION = '0.4.0'
+  VERSION = '1.0.0.beta1'
 end

data/lib/arclight/year_range.rb

@@ -18,7 +18,6 @@ module Arclight
     def initialize(dates = nil)
       @years = []
       self << parse_ranges(dates) if dates.present?
-      self
     end
 
     # @return [String] a concise, human-readable version of the year range, including gaps
@@ -77,13 +76,14 @@ module Arclight
     # Deals with making a human-readable range for years with 1 or more gaps.
     # It involves detection of streaks between the gaps.
     # @return [String] 1999-2000, 2002 for 1999, 2000, 2002
-    def to_s_with_gaps # rubocop: disable Metrics/AbcSize, Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def to_s_with_gaps
       raise ArgumentError if years.blank? || years.length < 2
 
       results = []
       streak = [years[0]]
       i = streak.first
-      years[1..-1].each do |j|
+      years[1..].each do |j|
         i += 1
         if i == j
           streak << j
@@ -100,6 +100,7 @@ module Arclight
       results << to_s_for_streak(streak)
       results.join(', ')
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     def to_s_for_streak(streak)
       return streak.min.to_s if streak.min == streak.max

data/lib/arclight.rb

@@ -5,6 +5,11 @@ require 'arclight/engine'
 require 'arclight/repository'
 require 'arclight/year_range'
 
+# :nodoc:
 module Arclight
-  # Your code goes here...
+  autoload :Routes, 'arclight/routes'
+
+  def self.deprecation
+    @deprecation ||= ActiveSupport::Deprecation.new('2.0', 'Arclight')
+  end
 end

data/lib/generators/arclight/install_generator.rb

@@ -33,32 +33,17 @@ module Arclight
       end
     end
 
-    def install_blacklight_range_limit
-      generate 'blacklight_range_limit:install'
-    end
-
     def add_custom_routes
       inject_into_file 'config/routes.rb', after: "mount Blacklight::Engine => '/'" do
-        "\n    mount Arclight::Engine => '/'\n"
+        "\n  mount Arclight::Engine => '/'\n"
       end
+
+      gsub_file 'config/routes.rb', 'root to: "catalog#index"', 'root to: "arclight/repositories#index"'
     end
 
     def copy_styles
       copy_file 'arclight.scss', 'app/assets/stylesheets/arclight.scss'
-    end
-
-    def inject_js
-      inject_into_file 'app/assets/javascripts/application.js', after: '//= require blacklight/blacklight' do
-        "\n// Required by Arclight" \
-        "\n//= require arclight/arclight" \
-        "\n//= require stickyfill"
-      end
-    end
-
-    def install_webpacker
-      return unless Rails.version.to_i == 6
-
-      rake 'webpacker:install'
+      remove_file 'app/assets/stylesheets/blacklight.scss' # Avoid two copies of bootstrap
     end
 
     def add_arclight_search_behavior
@@ -79,12 +64,65 @@ module Arclight
       copy_file 'config/downloads.yml' unless File.exist?('config/downloads.yml')
     end
 
+    def add_i18n_config
+      copy_file 'config/locales/arclight.en.yml'
+    end
+
     def modify_blacklight_yml
       gsub_file 'config/locales/blacklight.en.yml', "application_name: 'Blacklight'", "application_name: 'Arclight'"
     end
 
-    def run_yarn
-      run 'yarn add @babel/core @babel/plugin-external-helpers @babel/plugin-transform-modules-umd @babel/preset-env'
+    def assets
+      if using_importmap?
+        pin_javascript_dependencies
+        import_arclight_javascript
+      else
+        install_javascript_dependencies
+      end
+    end
+
+    def inject_arclight_routes
+      inject_into_file 'config/routes.rb',
+                       "  concern :hierarchy, Arclight::Routes::Hierarchy.new\n",
+                       after: /concern :exportable.*\n/
+      inject_into_file 'config/routes.rb',
+                       "  concerns :hierarchy\n",
+                       after: /resources :solr_documents.*\n/
+    end
+
+    private
+
+    def root
+      @root ||= Pathname(destination_root)
+    end
+
+    def using_importmap?
+      @using_importmap ||= root.join('config/importmap.rb').exist?
+    end
+
+    # This is the last step because any failure here wouldn't prevent the other steps from running
+    def install_javascript_dependencies
+      inject_into_file 'app/assets/javascripts/application.js', after: '//= require blacklight/blacklight' do
+        "\n// Required by Arclight" \
+          "\n//= require arclight/arclight"
+      end
+    end
+
+    def pin_javascript_dependencies
+      say 'Arclight Importmap asset generation'
+
+      append_to_file 'config/importmap.rb', <<~RUBY
+        pin "arclight", to: "arclight/arclight.js"
+        # TODO: We may be able to move these to a single importmap for arclight.
+        pin "arclight/oembed_viewer", to: "arclight/oembed_viewer.js"
+        pin "arclight/truncate_controller", to: "arclight/truncate_controller.js"
+      RUBY
+    end
+
+    def import_arclight_javascript
+      inject_into_file 'app/javascript/application.js', after: 'import "blacklight"' do
+        "\nimport \"arclight\""
+      end
     end
   end
 end

data/lib/generators/arclight/templates/arclight.scss

@@ -1,3 +1,4 @@
-/*
-*= require arclight/application
-*/
+$breadcrumb-divider: quote("»");
+@import 'bootstrap';
+@import 'blacklight/blacklight';
+@import 'arclight/application';