blacklight_advanced_search 5.1.4 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff76b283a42b92cb447e1a22d9c1db3e06f9663e
-  data.tar.gz: b53695523cade9db3640aa233ef422ea90c1428b
+  metadata.gz: 42196e18fa408ad581faf0d48166bf86578c40f6
+  data.tar.gz: 6137564dd1ffdbc2b29e9e553515b74834af7fff
 SHA512:
-  metadata.gz: 29dd20956b18315dac983e2757cec1f9571c53e91c9530fad07a66e40c02d3f02fdff9036124fb33c9995c38cef82f67ac1bb6dfcb55c82c3b36e87c98ce63db
-  data.tar.gz: 0114f011d414f3900857f052530880a41faa2e592a313a4ba430743a24cd922fcad9b9a84010e2ecb43fc2c9247d18fb881ad807bd06044de4ac9c779d601c0c
+  metadata.gz: 94fd18c2f7bf110903cd2f8a6c33de4e56b6422ab37337b9e0690046fc068a4073d2d27912719da12b296af7797cdfa339ac44b39ee580b3856f108dd5f8b0df
+  data.tar.gz: df99f7c358ab936301edb9fafc0d710164ff05b5f086f313dd8e4218fd53bdbf7df05a56dfc7df26cad36aad57f9ef6d3fd4e1f9ac15065c635d61441c4f0536

data/README.md

@@ -1,5 +1,7 @@
 This is an advanced search plugin for Blacklight ( http://www.projectblacklight.org ).  
 
+[![Gem Version](https://badge.fury.io/rb/blacklight_advanced_search.svg)](http://badge.fury.io/rb/blacklight_advanced_search)  [![Build Status](https://travis-ci.org/projectblacklight/blacklight_advanced_search.svg)](https://travis-ci.org/projectblacklight/blacklight_advanced_search)
+
 ## Blacklight version compatibility
 
 This is a plugin for [Blacklight](http://github.com/projectblacklight/blacklight)
@@ -32,12 +34,12 @@ Add to your application's Gemfile:
 
 then run 'bundle install'.  Then run:
 
-    rails generate blacklight_advanced_search:install
+    rails generate blacklight_advanced_search
 
 * The 'generate' command will install 'require' statements for the plugin's assets into your application's application.js/application.css asset pipeline files
 * And it can optionally install a localized search form with a link to advanced search. If you've already localized your search form you'll want to do this manually instead. 
 
-You may want to  `include BlacklightAdvancedSearch::ParseBasicQ` in your CatalogController to enable AND/OR/NOT parsing even in ordinary search, this is not on by default.  
+You may want turn to enable AND/OR/NOT parsing even in ordinary search, this is not on by default.  See "Expression parsing in ordinary search" below. 
 
 ## Accessing
  
@@ -64,7 +66,11 @@ If your application uses a single Solr qt request handler for all its search fie
 
 Turn this feature on by adding to your CatalogController definition:
 
-    include BlacklightAdvancedSearch::ParseBasicQ
+    self.search_params_logic << :add_advanced_parse_q_to_solr
+
+And/or, if you've switched over to configuration in SearchBuilder, then to your ./app/models/search_builder.rb:
+
+    self.default_processor_chain << :add_advanced_parse_q_to_solr
 
 This will intercept queries entered in ordinary Blacklight search interface, and parse them for AND/OR/NOT (and parens), producing appropriate Solr query. This allows single-field boolean expressions to be entered in ordinary search, providing a consistent experience with advanced search. 
 

data/Rakefile

@@ -26,7 +26,7 @@ end
   task :fixtures => ['engine_cart:generate'] do
     within_test_app do
       ENV['RAILS_ENV'] ||= 'test'
-      system "rake blacklight:solr:seed"
+      system "rake blacklight:index:seed"
       abort "Error running fixtures" unless $?.success?
     end
   end

data/VERSION

@@ -1 +1 @@
-5.1.4
+5.2.0

data/app/controllers/blacklight_advanced_search/advanced_controller.rb

@@ -1,8 +1,6 @@
 # Need to sub-class CatalogController so we get all other plugins behavior
 # for our own "inside a search context" lookup of facets. 
 class BlacklightAdvancedSearch::AdvancedController < CatalogController
-  include AdvancedHelper # so we get the #advanced_search_context method
-
 
   def index
     unless request.method==:post
@@ -12,48 +10,13 @@ class BlacklightAdvancedSearch::AdvancedController < CatalogController
 
   protected
   def get_advanced_search_facets
-    
-    search_context_params = {}
-    if (advanced_search_context.length > 0 )
-      # We have a search context, need to fetch facets from within
-      # that context -- but we dont' want to search within any
-      # existing :q or ADVANCED facets, so we remove those params.
-      adv_keys = blacklight_config.search_fields.keys.map {|k| k.to_sym}
-      trimmed_params = params.except *adv_keys
-      trimmed_params.delete(:f_inclusive) # adv facets
-      
-      search_context_params = solr_search_params(trimmed_params)
-
-      # Don't want to include the 'q' from basic search in our search
-      # context. Kind of hacky becuase solr_search_params insists on
-      # using controller.params, not letting us over-ride. 
-      search_context_params.delete(:q)
-      search_context_params.delete("q")
-      
-      # Also delete any facet-related params, or anything else
-      # we want to set ourselves
-      search_context_params.delete_if do |k, v|
-        k = k.to_s
-        (["facet.limit", "facet.sort", "f", "facets", "facet.fields", "per_page"].include?(k) ||                
-          k =~ /f\..+\.facet\.limit/ ||
-          k =~ /f\..+\.facet\.sort/
-        )        
-      end
+    # We want to find the facets available for the current search, but:
+    # * IGNORING current query (add in facets_for_advanced_search_form filter)
+    # * IGNORING current advanced search facets (remove add_advanced_search_to_solr filter)
+    response, _ = search_results(params, search_params_logic) do |search_builder|
+      search_builder.except(:add_advanced_search_to_solr).append(:facets_for_advanced_search_form)            
     end
 
-    input = HashWithIndifferentAccess.new
-    input.merge!( search_context_params )
-
-    input[:per_page] = 0 # force
-
-    # force if set
-    input[:qt] = blacklight_config.advanced_search[:qt] if blacklight_config.advanced_search[:qt] 
-    
-    input.merge!( blacklight_config.advanced_search[:form_solr_parameters] ) if blacklight_config.advanced_search[:form_solr_parameters]
-
-    # ensure empty query is all records, to fetch available facets on entire corpus
-    input[:q] ||= '{!lucene}*:*'
-    
-    repository.search(input)
+    return response
   end
 end

data/blacklight_advanced_search.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "blacklight", "~> 5.10"
+  s.add_dependency "blacklight", "~> 5.15"
   s.add_dependency "parslet"
 
   s.add_development_dependency "rails"

data/lib/blacklight_advanced_search/advanced_search_builder.rb

@@ -76,5 +76,25 @@ module BlacklightAdvancedSearch
         end
       end
     end
+
+    # A Solr param filter that is NOT included by default in the chain,
+    # but is appended by AdvancedController#index, to do a search
+    # for facets _ignoring_ the current query, we want the facets
+    # as if the current query weren't there. 
+    #
+    # Also adds any solr params set in blacklight_config.advanced_search[:form_solr_parameters]
+    def facets_for_advanced_search_form(solr_p)
+      # ensure empty query is all records, to fetch available facets on entire corpus
+      solr_p["q"]            = '{!lucene}*:*'
+
+      # We only care about facets, we don't need any rows. 
+      solr_p["rows"]         = "0"
+
+      # Anything set in config as a literal
+      if blacklight_config.advanced_search[:form_solr_parameters]
+        solr_p.merge!( blacklight_config.advanced_search[:form_solr_parameters] ) 
+      end
+
+    end
   end
-end
+end

data/lib/blacklight_advanced_search/render_constraints_override.rb

@@ -23,7 +23,7 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
         content << render_constraint_element(
           label, query,
           :remove =>
-            catalog_index_path(remove_advanced_keyword_query(field,my_params))
+            search_action_path(remove_advanced_keyword_query(field, my_params).except(:controller, :action))
         )
       end
       if (advanced_query.keyword_op == "OR" &&
@@ -48,7 +48,7 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
         label = facet_field_label(field)
         content << render_constraint_element(label,
           safe_join(value_list, " <strong class='text-muted constraint-connector'>OR</strong> ".html_safe),
-          :remove => catalog_index_path( remove_advanced_filter_group(field, my_params) )
+          :remove => search_action_path( remove_advanced_filter_group(field, my_params).except(:controller, :action) )
           )
       end
     end

data/lib/generators/blacklight_advanced_search/install_generator.rb

@@ -15,7 +15,7 @@ module BlacklightAdvancedSearch
         # Blacklight into local app as custom local override -- but add our link at the end too. 
         source_file = File.read(File.join(Blacklight.root, "app/views/catalog/_search_form.html.erb"))
 
-        new_file_contents = source_file + "\n\n<%= link_to 'More options', advanced_search_path(params), :class=>'advanced_search'%>"
+        new_file_contents = source_file + "\n\n<%= link_to 'More options', advanced_search_path(params.except(:controller, :action)), :class=>'advanced_search'%>"
 
         create_file("app/views/catalog/_search_form.html.erb", new_file_contents)      
       end

data/spec/features/blacklight_advanced_search_form_spec.rb

@@ -7,7 +7,7 @@ describe "Blacklight Advanced Search Form" do
 
   describe "advanced search form" do
     before do
-      visit '/advanced'
+      visit '/advanced?hypothetical_existing_param=true&q=ignore+this+existing+query'
     end
 
     it "should have field and facet blocks" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.2.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.15'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -196,7 +196,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Blacklight Advanced Search plugin