blacklight_advanced_search 5.2.1 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb68c4b7b6f6fbe62c4f6080aeba080f1f28af23
-  data.tar.gz: dcc1f42eec4a0f45f64de6a5323dd620de0e0f8a
+  metadata.gz: 172b0f2d44251a5f580647cb4a13e9668ee5a45f
+  data.tar.gz: a03b5a8d9f1b4af69501a2982a63d5ccce7bdb43
 SHA512:
-  metadata.gz: 71a9e1063c93f5daab27648cc616d892642d1560db2158f1f1a2585542db96adf7602159c81c7658c8f258d35fc3748564c741484941713f32841a02cdd23784
-  data.tar.gz: 63a3c3aeba623484f6935a9c4faac5b99f104f5177633ad071f3e5cf508b1a8a8d6c9be6a31e8573040fc8fca0a201fe1b6ced03816d61f021112525833885d5
+  metadata.gz: b662d7d13d678ce82adbbdea4e0dc141a536b1f210f46895c846f7e7cbed338a55e88eb4762bf81d08b18ab019ab4aa2bc283d5a38744cbe197ed4daa8e70e6b
+  data.tar.gz: f5b1d3ec51e22e2754bbc80be9447141a1e24bfbdf8a31c88783d78b42dc759ec8626e89b26de5c1238fa738b92742092c9b38f3c758f5554cbf8c4bf8efe052

data/VERSION

@@ -1 +1 @@
-5.2.1
+5.3.0

data/lib/blacklight_advanced_search/advanced_search_builder.rb

@@ -35,7 +35,7 @@ module BlacklightAdvancedSearch
 
     # Different versions of Parslet raise different exception classes,
     # need to figure out which one exists to rescue
-    @@parslet_failed_exceptions = if defined? Parslet::UnconsumedInput
+    PARSLET_FAILED_EXCEPTIONS = if defined? Parslet::UnconsumedInput
       [Parslet::UnconsumedInput]
     else
       [Parslet::ParseFailed]
@@ -50,30 +50,31 @@ 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 scope.params[:q].blank?
-        field_def = search_field_def_for_key( scope.params[:search_field]) ||
-          default_search_field
-          
-                
-        # If the individual field has advanced_parse_q suppressed, punt
-        return if field_def[:advanced_parse] == false  
-          
-        solr_direct_params = field_def[:solr_parameters] || {}
-        solr_local_params = field_def[:solr_local_parameters] || {}
-        
-        # 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(scope.params[:q], blacklight_config.advanced_search[:query_parser]).to_single_query_params( solr_local_params )
+      blacklight_params = scope.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
+      return if blacklight_params[:q].blank? || !blacklight_params[:q].respond_to?(:to_str)
+
+      field_def = search_field_def_for_key(blacklight_params[:search_field]) ||
+        default_search_field
+
+      # If the individual field has advanced_parse_q suppressed, punt
+      return if field_def[:advanced_parse] == false
+
+      solr_direct_params = field_def[:solr_parameters] || {}
+      solr_local_params = field_def[:solr_local_parameters] || {}
+
+      # 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/lib/blacklight_advanced_search/parse_basic_q.rb

@@ -23,7 +23,7 @@ module BlacklightAdvancedSearch::ParseBasicQ
 
   # Different versions of Parslet raise different exception classes,
   # need to figure out which one exists to rescue
-  @@parslet_failed_exceptions = if defined? Parslet::UnconsumedInput
+  PARSLET_FAILED_EXCEPTIONS = if defined? Parslet::UnconsumedInput
     [Parslet::UnconsumedInput]
   else
     [Parslet::ParseFailed]
@@ -60,7 +60,7 @@ module BlacklightAdvancedSearch::ParseBasicQ
 
         BlacklightAdvancedSearch.deep_merge!(solr_parameters, solr_direct_params)
         BlacklightAdvancedSearch.deep_merge!(solr_parameters, adv_search_params)        
-      rescue *@@parslet_failed_exceptions => e
+      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. 

data/spec/lib/advanced_search_builder_spec.rb

@@ -49,6 +49,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) { double("params", 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) { double("params", 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: 5.2.1
+  version: 5.3.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-05 00:00:00.000000000 Z
+date: 2017-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Blacklight Advanced Search plugin