blacklight_advanced_search 5.1.1 → 5.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a33cedcfe2d2ab6b0d6e13b59590f437a677c28f
+  data.tar.gz: 31a0d2c735d319c12d3b68f9ec628488422ae7b6
+SHA512:
+  metadata.gz: 63f77f4d587c6e992d989d1cd77fc29c06e1501dce50ef1dfadac14897d8a046634ed763e965020a99d4e612d23ab99b951e25cac8490bf739ccab996a6a9019
+  data.tar.gz: c150f0260b05357f3def4aa0dbfd1f96247fa9fcaef7cb55b76ba897b17553997f40b169b40f9c27520d01c25b219acb43935ac1bf3ad80eb1a77029aa8b9486

data/Gemfile

@@ -2,33 +2,19 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 4.0'
-
-group :test do
-  gem "bootstrap-sass"
-  gem 'turbolinks'
-end
-
-gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
-gem 'sqlite3', platform: :ruby
-
-# These need to be listed here explicitly for engine_cart testing to work,
-# not really sure why the existing gemspec and Gemfile of test app aren't enough. 
-gem 'jquery-rails'
-gem 'blacklight_marc'
-
-gem 'sass-rails'
-# If we don't specify 2.11.0 we'll end up with sprockets 2.12.0 in the main 
-# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
-# it'll want sprockets 2.11.0 and we'll have a conflict
-gem 'sprockets', '2.11.0'
-
-# If we don't specify 3.2.15 we'll end up with sass 3.3.2 in the main 
-# Gemfile.lock but since sass-rails gets generated (rails new) into the test app
-# it'll want sass 3.2.0 and we'll have a conflict
-gem 'sass', '~> 3.2.0'
-
-
-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
+file = File.expand_path("Gemfile", ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path("../spec/internal", __FILE__))
+if File.exists?(file)
+  puts "Loading #{file} ..." if $DEBUG # `ruby -d` or `bundle -v`
+  instance_eval File.read(file)
+else
+  gem 'rails', ENV['RAILS_VERSION']
+  
+  # explicitly include sass-rails to get compatible sprocket dependencies
+  if ENV['RAILS_VERSION'] and ENV['RAILS_VERSION'] =~ /^4.2/
+    gem 'sass-rails', ">= 5.0.0.beta1"
+    gem 'responders', "~> 2.0"
+  else
+    gem 'sass-rails', "< 5.0"
+    gem 'coffee-rails', "~> 4.0.0"
+  end
+end

data/VERSION

@@ -1 +1 @@
-5.1.1
+5.1.2

data/app/controllers/blacklight_advanced_search/advanced_controller.rb

@@ -54,7 +54,12 @@ class BlacklightAdvancedSearch::AdvancedController < CatalogController
     # ensure empty query is all records, to fetch available facets on entire corpus
     input[:q] ||= '{!lucene}*:*'
     
-    # first arg nil, use default search path. 
-    find(nil, input.to_hash)
+    # solr_repository was introduced in Blacklight 5.8
+    if respond_to? :solr_repository
+      solr_repository.search(input)
+    else
+      # first arg nil, use default search path.
+      find nil, input.to_hash
+    end
   end
 end

data/app/helpers/advanced_helper.rb

@@ -43,4 +43,9 @@ module AdvancedHelper
     end
   end
 
+  # Use configured facet partial name for facet or fallback on 'catalog/facet_limit'
+  def advanced_search_facet_partial_name(display_facet)
+    facet_configuration_for_field(display_facet.name).try(:partial) || "catalog/facet_limit"
+  end
+
 end

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

@@ -12,6 +12,5 @@
     <% end %>
     </ul>
   </div>
-
-  <%= render_facet_limit display_facet, :layout => nil, :partial => 'catalog/facet_limit' %>
+  <%= render_facet_limit display_facet, :layout => nil, :partial => advanced_search_facet_partial_name(display_facet) %>
 </div>

data/blacklight_advanced_search.gemspec

@@ -22,11 +22,8 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "blacklight_marc"
   s.add_development_dependency "rails"
-  s.add_development_dependency "rspec-rails"
+  s.add_development_dependency "rspec-rails", "~> 2.99"
+  s.add_development_dependency "capybara"
   s.add_development_dependency 'jettywrapper', ">= 1.4.2"
-
-  # engine_cart 0.3 is out, but can't run tests if we're using it,
-  # not sure what we need to change to work with 0.3, possibly cbeer
-  # might know, in the meantime locking to 0.2.x. 
-  s.add_development_dependency 'engine_cart', "~> 0.2.2"
+  s.add_development_dependency 'engine_cart', "~> 0.4"
 end

data/lib/blacklight_advanced_search/parse_basic_q.rb

@@ -11,6 +11,8 @@ require 'parsing_nesting/tree'
 # in your CatalogController
 module BlacklightAdvancedSearch::ParseBasicQ
   extend ActiveSupport::Concern
+
+  include Blacklight::SearchFields
   
   included do
     self.solr_search_params_logic += [:add_advanced_parse_q_to_solr]

data/spec/features/blacklight_advanced_search_form_spec.rb

@@ -11,35 +11,35 @@ describe "Blacklight Advanced Search Form" do
     end
 
     it "should have field and facet blocks" do
-      page.should have_selector('.query-criteria')
-      page.should have_selector('.limit-criteria')
+      expect(page).to have_selector('.query-criteria')
+      expect(page).to have_selector('.limit-criteria')
     end
 
     describe "query column" do
       it "should give the user a choice between and/or queries" do
-        page.should have_selector('#op')
+        expect(page).to have_selector('#op')
         within('#op') do
-          page.should have_selector('option[value="AND"]')
-          page.should have_selector('option[value="OR"]')
+          expect(page).to have_selector('option[value="AND"]')
+          expect(page).to 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'
+        expect(page).to have_selector '.advanced-search-field #title'
+        expect(page).to 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'
+        expect(page).not_to 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')
+        expect(page).to have_selector('.blacklight-language_facet')
 
         within('.blacklight-language_facet') do
-          page.should have_content "Language Facet"
+          expect(page).to have_content "Language Facet"
         end
       end
     end
@@ -47,14 +47,13 @@ describe "Blacklight Advanced Search Form" do
     it "scope searches to fields" do
       fill_in "title", :with => "Medicine"
       click_on "advanced-search-submit"
-      puts page.current_url
-      page.should have_content "Remove constraint Title: Medicine"
-      page.should have_content "2007020969"
+      expect(page).to have_content "Remove constraint Title: Medicine"
+      expect(page).to have_content "2007020969"
     end
   end
 
   it "should show the search fields" do
     visit '/advanced'
-    page.should have_selector('input#title')
+    expect(page).to have_selector('input#title')
   end
 end

data/spec/helpers/advanced_helper_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe AdvancedHelper do
+  describe '#advanced_search_facet_partial_name' do
+    let(:field) { double(name: "field_name") }
+    it 'should return the configured partial name if present' do
+      expect(helper).to receive(:facet_configuration_for_field).with(field.name).and_return(double(partial: 'partial-name'))
+      expect(helper.advanced_search_facet_partial_name(field)).to eq "partial-name"
+    end
+    it 'should fallback on "catalog/facet_limit" in the absence of a configured partial' do
+      expect(helper).to receive(:facet_configuration_for_field).with(field.name).and_return(nil)
+      expect(helper.advanced_search_facet_partial_name(field)).to eq "catalog/facet_limit"
+    end
+  end
+end

data/spec/integration/blacklight_stub_spec.rb

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

data/spec/lib/filter_parser_spec.rb

@@ -18,9 +18,9 @@ describe "BlacklightAdvancedSearch::FilterParser" do
 
       fq_params = generate_solr_fq
 
-      fq_params.find {|a| a =~ /format\:\((\"Book\"|\"Thesis\") +OR +(\"Thesis\"|\"Book\")/}.should_not be_nil
+      expect(fq_params.find {|a| a =~ /format\:\((\"Book\"|\"Thesis\") +OR +(\"Thesis\"|\"Book\")/}).not_to be_nil
 
-      fq_params.find {|a| a =~ /location\:\((\"Library\"|\"Online\") +OR +(\"Library\"|\"Online\")/}.should_not be_nil
+      expect(fq_params.find {|a| a =~ /location\:\((\"Library\"|\"Online\") +OR +(\"Library\"|\"Online\")/}).not_to be_nil
       
 
     end    

data/spec/parsing_nesting/build_tree_spec.rb

@@ -15,46 +15,46 @@ module ParseTreeSpecHelper
   # make sure they are and return the element
   def parse_one_element(s)
     l = parse(s)
-    l.should be_kind_of( List )
-    l.list.length.should == 1
+    expect(l).to be_kind_of( List )
+    expect(l.list.length).to eq(1)
     return l.list.first
   end
   
   def should_be_and_list(graph)
-    graph.should be_kind_of( AndList )
+    expect(graph).to be_kind_of( AndList )
     yield graph.list if block_given?
   end
   
   def should_be_list(graph)
-    graph.should be_kind_of( List)
+    expect(graph).to be_kind_of( List)
     yield graph.list if block_given?
   end
   
   def should_be_or_list(graph)
-    graph.should be_kind_of( OrList )
+    expect(graph).to be_kind_of( OrList )
     yield graph.list if block_given?
   end
   
   def should_be_term(graph, value)
-    graph.should be_kind_of( Term )
-    graph.value.should == value
+    expect(graph).to be_kind_of( Term )
+    expect(graph.value).to eq(value)
   end
   
   def should_be_phrase(graph, value)
-    graph.should be_kind_of( Phrase )
-    graph.value.should == value
+    expect(graph).to be_kind_of( Phrase )
+    expect(graph.value).to eq(value)
   end
   
   def should_be_mandatory(graph)
-    graph.should be_kind_of(MandatoryClause)
+    expect(graph).to be_kind_of(MandatoryClause)
     yield graph.operand if block_given?
   end
   def should_be_excluded(graph)
-    graph.should be_kind_of(ExcludedClause)
+    expect(graph).to be_kind_of(ExcludedClause)
     yield graph.operand if block_given?
   end
   def should_be_not_expression(graph)
-    graph.should be_kind_of(NotExpression)
+    expect(graph).to be_kind_of(NotExpression)
     yield graph.operand if block_given?
   end
 end
@@ -66,7 +66,7 @@ describe "NestingParser" do
     
     it "should build for term list" do
       should_be_list parse("one two three")  do |list|
-        list.length.should == 3
+        expect(list.length).to eq(3)
         should_be_term list[0], "one"
         should_be_term list[1], "two"
         should_be_term list[2], "three"        
@@ -75,7 +75,7 @@ describe "NestingParser" do
     
     it "should build AND list" do
       should_be_and_list parse_one_element("one AND two AND three") do |list|
-        list.length.should == 3
+        expect(list.length).to eq(3)
         
         should_be_term list[0], "one"
         should_be_term list[1], "two"
@@ -85,7 +85,7 @@ describe "NestingParser" do
     
     it "should build OR list" do
       should_be_or_list parse_one_element("one OR two OR three") do |list|        
-        list.length.should == 3
+        expect(list.length).to eq(3)
         should_be_term list[0], "one"
         should_be_term list[1], "two"
         should_be_term list[2], "three"                  
@@ -94,7 +94,7 @@ describe "NestingParser" do
     
     it "allows AND list of lists" do
       should_be_and_list parse_one_element('(one two) AND (blue yellow)') do |and_list|
-        and_list.length.should == 2
+        expect(and_list.length).to eq(2)
         should_be_list and_list[0] do |list|
           should_be_term(list[0], "one")
           should_be_term(list[1], "two")
@@ -105,7 +105,7 @@ describe "NestingParser" do
     
     it "should build for mandatory and excluded" do
       should_be_list parse("+one -two") do |list|
-        list.length.should == 2
+        expect(list.length).to eq(2)
         
         should_be_mandatory list[0] do |operand|
           should_be_term(operand, "one")
@@ -119,7 +119,7 @@ describe "NestingParser" do
     
     it "should build phrases" do
       should_be_list parse('"quick brown" +"jumps over" -"lazy dog"') do |list|
-        list.length.should == 3
+        expect(list.length).to eq(3)
         
         should_be_phrase(list[0], "quick brown")
       
@@ -169,12 +169,12 @@ describe "NestingParser" do
     
     it "should bind OR more tightly than AND" do
       should_be_and_list parse_one_element("grey AND big OR small AND tail") do |list|        
-        list.length.should == 3
+        expect(list.length).to eq(3)
         
         should_be_term list[0], "grey"
         
         should_be_or_list list[1] do |or_list|
-            or_list.length.should == 2
+            expect(or_list.length).to eq(2)
             should_be_term or_list[0], "big"
             should_be_term or_list[1], "small"         
         end
@@ -185,17 +185,17 @@ describe "NestingParser" do
     
     it "should parse AND'd lists" do      
       should_be_and_list parse_one_element("(foo bar one AND two) AND (three four ten OR twelve)") do |list|                
-        list.length.should == 2        
+        expect(list.length).to eq(2)        
         
         should_be_list(list[0]) do |first_half|
-          first_half[0].value.should == 'foo'
-          first_half[1].value.should == "bar"
+          expect(first_half[0].value).to eq('foo')
+          expect(first_half[1].value).to eq("bar")
           should_be_and_list(first_half[2])          
         end
         
         should_be_list(list[1]) do |second_half|
-          second_half[0].value.should == "three"
-          second_half[1].value.should == "four"
+          expect(second_half[0].value).to eq("three")
+          expect(second_half[1].value).to eq("four")
           should_be_or_list second_half[2]          
         end
       end
@@ -215,7 +215,7 @@ describe "NestingParser" do
             should_be_term or_list[1], "fun"
             
             should_be_and_list or_list[2] do |and_list|
-              and_list.length.should == 2
+              expect(and_list.length).to eq(2)
               
               should_be_and_list and_list[0]
               

data/spec/parsing_nesting/consuming_spec.rb

@@ -41,7 +41,7 @@ describe "NestingParser" do
      "(foo bar one AND two) AND (three four ten OR twelve)"
     ].each do |query|
       it "should consume<<#{query}>>" do
-        lambda {@parser.parse(query)}.should_not raise_error
+        expect {@parser.parse(query)}.not_to raise_error
       end
     end
   end

data/spec/parsing_nesting/to_solr_spec.rb

@@ -18,19 +18,19 @@ module SolrQuerySpecHelper
   
   # yields localparam string, and the actual internal query
   def local_param_match(query)
-    query.should =~ /^ *_query_:\"\{([^}]+)\}(.*)" *$/
+    expect(query).to match(/^ *_query_:\"\{([^}]+)\}(.*)" *$/)
     query =~ /^ *_query_:\"\{([^}]+)\}(.*)" *$/
-    (param_str = $1).should_not be_nil
-    (query = $2).should_not be_nil
+    expect(param_str = $1).not_to be_nil
+    expect(query = $2).not_to be_nil
     
     yield [param_str, query] if block_given?
   end
   
   def bare_local_param_match(query)
-    query.should =~ / *\{([^}]+)\}(.*)/
+    expect(query).to match(/ *\{([^}]+)\}(.*)/)
     query =~ /\{([^}]+)\}(.*)/
-    (param_str = $1).should_not be_nil
-    (query = $2).should_not be_nil
+    expect(param_str = $1).not_to be_nil
+    expect(query = $2).not_to be_nil
     yield [param_str, query] if block_given?
   end
   
@@ -55,7 +55,7 @@ module SolrQuerySpecHelper
     regexp_str = regexp_str.gsub("(", '\(').gsub(')', '\)').gsub("$QUERY", nested_re).gsub("$ALL", "\\*\\:\\*")
     regexp = Regexp.new('^ *' + regexp_str + ' *$')
 
-    top_query.should match( regexp )
+    expect(top_query).to match( regexp )
     
     yield *regexp.match(top_query).captures if block_given?    
   end
@@ -71,14 +71,14 @@ describe "NestingParser" do
       end
       it "should include LocalParams" do
         local_param_match(@query) do |params, query|
-          params.should include("pf=$pf_title")
-          params.should include('qf=\'field field2^5\'')          
+          expect(params).to include("pf=$pf_title")
+          expect(params).to include('qf=\'field field2^5\'')          
         end                
       end
       
       it "should include the query" do
         local_param_match(@query) do |params, query|
-          query.should == "one two three"
+          expect(query).to eq("one two three")
         end
       end
     end
@@ -87,16 +87,16 @@ describe "NestingParser" 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/)
+          expect(params).to match(/^\!dismax /)
+          expect(params).not_to 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/)
+          expect(params).to match(/^\!edismax qf=\$qf/)
+          expect(params).not_to match(/field/)
         end
       end
     end
@@ -109,7 +109,7 @@ describe "NestingParser" do
       end
       it "should include query" do
         local_param_match(@full_query) do |params, query|
-          query.should == @inner_query.gsub('"', '\\\\"')
+          expect(query).to eq(@inner_query.gsub('"', '\\\\"'))
         end
       end
     end
@@ -120,7 +120,7 @@ describe "NestingParser" do
       end
       it "should flatten to one dismax query" do
         local_param_match(@query) do |params, query|
-          query.should == "one +two +three"
+          expect(query).to eq("one +two +three")
         end
       end
       
@@ -130,7 +130,7 @@ describe "NestingParser" do
         end
         it "should preserve +/- operators" do
           local_param_match(@query) do |params, query|
-            query.should == "one -two +three"
+            expect(query).to eq("one -two +three")
           end
         end
       end
@@ -141,7 +141,7 @@ describe "NestingParser" do
         end
         it "should flatten into dismax" do
           local_param_match(@query) do |params, query|
-            query.should == "blue +green -violet +big -small +medium"
+            expect(query).to eq("blue +green -violet +big -small +medium")
           end
         end
       end     
@@ -149,8 +149,8 @@ describe "NestingParser" do
       it "for simple OR list, forcing mm=1" do
         query = parse("one OR two OR three").to_query(:qf => "$qf", :mm=>"50%")        
         local_param_match(query) do |params, query|
-          params.should include("mm=1")
-          query.should == "one two three"
+          expect(params).to include("mm=1")
+          expect(query).to eq("one two three")
         end                
       end
     end
@@ -165,13 +165,13 @@ describe "NestingParser" do
         query_template_matcher(query, "( *$QUERY +OR +$QUERY *)" ) do |first_half, second_half|
                 
           local_param_match(first_half) do |params, query|
-            params.should include("qf=$qf")
-            query.should == "one two three"
+            expect(params).to include("qf=$qf")
+            expect(query).to eq("one two three")
           end
           
           local_param_match(second_half) do |params, query|
-            params.should include("qf=$qf")
-            query.should == "red -green +blue"
+            expect(params).to include("qf=$qf")
+            expect(query).to eq("red -green +blue")
           end
         end
       end
@@ -181,8 +181,8 @@ describe "NestingParser" do
         query = parse("a OR b AND x OR y").to_query( params )
         
         query_template_matcher(query, "( *$QUERY +AND +$QUERY *)" ) do |first, second|                
-          first.should == parse("a OR b").to_query(params)
-          second.should == parse("x OR y").to_query(params)
+          expect(first).to eq(parse("a OR b").to_query(params))
+          expect(second).to eq(parse("x OR y").to_query(params))
         end
       end
       
@@ -191,8 +191,8 @@ describe "NestingParser" do
         query = parse("(one +two three) AND (four five -six)").to_query( params )
                 
         query_template_matcher(query, "( *$QUERY +AND +$QUERY *)" ) do |first, second|
-          first.should == parse("one +two three").to_query(params)
-          second.should == parse("four five -six").to_query(params)          
+          expect(first).to eq(parse("one +two three").to_query(params))
+          expect(second).to eq(parse("four five -six").to_query(params))          
         end
                 
       end
@@ -202,18 +202,18 @@ describe "NestingParser" do
         
         query_template_matcher(query, "( *$QUERY +AND +( *$QUERY +OR +($ALL AND NOT $QUERY *) *) +AND NOT $QUERY *)") do |red_q, dawn_q, night_q, moscow_q|
         
-          local_param_match(red_q) { |params, query| query.should == "red" }            
+          local_param_match(red_q) { |params, query| expect(query).to eq("red") }            
         
-          local_param_match(dawn_q) { |params, query| query.should == "dawn"}
+          local_param_match(dawn_q) { |params, query| expect(query).to eq("dawn")}
           
           local_param_match(night_q) do |params, query|
-            params.should include("mm=1")
-            query.should == "night afternoon"
+            expect(params).to include("mm=1")
+            expect(query).to eq("night afternoon")
           end
           
           local_param_match(moscow_q) do |params, query|
-            params.should include("mm=1")
-            query.should == "moscow beach"
+            expect(params).to include("mm=1")
+            expect(query).to eq("moscow beach")
           end
         
         end
@@ -228,7 +228,7 @@ describe "NestingParser" do
         query = parse("NOT frog").to_query
           
         query_template_matcher(query, "NOT $QUERY") do |q|
-          q.should == parse("frog").to_query
+          expect(q).to eq(parse("frog").to_query)
         end                    
       end
       it "binds tightly" do
@@ -237,11 +237,11 @@ describe "NestingParser" do
         query_template_matcher(query, "$QUERY AND NOT $QUERY") do |q1, q2|
           
           local_param_match(q1) do |params, query|
-            query.should == "one three"
+            expect(query).to eq("one three")
           end
           
           local_param_match(q2) do |params, query|
-            query.should == "two"
+            expect(query).to eq("two")
           end
         end
         
@@ -250,9 +250,9 @@ describe "NestingParser" do
         query = parse("one OR two NOT (three OR four AND five)").to_query
         #"_query_:'{!dismax mm=1}one two' AND NOT ( _query_:'{!dismax mm=1}three four' AND _query_:'{!dismax }five' )"
         query_template_matcher(query, "$QUERY +AND NOT +( *$QUERY +AND +$QUERY *)") do |external_or, internal_or, internal_term|
-          external_or.should == parse("one OR two").to_query
-          internal_or.should == parse("three OR four").to_query 
-          internal_term.should == parse("five").to_query 
+          expect(external_or).to eq(parse("one OR two").to_query)
+          expect(internal_or).to eq(parse("three OR four").to_query) 
+          expect(internal_term).to eq(parse("five").to_query) 
         end        
       end
       
@@ -269,8 +269,8 @@ describe "NestingParser" do
         
         query_template_matcher(query, " *NOT $QUERY") do |query|
           local_param_match(query) do |params, query|
-            params.should include("mm=1")
-            query.should == 'one two \\"a phrase\\"'
+            expect(params).to include("mm=1")
+            expect(query).to eq('one two \\"a phrase\\"')
           end
         end
         
@@ -281,8 +281,8 @@ describe "NestingParser" do
         
         query_template_matcher(query, "NOT $QUERY") do |query|
           local_param_match(query) do |params, query|
-            params.should =~ /mm=1 |$/
-            query.should == 'one two three'
+            expect(params).to match(/mm=1 |$/)
+            expect(query).to eq('one two three')
           end
         end
       end
@@ -292,8 +292,8 @@ describe "NestingParser" do
         
         query_template_matcher(query, "NOT $QUERY") do |query|
           local_param_match(query) do |params, query|
-            params.should include("mm=100%")
-            query.should == "one two three"
+            expect(params).to include("mm=100%")
+            expect(query).to eq("one two three")
           end
         end
 
@@ -316,28 +316,28 @@ describe "NestingParser" do
       describe "simple search" do
         it "should work with local params" do
           hash = parse("one +two -three").to_single_query_params(@solr_local_params)
-          hash[:defType].should == "dismax"
+          expect(hash[:defType]).to eq("dismax")
           bare_local_param_match(hash[:q]) do |params, query|
-            query.should == "one +two -three"
-            params.should include("pf=$title_pf")
-            params.should include("qf=$title_qf")
+            expect(query).to eq("one +two -three")
+            expect(params).to include("pf=$title_pf")
+            expect(params).to include("qf=$title_qf")
           end
         end
         
         it "should work without local params" do
           hash = parse("one +two -three").to_single_query_params({})
-          hash[:defType].should == "dismax"
-          hash[:q].should == "one +two -three"          
+          expect(hash[:defType]).to eq("dismax")
+          expect(hash[:q]).to eq("one +two -three")          
         end
       end
       describe "simple pure negative" do
         it "should be nested NOT" do
           hash = parse("-one -two").to_single_query_params({})
-          hash[:defType].should == "dismax"
+          expect(hash[:defType]).to eq("dismax")
           query_template_matcher(hash[:q], "NOT $QUERY") do |query|
             local_param_match(query) do |params, query|
-              query.should == "one two"
-              params.should include("mm=1")
+              expect(query).to eq("one two")
+              expect(params).to include("mm=1")
             end            
           end
         end
@@ -345,16 +345,16 @@ describe "NestingParser" do
       describe "complex query" do
         it "should parse" do
           hash = parse("one AND (two OR three)").to_single_query_params({})
-          hash[:defType].should == "lucene"
+          expect(hash[:defType]).to eq("lucene")
           query_template_matcher(hash[:q], "( *$QUERY +AND +$QUERY *)") do |first, second|
             local_param_match(first) do |params, query|
-              params.should include("dismax")
-              query.should == "one"
+              expect(params).to include("dismax")
+              expect(query).to eq("one")
             end
             local_param_match(second) do |params, query|
-              params.should include("mm=1")
-              params.should include("dismax")
-              query.should == "two three"
+              expect(params).to include("mm=1")
+              expect(params).to include("dismax")
+              expect(query).to eq("two three")
             end
           end
         end

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

@@ -3,10 +3,6 @@ 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'

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 5.1.1
-  prerelease: 
+  version: 5.1.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -10,126 +9,126 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-21 00:00:00.000000000 Z
+date: 2014-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
 - !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: blacklight_marc
   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: 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: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.99'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.99'
+- !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
-    none: false
     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: 1.4.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.2
 - !ruby/object:Gem::Dependency
   name: engine_cart
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: '0.4'
 description: 
 email:
 - blacklight-development@googlegroups.com
@@ -137,8 +136,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -182,6 +181,7 @@ files:
 - lib/parsing_nesting/grammar.rb
 - lib/parsing_nesting/tree.rb
 - spec/features/blacklight_advanced_search_form_spec.rb
+- spec/helpers/advanced_helper_spec.rb
 - spec/integration/blacklight_stub_spec.rb
 - spec/lib/deep_merge_spec.rb
 - spec/lib/filter_parser_spec.rb
@@ -192,42 +192,34 @@ 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
 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: 378368463660479159
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 378368463660479159
 requirements: []
 rubyforge_project: blacklight
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Blacklight Advanced Search plugin
 test_files:
 - spec/features/blacklight_advanced_search_form_spec.rb
+- spec/helpers/advanced_helper_spec.rb
 - spec/integration/blacklight_stub_spec.rb
 - spec/lib/deep_merge_spec.rb
 - spec/lib/filter_parser_spec.rb
@@ -238,7 +230,5 @@ 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

data/spec/test_app_templates/Gemfile.extra

@@ -1,16 +0,0 @@
-platforms :jruby do
-  gem 'mediashelf-loggable', '>= 0.4.8'
-  gem 'therubyrhino'
-end
-
-gem 'blacklight', github: 'projectblacklight/blacklight', branch: 'master'
-
-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/lib/tasks/blacklight_test_app.rake

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