sunspot 2.0.0 → 2.5.0

data/spec/api/query/faceting_examples.rb

@@ -2,114 +2,133 @@ shared_examples_for "facetable query" do
   describe 'on fields' do
     it 'does not turn faceting on if no facet requested' do
       search
-      connection.should_not have_last_search_with('facet')
+      expect(connection).not_to have_last_search_with('facet')
     end
 
     it 'turns faceting on if facet is requested' do
       search do
         facet :category_ids
       end
-      connection.should have_last_search_with(:facet => 'true')
+      expect(connection).to have_last_search_with(:facet => 'true')
     end
 
     it 'requests single field facet' do
       search do
         facet :category_ids
       end
-      connection.should have_last_search_with(:"facet.field" => %w(category_ids_im))
+      expect(connection).to have_last_search_with(:"facet.field" => %w(category_ids_im))
     end
 
     it 'requests multiple field facets' do
       search do
         facet :category_ids, :blog_id
       end
-      connection.should have_last_search_with(:"facet.field" => %w(category_ids_im blog_id_i))
+      expect(connection).to have_last_search_with(:"facet.field" => %w(category_ids_im blog_id_i))
     end
 
     it 'sets facet sort by count' do
       search do
         facet :category_ids, :sort => :count
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.sort" => 'true')
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.sort" => 'true')
     end
 
     it 'sets facet sort by index' do
       search do
         facet :category_ids, :sort => :index
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.sort" => 'false')
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.sort" => 'false')
     end
 
     it 'raises ArgumentError if bogus facet sort provided' do
-      lambda do
+      expect do
         search do
           facet :category_ids, :sort => :sideways
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'sets the facet limit' do
       search do
         facet :category_ids, :limit => 10
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.limit" => 10)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.limit" => 10)
     end
     
     it 'sets the facet offset' do
       search do
         facet :category_ids, :offset => 10
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.offset" => 10)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.offset" => 10)
     end
 
     it 'sets the facet minimum count' do
       search do
         facet :category_ids, :minimum_count => 5
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.mincount" => 5)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.mincount" => 5)
     end
 
     it 'sets the facet minimum count to zero if zeros are allowed' do
       search do
         facet :category_ids, :zeros => true
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.mincount" => 0)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.mincount" => 0)
     end
 
     it 'sets the facet minimum count to one by default' do
       search do
         facet :category_ids
       end
-      connection.should have_last_search_with(:"f.category_ids_im.facet.mincount" => 1)
+      expect(connection).to have_last_search_with(:"f.category_ids_im.facet.mincount" => 1)
     end
 
     it 'sets the facet prefix' do
       search do
         facet :title, :prefix => 'Test'
       end
-      connection.should have_last_search_with(:"f.title_ss.facet.prefix" => 'Test')
+      expect(connection).to have_last_search_with(:"f.title_ss.facet.prefix" => 'Test')
     end
     
     it 'sends a query facet for :any extra' do
       search do
         facet :category_ids, :extra => :any
       end
-      connection.should have_last_search_with(:"facet.query" => "category_ids_im:[* TO *]")
+      expect(connection).to have_last_search_with(:"facet.query" => "category_ids_im:[* TO *]")
     end
 
     it 'sends a query facet for :none extra' do
       search do
         facet :category_ids, :extra => :none
       end
-      connection.should have_last_search_with(:"facet.query" => "-category_ids_im:[* TO *]")
+      expect(connection).to have_last_search_with(:"facet.query" => "-category_ids_im:[* TO *]")
     end
 
     it 'raises an ArgumentError if bogus extra is passed' do
-      lambda do
+      expect do
         search do
           facet :category_ids, :extra => :bogus
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
+    end
+
+    it 'tags and excludes a geofilt in a field facet' do
+      search do
+        post_geo = with(:coordinates_new).in_radius(32, -68, 1)
+        facet(:coordinates_new, :exclude => post_geo) do
+          row(0..10) do
+            with(:coordinates_new).in_radius(32, -68, 10)
+          end
+        end
+      end
+      if connection.searches.last.has_key?(:"mlt.fl")
+        filter_tag = get_filter_tag('_query_:"{!geofilt sfield=coordinates_new_ll pt=32,-68 d=1}"')
+      else
+        filter_tag = get_filter_tag('{!geofilt sfield=coordinates_new_ll pt=32,-68 d=1}')
+      end
+      expect(connection).to have_last_search_with(
+        :"facet.query" => "{!ex=#{filter_tag}}_query_:\"{!geofilt sfield=coordinates_new_ll pt=32,-68 d=10}\""
+      )
     end
 
     it 'tags and excludes a scope filter in a field facet' do
@@ -118,7 +137,7 @@ shared_examples_for "facetable query" do
         facet(:blog_id, :exclude => blog_filter)
       end
       filter_tag = get_filter_tag('blog_id_i:1')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.field" => %W({!ex=#{filter_tag}}blog_id_i)
       )
     end
@@ -132,7 +151,7 @@ shared_examples_for "facetable query" do
         facet(:blog_id, :exclude => blog_filter)
       end
       filter_tag = get_filter_tag('(blog_id_i:1 OR blog_id_i:2)')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.field" => %W({!ex=#{filter_tag}}blog_id_i)
       )
     end
@@ -146,7 +165,7 @@ shared_examples_for "facetable query" do
       filter_tags = %w(blog_id_i:1 category_ids_im:2).map do |phrase|
         get_filter_tag(phrase)
       end.join(',')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.field" => %W({!ex=#{filter_tags}}blog_id_i)
       )
     end
@@ -155,39 +174,39 @@ shared_examples_for "facetable query" do
       search do
         with(:blog_id, 1)
       end
-      connection.should have_last_search_including(:fq, "blog_id_i:1")
+      expect(connection).to have_last_search_including(:fq, "blog_id_i:1")
     end
 
     it 'names a field facet' do
       search do
         facet(:blog_id, :name => :blog)
       end
-      connection.should have_last_search_including(:"facet.field", "{!key=blog}blog_id_i")
+      expect(connection).to have_last_search_including(:"facet.field", "{!key=blog}blog_id_i")
     end
 
     it 'uses the custom field facet name in facet option parameters' do
       search do
         facet(:blog_id, :name => :blog, :sort => :count)
       end
-      connection.should have_last_search_with(:"f.blog.facet.sort" => 'true')
+      expect(connection).to have_last_search_with(:"f.blog.facet.sort" => 'true')
     end
 
     it 'raises an ArgumentError if exclusion attempted on a restricted field facet' do
-      lambda do
+      expect do
         search do
           blog_filter = with(:blog_id, 1)
           facet(:blog_id, :only => 1, :exclude => blog_filter)
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'raises an ArgumentError if exclusion attempted on a facet with :extra' do
-      lambda do
+      expect do
         search do
           blog_filter = with(:blog_id, 1)
           facet(:blog_id, :extra => :all, :exclude => blog_filter)
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 
@@ -201,21 +220,21 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :published_at
       end
-      connection.should_not have_last_search_with(:"facet.date")
+      expect(connection).not_to have_last_search_with(:"facet.date")
     end
 
     it 'sets the facet to a date facet if time range is specified' do
       search do |query|
         query.facet :published_at, :time_range => @time_range
       end
-      connection.should have_last_search_with(:"facet.date" => ['published_at_dt'])
+      expect(connection).to have_last_search_with(:"facet.date" => ['published_at_dt'])
     end
 
     it 'sets the facet start and end' do
       search do |query|
         query.facet :published_at, :time_range => @time_range
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"f.published_at_dt.facet.date.start" => '2009-06-01T04:00:00Z',
         :"f.published_at_dt.facet.date.end" => '2009-07-01T04:00:00Z'
       )
@@ -225,22 +244,22 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :published_at, :time_range => @time_range
       end
-      connection.should have_last_search_with(:"f.published_at_dt.facet.date.gap" => "+86400SECONDS")
+      expect(connection).to have_last_search_with(:"f.published_at_dt.facet.date.gap" => "+86400SECONDS")
     end
 
     it 'uses custom time interval' do
       search do |query|
         query.facet :published_at, :time_range => @time_range, :time_interval => 3600
       end
-      connection.should have_last_search_with(:"f.published_at_dt.facet.date.gap" => "+3600SECONDS")
+      expect(connection).to have_last_search_with(:"f.published_at_dt.facet.date.gap" => "+3600SECONDS")
     end
 
     it 'does not allow date faceting on a non-date field' do
-      lambda do
+      expect do
         search do |query|
           query.facet :blog_id, :time_range => @time_range
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 
@@ -253,21 +272,21 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :average_rating
       end
-      connection.should_not have_last_search_with(:"facet.range")
+      expect(connection).not_to have_last_search_with(:"facet.range")
     end
 
     it 'sets the facet to a range facet if the range is specified' do
       search do |query|
         query.facet :average_rating, :range => @range
       end
-      connection.should have_last_search_with(:"facet.range" => ['average_rating_ft'])
+      expect(connection).to have_last_search_with(:"facet.range" => ['average_rating_ft'])
     end
 
     it 'sets the facet start and end' do
       search do |query|
         query.facet :average_rating, :range => @range
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"f.average_rating_ft.facet.range.start" => '2.0',
         :"f.average_rating_ft.facet.range.end" => '4.0'
       )
@@ -277,14 +296,14 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :average_rating, :range => @range
       end
-      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "10")
+      expect(connection).to have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "10")
     end
 
     it 'uses custom range interval' do
       search do |query|
         query.facet :average_rating, :range => @range, :range_interval => 1
       end
-      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "1")
+      expect(connection).to have_last_search_with(:"f.average_rating_ft.facet.range.gap" => "1")
     end
 
     it 'tags and excludes a scope filter in a range facet' do
@@ -293,7 +312,7 @@ shared_examples_for "facetable query" do
         query.facet(:average_rating, :range => @range, :exclude => blog_filter)
       end
       filter_tag = get_filter_tag('blog_id_i:1')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.range" => %W({!ex=#{filter_tag}}average_rating_ft)
       )
     end
@@ -302,15 +321,15 @@ shared_examples_for "facetable query" do
       search do |query|
         query.facet :average_rating, :range => @range, :include => :edge
       end
-      connection.should have_last_search_with(:"f.average_rating_ft.facet.range.include" => "edge")
+      expect(connection).to have_last_search_with(:"f.average_rating_ft.facet.range.include" => "edge")
     end
 
     it 'does not allow date faceting on a non-continuous field' do
-      lambda do
+      expect do
         search do |query|
           query.facet :title, :range => @range
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 
@@ -323,7 +342,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(:facet => 'true')
+      expect(connection).to have_last_search_with(:facet => 'true')
     end
 
     it 'facets by query' do
@@ -334,7 +353,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(:"facet.query" => 'average_rating_ft:[4\.0 TO 5\.0]')
+      expect(connection).to have_last_search_with(:"facet.query" => 'average_rating_ft:[4\.0 TO 5\.0]')
     end
 
     it 'requests multiple query facets' do
@@ -348,7 +367,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => [
           'average_rating_ft:[3\.0 TO 4\.0]',
           'average_rating_ft:[4\.0 TO 5\.0]'
@@ -365,7 +384,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => '(category_ids_im:1 AND blog_id_i:2)'
       )
     end
@@ -381,7 +400,7 @@ shared_examples_for "facetable query" do
           end
         end
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => '(category_ids_im:1 OR blog_id_i:2)'
       )
     end
@@ -390,7 +409,7 @@ shared_examples_for "facetable query" do
       search do
         facet :category_ids, :only => [1, 3]
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => ['category_ids_im:1', 'category_ids_im:3']
       )
     end
@@ -399,7 +418,7 @@ shared_examples_for "facetable query" do
       search do
         facet :published_at, :only => [Time.utc(2009, 8, 28, 15, 33), Time.utc(2008,8, 28, 15, 33)]
       end
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => [
           'published_at_dt:2009\-08\-28T15\:33\:00Z',
           'published_at_dt:2008\-08\-28T15\:33\:00Z'
@@ -411,7 +430,7 @@ shared_examples_for "facetable query" do
       search do
         facet(:foo) {}
       end
-      connection.should_not have_last_search_with(:"facet.query")
+      expect(connection).not_to have_last_search_with(:"facet.query")
     end
 
     it 'ignores facet query row with no restrictions' do
@@ -423,7 +442,7 @@ shared_examples_for "facetable query" do
           row(:baz) {}
         end
       end
-      connection.searches.last[:"facet.query"].should be_a(String)
+      expect(connection.searches.last[:"facet.query"]).to be_a(String)
     end
 
     it 'tags and excludes a scope filter in a query facet' do
@@ -436,7 +455,7 @@ shared_examples_for "facetable query" do
         end
       end
       filter_tag = get_filter_tag('blog_id_i:1')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => "{!ex=#{filter_tag}}category_ids_im:1"
       )
     end
@@ -454,7 +473,7 @@ shared_examples_for "facetable query" do
         end
       end
       filter_tag = get_filter_tag('(blog_id_i:1 OR blog_id_i:2)')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => "{!ex=#{filter_tag}}category_ids_im:1"
       )
     end
@@ -472,7 +491,7 @@ shared_examples_for "facetable query" do
       filter_tags = %w(blog_id_i:1 category_ids_im:2).map do |phrase|
         get_filter_tag(phrase)
       end.join(',')
-      connection.should have_last_search_with(
+      expect(connection).to have_last_search_with(
         :"facet.query" => "{!ex=#{filter_tags}}category_ids_im:1"
       )
     end
@@ -484,25 +503,25 @@ shared_examples_for "facetable query" do
           row(:bar) {}
         end
       end
-      connection.should_not have_last_search_with(:"facet.query")
+      expect(connection).not_to have_last_search_with(:"facet.query")
     end
 
     it 'does not allow 0 arguments to facet method with block' do
-      lambda do
+      expect do
         search do
           facet do
           end
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
 
     it 'does not allow more than 1 argument to facet method with block' do
-      lambda do
+      expect do
         search do
           facet :foo, :bar do
           end
         end
-      end.should raise_error(ArgumentError)
+      end.to raise_error(ArgumentError)
     end
   end
 end