blacklight_advanced_search 6.2.0 → 6.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94e150438b2ed6a6fabd89cfbd050babfbcd96e
-  data.tar.gz: ad24822b9631e506de17d7a11db709dba64a68e7
+  metadata.gz: 050411c1a81b12203d148e6573bdcf65a1e24f6d
+  data.tar.gz: 23537090bf069c31ed54b42f07bcc60fd18fdf86
 SHA512:
-  metadata.gz: 72a0b4d1718c5f03c69df999c11bc2465d787c0198932e7f964c06bb20097c9db6950107ea9c14eb65f6c4a77bbe0ba3a4c06f29cafa2680c24eb65761650a29
-  data.tar.gz: 3961675ce8655a762252fce99bede4bfd758c52e2a96ff33c69263ce722bbf27143599fc8bc3a27052c0b6393daacc379fce12712310afc97317bdf235e4ae2c
+  metadata.gz: 96ccfb9dfb3c8a8b14bb973ff9adaff70ce15e722b706b0b428396e3c2b5e08263bc2f5b0bdf14b80a6a64c5eb01ce311dce4585032a7f279b18dfe172bdc6f2
+  data.tar.gz: 25f215056e4225475c068732e8facd4c09c60e71d3a2a4bd90ce44a5f4de916608d0d775435fa8fd452edb6b94abeee69b70c861e0fd727d7c428d1260133aca

data/VERSION

@@ -1 +1 @@
-6.2.0
+6.2.1

data/lib/blacklight_advanced_search/advanced_search_builder.rb

@@ -48,29 +48,29 @@ module BlacklightAdvancedSearch
     # parse and send it straight to solr same as if advanced_parse_q
     # were not being used.
     def add_advanced_parse_q_to_solr(solr_parameters)
-      unless blacklight_params[:q].blank?
-        field_def = search_field_def_for_key(blacklight_params[:search_field]) ||
-          default_search_field
+      return if blacklight_params[:q].blank? || !blacklight_params[:q].respond_to?(:to_str)
 
-        # If the individual field has advanced_parse_q suppressed, punt
-        return if field_def[:advanced_parse] == false
+      field_def = search_field_def_for_key(blacklight_params[:search_field]) ||
+        default_search_field
 
-        solr_direct_params = field_def[:solr_parameters] || {}
-        solr_local_params = field_def[:solr_local_parameters] || {}
+      # If the individual field has advanced_parse_q suppressed, punt
+      return if field_def[:advanced_parse] == false
 
-        # See if we can parse it, if we can't, we're going to give up
-        # and just allow basic search, perhaps with a warning.
-        begin
-          adv_search_params = ParsingNesting::Tree.parse(blacklight_params[:q], blacklight_config.advanced_search[:query_parser]).to_single_query_params(solr_local_params)
+      solr_direct_params = field_def[:solr_parameters] || {}
+      solr_local_params = field_def[:solr_local_parameters] || {}
 
-          BlacklightAdvancedSearch.deep_merge!(solr_parameters, solr_direct_params)
-          BlacklightAdvancedSearch.deep_merge!(solr_parameters, adv_search_params)
-        rescue PARSLET_FAILED_EXCEPTIONS => e
-          # do nothing, don't merge our input in, keep basic search
-          # optional TODO, display error message in flash here, but hard to
-          # display a good one.
-          return
-        end
+      # See if we can parse it, if we can't, we're going to give up
+      # and just allow basic search, perhaps with a warning.
+      begin
+        adv_search_params = ParsingNesting::Tree.parse(blacklight_params[:q], blacklight_config.advanced_search[:query_parser]).to_single_query_params(solr_local_params)
+
+        BlacklightAdvancedSearch.deep_merge!(solr_parameters, solr_direct_params)
+        BlacklightAdvancedSearch.deep_merge!(solr_parameters, adv_search_params)
+      rescue *PARSLET_FAILED_EXCEPTIONS => e
+        # do nothing, don't merge our input in, keep basic search
+        # optional TODO, display error message in flash here, but hard to
+        # display a good one.
+        return
       end
     end
 

data/spec/lib/advanced_search_builder_spec.rb

@@ -44,6 +44,23 @@ describe BlacklightAdvancedSearch::AdvancedSearchBuilder do
           obj.add_advanced_parse_q_to_solr(solr_params)
           expect(solr_params[:q]).to eq(unparseable_q)
         end
+
+        describe 'when parslet fails' do
+          let(:failing_q) { ")(" }
+          let(:params) { { :q => failing_q } }
+          it 'does not return the query that could not be parsed' do
+            obj.add_advanced_parse_q_to_solr(solr_params)
+            expect(solr_params[:q]).to be_nil
+          end
+        end
+
+        describe 'when `q` is a hash' do
+          let(:params) { { q: { id: ['a'] } } }
+          it 'does not return the query that could not be parsed' do
+            obj.add_advanced_parse_q_to_solr(solr_params)
+            expect(solr_params[:q]).to be_nil
+          end
+        end
       end
 
       context "when advanced_parse is false" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.5.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Blacklight Advanced Search plugin