blacklight 6.11.2 → 6.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 445c850f8ead2b777654edd2de72f938cc4428d0
-  data.tar.gz: 5f0eb1aff8ceeabe37f47b4bda0118834ab45819
+  metadata.gz: 02341df004a989772bead1f95c9d0cb9bbe2efb4
+  data.tar.gz: bfa578b3cbd743828afdbc9e261f0aaff917373e
 SHA512:
-  metadata.gz: 0704b69f8407a748857c5becb09e53eda41cdd76fbfeea523b7e37b534841142dc8393fbc88ab0257710743cebf8ba45aafe23fe20c41d7ea3281dde3f26083b
-  data.tar.gz: c5c17214fda7c4743bad2eca926b1a84d4aab9fc1d79c8e1c9dfe99d9b7e908b3d43104e4ebf417c6c8bac4d634f5dcc753d68156ec7b0442f10e232f90e2700
+  metadata.gz: 33942d3280a5ce4ab36703a0d81975ecc8e93a92ec44b3c824166ae0a738522bdd7a17f54fd77371449a3c386b4793d0e5dcfbdbd0542d0d25a283e9fe0a72b1
+  data.tar.gz: 24b2a2e23c5ec9e38c710ad3764a2e47a3a9ededd1d327842a47c0d1eb52777c92576e39b16d634ca08f74c471d01427460cb532784c92fc576d45f1f03614a5

data/.rubocop_todo.yml

@@ -92,6 +92,7 @@ Metrics/ClassLength:
   Exclude:
     - 'lib/blacklight/configuration.rb'
     - 'lib/blacklight/search_builder.rb'
+    - 'lib/blacklight/search_state.rb'
 
 # Offense count: 20
 Metrics/CyclomaticComplexity:

data/VERSION

@@ -1 +1 @@
-6.11.2
+6.12.0

data/app/assets/javascripts/blacklight/ajax_modal.js

@@ -126,7 +126,7 @@ Blacklight.ajaxModal.receiveAjax = function (contents) {
     $(Blacklight.ajaxModal.modalSelector).find('.modal-content').html(contents);
 
     // send custom event with the modal dialog div as the target
-    var e    = $.Event('loaded.blacklight.blacklight-modal')
+    var e    = $.Event('loaded.blacklight.ajax-modal');
     $(Blacklight.ajaxModal.modalSelector).trigger(e);
     // if they did preventDefault, don't show the dialog
     if (e.isDefaultPrevented()) return;

data/app/controllers/concerns/blacklight/default_component_configuration.rb

@@ -56,13 +56,17 @@ module Blacklight
             flash[:success] ||= I18n.t("blacklight.#{name}.success", default: nil)
 
             respond_to do |format|
-              format.html { redirect_to action_success_redirect_path }
-              format.js { render "#{name}_success" }
+              format.html do
+                return render "#{name}_success", layout: false if request.xhr?
+                redirect_to action_success_redirect_path
+              end
             end
           else
             respond_to do |format|
-              format.html
-              format.js { render :layout => false }
+              format.html do
+                return render layout: false if request.xhr?
+                # Otherwise draw the full page
+              end
             end
           end
         end

data/lib/blacklight/search_state.rb

@@ -114,7 +114,15 @@ module Blacklight
       # from the session will get remove in the show view...
       p[:f] = (p[:f] || {}).dup
       p[:f][url_field] = (p[:f][url_field] || []).dup
-      p[:f][url_field] = p[:f][url_field] - [value]
+
+      collection = p[:f][url_field]
+      # collection should be an array, because we link to ?f[key][]=value,
+      # however, Facebook (and maybe some other PHP tools) tranform that parameters
+      # into ?f[key][0]=value, which Rails interprets as a Hash.
+      if collection.is_a? Hash
+        collection = collection.values
+      end
+      p[:f][url_field] = collection - [value]
       p[:f].delete(url_field) if p[:f][url_field].empty?
       p.delete(:f) if p[:f].empty?
       p

data/solr/conf/schema.xml

@@ -16,10 +16,10 @@
  limitations under the License.
 -->
 
-<!--  
+<!--
  This is the Solr schema file. This file should be named "schema.xml" and
  should be in the conf directory under the solr home
- (i.e. ./solr/conf/schema.xml by default) 
+ (i.e. ./solr/conf/schema.xml by default)
  or located where the classloader for the Solr webapp can find it.
 
  This example schema is the recommended starting point for users.
@@ -51,7 +51,7 @@
        version="1.4" is Solr's version number for the schema syntax and semantics.  It should
        not normally be changed by applications.
        1.0: multiValued attribute did not exist, all fields are multiValued by nature
-       1.1: multiValued attribute introduced, false by default 
+       1.1: multiValued attribute introduced, false by default
        1.2: omitTermFreqAndPositions attribute introduced, true by default except for text fields.
        1.3: removed optional field compress feature
        1.4: default auto-phrase (QueryParser feature) to off
@@ -88,7 +88,7 @@
        - If sortMissingLast="false" and sortMissingFirst="false" (the default),
          then default lucene sorting will be used which places docs without the
          field first in an ascending sort and last in a descending sort.
-    -->    
+    -->
 
     <!--
       Default numeric field types. For faster range queries, consider the tint/tfloat/tlong/tdouble types.
@@ -115,7 +115,7 @@
 
     <!-- The format for this date field is of the form 1995-12-31T23:59:59Z, and
          is a more restricted form of the canonical representation of dateTime
-         http://www.w3.org/TR/xmlschema-2/#dateTime    
+         http://www.w3.org/TR/xmlschema-2/#dateTime
          The trailing "Z" designates UTC time and is mandatory.
          Optional fractional seconds are allowed: 1995-12-31T23:59:59.999Z
          All other components are mandatory.
@@ -130,7 +130,7 @@
                NOW/DAY+6MONTHS+3DAYS
                   ... 6 months and 3 days in the future from the start of
                       the current day
-                      
+
          Consult the DateField javadocs for more information.
 
          Note: For faster range queries, consider the tdate type
@@ -142,11 +142,11 @@
 
     <!-- The "RandomSortField" is not used to store or search any
          data.  You can declare fields of this type it in your schema
-         to generate pseudo-random orderings of your docs for sorting 
-         purposes.  The ordering is generated based on the field name 
+         to generate pseudo-random orderings of your docs for sorting
+         purposes.  The ordering is generated based on the field name
          and the version of the index, As long as the index version
          remains unchanged, and the same field name is reused,
-         the ordering of the docs will be consistent.  
+         the ordering of the docs will be consistent.
          If you want different psuedo-random orderings of documents,
          for the same version of the index, use a dynamicField and
          change the name
@@ -351,13 +351,13 @@
         <filter class="solr.TrimFilterFactory" />
         <!-- The PatternReplaceFilter gives you the flexibility to use
              Java Regular expression to replace any sequence of characters
-             matching a pattern with an arbitrary replacement string, 
+             matching a pattern with an arbitrary replacement string,
              which may include back references to portions of the original
              string matched by the pattern.
-             
+
              See the Java Regular Expression documentation for more
              information on pattern and replacement string syntax.
-             
+
              http://java.sun.com/j2se/1.5.0/docs/api/java/util/regex/package-summary.html
           -->
         <filter class="solr.PatternReplaceFilterFactory"
@@ -365,7 +365,7 @@
         />
       </analyzer>
     </fieldType>
-    
+
     <fieldtype name="phonetic" stored="false" indexed="true" class="solr.TextField" >
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
@@ -379,7 +379,7 @@
         <!--
         The DelimitedPayloadTokenFilter can put payloads on tokens... for example,
         a token of "foo|1.4"  would be indexed as "foo" with a payload of 1.4f
-        Attributes of the DelimitedPayloadTokenFilterFactory : 
+        Attributes of the DelimitedPayloadTokenFilterFactory :
          "delimiter" - a one character delimiter. Default is | (pipe)
 	 "encoder" - how to encode the following value into a playload
 	    float -> org.apache.lucene.analysis.payloads.FloatEncoder,
@@ -406,12 +406,12 @@
     </fieldType>
 
     <!-- since fields of this type are by default not stored or indexed,
-         any data added to them will be ignored outright.  --> 
+         any data added to them will be ignored outright.  -->
     <fieldtype name="ignored" stored="false" indexed="false" multiValued="true" class="solr.StrField" />
 
     <!-- This point type indexes the coordinates as separate fields (subFields)
       If subFieldType is defined, it references a type, and a dynamic field
-      definition is created matching *___<typename>.  Alternately, if 
+      definition is created matching *___<typename>.  Alternately, if
       subFieldSuffix is defined, that is used to create the subFields.
       Example: if subFieldType="double", then the coordinates would be
         indexed in fields myloc_0___double,myloc_1___double.
@@ -436,7 +436,7 @@
  <fields>
    <!-- Valid attributes for fields:
      name: mandatory - the name for the field
-     type: mandatory - the name of a previously defined type from the 
+     type: mandatory - the name of a previously defined type from the
        <types> section
      indexed: true if this field should be indexed (searchable or sortable)
      stored: true if this field should be retrievable
@@ -449,9 +449,9 @@
        given field.
        When using MoreLikeThis, fields used for similarity should be
        stored for best performance.
-     termPositions: Store position information with the term vector.  
+     termPositions: Store position information with the term vector.
        This will increase storage costs.
-     termOffsets: Store offset information with the term vector. This 
+     termOffsets: Store offset information with the term vector. This
        will increase storage costs.
      default: a value that should be used if no value is specified
        when adding a document.
@@ -463,7 +463,7 @@
    <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="false" multiValued="true"/>
-   
+
    <!-- these display fields are NOT multi-valued -->
    <field name="marc_display" type="string" indexed="false" stored="true" multiValued="false"/>
    <field name="title_display" type="string" indexed="false" stored="true" multiValued="false"/>
@@ -472,7 +472,7 @@
    <field name="subtitle_vern_display" type="string" indexed="false" stored="true" multiValued="false"/>
    <field name="author_display" type="string" indexed="false" stored="true" multiValued="false"/>
    <field name="author_vern_display" type="string" indexed="false" stored="true" multiValued="false"/>
-   
+
    <!-- these fields are also used for display, so they must be stored -->
    <field name="isbn_t" type="text" indexed="true" stored="true" multiValued="true"/>
    <field name="language_facet" type="string" indexed="true" stored="true" multiValued="true" />
@@ -484,11 +484,11 @@
    <!-- pub_date sort uses new trie-based int fields, which are recommended for any int and are displayable, sortable, and range-quer
    we use 'tint' for faster range-queries. -->
    <field name="pub_date_sort" type="tint" indexed="true" stored="true" multiValued="false"/>
-     
+
    <!-- format is used for facet, display, and choosing which partial to use for the show view, so it must be stored and indexed -->
    <field name="format" type="string" 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.
@@ -531,30 +531,24 @@
    <dynamicField name="*spell" type="textSpell" indexed="true" stored="false" multiValued="true" />
    <dynamicField name="*suggest" type="textSuggest" indexed="true" stored="false" multiValued="true" />
 
-   <!-- uncomment the following to ignore any fields that don't already match an existing 
-        field name or dynamic field, rather than reporting them as an error. 
-        alternately, change the type="ignored" to some other type e.g. "text" if you want 
-        unknown fields indexed and/or stored by default --> 
+   <!-- uncomment the following to ignore any fields that don't already match an existing
+        field name or dynamic field, rather than reporting them as an error.
+        alternately, change the type="ignored" to some other type e.g. "text" if you want
+        unknown fields indexed and/or stored by default -->
    <!--dynamicField name="*" type="ignored" multiValued="true" /-->
-   
+
  </fields>
 
- <!-- Field to use to determine and enforce document uniqueness. 
+ <!-- Field to use to determine and enforce document uniqueness.
       Unless this field is marked with required="false", it will be a required field
    -->
  <uniqueKey>id</uniqueKey>
 
- <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>text</defaultSearchField>
-
- <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="OR"/>
-
   <!-- copyField commands copy one field to another at the time a document
         is added to the index.  It's used either to index the same field differently,
         or to add multiple fields to the same field for easier/faster searching.  -->
    <!-- Copy Fields -->
-        
+
    <!-- unstemmed fields -->
    <copyField source="title_t" dest="title_unstem_search"/>
    <copyField source="subtitle_t" dest="subtitle_unstem_search"/>
@@ -566,11 +560,11 @@
    <copyField source="subject_t" dest="subject_unstem_search"/>
    <copyField source="subject_addl_t" dest="subject_addl_unstem_search"/>
    <copyField source="subject_topic_facet" dest="subject_topic_unstem_search"/>
-   
+
    <!-- sort fields -->
    <copyField source="pub_date" dest="pub_date_sort"/>
-   
-        
+
+
    <!-- spellcheck fields -->
    <!-- default spell check;  should match fields for default request handler -->
    <!-- it won't work with a copy of a copy field -->
@@ -588,8 +582,8 @@
    <!-- subject spell check; should match fields for subject request handler -->
    <copyField source="subject_topic_facet" dest="subject_spell"/>
    <copyField source="subject_t" dest="subject_spell"/>
-   <copyField source="subject_addl_t" dest="subject_spell"/>  
-   
+   <copyField source="subject_addl_t" dest="subject_spell"/>
+
    <!-- OpenSearch query field should match request handler search fields -->
    <copyField source="title_t" dest="opensearch_display"/>
    <copyField source="subtitle_t" dest="opensearch_display"/>
@@ -600,22 +594,22 @@
    <copyField source="author_addl_t" dest="opensearch_display"/>
    <copyField source="subject_topic_facet" dest="opensearch_display"/>
    <copyField source="subject_t" dest="opensearch_display"/>
-   <copyField source="subject_addl_t" dest="opensearch_display"/>  
+   <copyField source="subject_addl_t" dest="opensearch_display"/>
 
    <!-- for suggestions -->
    <copyField source="*_t" dest="suggest"/>
    <copyField source="*_facet" dest="suggest"/>
-   
-   <!-- Above, multiple source fields are copied to the [text] field. 
-	  Another way to map multiple source fields to the same 
-	  destination field is to use the dynamic field syntax. 
+
+   <!-- Above, multiple source fields are copied to the [text] field.
+	  Another way to map multiple source fields to the same
+	  destination field is to use the dynamic field syntax.
 	  copyField also supports a maxChars to copy setting.  -->
-	   
+
    <!-- <copyField source="*_t" dest="text" maxChars="3000"/> -->
 
    <!-- copy name to alphaNameSort, a field designed for sorting by name -->
    <!-- <copyField source="name" dest="alphaNameSort"/> -->
- 
+
 
  <!-- Similarity is the scoring routine for each document vs. a query.
       A custom similarity may be specified here, but the default is fine

data/spec/lib/blacklight/search_state_spec.rb

@@ -266,6 +266,17 @@ describe Blacklight::SearchState do
       end
     end
 
+    context "when the facet_params is a HWIA" do
+      let(:facet_values) { { '0' => 'some_value', '1' => 'another_value' }.with_indifferent_access }
+      let(:facet_params) { { 'some_field' => facet_values } }
+
+      it "removes the facet / value tuple from the query parameters" do
+        params = search_state.remove_facet_params('some_field', 'some_value')
+        expect(params[:f]['some_field']).not_to include 'some_value'
+        expect(params[:f]['some_field']).to include 'another_value'
+      end
+    end
+
     context "when the facet has configuration" do
       before do
         allow(search_state).to receive(:facet_configuration_for_field).with('some_field').and_return(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.11.2
+  version: 6.12.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -764,7 +764,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Blacklight provides a discovery interface for any Solr (http://lucene.apache.org/solr)