blacklight_advanced_search 6.4.0 → 8.0.0.alpha1

data/solr/conf/solrconfig.xml

@@ -1,229 +1,93 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements.  See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!--
- This is a stripped down config file used for a simple example...  
- It is *not* a good example to work from. 
--->
 <config>
-  
-  <!-- Controls what version of Lucene various components of Solr
-       adhere to.  Generally, you want to use the latest version to
-       get all bug fixes and improvements. It is highly recommended
-       that you fully re-index after changing this setting as it can
-       affect both how text is indexed and queried.
-  -->
-  <luceneMatchVersion>5.0.0</luceneMatchVersion>
-  
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
-  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
+  <!-- NOTE: various comments and unused configuration possibilities have been purged
+     from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
+     as well as the default solrconfig file included with Solr -->
 
-  <directoryFactory name="DirectoryFactory" 
-                    class="${solr.directoryFactory:solr.NRTCachingDirectoryFactory}">
-  </directoryFactory> 
+  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <codecFactory class="solr.SchemaCodecFactory"/>
+  <luceneMatchVersion>6.1.0</luceneMatchVersion>
 
-  <schemaFactory class="ClassicIndexSchemaFactory"/>
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
+  <updateHandler class="solr.DirectUpdateHandler2">
+    <updateLog>
+      <str name="dir">${solr.core0.data.dir:}</str>
+    </updateLog>
+  </updateHandler>
 
-  <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
-  
-  <requestDispatcher handleSelect="true" >
-    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
-  </requestDispatcher>
-  
-  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
-
-  <!-- config for the admin interface --> 
-  <admin>
-    <defaultQuery>*:*</defaultQuery>
-  </admin>
-
-  <!-- SearchHandler
+  <!-- solr lib dirs -->
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
-       http://wiki.apache.org/solr/SearchHandler
+  <dataDir>${solr.data.dir:}</dataDir>
 
-       For processing Search Queries, the primary Request Handler
-       provided with Solr is "SearchHandler" It delegates to a sequent
-       of SearchComponents (see below) and supports distributed
-       queries across multiple shards
-    -->
   <requestHandler name="search" class="solr.SearchHandler" default="true">
     <!-- default values for query parameters can be specified, these
          will be overridden by parameters in the request
       -->
      <lst name="defaults">
-       <str name="defType">dismax</str>
+       <str name="defType">edismax</str>
        <str name="echoParams">explicit</str>
-       <int name="rows">10</int>
-
        <str name="q.alt">*:*</str>
        <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
-
+       <int name="qs">1</int>
+       <int name="ps">2</int>
+       <float name="tie">0.01</float>
        <!-- this qf and pf are used by default, if not otherwise specified by
             client. The default blacklight_config will use these for the
-            "keywords" search. See the author_qf/author_pf, title_qf, etc 
+            "keywords" search. See the author_qf/author_pf, title_qf, etc
             below, which the default blacklight_config will specify for
             those searches. You may also be interested in:
             http://wiki.apache.org/solr/LocalParams
        -->
+        <str name="qf">
+          id
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
+          active_fedora_model_ssi
+          title_tsim
+          author_tsim
+          subject_tsim
+          all_text_timv
+        </str>
+        <str name="pf">
+          all_text_timv^10
+        </str>
 
-       <str name="qf">
-         title_unstem_search^100000
-         subtitle_unstem_search^50000
-         title_t^25000
-         subtitle_t^10000
-         title_addl_unstem_search^5000
-         title_addl_t^2500
-         title_added_entry_unstem_search^1500
-         title_added_entry_t^1250
-         subject_topic_unstem_search^1000
-         subject_unstem_search^750
-         subject_topic_facet^625
-         subject_t^500
-         author_unstem_search^250
-         author_addl_unstem_search^250
-         author_t^100
-         author_addl_t^50
-         subject_addl_unstem_search^250
-         subject_addl_t^50
-         title_series_unstem_search^25
-         title_series_t^10
-         isbn_t
-         text
-       </str>
-       <str name="pf">
-         title_unstem_search^1000000
-         subtitle_unstem_search^500000
-         title_t^250000
-         subtitle_t^100000
-         title_addl_unstem_search^50000
-         title_addl_t^25000
-         title_added_entry_unstem_search^15000
-         title_added_entry_t^12500
-         subject_topic_unstem_search^10000
-         subject_unstem_search^7500
-         subject_topic_facet^6250
-         subject_t^5000
-         author_unstem_search^2500
-         author_addl_unstem_search^2500
-         author_t^1000
-         author_addl_t^500
-         subject_addl_unstem_search^2500
-         subject_addl_t^500
-         title_series_unstem_search^250
-         title_series_t^100
-         text^10
-       </str>
        <str name="author_qf">
-         author_unstem_search^200
-         author_addl_unstem_search^50
-         author_t^20
-         author_addl_t
+          author_tsim
        </str>
        <str name="author_pf">
-         author_unstem_search^2000
-         author_addl_unstem_search^500
-         author_t^200
-         author_addl_t^10
        </str>
        <str name="title_qf">
-         title_unstem_search^50000
-         subtitle_unstem_search^25000
-         title_addl_unstem_search^10000
-         title_t^5000
-         subtitle_t^2500
-         title_addl_t^100
-         title_added_entry_unstem_search^50
-         title_added_entry_t^10
-         title_series_unstem_search^5
-         title_series_t
+          title_tsim
+          full_title_tsim
+          short_title_tsim
+          alternative_title_tsim
        </str>
        <str name="title_pf">
-         title_unstem_search^500000
-         subtitle_unstem_search^250000
-         title_addl_unstem_search^100000
-         title_t^50000
-         subtitle_t^25000
-         title_addl_t^1000
-         title_added_entry_unstem_search^500
-         title_added_entry_t^100
-         title_series_t^50
-         title_series_unstem_search^10
        </str>
        <str name="subject_qf">
-         subject_topic_unstem_search^200
-         subject_unstem_search^125
-         subject_topic_facet^100
-         subject_t^50
-         subject_addl_unstem_search^10
-         subject_addl_t
+          subject_tsim
        </str>
        <str name="subject_pf">
-         subject_topic_unstem_search^2000
-         subject_unstem_search^1250
-         subject_t^1000
-         subject_topic_facet^500
-         subject_addl_unstem_search^100
-         subject_addl_t^10
        </str>
-       
-       <int name="ps">3</int>
-       <float name="tie">0.01</float>
 
-       <!-- NOT using marc_display because it is large and will slow things down for search results -->
        <str name="fl">
-         id, 
-         score,
-         author_display,
-         author_vern_display, 
-         format, 
-         isbn_t, 
-         language_facet, 
-         lc_callnum_display,
-         material_type_display, 
-         published_display,
-         published_vern_display,
-         pub_date,
-         title_display,
-         title_vern_display,
-         subject_topic_facet,
-         subject_geo_facet,
-         subject_era_facet,
-         subtitle_display,
-         subtitle_vern_display,
-         url_fulltext_display,
-         url_suppl_display,
+         *,
+         score
        </str>
 
        <str name="facet">true</str>
        <str name="facet.mincount">1</str>
-       <str name="facet.field">format</str>
-       <str name="facet.field">lc_1letter_facet</str>
-       <str name="facet.field">lc_alpha_facet</str>
-       <str name="facet.field">lc_b4cutter_facet</str>
-       <str name="facet.field">language_facet</str>
-       <str name="facet.field">pub_date</str>
-       <str name="facet.field">subject_era_facet</str>
-       <str name="facet.field">subject_geo_facet</str>
-       <str name="facet.field">subject_topic_facet</str>
-       
+       <str name="facet.limit">10</str>
+       <str name="facet.field">active_fedora_model_ssi</str>
+       <str name="facet.field">subject_ssim</str>
+       <str name="facet.field">language_ssim</str>
+
        <str name="spellcheck">true</str>
        <str name="spellcheck.dictionary">default</str>
        <str name="spellcheck.onlyMorePopular">true</str>
@@ -232,91 +96,46 @@
        <str name="spellcheck.count">5</str>
 
      </lst>
-    <!-- In addition to defaults, "appends" params can be specified
-         to identify values which should be appended to the list of
-         multi-val params from the query (or the existing "defaults").
-      -->
-    <!-- In this example, the param "fq=instock:true" would be appended to
-         any query time fq params the user may specify, as a mechanism for
-         partitioning the index, independent of any user selected filtering
-         that may also be desired (perhaps as a result of faceted searching).
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "appends" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="appends">
-         <str name="fq">inStock:true</str>
-       </lst>
-      -->
-    <!-- "invariants" are a way of letting the Solr maintainer lock down
-         the options available to Solr clients.  Any params values
-         specified here are used regardless of what values may be specified
-         in either the query, the "defaults", or the "appends" params.
-
-         In this example, the facet.field and facet.query params would
-         be fixed, limiting the facets clients can use.  Faceting is
-         not turned on by default - but if the client does specify
-         facet=true in the request, these are the only facets they
-         will be able to see counts for; regardless of what other
-         facet.field or facet.query params they may specify.
-
-         NOTE: there is *absolutely* nothing a client can do to prevent these
-         "invariants" values from being used, so don't use this mechanism
-         unless you are sure you always want it.
-      -->
-    <!--
-       <lst name="invariants">
-         <str name="facet.field">cat</str>
-         <str name="facet.field">manu_exact</str>
-         <str name="facet.query">price:[* TO 500]</str>
-         <str name="facet.query">price:[500 TO *]</str>
-       </lst>
-      -->
-    <!-- If the default list of SearchComponents is not desired, that
-         list can either be overridden completely, or components can be
-         prepended or appended to the default list.  (see below)
-      -->
-    <!--
-       <arr name="components">
-         <str>nameOfCustomComponent1</str>
-         <str>nameOfCustomComponent2</str>
-       </arr>
-      -->
     <arr name="last-components">
       <str>spellcheck</str>
     </arr>
-      
   </requestHandler>
 
-  <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
-  <requestHandler name="document" class="solr.SearchHandler" >
+  <requestHandler name="permissions" class="solr.SearchHandler" >
     <lst name="defaults">
+      <str name="facet">off</str>
       <str name="echoParams">all</str>
-      <str name="fl">*</str>
       <str name="rows">1</str>
-      <str name="q">{!term f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
+      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
+      <str name="fl">
+        id,
+        access_ssim,
+        discover_access_group_ssim,discover_access_person_ssim,
+        read_access_group_ssim,read_access_person_ssim,
+        edit_access_group_ssim,edit_access_person_ssim,
+        depositor_ti,
+        embargo_release_date_dtsi
+        inheritable_access_ssim,
+        inheritable_discover_access_group_ssim,inheritable_discover_access_person_ssim,
+        inheritable_read_access_group_ssim,inheritable_read_access_person_ssim,
+        inheritable_edit_access_group_ssim,inheritable_edit_access_person_ssim,
+        inheritable_embargo_release_date_dtsi
+      </str>
     </lst>
   </requestHandler>
 
-<!-- Spell Check
+  <requestHandler name="standard" class="solr.SearchHandler">
+     <lst name="defaults">
+       <str name="echoParams">explicit</str>
+       <str name="defType">lucene</str>
+     </lst>
+  </requestHandler>
 
-        The spell check component can return a list of alternative spelling
-        suggestions.  
 
-        http://wiki.apache.org/solr/SpellCheckComponent
-     -->
   <searchComponent name="spellcheck" class="solr.SpellCheckComponent">
-
     <str name="queryAnalyzerFieldType">textSpell</str>
-
-    <!-- Multiple "Spell Checkers" can be declared and used by this
-         component
-      -->
-
-    <!-- a spellchecker built from a field of the main index, and
-         written to disk
+    <!-- Multiple "Spell Checkers" can be declared and used by this component
+      (e.g. for title_spell field)
       -->
     <lst name="spellchecker">
       <str name="name">default</str>
@@ -345,45 +164,6 @@
       <str name="accuracy">0.7</str>
       <str name="buildOnOptimize">true</str>
     </lst>
-
-    <!-- a spellchecker that uses a different distance measure -->
-    <!--
-       <lst name="spellchecker">
-         <str name="name">jarowinkler</str>
-         <str name="field">spell</str>
-         <str name="distanceMeasure">
-           org.apache.lucene.search.spell.JaroWinklerDistance
-         </str>
-         <str name="spellcheckIndexDir">spellcheckerJaro</str>
-       </lst>
-     -->
-
-    <!-- a spellchecker that use an alternate comparator 
-
-         comparatorClass be one of:
-          1. score (default)
-          2. freq (Frequency first, then score)
-          3. A fully qualified class name
-      -->
-    <!--
-       <lst name="spellchecker">
-         <str name="name">freq</str>
-         <str name="field">lowerfilt</str>
-         <str name="spellcheckIndexDir">spellcheckerFreq</str>
-         <str name="comparatorClass">freq</str>
-         <str name="buildOnCommit">true</str>
-      -->
-
-    <!-- A spellchecker that reads the list of words from a file -->
-    <!--
-       <lst name="spellchecker">
-         <str name="classname">solr.FileBasedSpellChecker</str>
-         <str name="name">file</str>
-         <str name="sourceLocation">spellings.txt</str>
-         <str name="characterEncoding">UTF-8</str>
-         <str name="spellcheckIndexDir">spellcheckerFile</str>
-       </lst>
-      -->
   </searchComponent>
 
   <searchComponent name="suggest" class="solr.SuggestComponent">
@@ -407,5 +187,11 @@
     </arr>
   </requestHandler>
 
-</config>
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" />
+
+  <requestDispatcher handleSelect="true" >
+    <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
+  </requestDispatcher>
 
+  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
+</config>

data/spec/features/blacklight_advanced_search_form_spec.rb

@@ -1,8 +1,4 @@
 describe "Blacklight Advanced Search Form" do
-  before(:all) do
-    AdvancedController.copy_blacklight_config_from(CatalogController)
-  end
-
   describe "advanced search form" do
     before do
       visit '/advanced?hypothetical_existing_param=true&q=ignore+this+existing+query'
@@ -17,33 +13,33 @@ describe "Blacklight Advanced Search Form" do
       it "should give the user a choice between and/or queries" do
         expect(page).to have_selector('#op')
         within('#op') do
-          expect(page).to have_selector('option[value="AND"]')
-          expect(page).to have_selector('option[value="OR"]')
+          expect(page).to have_selector('option[value="must"]')
+          expect(page).to have_selector('option[value="should"]')
         end
       end
 
       it "should list the configured search fields" do
-        expect(page).to have_selector '.advanced-search-field #title'
-        expect(page).to have_selector '.advanced-search-field #author'
+        expect(page).to have_field 'Title'
+        expect(page).to have_field 'Author'
       end
 
       it "should not list the search fields listed as not to be included in adv search" do
-        expect(page).not_to have_selector '.advanced_search_field #dummy_field'
+        expect(page).not_to have_field 'Dummy field'
       end
     end
 
     describe "facet column" do
       it "should list facets" do
-        expect(page).to have_selector('.blacklight-language_facet')
+        expect(page).to have_selector('.blacklight-language_ssim')
 
-        within('.blacklight-language_facet') do
-          expect(page).to have_content "Language Facet"
+        within('.blacklight-language_ssim') do
+          expect(page).to have_content "Language Ssim"
         end
       end
     end
 
     it "scope searches to fields" do
-      fill_in "title", :with => "Medicine"
+      fill_in "Title", :with => "Medicine"
       click_on "advanced-search-submit"
       expect(page).to have_content "Remove constraint Title: Medicine"
       expect(page).to have_content "2007020969"
@@ -52,21 +48,20 @@ describe "Blacklight Advanced Search Form" do
 
   it "should show the search fields" do
     visit '/advanced'
-    expect(page).to have_selector('input#title')
+    expect(page).to have_field 'Title'
   end
 
   describe "prepopulated advanced search form" do
     before do
-      visit '/advanced?all_fields=&author=&commit=Search&op=AND&search_field=advanced&title=cheese'
+      visit '/advanced?clause[0][field]=title&clause[0][query]=cheese'
     end
 
     it "should not create hidden inputs for search fields" do
-      expect(page).not_to have_selector('.advanced input[type="hidden"][name="title"]', visible: false)
-      expect(page).to have_selector('.advanced input[type="text"][name="title"]')
+      expect(page).to have_field 'Title', with: 'cheese'
     end
 
     it "should not have multiple parameters for a search field" do
-      fill_in "title", :with => "bread"
+      fill_in "Title", :with => "bread"
       click_on "advanced-search-submit"
       expect(page.current_url).to match(/bread/)
       expect(page.current_url).not_to match(/cheese/)

data/spec/lib/advanced_search_builder_spec.rb

@@ -10,17 +10,19 @@ describe BlacklightAdvancedSearch::AdvancedSearchBuilder do
       end
     end
 
-    let(:obj) do
-      class BACTestClass
-        cattr_accessor :blacklight_config, :blacklight_params
-        include Blacklight::SearchHelper
+    let(:context) { CatalogController.new }
+
+    before { allow(context).to receive(:blacklight_config).and_return(blacklight_config) }
+
+    let(:search_builder_class) do
+      Class.new(Blacklight::SearchBuilder) do
         include BlacklightAdvancedSearch::AdvancedSearchBuilder
-        def initialize(blacklight_config, blacklight_params)
-          self.blacklight_config = blacklight_config
-          self.blacklight_params = blacklight_params
-        end
       end
-      BACTestClass.new blacklight_config, params
+    end
+    let(:search_builder) { search_builder_class.new(context) }
+
+    let(:obj) do
+      search_builder.with(params)
     end
 
     let(:params) { {} }

data/spec/spec_helper.rb

@@ -9,19 +9,51 @@ require 'rspec/rails'
 require 'capybara/rails'
 
 RSpec.configure do |config|
-  # Maintain this rspec2 behavior even in rspec3, until we
-  # adjust our stuff. Deprecation warning was:
-  # --------------------------------------------------------------------------------
-  # rspec-rails 3 will no longer automatically infer an example group's spec type
-  # from the file location. You can explicitly opt-in to this feature using this
-  # snippet:
-
-  # RSpec.configure do |config|
-  #   config.infer_spec_type_from_file_location!
-  # end
-
-  # If you wish to manually label spec types via metadata you can safely ignore
-  # this warning and continue upgrading to RSpec 3 without addressing it.
-  # --------------------------------------------------------------------------------
   config.infer_spec_type_from_file_location!
+  config.filter_rails_from_backtrace!
+
+  config.use_transactional_fixtures = true
+
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.default_formatter = 'doc' if config.files_to_run.one?
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+
+  # This allows you to limit a spec run to individual examples or groups
+  # you care about by tagging them with `:focus` metadata. When nothing
+  # is tagged with `:focus`, all examples get run. RSpec also provides
+  # aliases for `it`, `describe`, and `context` that include `:focus`
+  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
+  config.filter_run_when_matching :focus
+
+  config.example_status_persistence_file_path = 'spec/examples.txt'
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  # config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

data/spec/test_app_templates/app/controllers/catalog_controller.rb

@@ -1,12 +1,10 @@
 class CatalogController < ApplicationController
   include Blacklight::Catalog
-  include BlacklightAdvancedSearch::Controller
 
   configure_blacklight do |config|
     # default advanced config values
     config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
-    # config.advanced_search[:qt] ||= 'advanced'
-    config.advanced_search[:url_key] ||= 'advanced'
+    config.advanced_search[:enabled] = true
     config.advanced_search[:query_parser] ||= 'dismax'
     config.advanced_search[:form_solr_parameters] ||= {}
 
@@ -15,19 +13,19 @@ class CatalogController < ApplicationController
       :rows => 10
     }
 
-    config.add_facet_field 'language_facet'
+    config.add_facet_field 'language_ssim'
 
     config.add_search_field('title') do |field|
-      field.solr_local_parameters = { :qf => "title_t", :pf => "title_t" }
+      field.solr_local_parameters = { :qf => "title_tsim", :pf => "title_tsim" }
     end
 
     config.add_search_field('author') do |field|
-      field.solr_local_parameters = { :qf => "author_t", :pf => "author_t" }
+      field.solr_local_parameters = { :qf => "author_tsim", :pf => "author_tsim" }
     end
 
     config.add_search_field('dummy_field') do |field|
       field.include_in_advanced_search = false
-      field.solr_local_parameters = { :qf => "author_t", :pf => "author_t" }
+      field.solr_local_parameters = { :qf => "author_tsim", :pf => "author_tsim" }
     end
   end
 end