blacklight_advanced_search 2.1.1 → 2.2.0

data/.gitignore

@@ -2,4 +2,9 @@
 coverage.data
 coverage/
 log/*
-*.log
+*.log
+/spec/internal
+/jetty
+Gemfile.lock
+pkg/*
+tmp/*

data/.travis.yml

@@ -0,0 +1,16 @@
+notifications:
+  email: false
+
+rvm:
+  - 2.1.0
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+
+notifications:
+  irc: "irc.freenode.org#blacklight"
+  email:
+      - blacklight-commits@googlegroups.com
+env:
+  global:
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true

data/Gemfile

@@ -2,5 +2,15 @@ source 'http://rubygems.org'
 
 gemspec
 
-#gem 'combustion'
-gem 'blacklight', :git => 'git://github.com/projectblacklight/blacklight.git'
+group :test do
+  gem "bootstrap-sass"
+  gem 'turbolinks'
+end
+
+gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
+gem 'sqlite3', platform: :ruby
+gem 'jquery-rails'
+
+if File.exists?('spec/test_app_templates/Gemfile.extra')
+  eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
+end

data/README.rdoc

@@ -1,12 +1,19 @@
 This is an advanced search plugin for Blacklight ( http://www.projectblacklight.org ).  
 
-== Pre-requisites:
-* The Blacklight plugin ( http://github.com/projectblacklight/blacklight )
-  * 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. 
+== Blacklight version compatibility
+
+This is a plugin for Blacklight: http://github.com/projectblacklight/blacklight
+
+It has been hard to keep track of which versions of `blacklight_advanced_search`
+work with which versions of `blacklight`. Some notes:
+
+* versions 5.x of Advanced Search plugin should work with Blacklight >= 5.1 and < 6 -- we now synchronize the _major_ version number between `blacklight` and `blacklight_advanced_search`.
+* version 2.2 of `blacklight_advanced_search` should work with `blacklight` 4.x. 
+* versions `1.2.*` of Advanced Search plugin can work with blacklight 3.2.2 through latest 3.2.x
+* 1.2.0 was an aborted version, 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. 
+* advanced search 1.1.x versions will work with Blacklights 3.0.x through 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. 
 
 == Installation:
 
@@ -27,13 +34,14 @@ You may want to  `include BlacklightAdvancedSearch::ParseBasicQ` in your Catalog
 
 == Accessing
  
-The advanced search form will be available in your app at /advanced
+The advanced search form will be available in your app at /advanced, and in your app using
+routing helper `advanced_search_path`. 
 
-  url_for(:controller => "advanced", :action => "index")
+  advanced_search_path
   
 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")
+  advanced_search_path( params )
    
 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. 
 
@@ -148,11 +156,17 @@ By default, the advanced search form will show as limits whatever facets are con
 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]
+   Solr request handler to use for any search that includes advanced search criteria. Defaults to what the application has set as blacklight_config.default_solr_params[: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.  
+[:query_parser]
+  advanced searches are translated to solr nested queries, where the inner queries are of a dismax-type. 
+  By default, they are actually specifically 'dismax', but you can set :query_parser to 'edismax' instead. 
+  This may make additional features available like * wildcards in advanced searches; but it may also
+  cause some user query elements to be interpreted as operators for edismax when they
+  were intended as literals. Somewhat experimental. See Github issues #11 and #14. 
 
 
 == Translation to Solr Query, technical details

data/Rakefile

@@ -5,41 +5,33 @@ require 'rdoc/task'
 require 'bundler/setup'
 Bundler::GemHelper.install_tasks
 
+ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.0.0.zip"
+APP_ROOT = File.dirname(__FILE__)
+
 require 'rspec/core/rake_task'
+require 'engine_cart/rake_task'
 
+require 'jettywrapper'
 require 'blacklight'
 import File.join(Blacklight.root, 'lib', 'railties', 'solr_marc.rake')
 
-task :default => :spec
+task :default => :ci
 
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
 
 end
 
-
-desc "Execute Continuous Integration build"
-task :ci do
-
-  require 'combustion'
-  require 'blacklight'
-Combustion.initialize!
-  unless ENV['environment'] == 'test'
-    exec("rake ci environment=test") 
+  desc "Load fixtures"
+  task :fixtures => ['engine_cart:generate'] do
+    within_test_app do
+      system "rake solr:marc:index_test_data RAILS_ENV=test"
+      abort "Error running fixtures" unless $?.success?
+    end
   end
 
-  require 'rails/generators'
-  require File.join(Blacklight.root, 'lib', 'generators', 'blacklight', 'jetty_generator.rb')
-
-  Blacklight::Jetty.start(["--save_location=jetty", "--force"])
-
-  ENV['RAILS_ENV'] = 'test'
-  ENV['CONFIG_PATH'] = File.expand_path(File.join(Blacklight.root, 'lib', 'generators', 'blacklight', 'templates', 'config', 'SolrMarc', 'config-test.properties'))
-  ENV['SOLRMARC_JAR_PATH'] = File.expand_path(File.join(Blacklight.root, 'lib', 'SolrMarc.jar'))
-  ENV['SOLR_PATH'] = File.expand_path(File.join('jetty', 'solr'))
-  ENV['SOLR_WAR_PATH'] = File.expand_path(File.join('jetty', 'webapps', 'solr.war'))
-  Rake::Task['solr:marc:index_test_data'].invoke
-
+desc "Execute Continuous Integration build"
+task :ci => ['jetty:clean', 'engine_cart:generate'] do
 
   require 'jettywrapper'
   jetty_params = {
@@ -51,6 +43,7 @@ Combustion.initialize!
   }
 
   error = Jettywrapper.wrap(jetty_params) do
+    Rake::Task['fixtures'].invoke
     Rake::Task['spec'].invoke
   end
   raise "test failures: #{error}" if error

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.2.0

data/app/controllers/blacklight_advanced_search/advanced_controller.rb

@@ -25,6 +25,7 @@ class BlacklightAdvancedSearch::AdvancedController < CatalogController
       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. 
@@ -32,11 +33,10 @@ class BlacklightAdvancedSearch::AdvancedController < CatalogController
       search_context_params.delete("q")
       
       # Also delete any facet-related params, or anything else
-      # we want to set ourselves or inherit from Solr request handler
-      # defaults. 
+      # 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", "qt", "per_page"].include?(k) ||                
+        (["facet.limit", "facet.sort", "f", "facets", "facet.fields", "per_page"].include?(k) ||                
           k =~ /f\..+\.facet\.limit/ ||
           k =~ /f\..+\.facet\.sort/
         )        
@@ -45,12 +45,18 @@ class BlacklightAdvancedSearch::AdvancedController < CatalogController
 
     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!( :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]
+
+    # ensure empty query is all records, to fetch available facets on entire corpus
     input[:q] ||= '{!lucene}*:*'
     
-    
-    find(input.to_hash)
+    # first arg nil, use default search path. 
+    find(nil, input.to_hash)
   end
 end

data/app/helpers/advanced_helper.rb

@@ -34,18 +34,8 @@ module AdvancedHelper
   end
 
   def search_fields_for_advanced_search
-    # If we could count on 1.9.3 with ordered hashes and
-    # Hash#select that worked reasonably, this would be trivial.
-    # instead, a way compat with 1.8.7 and 1.9.x both.
     @search_fields_for_advanced_search ||= begin
-      # make it an ActiveSupport::OrderedHash if it needs to be
-      hash = blacklight_config.search_fields.class.new
-
-      blacklight_config.search_fields.each_pair do |key, value|
-        hash[key] = value unless value.include_in_advanced_search == false
-      end
-
-      hash
+      blacklight_config.search_fields.select { |k,v| v.include_in_advanced_search or v.include_in_advanced_search.nil? }
     end
   end
 

data/app/views/advanced/_facet_limit.html.erb

@@ -1,7 +1,7 @@
 <ul>
   <% display_facet.items.each do |item| -%>
   <li>
-    <%= label_tag "f_inclusive_#{solr_field}[#{item.value.to_sym}]", (check_box_tag "f_inclusive[#{solr_field}][#{item.value.to_sym}]", 1, facet_value_checked?(solr_field, item.value)) + content_tag(:span, item.value, :class => 'facet-value') + " (#{format_num item.hits})".html_safe, :class => 'checkbox' %>
+    <%= label_tag "f_inclusive_#{solr_field}[#{item.value.to_sym}]", (check_box_tag "f_inclusive[#{solr_field}][#{item.value.to_sym}]", 1, facet_value_checked?(solr_field, item.value)) + content_tag(:span, item.value, :class => 'facet-value') + " (#{number_with_delimiter item.hits})".html_safe, :class => 'checkbox' %>
   </li>
   <% end -%>
 </ul>

data/app/views/advanced/index.html.erb

@@ -5,6 +5,4 @@
 
 <h1 class="advanced">More Search Options</h1>
 <%= render 'advanced_search_form' %>
-<%- sidebar_items << capture do -%>
-  <%= render "advanced_search_help" %>
-<%- end -%>
+<%= render "advanced_search_help" %>

data/app/views/blacklight_advanced_search/_facet_limit.html.erb

@@ -3,7 +3,7 @@
     <h4>Any of:</h4>
     <ul>
     <% @advanced_query.filters[solr_field].each do |value| %>
-        <li><span class="selected"><%= h(value) %></span> <%= link_to(content_tag(:i, '', :class => "icon-remove") + content_tag(:span, '[remove]', :class => 'hide-text'), remove_facet_params(solr_field, value, params), :class=>"remove") %></li>
+        <li><span class="selected"><%= h(value) %></span> <%= link_to(content_tag(:i, '', :class => "icon-remove") + content_tag(:span, '[remove]', :class => 'hide-text'), remove_advanced_facet_param(solr_field, value, params), :class=>"remove") %></li>
     <% end %>
     </ul>
   </div>

data/blacklight_advanced_search.gemspec

@@ -22,10 +22,7 @@ Gem::Specification.new do |s|
   s.add_dependency "parslet"
 
   s.add_development_dependency "rails"
-  s.add_development_dependency "combustion"
   s.add_development_dependency "rspec-rails"
-  s.add_development_dependency "capybara"
-  s.add_development_dependency "sqlite3"
-  s.add_development_dependency 'launchy'
-  s.add_development_dependency 'jettywrapper'
+  s.add_development_dependency 'jettywrapper', ">= 1.4.2"
+  s.add_development_dependency 'engine_cart'
 end

data/config/jetty.yml

@@ -0,0 +1,4 @@
+default:
+  startup_wait: 15
+  jetty_port: <%= ENV['TEST_JETTY_PORT'] || 8888 %> 
+  <%= ENV['TEST_JETTY_PATH'] ? "jetty_home: " + ENV['TEST_JETTY_PATH'] : '' %>

data/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  get 'advanced' => 'advanced#index'
+  get 'advanced' => 'advanced#index', :as => 'advanced_search'
 end

data/lib/blacklight_advanced_search/controller.rb

@@ -8,7 +8,9 @@ module BlacklightAdvancedSearch::Controller
   included do
     # default adv config values
     self.blacklight_config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
+    #self.blacklight_config.advanced_search[:qt] ||= 'advanced'
     self.blacklight_config.advanced_search[:url_key] ||= 'advanced'
+    self.blacklight_config.advanced_search[:query_parser] ||= 'dismax'
     self.blacklight_config.advanced_search[:form_solr_parameters] ||= {}    
     
     
@@ -18,8 +20,13 @@ module BlacklightAdvancedSearch::Controller
     # Display advanced search constraints properly
     helper BlacklightAdvancedSearch::RenderConstraintsOverride
     helper BlacklightAdvancedSearch::CatalogHelperOverride
+    helper_method :is_advanced_search?
   end
   
+  def is_advanced_search? req_params = params
+    (req_params[:search_field] == self.blacklight_config.advanced_search[:url_key]) ||
+          req_params[:f_inclusive]
+  end
   
   # this method should get added into the solr_search_params_logic
   # list, in a position AFTER normal query handling (:add_query_to_solr),
@@ -30,8 +37,7 @@ module BlacklightAdvancedSearch::Controller
     # 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. 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] )
+    if is_advanced_search? req_params
       # 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, self.blacklight_config )      

data/lib/blacklight_advanced_search/parse_basic_q.rb

@@ -40,7 +40,7 @@ module BlacklightAdvancedSearch::ParseBasicQ
       # 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 )
+        adv_search_params = ParsingNesting::Tree.parse(req_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)        

data/lib/blacklight_advanced_search/render_constraints_override.rb

@@ -4,7 +4,11 @@
 module BlacklightAdvancedSearch::RenderConstraintsOverride
 
   def query_has_constraints?(localized_params = params)
-    !(localized_params[:q].blank? and localized_params[:f].blank? and localized_params[:f_inclusive].blank?)
+    if is_advanced_search? localized_params
+      true
+    else
+      !(localized_params[:q].blank? and localized_params[:f].blank? and localized_params[:f_inclusive].blank?)
+    end
   end
 
   #Over-ride of Blacklight method, provide advanced constraints if needed,

data/lib/generators/blacklight_advanced_search/assets_generator.rb

@@ -15,21 +15,38 @@ module BlacklightAdvancedSearch
   class AssetsGenerator < Rails::Generators::Base
     source_root File.join(BlacklightAdvancedSearch::Engine.root, 'app', 'assets')
 
-    def assets
-      original_css = File.binread("app/assets/stylesheets/application.css")
+    def css_asset
+      application_css_location = Dir["app/assets/stylesheets/application{.css,.scss,.css.scss}"].first
+
+      unless application_css_location
+        say_status "skipped", "Can not find an application.css, did not insert our require", :red
+        return
+      end
+
+      original_css = File.binread(application_css_location)
       if original_css.include?("require 'blacklight_advanced_search'")
         say_status("skipped", "insert into app/assets/stylesheets/application.css", :yellow)
       else        
-        insert_into_file "app/assets/stylesheets/application.css", :before => "*/" do
+        insert_into_file application_css_location, :before => "*/" do
           "\n *= require 'blacklight_advanced_search'\n\n"
         end
       end
+
+    end
+
+    def js_asset
+      application_js_location = Dir["app/assets/javascripts/application{.js,.coffee,.js.coffee}"].first
+
+      unless application_js_location
+        say_status "skipped", "Can not find an application.js, did not insert our require", :red
+        return
+      end
       
-      original_js = File.binread("app/assets/javascripts/application.js")
+      original_js = File.binread(application_js_location)
       if original_js.include?("require 'blacklight_advanced_search'")
         say_status("skipped", "insert into app/assets/javascripts/application.js", :yellow)
       else
-        insert_into_file "app/assets/javascripts/application.js", :after => %r{//= require ['"]?jquery['"]?$} do
+        insert_into_file application_js_location, :after => %r{//= require ['"]?jquery['"]?$} do
           "\n//= require 'blacklight_advanced_search'\n\n"
         end
       end

data/lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb

@@ -10,8 +10,14 @@ class BlacklightAdvancedSearchGenerator < Rails::Generators::Base
   
   
   def install_localized_search_form
-    if options[:force] or yes?("Install local search form with advanced link?")      
-      copy_file("_search_form.html.erb", "app/views/catalog/_search_form.html.erb")      
+    if options[:force] or yes?("Install local search form with advanced link? (y/N)", :green)
+      # We're going to copy the search from from actual currently loaded
+      # 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'%>"
+
+      create_file("app/views/catalog/_search_form.html.erb", new_file_contents)      
     end
   end
 

data/lib/generators/blacklight_advanced_search/templates/advanced_controller.rb

@@ -1,13 +1,14 @@
 class AdvancedController < BlacklightAdvancedSearch::AdvancedController
 
   blacklight_config.configure do |config|
-    # name of Solr request handler, leave unset to use the same one as your Blacklight.config[:default_qt]
-    config.advanced_search.qt = 'advanced'
+    # name of Solr request handler, leave unset to use the same one your Blacklight
+    # is ordinarily using (recommended if possible)
+    # config.advanced_search.qt = 'advanced'
 
     ##
     # The advanced search form displays facets as a limit option.
     # By default it will use whatever facets, if any, are returned
-    # by the Solr qt request handler in use. However, you can use
+    # by the Solr request handler in use. However, you can use
     # this config option to have it request other facet params than
     # default in the Solr request handler, in desired.
     config.advanced_search.form_solr_parameters = {}

data/lib/parsing_nesting/tree.rb

@@ -22,8 +22,8 @@ module ParsingNesting::Tree
   #
   # the #negate method was an experiment in transforming parse tree in
   # place, but isn't being used. But it's left as a sign post. 
-  def self.parse(string)
-    to_node_tree(ParsingNesting::Grammar.new.parse(string))
+  def self.parse(string, query_parser='dismax')
+    to_node_tree(ParsingNesting::Grammar.new.parse(string), query_parser)
   end
   
 
@@ -31,25 +31,25 @@ module ParsingNesting::Tree
   # manner in which I'm parsing to Parslet labelled hash isn't exactly what
   # Parslet Transform is set up to work with, I couldn't figure it out. But
   # easy enough to do 'manually'.
-  def self.to_node_tree(tree)
+  def self.to_node_tree(tree, query_parser)
     if tree.kind_of? Array  
       # at one point I was normalizing top-level lists of one item to just
       # be that item, no list wrapper. But having the list wrapper
       # at the top level is actually useful for Solr output.       
-      List.new( tree.collect {|i| to_node_tree(i)})      
+      List.new( tree.collect {|i| to_node_tree(i, query_parser)}, query_parser)
     elsif tree.kind_of? Hash       
       if list = tree[:list]
-        List.new( list.collect {|i| to_node_tree(i)} )
+        List.new( list.collect {|i| to_node_tree(i, query_parser)}, query_parser)
       elsif tree.has_key?(:and_list)
-        AndList.new( tree[:and_list].collect{|i| to_node_tree(i)  } )
+        AndList.new( tree[:and_list].collect{|i| to_node_tree(i, query_parser)  }, query_parser)
       elsif tree.has_key?(:or_list)
-        OrList.new( tree[:or_list].collect{|i| to_node_tree(i)  } )
+        OrList.new( tree[:or_list].collect{|i| to_node_tree(i, query_parser)  }, query_parser )
       elsif not_payload = tree[:not_expression]
-        NotExpression.new( to_node_tree(not_payload) )
+        NotExpression.new( to_node_tree(not_payload, query_parser) )
       elsif tree.has_key?(:mandatory)
-        MandatoryClause.new( to_node_tree(tree[:mandatory]  ))
+        MandatoryClause.new( to_node_tree(tree[:mandatory], query_parser))
       elsif tree.has_key?(:excluded)
-        ExcludedClause.new( to_node_tree(tree[:excluded]))
+        ExcludedClause.new( to_node_tree(tree[:excluded], query_parser))
       elsif phrase = tree[:phrase]
         Phrase.new( phrase )
       elsif tree.has_key?(:token)
@@ -87,7 +87,7 @@ module ParsingNesting::Tree
       
       # if it's pure negative, we need to transform
       if embeddables.find_all{|n| n.kind_of?(ExcludedClause)}.length == embeddables.length
-        negated = NotExpression.new( List.new(embeddables.collect {|n| n.operand}))
+        negated = NotExpression.new( List.new(embeddables.collect {|n| n.operand}, options[:force_deftype] ))
         solr_params = solr_params.merge(:mm => "1")        
         return negated.to_query(solr_params)              
       else
@@ -103,8 +103,7 @@ module ParsingNesting::Tree
 
       end      
     end
-            
-    
+
     # Pass in nil 2nd argument if you DON'T want to embed
     # "!dismax" in your local params. Used by #to_single_query_params
     def build_local_params(hash = {}, force_deftype = "dismax")
@@ -135,7 +134,9 @@ module ParsingNesting::Tree
   
   class List < Node
     attr_accessor :list
-    def initialize(aList)
+    attr_reader :query_parser
+    def initialize(aList, query_parser)
+      @query_parser = query_parser
       self.list = aList
     end
     def can_embed?
@@ -152,7 +153,7 @@ module ParsingNesting::Tree
       (embeddable, gen_full_query) = list.partition {|i| i.respond_to?(:can_embed?) && i.can_embed?}
        
       unless embeddable.empty?
-        queries << build_nested_query(embeddable, solr_params)
+        queries << build_nested_query(embeddable, solr_params, force_deftype: query_parser)
       end
       
       gen_full_query.each do |node|
@@ -185,7 +186,7 @@ module ParsingNesting::Tree
         { 
           #build_local_params(solr_local_params, nil) + list.collect {|n| n.to_embed}.join(" "),
           :q => build_nested_query(list, solr_local_params, :always_nested => false, :force_deftype => nil), 
-          :defType => "dismax"
+          :defType => query_parser
         }        
       else
         # Can't be expressed in a single dismax, do it the normal way
@@ -199,7 +200,6 @@ module ParsingNesting::Tree
     def negate
       List.new(list.collect {|i| i.negate})
     end
-
   end
   
   class AndList < List
@@ -355,8 +355,6 @@ module ParsingNesting::Tree
       false
     end
     
-    
-     
     def negate
       operand
     end

data/spec/{acceptance → features}/blacklight_advanced_search_form_spec.rb

@@ -2,27 +2,6 @@ require 'spec_helper'
 
 describe "Blacklight Advanced Search Form" do
   before(:all) do
-    CatalogController.configure_blacklight do |config|
-      config.default_solr_params = { 
-        :qt => 'search',
-        :rows => 10 
-      }
-
-      config.add_facet_field 'language_facet'
-
-      config.add_search_field('title') do |field|
-        field.solr_local_parameters = { :qf => "title_t", :pf => "title_t"}
-      end
-
-      config.add_search_field('author') do |field|
-        field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
-      end
-
-      config.add_search_field('dummy_field') do |field|
-        field.include_in_advanced_search = false
-        field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
-      end
-    end
     AdvancedController.copy_blacklight_config_from(CatalogController)
   end
 
@@ -67,7 +46,8 @@ describe "Blacklight Advanced Search Form" do
 
     it "scope searches to fields" do
       fill_in "title", :with => "Medicine"
-      click_on "Search"
+      click_on "advanced_search"
+      puts page.current_url
       page.should have_content "Remove constraint Title: Medicine"
       page.should have_content "2007020969"
     end

data/spec/parsing_nesting/to_solr_spec.rb

@@ -8,8 +8,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 #load '../../lib/parsing_nesting/tree.rb'
 
 module SolrQuerySpecHelper
-  def parse(s)
-    ParsingNesting::Tree.parse(s)
+  def parse(s, arg=nil)
+    if arg
+      ParsingNesting::Tree.parse(s, arg)
+    else
+      ParsingNesting::Tree.parse(s)
+    end
   end
   
   # yields localparam string, and the actual internal query
@@ -65,15 +69,6 @@ describe "NestingParser" do
       before do
         @query = parse("one two three").to_query(:qf => "field field2^5", :pf=>"$pf_title")
       end
-      
-      it "should insist on dismax for nested query" do
-        query = parse("one two three").to_query(:defType => "field", :qf=>"$qf")
-        local_param_match(query) do |params, query|
-          params.should match(/^\!dismax /)
-          params.should_not match(/field/)
-        end
-      end
-      
       it "should include LocalParams" do
         local_param_match(@query) do |params, query|
           params.should include("pf=$pf_title")
@@ -87,6 +82,25 @@ describe "NestingParser" do
         end
       end
     end
+
+    describe "with custom qf" do
+      it "should insist on dismax for nested query" do
+        query = parse("one two three").to_query(:defType => "field", :qf=>"$qf")
+        local_param_match(query) do |params, query|
+          params.should match(/^\!dismax /)
+          params.should_not match(/field/)
+        end
+      end
+
+      it "should insist on edismax for nested query" do
+        query = parse("one two three", 'edismax').to_query(:defType => "field", :qf=>"$qf")
+        local_param_match(query) do |params, query|
+          params.should match(/^\!edismax qf=\$qf/)
+          params.should_not match(/field/)
+        end
+      end
+    end
+      
     
     describe "with simple mandatory/excluded terms" do
       before do

data/spec/spec_helper.rb

@@ -1,15 +1,10 @@
-require 'rubygems'
-require 'combustion'
-
 ENV["RAILS_ENV"] = "test"
 
-require 'capybara/rspec'
-Combustion.initialize! :active_model, :action_controller
+require 'engine_cart'
+EngineCart.load_application!
 
-class SolrDocument
-  include Blacklight::Solr::Document
-end
 
+require 'capybara/rspec'
 require 'rspec/rails'
 require 'capybara/rails'
 

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,14 @@
+platforms :jruby do
+  gem 'mediashelf-loggable', '>= 0.4.8'
+  gem 'therubyrhino'
+end
+
+group :test do
+  gem 'rspec-rails', '~> 2.13'
+  gem 'generator_spec'
+  gem 'capybara'
+  gem 'simplecov', :platform => :mri_19
+end
+
+gem 'jettywrapper', '>= 1.2.0'
+

data/spec/test_app_templates/app/controllers/catalog_controller.rb

@@ -0,0 +1,25 @@
+class CatalogController < ApplicationController
+  include Blacklight::Catalog
+
+  configure_blacklight do |config|
+      config.default_solr_params = { 
+        :qt => 'search',
+        :rows => 10 
+      }
+
+      config.add_facet_field 'language_facet'
+
+      config.add_search_field('title') do |field|
+        field.solr_local_parameters = { :qf => "title_t", :pf => "title_t"}
+      end
+
+      config.add_search_field('author') do |field|
+        field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
+      end
+
+      config.add_search_field('dummy_field') do |field|
+        field.include_in_advanced_search = false
+        field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
+      end
+    end
+  end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -0,0 +1,34 @@
+require 'rails/generators'
+
+class TestAppGenerator < Rails::Generators::Base
+  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+
+  def copy_blacklight_test_app_rake_task
+    copy_file "lib/tasks/blacklight_test_app.rake"
+  end
+
+  def remove_index 
+    remove_file "public/index.html"
+    remove_file 'app/assets/images/rails.png'
+  end
+
+  def run_blacklight_generator
+    say_status("warning", "GENERATING BL", :yellow)       
+
+    generate 'blacklight', '--marc'
+  end
+
+  def run_blacklight_advanced_search
+    generate 'blacklight_advanced_search', '--force'
+  end
+
+  def run_test_support_generator
+    say_status("warning", "GENERATING test_support", :yellow)       
+
+    generate 'blacklight:test_support'
+  end
+
+  def copy_blacklight_catalog_controller
+    copy_file "app/controllers/catalog_controller.rb", :force => true
+  end
+end

data/spec/test_app_templates/lib/tasks/blacklight_test_app.rake

@@ -0,0 +1,14 @@
+require 'rspec/core/rake_task'
+
+desc "run the blacklight gem spec"
+gem_home = File.expand_path('../../../../..', __FILE__)
+
+namespace :blacklight_test_app do
+
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    t.pattern = gem_home + '/spec/**/*_spec.rb'
+    t.rspec_opts = "--colour"
+    t.ruby_opts = "-I#{gem_home}/spec"
+  end
+
+end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
+  prerelease: 
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,11 +10,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -21,6 +23,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -28,113 +31,81 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: combustion
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: launchy
+  name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.2
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -145,6 +116,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -167,8 +139,8 @@ files:
 - app/views/advanced/index.html.erb
 - app/views/blacklight_advanced_search/_facet_limit.html.erb
 - blacklight_advanced_search.gemspec
+- config/jetty.yml
 - config/routes.rb
-- install.rb
 - lib/blacklight_advanced_search.rb
 - lib/blacklight_advanced_search/advanced_query_parser.rb
 - lib/blacklight_advanced_search/catalog_helper_override.rb
@@ -181,22 +153,12 @@ files:
 - lib/blacklight_advanced_search/version.rb
 - lib/generators/blacklight_advanced_search/assets_generator.rb
 - lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb
-- lib/generators/blacklight_advanced_search/templates/_search_form.html.erb
 - lib/generators/blacklight_advanced_search/templates/advanced_controller.rb
 - lib/parsing_nesting/Readme.rdoc
 - lib/parsing_nesting/grammar.rb
 - lib/parsing_nesting/tree.rb
-- spec/acceptance/blacklight_advanced_search_form_spec.rb
+- spec/features/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
@@ -204,42 +166,43 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- uninstall.rb
+- spec/test_app_templates/Gemfile.extra
+- spec/test_app_templates/app/controllers/catalog_controller.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/lib/tasks/blacklight_test_app.rake
 homepage: http://projectblacklight.org/
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4211602717521532640
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4211602717521532640
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 2.0.5
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Blacklight Advanced Search plugin
 test_files:
-- spec/acceptance/blacklight_advanced_search_form_spec.rb
+- spec/features/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
@@ -247,3 +210,7 @@ test_files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
+- spec/test_app_templates/Gemfile.extra
+- spec/test_app_templates/app/controllers/catalog_controller.rb
+- spec/test_app_templates/lib/generators/test_app_generator.rb
+- spec/test_app_templates/lib/tasks/blacklight_test_app.rake

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 88c89d9dad653f511cc4e2dea1697197d202629f
-  data.tar.gz: 696d97de529662c487dd7222977509f5989cd8b4
-SHA512:
-  metadata.gz: 363640e863a043a78538fa6626ce9e526d4d8e0327dabd41217e7229ed9f85daa98037267bb46cde9e21cb40d86fa8e535b83a9986deae4bbbd14a706ad28db3
-  data.tar.gz: f46ad4a220c5ce81564a96593f938fdf62b3f156d46a04c929e66a999c97737253912d8626f75744e3b3bc685045308eb7708b02a05aced9f165510b34520cd4

data/lib/generators/blacklight_advanced_search/templates/_search_form.html.erb

@@ -1,23 +0,0 @@
-  <%= form_tag search_action_url, :method => :get, :class => 'search-query-form form-inline clearfix' do %>
-    <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page]).html_safe %>
-
-    <% unless search_fields.empty? %>
-      <div class="pull-left">
-        <label for="search_field" class="hide-text"><%= t('blacklight.search.form.search_field.label') %></label>
-        <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => t('blacklight.search.form.search_field.title'), :class=>"search_field input-small") %>
-        <span class="hide-text"><%= t('blacklight.search.form.search_field.post_label') %></span>
-      </div>
-      <% end %>
-       <div class="input-append pull-left">
-        <label for="q" class="hide-text"><%= t('blacklight.search.form.q') %></label>
-         <%= text_field_tag :q, params[:q], :placeholder => t('blacklight.search.form.q'), :class => "search_q q", :id => "q"%>
-        <button type="submit" class="btn btn-primary search-btn" id="search">
-          <span class="submit-search-text"><%=t('blacklight.search.form.submit')%></span>
-          <i class="icon-search icon-white"></i>
-        </button>
-
-       </div>
-
-  <% end %>
-
-  <%= link_to 'More options', params.merge(:controller=>"advanced", :action=>"index") , :class=>"advanced_search"%>

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

@@ -1,6 +0,0 @@
-class ApplicationController < ActionController::Base
-  include Blacklight::Controller
-
-  layout 'blacklight'
-
-end

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

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

data/spec/internal/config/database.yml

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

data/spec/internal/config/routes.rb

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

data/spec/internal/config/solr.yml

@@ -1,18 +0,0 @@
-# = 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:8888/solr
-cucumber:
-  <<: *test

data/spec/internal/db/schema.rb

@@ -1,53 +0,0 @@
-# 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

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

data/uninstall.rb

@@ -1 +0,0 @@
-# Uninstall hook code here