blacklight_advanced_search 1.2.0 → 1.2.1

data/Gemfile

@@ -0,0 +1,5 @@
+source 'http://rubygems.org'
+
+gemspec
+
+gem 'combustion'

data/README.rdoc

@@ -2,8 +2,9 @@ This is an advanced search plugin for Blacklight ( http://www.projectblacklight.
 
 == Pre-requisites:
 * The Blacklight plugin ( http://github.com/projectblacklight/blacklight )
-  * NOTE: Blacklight 3.2 is required for current version of Advanced Search plugin
-  * 1.1.x versions will work with older version of Blacklight 3.x
+  * NOTE: Blacklight 3.2.2+ is required for current (1.2.1+) version of Advanced Search plugin, and likewise BL 3.2.x requires current 1.2.1+ version of Advanced Search.  
+  * 1.2.0 was an aborted version of Blacklight 3.2 compatibility, don't use it, if you did, re-do your configuration according to current instructions and delete any local ./app/controllers/advanced_controller.rb file. 
+  * 1.1.x versions will work with older version of Blacklight 3.0.x-3.1.x
   * advanced search plugin latest 0.X.X version will work with Blacklight 2.9/Rails2. 
   * Older tagged versions of Advanced Search may work with even older BL. 
 
@@ -12,20 +13,20 @@ This is an advanced search plugin for Blacklight ( http://www.projectblacklight.
 === Blacklight 3.x/Rails 3
 
 Add to your application's Gemfile:
+
    gem "blacklight_advanced_search"
 
 then run 'bundle install'.  Then run:
+
    rails generate blacklight_advanced_search
 
-* The 'generate' command will install the plugin's assets into your application's application.js/application.css asset pipeline files
-* It will also generate AdvancedController into app/controllers/advanced_controller.rb, which you should configure for your local needs.
+* 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 set `blacklight_config.advanced_search.advanced_parse_q = true` to enable AND/OR/NOT parsing even in ordinary search, this is not on by default.  
 
 == Accessing
  
- 
 The advanced search form will be available in your app at /advanced
 
   url_for(:controller => "advanced", :action => "index")
@@ -33,11 +34,7 @@ The advanced search form will be available in your app at /advanced
 You can also send the advanced search form url parameters representing a search, to have the form add on additional 'advanced' criteria to the search.  For example:
 
   url_for( params.merge(:controller => "advanced", :action => "index")
-  
-If you do not have the default :controller/:action route enabled for your application, you may need to add a custom route to config/routes.rb.  For example:
-
-    map.advanced 'advanced', :controller => 'advanced', :action => 'index'
-  
+   
 By default there won't be any links in your application to the search form. If you've heavily customized your app, you can put them wherever you want as above. 
 
 However, especially if your app isn't much customized, the optional installer can write a localized Blacklight search form into your application with a 'more options' link to advanced. You may need to adjust your styles to make room for the new link, depending on what you've done with your app. 
@@ -46,47 +43,67 @@ However, especially if your app isn't much customized, the optional installer ca
 
 == Configuration:
 
-If your application uses a single Solr qt request handler for all its search fields, then this plugin may work well with no configuration.  Nonetheless, configuration is available to change or improve behavior, or to use a separate Solr request handler for the advanced search plugin.
+If your application uses a single Solr qt request handler for all its search fields, then this plugin may work well with no configuration.  Nonetheless, configuration is available to change or improve behavior, or to use a separate Solr request handler for the advanced search plugin. Most configuration takes place in your ./app/controllers/catalog_controller.rb `configure_blacklight` block.
 
-All plugin configuration mentioned below can be in any initializer in your app (any ruby file in config/initializers), although using the convention config/initializers/blacklight_advanced_search.rb may keep things clear. 
-
-The optional installer script can install a sample blacklight_advanced_search.rb for you which demonstrates various options.
 
 === Expression parsing in ordinary search
 
-If you turn on this feature with `blacklight_config.advanced_search.advanced_parse_q = true`, then the plugin 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. 
+Turn this feature on by adding to your CatalogController definition:
+
+    include BlacklightAdvancedSearch::ParseBasicQ
+
+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. 
+
+Individual blacklight 'search fields' can have advanced parsing turned off:
+
+    config.add_search_field("something") do |field|
+      # ...
+      field.advanced_parse = false
+    end
+
 
 When this feature is turned on, queries that don't have any special operators (eg: AND, OR, NOT, parens) will still be passed to Solr much the same as they were before. But queries with special operators will have appropriate Solr queries generated for them, usually including nested "_query_" elements, to have the same meaning they would in advanced search. If a user enters something that is a syntax error for parsed search (for instance an unclosed phrase quote or paren), the logic will rescue from the parse erorr by running the exact user entered query direct to solr without advanced parsing. 
 
-Due to limitations of the logic, sometimes these generated Solr queries may not really be as simple as they could be, they may include a *single* nested _query_, which really doens't need to be a nested query at all, although it will still work fine. 
+Due to limitations of the logic, sometimes these generated Solr queries may not really be as simple as they could be, they may include a *single* nested _query_, which really doens't need to be a nested query at all, although it will still work fine.
+
+If there'a a parse error trying to parse as boolean expression, it'll give up and pass the query on through same as it would without ParseBasicQ. 
 
 === Search fields
 
-Your main blacklight search fields are generally defined in config/blacklight_config.rb, under "config[:search_fields]" ( https://github.com/projectblacklight/blacklight/blob/master/config/initializers/blacklight_config.rb#L194 ). If there are particular search fields in your main blacklight config you want excluded from the advanced search form, you can set ":include_in_advanced_search => false"
+Your main blacklight search fields are generally defined in CatalogController blacklight_config using `add_search_field`. They are all by default used in advanced search. 
 
-All advanced search fields must share the same Solr request handler (":qt"). As such, search fields that use a custom ":qt" parameter may not be re-used by the advanced search plugin. However, you may use a separate Solr request handler than the Blacklight default. If you would like the advanced search to use a different Solr request handler than your app's default, set:
-  blacklight_config.advanced_search.qt
-to the name of the Solr request handler. 
+If there are particular search fields in your main blacklight config you want excluded from the advanced search form, you can set ":include_in_advanced_search => false"
+
+    config.add_search_field("isbn") do |field|
+      field.include_in_advanced_search = false
+      field.solr_parameters = { :qf => "isbn_t" } 
+    end      
 
-If you use a separate Solr request handler for advanced search, you must supply a completely separate list of search fields for the advanced search form. Each field is defined by a hash whose format is specified in Blacklight::SearchFields ( https://github.com/projectblacklight/blacklight/blob/master/lib/blacklight/search_fields.rb#L7 ). 
+If you want search fields ONLY available in advanced search, you can suppress them from ordinary search:
 
-  blacklight_config.search_fields.empty
+   config.add_search_field("publisher") do |field|
+      field.include_in_simple_select = false
+      field.solr_parameters = { :qf => "publisher_t" }        
+   end
 
-  blacklight_config.add_search_field('title') do |field|
-    field.solr_local_parameters => {
-      :qf => "title_t subtitle_t addl_titles_t title_unstem_search^1000" # see ( http://wiki.apache.org/solr/DisMaxQParserPlugin#qf_.28Query_Fields.29 )
-      :pf => "title_t subtitle_t addl_titles_t title_unstem_search^1000" # see ( http://wiki.apache.org/solr/DisMaxQParserPlugin#pf_.28Phrase_Fields.29 )
+All advanced search fields must share the same Solr request handler (":qt"). As such, search fields that use a custom ":qt" parameter may not be re-used by the advanced search plugin. However, you may use a separate Solr request handler than the Blacklight default. If you would like the advanced search to use a different Solr request handler than your app's default, set:
+ 
+    config.advanced_search = { 
+      :qt => 'advanced'
     }
-  end
+ 
+If you use a separate Solr request handler for advanced search, you must supply a completely separate list of search fields for the advanced search form, just define them with `:include_in_advanced_search => true` and `:include_in_simple_search => false` as above. 
 
 Additionally, to make your advanced search solr requests more concise, you are strongly encouraged to take advantage of the :local_solr_parameters option in your search field definition to use a solr parameter substitution with $variables. 
 
-  blacklight_config.add_search_field('authot') do |field|
-    field.solr_local_parameters => {
-      :qf=>"$qf_author",
-      :pf=>"$pf_author"
-    }
-  end
+    configure_blacklight do |config|
+      config.add_search_field('author') do |field|
+        field.solr_local_parameters = {
+          :qf=>"$qf_author",
+          :pf=>"$pf_author"
+        }
+      end
+    end
 
 Within your solrconfig.xml you may then provide the appropriate custom configuration.
 
@@ -117,23 +134,26 @@ Within your solrconfig.xml you may then provide the appropriate custom configura
 
 By default, the advanced search form will show as limits whatever facets are configured as default in your Solr request handler.  To have the advanced search form request specific facets and/or specific facet parameters, you can set config[:form_solr_parameters]. 
 
-  blacklight_config.advanced_search.form_solr_parameters = {
-    "facet.field" => ["format", "language_facet"],
-    "facet.limit" => -1, # return all facet values
-    "facet.sort" => "index" # sort by byte order of values
-  }
+    config.advanced_search => {
+      :form_solr_parameters => {
+        "facet.field" => ["format", "language_facet"],
+        "facet.limit" => -1, # return all facet values
+        "facet.sort" => "index" # sort by byte order of values
+      }
+    }
  
 
 === Advanced Search Config Options
 
+Complete list of keys that can be supplied inside your configure_blacklight `advanced_search` block:
+
 [:qt] 
    Solr request handler to use for any search that includes advanced search criteria. Defaults to what the application has set as Blacklight.config[:default_qt]
 [:url_key]
    Key to use in application URLs to indicate advanced search is included in a query, defaults to "advanced". URLs will have "&search_field=[url key]".
 [:form_solr_paramters]
   A hash of solr parameters which will be included in Solr request sent before display of advanced search form. Can be used to set facet parameters for advanced search form display.  
-[:advanced_parse_q]
-  Set to 'true' to have AND/OR/NOT parsed even in ordinary 'simple' blacklight search, and converted to appropriate Solr query for that single field. 
+
 
 == Translation to Solr Query, technical details
 
@@ -147,12 +167,16 @@ You may also find the rspecs for parsing a user-entered query and converting it
  
 == Running tests
 
-Test coverage is provided with rspec, run all tests by running:
-   spec ./spec 
+(experimental, in progress). 
+
+(Limited) test coverage is provided with rspec, run all tests by running:
+   rspec
 
+from the blacklight_advanced_search directory. you may need to `bundle install` first. 
   
 == To Do
 
 * Alphabetical sorting of facet values returned by solr in count order (perhaps with limit). 
+* Parse for fielded search too like << title:"some title" >>.  'field:' that doesn't match an actual known field should be passed through same as now, while recognized fields should generate nested queries tied to those blacklight search types. 
 
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/app/controllers/advanced_controller.rb

@@ -1,8 +1,27 @@
+# This class should NOT be generated into local app. If you generated
+# into local app in a previous version, remove that, config is done
+# in CatalogController now.
+#
+# Note that this NEEDS to sub-class CatalogController, so it gets any
+# custom searching behavior you've added, and uses when fetching facets
+# etc. It does that right now because BlacklightAdvancedSearch::AdvancedController
+# is hard-coded to subclass CatalogController. 
+#
+# TODO: 
+# This seperate controller may not need to exist at all -- it just exists
+# to provide the advanced search form (and fetching of facets to display
+# on that form). Instead, mix-in a new "advanced" action to CatalogController?
+# (Make a backwards compat route though). 
+#
+# Alternately, if this does exist as a seperate controller, it should 
+# _directly_ < CatalogController, and BlacklightAdvancedSearch::AdvancedController
+# should be a mix-in that does not assume parent controller. Then, if you have
+# multi-controllers, you just need to create new `AdvancedControllerForX < XController`
+# which still mixes in BlacklightAdvancedSearch::AdvancedController. There
+# are probably some other edges that need to be smoothed for that approach, but
+# that'd be the direction. 
 class AdvancedController < BlacklightAdvancedSearch::AdvancedController
 
-  blacklight_config.configure do |config|
-    config.advanced_search.form_solr_parameters ||= {}
-    config.advanced_search.url_key ||= 'advanced'
-  end
+  copy_blacklight_config_from(CatalogController)
 
 end

data/app/controllers/blacklight_advanced_search/advanced_controller.rb

@@ -3,10 +3,7 @@
 class BlacklightAdvancedSearch::AdvancedController < CatalogController
   include AdvancedHelper # so we get the #advanced_search_context method
 
-  blacklight_config.configure do |config|
-    config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
-  end
-  
+
   def index
     unless request.method==:post
       @response = get_advanced_search_facets
@@ -48,8 +45,9 @@ class BlacklightAdvancedSearch::AdvancedController < CatalogController
 
     input = HashWithIndifferentAccess.new
     input.merge!( search_context_params )
-    input.merge!( :qt => blacklight_config.advanced_search[:qt] , :per_page => 0)
-    input.merge!( blacklight_config.advanced_search[:form_solr_parameters] )
+    
+    input.merge!( :qt => blacklight_config.advanced_search[:qt] || blacklight_config.default_qt , :per_page => 0)
+    input.merge!( blacklight_config.advanced_search[:form_solr_parameters] ) if blacklight_config.advanced_search[:form_solr_parameters]
     input[:q] ||= '{!lucene}*:*'
     
     

data/blacklight_advanced_search.gemspec

@@ -21,4 +21,10 @@ Gem::Specification.new do |s|
   s.add_dependency "rails", "~> 3.0"
   s.add_dependency "blacklight", "~> 3.2.1"
   s.add_dependency "parslet"
+
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "capybara"
+  s.add_development_dependency "sqlite3"
+  s.add_development_dependency 'launchy'
 end

data/lib/blacklight_advanced_search/controller.rb

@@ -6,15 +6,16 @@ module BlacklightAdvancedSearch::Controller
   extend ActiveSupport::Concern
 
   included do
-    if blacklight_config[:advanced_parse_q]
-      # Only to parse AND/OR in ordinary 'q'
-      solr_search_params_logic << :add_advanced_parse_q_to_solr
-    end
+    # default adv config values
+    self.blacklight_config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
+    self.blacklight_config.advanced_search[:url_key] ||= 'advanced'
+    self.blacklight_config.advanced_search[:form_solr_parameters] ||= {}    
+    
     
-    # Always, to parse adv search form params. 
+    # Parse app URL params used for adv searches 
     solr_search_params_logic << :add_advanced_search_to_solr
     
-
+    # Display advanced search constraints properly
     helper BlacklightAdvancedSearch::RenderConstraintsOverride
     helper BlacklightAdvancedSearch::CatalogHelperOverride
   end
@@ -28,91 +29,23 @@ module BlacklightAdvancedSearch::Controller
     # If we've got the hint that we're doing an 'advanced' search, then
     # map that to solr #q, over-riding whatever some other logic may have set, yeah.
     # the hint right now is :search_field request param is set to a magic
-    # key.     
-    if (req_params[:search_field] == ::AdvancedController.blacklight_config.advanced_search[:url_key] ||
-      req_params[:f_inclusive])
+    # key. OR of :f_inclusive is set for advanced params, we need processing too.     
+    if ( (req_params[:search_field] == self.blacklight_config.advanced_search[:url_key]) ||
+          req_params[:f_inclusive] )
       # Set this as a controller instance variable, not sure if some views/helpers depend on it. Better to leave it as a local variable
       # if not, more investigation later.       
-      @advanced_query = BlacklightAdvancedSearch::QueryParser.new(req_params, ::AdvancedController.blacklight_config )
-      deep_merge!(solr_parameters, @advanced_query.to_solr )
+      @advanced_query = BlacklightAdvancedSearch::QueryParser.new(req_params, self.blacklight_config )      
+      BlacklightAdvancedSearch.deep_merge!(solr_parameters, @advanced_query.to_solr )
       if @advanced_query.keyword_queries.length > 0
-        # force :qt if set
-        solr_parameters[:qt] = ::AdvancedController.blacklight_config.advanced_search[:qt]
+        # force :qt if set, fine if it's nil, we'll use whatever CatalogController
+        # ordinarily uses.         
+        solr_parameters[:qt] = self.blacklight_config.advanced_search[:qt]
         solr_parameters[:defType] = "lucene"        
       end
       
     end
   end
-  
-  # This method can be included in solr_search_params_logic to have us
-  # parse an ordinary entered :q for AND/OR/NOT and produce appropriate
-  # Solr query. Note that it is NOT included in solr_search_params_logic
-  # by default when this module is included, because it is optional behavior.
-  # BlacklightAdvancedSearch init code will add it to CatalogController
-  # if it's configured to do so. You can of course add it yourself
-  # manually too. 
-  #
-  # Note: For syntactically invalid input, we'll just skip the adv
-  # 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, req_params = params)
-    unless req_params[:q].blank?
-      field_def = search_field_def_for_key( req_params[:search_field]) ||
-        default_search_field
-        
-              
-      # If the individual field has advanced_parse_q suppressed, punt
-      return if field_def[:advanced_parse_q] == 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(req_params[:q]).to_single_query_params( solr_local_params )
-        
-        deep_merge!(solr_parameters, solr_direct_params)
-        
-        deep_merge!(
-          solr_parameters, 
-          adv_search_params    
-         )
-      rescue Parslet::UnconsumedInput => 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
-  end
-
-  
-  protected
-  # Merges new_hash into source_hash, without modifying arguments, but
-  # will merge nested arrays and hashes too. Also will NOT merge nil or blank
-  # from new_hash into old_hash      
-  def deep_merge!(source_hash, new_hash)
-    source_hash.merge!(new_hash) do |key, old, new|
-      if new.respond_to?(:blank) && new.blank?
-        old        
-      elsif (old.kind_of?(Hash) and new.kind_of?(Hash))
-        deep_merge!(old, new)
-      elsif (old.kind_of?(Array) and new.kind_of?(Array))
-        old.concat(new).uniq
-      elsif new.nil?
-        # Allowing nil values to over-write on merge messes things up.
-        # don't set a nil value if you really want to force blank, set
-        # empty string. 
-        old
-      else
-        new
-      end
-    end
-  end
-  
-  
-  
+          
   
 end
 

data/lib/blacklight_advanced_search/engine.rb

@@ -11,6 +11,9 @@ module BlacklightAdvancedSearch
     # dev mode, if they are in the BL plugin and haven't been copied to
     # local, they won't be. But we do our best.
     config.to_prepare do    
+
+      
+
       # Ordinary module over-ride to CatalogController
       CatalogController.send(:include,  
           BlacklightAdvancedSearch::Controller  

data/lib/blacklight_advanced_search/parse_basic_q.rb

@@ -0,0 +1,56 @@
+# A solr search logic mix-in to CatalogController. 
+# If mixed-in, adds Advanced Search parsing behavior
+# to queries entered on basic/standard/simple search
+# form too, for boolean expressions. 
+#
+#  simply:
+#    include BlacklightAdvancedSearch::ParseBasicQ
+# in your CatalogController
+module BlacklightAdvancedSearch::ParseBasicQ
+  extend ActiveSupport::Concern
+  
+  included do
+    solr_search_params_logic << :add_advanced_parse_q_to_solr
+  end
+  
+  
+  # This method can be included in solr_search_params_logic to have us
+  # parse an ordinary entered :q for AND/OR/NOT and produce appropriate
+  # Solr query. Note that it is NOT included in solr_search_params_logic
+  # by default when this module is included, because it is optional behavior.
+  # BlacklightAdvancedSearch init code will add it to CatalogController
+  # if it's configured to do so. You can of course add it yourself
+  # manually too. 
+  #
+  # Note: For syntactically invalid input, we'll just skip the adv
+  # 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, req_params = params)
+    unless req_params[:q].blank?
+      field_def = search_field_def_for_key( req_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(req_params[:q]).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::UnconsumedInput => 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
+  end
+
+end

data/lib/blacklight_advanced_search.rb

@@ -5,8 +5,34 @@ module BlacklightAdvancedSearch
   autoload :QueryParser, 'blacklight_advanced_search/advanced_query_parser'
   autoload :ParsingNestingParser, 'blacklight_advanced_search/parsing_nesting_parser'
   autoload :FilterParser, 'blacklight_advanced_search/filter_parser'
+  autoload :ParseBasicQ, 'blacklight_advanced_search/parse_basic_q'
 
   require 'blacklight_advanced_search/version'
   require 'blacklight_advanced_search/engine'
 
+  
+  # Utility method used in our solr search logic. 
+  # Merges new_hash into source_hash, but will recursively
+  # merge nested arrays and hashes too; also will NOT merge nil
+  # or blank values from new_hash into source_hash, nil or blank values
+  # in new_hash will not overwrite values in source_hash. 
+  def self.deep_merge!(source_hash, new_hash)
+    source_hash.merge!(new_hash) do |key, old, new|
+      if new.respond_to?(:blank) && new.blank?
+        old        
+      elsif (old.kind_of?(Hash) and new.kind_of?(Hash))
+        deep_merge!(old, new)
+      elsif (old.kind_of?(Array) and new.kind_of?(Array))
+        old.concat(new).uniq
+      elsif new.nil?
+        # Allowing nil values to over-write on merge messes things up.
+        # don't set a nil value if you really want to force blank, set
+        # empty string. 
+        old
+      else
+        new
+      end
+    end
+  end
+  
 end

data/lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb

@@ -3,14 +3,11 @@ require 'rails/generators'
 class BlacklightAdvancedSearchGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
 
-  require File.expand_path('../assets_generator.rb', __FILE__)
-  def copy_public_assets
+  require File.expand_path('../assets_generator.rb', __FILE__)  
+  def inject_asset_requires
     BlacklightAdvancedSearch::AssetsGenerator.start
   end
   
-  def install_local_controller
-    copy_file("advanced_controller.rb", "app/controllers/advanced_controller.rb")
-  end
   
   def install_localized_search_form
     if options[:force] or yes?("Install local search form with advanced link?")      

data/spec/acceptance/blacklight_advanced_search_form_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "Blacklight Advanced Search Form" do
+  before do
+    AdvancedController.blacklight_config = Blacklight::Configuration.new
+    AdvancedController.configure_blacklight do |config|
+
+      config.add_search_field('title') do |field|
+        field.solr_local_parameters = { :qf => "title_t", :pf => "title_t"}
+      end
+    end
+  end
+
+  it "should show the search fields" do
+    visit '/advanced'
+    page.should have_selector('input#title')
+
+  end
+end

data/spec/integration/blacklight_stub_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe 'Blacklight Test Application' do
+  it "should have a Blacklight module" do
+    Blacklight.should be_a_kind_of(Module)
+  end
+  it "should have a Catalog controller" do
+    CatalogController.blacklight_config.should be_a_kind_of(Blacklight::Configuration)
+  end
+end

data/spec/internal/app/controllers/application_controller.rb

@@ -0,0 +1,4 @@
+class ApplicationController < ActionController::Base
+  include Blacklight::Controller
+
+end

data/spec/internal/app/models/solr_document.rb

@@ -0,0 +1,3 @@
+class SolrDocument
+  include Blacklight::Solr::Document
+end

data/spec/internal/config/database.yml

@@ -0,0 +1,3 @@
+test:
+  adapter:  sqlite3
+  database: db/combustion_test.sqlite

data/spec/internal/config/routes.rb

@@ -0,0 +1,6 @@
+Rails.application.routes.draw do
+  Blacklight.add_routes(self)
+
+  root :to => "catalog#index"
+  #
+end

data/spec/internal/config/solr.yml

@@ -0,0 +1,18 @@
+# = jetty_path key
+# each environment can have a jetty_path with absolute or relative
+# (to app root) path to a jetty/solr install. This is used
+# by the rake tasks that start up solr automatically for testing
+# and by rake solr:marc:index.  
+#
+# jetty_path is not used by a running Blacklight application
+# at all. In general you do NOT need to deploy solr in Jetty, you can deploy it
+# however you want.  
+# jetty_path is only required for rake tasks that need to know
+# how to start up solr, generally for automated testing. 
+
+development:
+  url: http://127.0.0.1:8983/solr
+test: &test
+  url: http://127.0.0.1:8983/solr
+cucumber:
+  <<: *test

data/spec/internal/db/schema.rb

@@ -0,0 +1,53 @@
+# encoding: UTF-8
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
+#
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# you'll amass, the slower it'll run and the greater likelihood for issues).
+#
+# It's strongly recommended to check this file into your version control system.
+
+ActiveRecord::Schema.define(:version => 20111123152341) do
+
+  create_table "bookmarks", :force => true do |t|
+    t.integer  "user_id",     :null => false
+    t.string   "document_id"
+    t.string   "title"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "user_type"
+  end
+
+  create_table "searches", :force => true do |t|
+    t.text     "query_params"
+    t.integer  "user_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "user_type"
+  end
+
+  add_index "searches", ["user_id"], :name => "index_searches_on_user_id"
+
+  create_table "users", :force => true do |t|
+    t.string   "email",                                 :default => "", :null => false
+    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
+    t.string   "reset_password_token"
+    t.datetime "reset_password_sent_at"
+    t.datetime "remember_created_at"
+    t.integer  "sign_in_count",                         :default => 0
+    t.datetime "current_sign_in_at"
+    t.datetime "last_sign_in_at"
+    t.string   "current_sign_in_ip"
+    t.string   "last_sign_in_ip"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
+  add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
+
+end

data/spec/internal/log/.gitignore

@@ -0,0 +1 @@
+*.log

data/spec/spec_helper.rb

@@ -1,7 +1,23 @@
-#RAILS_ROOT = "#{File.dirname(__FILE__)}/.."
+require 'rubygems'
+require 'bundler'
+
+Bundler.require :default, :development
+
+require 'blacklight/engine'
+require 'rsolr'
+require 'rsolr-ext'
+require 'capybara/rspec'
+Combustion.initialize!
+
+Blacklight.solr_config = { :url => 'http://127.0.0.1:8983/solr' }
+
+class SolrDocument
+  include Blacklight::Solr::Document
+end
+
+require 'rspec/rails'
+require 'capybara/rails'
 
-Dir[Pathname.new(File.expand_path("../support/**/*.rb", __FILE__))].each {|f| require f}
-require 'lib/blacklight_advanced_search'
 
 RSpec.configure do |config|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-16 00:00:00.000000000 Z
+date: 2012-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152619380 !ruby/object:Gem::Requirement
+  requirement: &2164715840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152619380
+  version_requirements: *2164715840
 - !ruby/object:Gem::Dependency
   name: blacklight
-  requirement: &2152618720 !ruby/object:Gem::Requirement
+  requirement: &2164712380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152618720
+  version_requirements: *2164712380
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &2152618160 !ruby/object:Gem::Requirement
+  requirement: &2164711400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,7 +44,62 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152618160
+  version_requirements: *2164711400
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2164706680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2164706680
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: &2164705220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2164705220
+- !ruby/object:Gem::Dependency
+  name: capybara
+  requirement: &2164703840 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2164703840
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2164702960 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2164702960
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &2164701540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2164701540
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -53,6 +108,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -82,6 +138,7 @@ files:
 - lib/blacklight_advanced_search/controller.rb
 - lib/blacklight_advanced_search/engine.rb
 - lib/blacklight_advanced_search/filter_parser.rb
+- lib/blacklight_advanced_search/parse_basic_q.rb
 - lib/blacklight_advanced_search/parsing_nesting_parser.rb
 - lib/blacklight_advanced_search/render_constraints_override.rb
 - lib/blacklight_advanced_search/version.rb
@@ -92,6 +149,17 @@ files:
 - lib/parsing_nesting/Readme.rdoc
 - lib/parsing_nesting/grammar.rb
 - lib/parsing_nesting/tree.rb
+- spec/acceptance/blacklight_advanced_search_form_spec.rb
+- spec/integration/blacklight_stub_spec.rb
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/models/solr_document.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/config/solr.yml
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
 - spec/lib/filter_parser_spec.rb
 - spec/parsing_nesting/build_tree_spec.rb
 - spec/parsing_nesting/consuming_spec.rb
@@ -99,7 +167,6 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/blacklight_mock.rb
 - uninstall.rb
 homepage: http://projectblacklight.org/
 licenses: []
@@ -121,11 +188,22 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Blacklight Advanced Search plugin
 test_files:
+- spec/acceptance/blacklight_advanced_search_form_spec.rb
+- spec/integration/blacklight_stub_spec.rb
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/models/solr_document.rb
+- spec/internal/config/database.yml
+- spec/internal/config/routes.rb
+- spec/internal/config/solr.yml
+- spec/internal/db/combustion_test.sqlite
+- spec/internal/db/schema.rb
+- spec/internal/log/.gitignore
+- spec/internal/public/favicon.ico
 - spec/lib/filter_parser_spec.rb
 - spec/parsing_nesting/build_tree_spec.rb
 - spec/parsing_nesting/consuming_spec.rb
@@ -133,4 +211,3 @@ test_files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/support/blacklight_mock.rb

data/spec/support/blacklight_mock.rb

@@ -1,5 +0,0 @@
-module Blacklight
-  module SearchFields
-
-  end
-end