arclight 0.1.4 → 0.2.0

data/lib/arclight/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Arclight
-  VERSION = '0.1.4'
+  VERSION = '0.2.0'
 end

data/lib/generators/arclight/install_generator.rb

@@ -19,6 +19,20 @@ module Arclight
       end
     end
 
+    def install_blacklight_locale_picker
+      gem 'blacklight-locale_picker'
+
+      Bundler.with_clean_env do
+        run 'bundle install'
+      end
+
+      generate 'blacklight:locale_picker:install'
+
+      inject_into_file 'app/helpers/application_helper.rb', after: 'include Blacklight::LocalePicker::LocaleHelper' do
+        "\n\n  def additional_locale_routing_scopes\n    [blacklight, arclight_engine]\n  end"
+      end
+    end
+
     def install_blacklight_range_limit
       generate 'blacklight_range_limit:install'
     end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-class CatalogController < ApplicationController
 
+class CatalogController < ApplicationController
   include Blacklight::Catalog
   include Arclight::Catalog
   include Arclight::FieldConfigHelpers
@@ -21,31 +21,31 @@ class CatalogController < ApplicationController
     }
 
     # solr path which will be added to solr base url before the other solr params.
-    #config.solr_path = 'select'
+    # config.solr_path = 'select'
 
     # items to show per page, each number in the array represent another option to choose from.
-    #config.per_page = [10,20,50,100]
+    # config.per_page = [10,20,50,100]
 
-    ## Default parameters to send on single-document requests to Solr. These settings are the Blackligt defaults (see SearchHelper#solr_doc_params) or
+    ## Default parameters to send on single-document requests to Solr. These settings are the Blacklight defaults (see SearchHelper#solr_doc_params) or
     ## parameters included in the Blacklight-jetty document requestHandler.
     #
-    #config.default_document_solr_params = {
+    # config.default_document_solr_params = {
     #  qt: 'document',
     #  ## These are hard-coded in the blacklight 'document' requestHandler
     #  # fl: '*',
     #  # rows: 1,
     #  # q: '{!term f=id v=$id}'
-    #}
+    # }
 
     # solr field configuration for search results/index views
     config.index.title_field = 'normalized_title_ssm'
     config.index.display_type_field = 'level_ssm'
-    #config.index.thumbnail_field = 'thumbnail_path_ss'
+    # config.index.thumbnail_field = 'thumbnail_path_ss'
 
     # solr field configuration for document/show views
-    #config.show.title_field = 'title_display'
-    #config.show.display_type_field = 'format'
-    #config.show.thumbnail_field = 'thumbnail_path_ss'
+    # config.show.title_field = 'title_display'
+    config.show.display_type_field = 'level_ssm'
+    # config.show.thumbnail_field = 'thumbnail_path_ss'
 
     config.add_results_document_tool(:bookmark, partial: 'bookmark_control', if: :render_bookmarks_control?)
 
@@ -85,16 +85,16 @@ class CatalogController < ApplicationController
     #  (useful when user clicks "more" on a large facet and wants to navigate alphabetically across a large set of results)
     # :index_range can be an array or range of prefixes that will be used to create the navigation (note: It is case sensitive when searching values)
 
-    config.add_facet_field 'collection_sim', label: 'Collection'
-    config.add_facet_field 'creator_ssim', label: 'Creator'
+    config.add_facet_field 'collection_sim', label: 'Collection', limit: 10
+    config.add_facet_field 'creator_ssim', label: 'Creator', limit: 10
     config.add_facet_field 'creators_ssim', label: 'Creator', show: false
     config.add_facet_field 'date_range_sim', label: 'Date range', range: true
-    config.add_facet_field 'level_sim', label: 'Level'
-    config.add_facet_field 'names_ssim', label: 'Names'
-    config.add_facet_field 'repository_sim', label: 'Repository'
-    config.add_facet_field 'geogname_sim', label: 'Place'
-    config.add_facet_field 'places_ssim', label: 'Places', show:false
-    config.add_facet_field 'access_subjects_ssim', label: 'Subject'
+    config.add_facet_field 'level_sim', label: 'Level', limit: 10
+    config.add_facet_field 'names_ssim', label: 'Names', limit: 10
+    config.add_facet_field 'repository_sim', label: 'Repository', limit: 10
+    config.add_facet_field 'geogname_sim', label: 'Place', limit: 10
+    config.add_facet_field 'places_ssim', label: 'Places', show: false
+    config.add_facet_field 'access_subjects_ssim', label: 'Subject', limit: 10
 
     # 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
@@ -198,29 +198,29 @@ class CatalogController < ApplicationController
     config.index.partials.insert(0, :index_breadcrumb)
     config.index.partials.insert(0, :arclight_document_index_header)
 
-    config.show.metadata_partials = [
-      :summary_field,
-      :access_field,
-      :background_field,
-      :related_field,
-      :indexed_terms_field
+    config.show.metadata_partials = %i[
+      summary_field
+      access_field
+      background_field
+      related_field
+      indexed_terms_field
     ]
 
-    config.show.context_sidebar_items = [
-      :in_person_field,
-      :terms_field,
-      :cite_field
+    config.show.context_sidebar_items = %i[
+      in_person_field
+      terms_field
+      cite_field
     ]
 
-    config.show.component_metadata_partials = [
-      :component_field,
-      :component_indexed_terms_field
+    config.show.component_metadata_partials = %i[
+      component_field
+      component_indexed_terms_field
     ]
 
-    config.show.component_sidebar_items = [
-      :in_person_field,
-      :component_terms_field,
-      :cite_field
+    config.show.component_sidebar_items = %i[
+      in_person_field
+      component_terms_field
+      cite_field
     ]
 
     # Component Show Page - Metadata Section
@@ -243,7 +243,7 @@ class CatalogController < ApplicationController
     }
 
     # Collection Show Page - Indexed Terms Section
-    config.add_component_indexed_terms_field 'access_subjects_ssim', label: 'Subjects', :link_to_facet => true, separator_options: {
+    config.add_component_indexed_terms_field 'access_subjects_ssim', label: 'Subjects', link_to_facet: true, separator_options: {
       words_connector: '<br/>',
       two_words_connector: '<br/>',
       last_word_connector: '<br/>'
@@ -255,7 +255,7 @@ class CatalogController < ApplicationController
       last_word_connector: '<br/>'
     }, helper_method: :link_to_name_facet
 
-    config.add_component_indexed_terms_field 'places_ssim', label: 'Places', :link_to_facet => true, separator_options: {
+    config.add_component_indexed_terms_field 'places_ssim', label: 'Places', link_to_facet: true, separator_options: {
       words_connector: '<br/>',
       two_words_connector: '<br/>',
       last_word_connector: '<br/>'
@@ -266,7 +266,7 @@ class CatalogController < ApplicationController
     config.add_component_terms_field 'parent_access_terms_ssm', label: 'Terms of Access'
 
     # Collection Show Page - Summary Section
-    config.add_summary_field 'creators_ssim', label: 'Creator', :link_to_facet => true
+    config.add_summary_field 'creators_ssim', label: 'Creator', link_to_facet: true
     config.add_summary_field 'abstract_ssm', label: 'Abstract'
     config.add_summary_field 'extent_ssm', label: 'Extent'
     config.add_summary_field 'language_ssm', label: 'Language'
@@ -304,7 +304,7 @@ class CatalogController < ApplicationController
     config.add_related_field 'originalsloc_ssm', label: 'Location of originals', helper_method: :paragraph_separator
 
     # Collection Show Page - Indexed Terms Section
-    config.add_indexed_terms_field 'access_subjects_ssim', label: 'Subjects', :link_to_facet => true, separator_options: {
+    config.add_indexed_terms_field 'access_subjects_ssim', label: 'Subjects', link_to_facet: true, separator_options: {
       words_connector: '<br/>',
       two_words_connector: '<br/>',
       last_word_connector: '<br/>'
@@ -316,7 +316,7 @@ class CatalogController < ApplicationController
       last_word_connector: '<br/>'
     }, helper_method: :link_to_name_facet
 
-    config.add_indexed_terms_field 'places_ssim', label: 'Places', :link_to_facet => true, separator_options: {
+    config.add_indexed_terms_field 'places_ssim', label: 'Places', link_to_facet: true, separator_options: {
       words_connector: '<br/>',
       two_words_connector: '<br/>',
       last_word_connector: '<br/>'
@@ -334,7 +334,10 @@ class CatalogController < ApplicationController
     end
 
     # Insert the breadcrumbs at the beginning
+    config.show.partials.unshift(:show_upper_metadata)
     config.show.partials.unshift(:show_breadcrumbs)
+    config.show.partials.delete(:show_header)
+
 
     ##
     # Hierarchy Index View

data/lib/tasks/index.rake

@@ -19,9 +19,11 @@ namespace :arclight do
   desc 'Index an EAD document, use FILE=<path/to/ead.xml> and REPOSITORY_ID=<myid>'
   task :index do
     raise 'Please specify your EAD document, ex. FILE=<path/to/ead.xml>' unless ENV['FILE']
-    indexer = load_indexer
     print "Loading #{ENV['FILE']} into index...\n"
-    elapsed_time = Benchmark.realtime { indexer.update(ENV['FILE']) }
+    load_indexer # a leftover construct from solr_ead. Likely will need to be removed/modified when we remove that
+    elapsed_time = Benchmark.realtime { 
+      `bundle exec traject -u #{ENV['SOLR_URL']} -i xml -c #{Arclight::Engine.root}/lib/arclight/traject/ead2_config.rb #{ENV['FILE']}`
+    }
     print "Indexed #{ENV['FILE']} (in #{elapsed_time.round(3)} secs).\n"
   end
 

data/solr/conf/schema.xml

@@ -308,7 +308,6 @@
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
-        <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
         <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
       </analyzer>
@@ -317,7 +316,6 @@
     <fieldType class="solr.TextField" name="textSuggest" positionIncrementGap="100">
        <analyzer>
           <tokenizer class="solr.KeywordTokenizerFactory"/>
-          <filter class="solr.StandardFilterFactory"/>
           <filter class="solr.LowerCaseFilterFactory"/>
           <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
        </analyzer>
@@ -430,6 +428,9 @@
     See http://wiki.apache.org/solr/SpatialSearch
    -->
     <fieldtype name="geohash" class="solr.GeoHashField"/>
+    
+    <fieldType name="_nest_path_" class="solr.NestPathField" />
+
  </types>
 
 
@@ -463,6 +464,10 @@
    <field name="timestamp" type="date" indexed="true" stored="true" default="NOW" multiValued="false"/>
    <!-- default, catch all search field -->
    <field name="text" type="text" indexed="true" stored="true" multiValued="true"/>
+   
+   <field name="_root_" type="string" indexed="true" stored="true" docValues="false" />
+   <field name="_nest_parent_" type="string" indexed="true" stored="true"/>
+   <field name="_nest_path_" type="_nest_path_" indexed="true" stored="true"/>
 
    <!-- Dynamic field definitions.  If a field name is not found, dynamicFields
         will be used if the name matches any of the patterns.

data/tasks/arclight.rake

@@ -5,6 +5,8 @@ require 'engine_cart/rake_task'
 require 'rspec/core/rake_task'
 require 'arclight'
 
+class DependencyNotInstalled < StandardError; end
+
 desc 'Run test suite'
 task ci: %w[arclight:generate] do
   SolrWrapper.wrap do |solr|
@@ -20,7 +22,9 @@ end
 
 desc 'Run Eslint'
 task :eslint do
-  system './node_modules/.bin/eslint app/assets/javascripts'
+  raise DependencyNotInstalled, 'ESLint not found.  Please run yarn install.' unless File.exist?('./node_modules/.bin/eslint')
+
+  exit 1 unless system './node_modules/.bin/eslint app/assets/javascripts'
 end
 
 namespace :arclight do

data/template.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 gem 'arclight', github: 'sul-dlss/arclight'
-gem 'blacklight_range_limit', '7.0.0.rc2'
+gem 'blacklight_range_limit', '~> 7.1'
 
 run 'bundle install'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arclight
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Darren Hardy
@@ -11,36 +11,42 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-12 00:00:00.000000000 Z
+date: 2019-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc1
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc1
+        version: '7.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
   name: blacklight_range_limit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc2
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.0.0.rc2
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -70,27 +76,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: traject
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
-  type: :development
+        version: '3.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: traject_plus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -98,7 +104,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+- !ruby/object:Gem::Dependency
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -126,7 +146,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -159,28 +179,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.74.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.74.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.35'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: '1.35'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +215,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -209,6 +257,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - drh@stanford.edu
@@ -223,6 +285,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".solr_wrapper"
 - ".travis.yml"
 - CONTRIBUTING.md
@@ -238,6 +301,7 @@ files:
 - app/assets/javascripts/arclight/collection_scrollspy.js
 - app/assets/javascripts/arclight/component_ancestors.js
 - app/assets/javascripts/arclight/oembed_viewer.js
+- app/assets/javascripts/arclight/search_results.js
 - app/assets/javascripts/arclight/truncator.js.erb
 - app/assets/stylesheets/arclight/application.scss
 - app/assets/stylesheets/arclight/bootstrap_overrides.scss
@@ -274,8 +338,6 @@ files:
 - app/views/catalog/_arclight_document_index_header.html.erb
 - app/views/catalog/_arclight_document_index_header_hierarchy_default.html.erb
 - app/views/catalog/_arclight_document_index_header_online_contents_default.html.erb
-- app/views/catalog/_arclight_document_show_header.html.erb
-- app/views/catalog/_arclight_document_show_header_collection.html.erb
 - app/views/catalog/_arclight_index_compact_default.html.erb
 - app/views/catalog/_arclight_online_content_indicator.html.erb
 - app/views/catalog/_arclight_rangelimit.html.erb
@@ -285,6 +347,7 @@ files:
 - app/views/catalog/_collection_downloads.html.erb
 - app/views/catalog/_collection_online_contents.html.erb
 - app/views/catalog/_collection_overview.html.erb
+- app/views/catalog/_component_contents.html.erb
 - app/views/catalog/_component_overview.html.erb
 - app/views/catalog/_context_card.html.erb
 - app/views/catalog/_context_sidebar.html.erb
@@ -300,13 +363,13 @@ files:
 - app/views/catalog/_results_histogram.html.erb
 - app/views/catalog/_search_results.html.erb
 - app/views/catalog/_search_results_repository.html.erb
-- app/views/catalog/_search_within_form.html.erb
 - app/views/catalog/_show_breadcrumbs_default.html.erb
 - app/views/catalog/_show_collection.html.erb
 - app/views/catalog/_show_component_sidebar.html.erb
 - app/views/catalog/_show_default.html.erb
-- app/views/catalog/_show_header.html.erb
 - app/views/catalog/_show_sidebar.html.erb
+- app/views/catalog/_show_upper_metadata_collection.html.erb
+- app/views/catalog/_show_upper_metadata_default.html.erb
 - app/views/catalog/index.html.erb
 - app/views/layouts/catalog_result.html.erb
 - app/views/shared/_breadcrumbs.html.erb
@@ -317,6 +380,7 @@ files:
 - bin/console
 - bin/rails
 - bin/setup
+- config/i18n-tasks.yml
 - config/locales/arclight.en.yml
 - config/routes.rb
 - lib/arclight.rb
@@ -325,7 +389,9 @@ files:
 - lib/arclight/digital_object.rb
 - lib/arclight/engine.rb
 - lib/arclight/exceptions.rb
+- lib/arclight/hash_absolute_xpath.rb
 - lib/arclight/indexer.rb
+- lib/arclight/missing_id_strategy.rb
 - lib/arclight/normalized_date.rb
 - lib/arclight/normalized_id.rb
 - lib/arclight/normalized_title.rb
@@ -333,6 +399,7 @@ files:
 - lib/arclight/shared_indexing_behavior.rb
 - lib/arclight/shared_terminology_behavior.rb
 - lib/arclight/solr_ead_indexer_ext.rb
+- lib/arclight/traject/ead2_config.rb
 - lib/arclight/version.rb
 - lib/arclight/viewer.rb
 - lib/arclight/viewers/oembed.rb
@@ -385,8 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ''