blacklight_advanced_search 1.2.4 → 2.0.0

data/Gemfile

@@ -3,3 +3,4 @@ source 'http://rubygems.org'
 gemspec
 
 gem 'combustion'
+gem 'blacklight', :git => 'git://github.com/projectblacklight/blacklight.git'

data/README.rdoc

@@ -167,12 +167,16 @@ You may also find the rspecs for parsing a user-entered query and converting it
  
 == Running tests
 
-(experimental, in progress). 
+The Blacklight Advanced Search acceptance tests require a copy of the blacklight-jetty demo index. You can get a copy by running:
+  
+  git submodule init
+  git submodule update
+
+(Limited) test coverage is provided with rspec, run all tests (and start the jetty instance) by running:
+   rake ci 
 
-(Limited) test coverage is provided with rspec, run all tests by running:
-   rspec
+from the blacklight_advanced_search directory. Note: you may need to `bundle install` first. 
 
-from the blacklight_advanced_search directory. you may need to `bundle install` first. 
   
 == To Do
 

data/Rakefile

@@ -4,3 +4,54 @@ require 'rake/rdoctask'
 
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rspec/core/rake_task'
+
+require 'blacklight'
+import File.join(Blacklight.root, 'lib', 'railties', 'solr_marc.rake')
+
+task :default => :spec
+
+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") 
+  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
+
+
+  require 'jettywrapper'
+  jetty_params = {
+    :jetty_home => File.expand_path(File.dirname(__FILE__) + '/jetty'),
+    :quiet => false,
+    :jetty_port => 8888,
+    :solr_home => File.expand_path(File.dirname(__FILE__) + '/jetty/solr'),
+    :startup_wait => 30
+  }
+
+  error = Jettywrapper.wrap(jetty_params) do
+    Rake::Task['spec'].invoke
+  end
+  raise "test failures: #{error}" if error
+end

data/VERSION

@@ -1 +1 @@
-1.2.4
+2.0.0

data/app/assets/javascripts/blacklight_advanced_search/blacklight_advanced_search_javascript.js

@@ -1,53 +1,39 @@
 $(document).ready(function() {
-  $('.limit_column ul').each(function(){
-    var ul = $(this);
-    // find all ul's that don't have any span descendants with a class of "selected"
-    if($('span.selected', ul).length == 0){
-      // hide it
-      ul.hide();
-      // attach the toggle behavior to the h3 tag
-      $('h3', ul.parent()).click(function(){
-         // toggle the next ul sibling
-         $(this).next('ul').slideToggle();
-      });
-     }
-  });
-  
-  
+
   /* Stuff for handling the checkboxes */
   /* When you click a checkbox, update readout */
-  
-  
+
+
   /* Pass in a jquery obj holding the "selected facet element" spans,  get back
      a string for display representing currently checked things. */
   function checkboxesToString(checkbox_elements) {
     var selectedLabels = new Array();
     checkbox_elements.each(function() {
         if ($(this).is(":checked")) {
-          selectedLabels.push( $(this).next('label').text());
+          selectedLabels.push( $(this).next('.facet-value').text());
         }
     });
     return selectedLabels.join(" OR ");
   }
-  
+
   //Pass in JQuery object of zero or more <div class="facet_item"> blocks,
   //that contain an h3, some checkboxes, and a span.adv_facet_selections for
-  //display of current selections. Will update the span. 
+  //display of current selections. Will update the span.
   function updateSelectedDisplay(facet_item) {
     var checkboxes = $(facet_item).find("input:checkbox");
     var displaySpan = $(facet_item).find("span.adv_facet_selections");
     var displayStr = checkboxesToString( checkboxes );
-    
+
     displaySpan.text( displayStr );
     if (displayStr == "") {
       displaySpan.hide();
     } else {
       displaySpan.show();
     }
-    
-    
+
+
   }
-  
+
   // on page load, set initial properly
   $(".facet_item").each(function() {
       updateSelectedDisplay(this);
@@ -57,6 +43,6 @@ $(document).ready(function() {
   $(".facet_item input:checkbox").change( function() {
       updateSelectedDisplay( $(this).closest(".facet_item"));
   });
-  
-  
+
+
 });

data/app/assets/stylesheets/blacklight_advanced_search/blacklight_advanced_search_styles.css.scss

@@ -1,39 +1,12 @@
 
 /* Random styles */
 
-.advanced_search_field label {
-  display:block; 
+form.advanced h4 select {
+  height: auto;
+  margin: 0;
 }
 
-.advanced_search_field input {
-  margin-bottom: 0.666em;
-  width: 80%;
-}
-
-form.advanced label {
-  font-weight:normal;
-}
-
-form.advanced h2 {
-  font-weight: normal;
-  background-color: #EEEEEE;
-  height: 3em;
-}
-
-form.advanced .limit_column ul {
-  margin: 1em; 
-}
 
-form.advanced .limit_column li {
-  list-style: none;  
-  padding: 0.1em 0.4em;
-  font-size: 80%;
-}
-
-form.advanced .facet_item h3 {
-  cursor: pointer;
-}
-  
 form.advanced .adv_facet_selections {
   color:green;
   font-size: 80%;
@@ -41,65 +14,10 @@ form.advanced .adv_facet_selections {
   margin-top: 0.25em;
 }
 
-form.advanced .advanced_button {
-    -moz-border-radius: 4px 4px 4px 4px;
-    -webkit-border-radius: 4px 4px 4px 4px;
-    border-radius: 4px 4px 4px 4px;
-    background-color: #F6F6F6;
-    border: 1px solid #CCCCCC;
-    color: #2E4F81;
-    display: inline-block;
-    float: right;
-    margin-right: 1em;
-    padding: 0.4em 1em;
-    text-decoration: none;
-}
-
-form.advanced .reset {  
-}
-
-
 
 .advanced_help li {
   margin-top: 0.5em;
   margin-bottom: 0.5em;
 }
 
-form.advanced .sort_submit_buttons {
- background-color: #EEEEEE;
- padding: 1em; 
- margin-top: 1em;
- overflow: hidden; /* trick into containing floats please */
-}
-
-form.advanced .constraints {
-  padding: 1em;
-  margin-top: 1em;
-  background-color: #E2EDFE;
-  border: 1px solid #C4DAFE;
-}
-
-form.advanced .constraints h4 {
-  margin-bottom: 0.66em; 
-}
-
-form.advanced .constraints .constraint {
-  display:block;
-  padding-left:2em;
-  text-indent:-2em;
-}
-
-form.advanced .constraints .constraint .filterName {
-  font-weight: bold;
-  margin-right: 0.66em;
-}
-
-form.advanced .column > h2 {
-  padding: 0.33em;
-}
-form.advanced .column > div {
-  padding-left: 0.33em;
-  padding-right: 0.33em;
-}
-
 

data/app/helpers/advanced_helper.rb

@@ -4,7 +4,7 @@ module AdvancedHelper
   # Fill in default from existing search, if present
   # -- if you are using same search fields for basic
   # search and advanced, will even fill in properly if existing
-  # search used basic search on same field present in advanced. 
+  # search used basic search on same field present in advanced.
   def label_tag_default_for(key)
     if (! params[key].blank?)
       return params[key]
@@ -12,7 +12,7 @@ module AdvancedHelper
       return params["q"]
     else
       return nil
-    end    
+    end
   end
 
   # Is facet value in adv facet search results?
@@ -21,7 +21,7 @@ module AdvancedHelper
   end
 
   # Current params without fields that will be over-written by adv. search,
-  # or other fields we don't want. 
+  # or other fields we don't want.
   def advanced_search_context
     my_params = params.dup
     [:page, :commit, :f_inclusive, :q, :search_field, :op, :action, :index, :sort, :controller].each do |bad_key|
@@ -33,20 +33,20 @@ module AdvancedHelper
     my_params
   end
 
-  def search_fields_for_advanced_search   
+  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. 
+    # 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
     end
   end
-  
+
 end

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

@@ -1 +1,3 @@
-<%= render_facet_partials facet_field_names, :partial => 'facet_limit' %>
+<div class="facets-collapse" id="facets">
+<%= render_facet_partials facet_field_names %>
+</div>

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

@@ -1,6 +1,6 @@
 <%- search_fields_for_advanced_search.each do |key, field_def| -%>
   <div class="advanced_search_field">
       <%= label_tag key, "#{field_def.label }:" %>
-      <%= text_field_tag key, label_tag_default_for(key) %>
+      <%= text_field_tag key, label_tag_default_for(key), :class => 'input-block-level' %>
   </div>
 <%- end -%>

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

@@ -1,38 +1,42 @@
 <%= form_tag catalog_index_path, :class => 'advanced', :method => :get do  %>
 
-  <%= search_as_hidden_fields(:params => advanced_search_context ) %>  
+  <%= search_as_hidden_fields(:params => advanced_search_context ) %>
+
+  <div class="input_columns row">
+
+      <div class="query_column span6">
+        <h4>Find items that match <%= select_tag(:op, options_for_select({'all'=>'AND','any'=>'OR'}.sort,'all'), :class => 'input-small') %> of the fields below:</h4>
 
-  <div class="input_columns yui-g">
-	      
-      <div class="query_column column">
-        <h2>Find items that match <%= select_tag(:op, options_for_select({'all'=>'AND','any'=>'OR'}.sort,'all')) %> of the fields below:</h2>
-        
         <div id="advanced_search">
           <%= render 'advanced/advanced_search_fields' %>
-        </div>        
+        </div>
       </div>
-           <div class="limit_column column">      
-        <h2><strong>AND</strong> have these attributes:</h2>
-      
+           <div class="limit_column offset1 span4">
+        <h4><strong>AND</strong> have these attributes:</h4>
+
         <div id="advanced_search_facets" class="limit_input">
           <%= render 'advanced_search_facets' %>
         </div>
       </div>
   </div>
-  
+
   <% unless (search_context_str = render_search_to_s( advanced_search_context)).blank? %>
     <div class="constraints">
       <h4>Within search:</h4>
       <%= search_context_str %>
     </div>
   <% end %>
-  
-  
-  <div class="sort_submit_buttons">
-	<%= label_tag(:sort, "Sort results by") %> 
+
+
+  <div class="sort_submit_buttons well clearfix">
+    <div class="pull-left">
+	<%= label_tag(:sort, "Sort results by") %>
     <%= select_tag(:sort, options_for_select(sort_fields, h(params[:sort]))) %>
 	<%= hidden_field_tag(:search_field, blacklight_config.advanced_search[:url_key]) %>
-    <%= submit_tag 'Search', :class=>'advanced_button', :id=>'advanced_search' %>
-	<%= link_to "Start over", {:controller => "advanced", :action => "index"}, :class =>"reset advanced_button" %>
+</div>
+<div class="pull-right">
+    <%= submit_tag 'Search', :class=>'btn btn-primary', :id=>'advanced_search' %>
+	<%= link_to "Start over", {:controller => "advanced", :action => "index"}, :class =>"reset btn" %>
+</div>
   </div>
 <% end %>

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

@@ -1,5 +1,5 @@
 <div class="facet_item blacklight-<%= facet_field.field.parameterize %>">
-  <h3><%= facet_field.label -%> <span class="adv_facet_selections" style="display:none;"></span></h3>
+  <h5 class="twiddle"><%= facet_field.label -%> <i class="icon-chevron"></i><span class="adv_facet_selections" style="display:none;"></span></h5>
 
   <%= yield %>
 </div>

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

@@ -1,7 +1,7 @@
 <ul>
   <% display_facet.items.each do |item| -%>
   <li>
-     <%= check_box_tag "f_inclusive[#{solr_field}][#{item.value.to_sym}]", 1, facet_value_checked?(solr_field, item.value)%> <%= label_tag "f_inclusive_#{solr_field}[#{item.value.to_sym}]", h(item.value) %> (<%= format_num item.hits %>)
+    <%= 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' %>
   </li>
   <% end -%>
 </ul>

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

@@ -3,9 +3,10 @@
     <h4>Any of:</h4>
     <ul>
     <% @advanced_query.filters[solr_field].each do |value| %>
-        <li><span class="selected"><%= h(value) %></span> <%= link_to "[remove]", remove_advanced_facet_param(solr_field, value), :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_facet_params(solr_field, value, params), :class=>"remove") %></li>
     <% end %>
     </ul>
   </div>
-  
+
   <%= render_facet_limit display_facet, :layout => nil, :partial => 'catalog/facet_limit' %>
+</div>

data/blacklight_advanced_search.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
 
   s.add_dependency "rails", "~> 3.0"
-  s.add_dependency "blacklight", ">= 3.2.1", "~> 3.2"
+  s.add_dependency "blacklight", "~> 4.0"
   s.add_dependency "parslet"
 
   s.add_development_dependency "rspec"
@@ -27,4 +27,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "capybara"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency 'launchy'
+  s.add_development_dependency 'jettywrapper'
 end

data/lib/blacklight_advanced_search/render_constraints_override.rb

@@ -1,11 +1,15 @@
 # Meant to be applied on top of Blacklight view helpers, to over-ride
-# certain methods from RenderConstraintsHelper (newish in BL), 
-# to effect constraints rendering and search history rendering, 
+# certain methods from RenderConstraintsHelper (newish in BL),
+# to effect constraints rendering and search history rendering,
 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?)
+  end
+
   #Over-ride of Blacklight method, provide advanced constraints if needed,
   # otherwise call super. Existence of an @advanced_query instance variable
-  # is our trigger that we're in advanced mode. 
+  # is our trigger that we're in advanced mode.
   def render_constraints_query(my_params = params)
     if (@advanced_query.nil? || @advanced_query.keyword_queries.empty? )
       return super(my_params)
@@ -19,53 +23,53 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
             catalog_index_path(remove_advanced_keyword_query(field,my_params))
         )
       end
-      if (@advanced_query.keyword_op == "OR" &&   
+      if (@advanced_query.keyword_op == "OR" &&
           @advanced_query.keyword_queries.length > 1)
         content = '<span class="inclusive_or appliedFilter">' + '<span class="operator">Any of:</span>' + content + '</span>'
       end
-      
+
       return content
     end
   end
 
   #Over-ride of Blacklight method, provide advanced constraints if needed,
   # otherwise call super. Existence of an @advanced_query instance variable
-  # is our trigger that we're in advanced mode. 
+  # is our trigger that we're in advanced mode.
   def render_constraints_filters(my_params = params)
     content = super(my_params)
 
     if (@advanced_query)
       @advanced_query.filters.each_pair do |field, value_list|
         label = facet_field_labels[field]
-        content << render_constraint_element(label, 
+        content << render_constraint_element(label,
           value_list.join(" OR "),
           :remove => catalog_index_path( remove_advanced_filter_group(field, my_params) )
           )
       end
     end
-    
+
     return content
   end
 
   def render_search_to_s_filters(my_params)
     content = super(my_params)
-    
+
     advanced_query = BlacklightAdvancedSearch::QueryParser.new(my_params, blacklight_config )
-    
+
     if (advanced_query.filters.length > 0)
       advanced_query.filters.each_pair do |field, values|
         label = facet_field_labels[field]
-      
-        content << render_search_to_s_element( 
+
+        content << render_search_to_s_element(
           label,
           values.join(" OR ")
         )
-      end      
+      end
     end
     return content
   end
 
-  def render_search_to_s_q(my_params)    
+  def render_search_to_s_q(my_params)
     content = super(my_params)
 
     advanced_query = BlacklightAdvancedSearch::QueryParser.new(my_params, blacklight_config )
@@ -77,20 +81,20 @@ module BlacklightAdvancedSearch::RenderConstraintsOverride
         display_as = advanced_query.keyword_queries.collect do |field, query|
           h( search_field_def_for_key(field)[:label] + ": " + query )
         end.join(" ; ")
-        
+
         content << render_search_to_s_element("Any of",
           display_as,
           :escape_value => false
         )
-    elsif (advanced_query.keyword_queries.length > 0) 
+    elsif (advanced_query.keyword_queries.length > 0)
       advanced_query.keyword_queries.each_pair do |field, query|
         label = search_field_def_for_key(field)[:label]
 
         content << render_search_to_s_element(label, query)
-      end    
+      end
     end
-    
+
     return content
   end
-  
+
 end

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

@@ -1,13 +1,23 @@
-<div id="search" class="search">
-  <%= form_tag catalog_index_path, :method => :get do %>
-    <h2 class="search"><%= label_tag(:q, "Search ") %></h2>
-    <%= text_field_tag :q, params[:q], :class => "q" %>
-    <%= label_tag(:search_field, " in ") %>
-    <%= select_tag(:search_field, options_for_select(search_fields, h(params[:search_field])), :title => "Targeted search options", :class=>"search_field") %>
-    
-    <%= search_as_hidden_fields(:omit_keys => [:q, :search_field, :qt, :page]).html_safe %>        
-    
-    <%= submit_tag 'search', :class=>'submit' %>
+  <%= 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"%> 
-</div>
+
+  <%= link_to 'More options', params.merge(:controller=>"advanced", :action=>"index") , :class=>"advanced_search"%>

data/spec/acceptance/blacklight_advanced_search_form_spec.rb

@@ -1,19 +1,80 @@
 require 'spec_helper'
 
 describe "Blacklight Advanced Search Form" do
-  before do
-    AdvancedController.blacklight_config = Blacklight::Configuration.new
-    AdvancedController.configure_blacklight do |config|
+  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
+
+  describe "advanced search form" do
+    before do
+      visit '/advanced'
+    end
+
+    it "should have field and facet blocks" do
+      page.should have_selector('.query_column')
+      page.should have_selector('.limit_column')
+    end
+
+    describe "query column" do
+      it "should give the user a choice between and/or queries" do
+        page.should have_selector('#op')
+        within('#op') do
+          page.should have_selector('option[value="AND"]')
+          page.should have_selector('option[value="OR"]')
+        end
+      end
+
+      it "should list the configured search fields" do
+        page.should have_selector '.advanced_search_field #title'
+        page.should have_selector '.advanced_search_field #author'
+      end
+
+      it "should not list the search fields listed as not to be included in adv search" do
+        page.should_not have_selector '.advanced_search_field #dummy_field'
+      end
+    end
+
+    describe "facet column" do
+      it "should list facets" do
+        page.should have_selector('.blacklight-language_facet')
+
+        within('.blacklight-language_facet') do
+          page.should have_content "Language Facet"
+        end
+      end
+    end
+
+    it "scope searches to fields" do
+      fill_in "title", :with => "Medicine"
+      click_on "Search"
+      page.should have_content "Remove constraint Title: Medicine"
+      page.should have_content "2007020969"
     end
   end
 
   it "should show the search fields" do
     visit '/advanced'
     page.should have_selector('input#title')
-
   end
 end

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

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

data/spec/internal/config/solr.yml

@@ -13,6 +13,6 @@
 development:
   url: http://127.0.0.1:8983/solr
 test: &test
-  url: http://127.0.0.1:8983/solr
+  url: http://127.0.0.1:8888/solr
 cucumber:
   <<: *test

data/spec/spec_helper.rb

@@ -3,14 +3,13 @@ require 'bundler'
 
 Bundler.require :default, :development
 
+ENV["RAILS_ENV"] = "test"
+
 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

metadata

@@ -1,155 +1,168 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 2.0.0
   prerelease: 
-  segments: 
-  - 1
-  - 2
-  - 4
-  version: 1.2.4
 platform: ruby
-authors: 
+authors:
 - Jonathan Rochkind
 - Chris Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: blacklight
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 3
-        - 2
-        - 1
-        version: 3.2.1
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 3
-        - 2
-        version: "3.2"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: blacklight
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: parslet
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: parslet
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  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
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jettywrapper
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
-email: 
+email:
 - blacklight-development@googlegroups.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - LICENSE
@@ -213,38 +226,35 @@ files:
 - uninstall.rb
 homepage: http://projectblacklight.org/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -4136791477781994072
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -4136791477781994072
 requirements: []
-
 rubyforge_project: blacklight
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Blacklight Advanced Search plugin
-test_files: 
+test_files:
 - spec/acceptance/blacklight_advanced_search_form_spec.rb
 - spec/integration/blacklight_stub_spec.rb
 - spec/internal/app/controllers/application_controller.rb