sunspot 2.0.0 → 2.5.0

data/spec/api/query/function_spec.rb

@@ -7,7 +7,7 @@ describe 'function query' do
         boost(function { :average_rating })
       end
     end
-    connection.should have_last_search_including(:bf, 'average_rating_ft')
+    expect(connection).to have_last_search_including(:bf, 'average_rating_ft')
   end
 
   it "should send query to solr with boost function and boost amount" do
@@ -16,7 +16,7 @@ describe 'function query' do
         boost(function { :average_rating }^5)
       end
     end
-    connection.should have_last_search_including(:bf, 'average_rating_ft^5')
+    expect(connection).to have_last_search_including(:bf, 'average_rating_ft^5')
   end
 
   it "should handle boost function with constant float" do
@@ -25,7 +25,7 @@ describe 'function query' do
         boost(function { 10.5 })
       end
     end
-    connection.should have_last_search_including(:bf, '10.5')
+    expect(connection).to have_last_search_including(:bf, '10.5')
   end
 
   it "should handle boost function with constant float and boost amount" do
@@ -34,7 +34,7 @@ describe 'function query' do
         boost(function { 10.5 }^5)
       end
     end
-    connection.should have_last_search_including(:bf, '10.5^5')
+    expect(connection).to have_last_search_including(:bf, '10.5^5')
   end
 
   it "should handle boost function with time literal" do
@@ -43,7 +43,7 @@ describe 'function query' do
         boost(function { Time.parse('2010-03-25 14:13:00 EDT') })
       end
     end
-    connection.should have_last_search_including(:bf, '2010-03-25T18:13:00Z')
+    expect(connection).to have_last_search_including(:bf, '2010-03-25T18:13:00Z')
   end
  
   it "should handle arbitrary functions in a function query block" do
@@ -52,7 +52,7 @@ describe 'function query' do
         boost(function { product(:average_rating, 10) })
       end
     end
-    connection.should have_last_search_including(:bf, 'product(average_rating_ft,10)')
+    expect(connection).to have_last_search_including(:bf, 'product(average_rating_ft,10)')
   end
 
   it "should handle the sub function in a function query block" do
@@ -61,7 +61,7 @@ describe 'function query' do
         boost(function { sub(:average_rating, 10) })
       end
     end
-    connection.should have_last_search_including(:bf, 'sub(average_rating_ft,10)')
+    expect(connection).to have_last_search_including(:bf, 'sub(average_rating_ft,10)')
   end
 
   it "should handle boost amounts on function query block" do
@@ -70,7 +70,7 @@ describe 'function query' do
         boost(function { sub(:average_rating, 10)^5 })
       end
     end
-    connection.should have_last_search_including(:bf, 'sub(average_rating_ft,10)^5')
+    expect(connection).to have_last_search_including(:bf, 'sub(average_rating_ft,10)^5')
   end
  
   it "should handle nested functions in a function query block" do
@@ -79,28 +79,131 @@ describe 'function query' do
         boost(function { product(:average_rating, sum(:average_rating, 20)) })
       end
     end
-    connection.should have_last_search_including(:bf, 'product(average_rating_ft,sum(average_rating_ft,20))')
+    expect(connection).to have_last_search_including(:bf, 'product(average_rating_ft,sum(average_rating_ft,20))')
   end
 
   # TODO SOLR 1.5
   it "should raise ArgumentError if string literal passed" do
-    lambda do
+    expect do
       session.search Post do
         keywords('pizza') do
           boost(function { "hello world" })
         end
       end
-    end.should raise_error(ArgumentError)
+    end.to raise_error(ArgumentError)
   end
 
   it "should raise UnrecognizedFieldError if bogus field name passed" do
-    lambda do
+    expect do
       session.search Post do
         keywords('pizza') do
           boost(function { :bogus })
         end
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
+
+  it "should send query to solr with multiplicative boost function" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { :average_rating })
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, 'average_rating_ft')
+  end
+
+  it "should send query to solr with multiplicative boost function and boost amount" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { :average_rating }^5)
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, 'average_rating_ft^5')
+  end
+
+  it "should handle multiplicative boost function with constant float" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { 10.5 })
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, '10.5')
+  end
+
+  it "should handle multiplicative boost function with constant float and boost amount" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { 10.5 }^5)
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, '10.5^5')
+  end
+
+  it "should handle multiplicative boost function with time literal" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { Time.parse('2010-03-25 14:13:00 EDT') })
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, '2010-03-25T18:13:00Z')
+  end
+ 
+  it "should handle arbitrary functions in a function query block" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { product(:average_rating, 10) })
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, 'product(average_rating_ft,10)')
+  end
+
+  it "should handle the sub function in a multiplicative boost function query block" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { sub(:average_rating, 10) })
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, 'sub(average_rating_ft,10)')
+  end
+
+  it "should handle boost amounts on multiplicative boost function query block" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { sub(:average_rating, 10)^5 })
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, 'sub(average_rating_ft,10)^5')
+  end
+ 
+  it "should handle nested functions in a multiplicative boost function query block" do
+    session.search Post do
+      keywords('pizza') do
+        multiplicative_boost(function { product(:average_rating, sum(:average_rating, 20)) })
+      end
+    end
+    expect(connection).to have_last_search_including(:boost, 'product(average_rating_ft,sum(average_rating_ft,20))')
+  end
+
+  # TODO SOLR 1.5
+  it "should raise ArgumentError if string literal passed to multiplicative boost" do
+    expect do
+      session.search Post do
+        keywords('pizza') do
+          multiplicative_boost(function { "hello world" })
+        end
+      end
+    end.to raise_error(ArgumentError)
+  end
+
+  it "should raise UnrecognizedFieldError if bogus field name passed to multiplicative boost" do
+    expect do
+      session.search Post do
+        keywords('pizza') do
+          multiplicative_boost(function { :bogus })
+        end
+      end
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
+  end
+
 end
 

data/spec/api/query/geo_examples.rb

@@ -5,35 +5,35 @@ shared_examples_for 'geohash query' do
     search do
       with(:coordinates).near(40.7, -73.5)
     end
-    connection.should have_last_search_including(:q, build_geo_query)
+    expect(connection).to have_last_search_including(:q, build_geo_query)
   end
 
   it 'searches for nearby points with non-Float arguments' do
     search do
       with(:coordinates).near(BigDecimal.new('40.7'), BigDecimal.new('-73.5'))
     end
-    connection.should have_last_search_including(:q, build_geo_query)
+    expect(connection).to have_last_search_including(:q, build_geo_query)
   end
 
   it 'searches for nearby points with given precision' do
     search do
       with(:coordinates).near(40.7, -73.5, :precision => 10)
     end
-    connection.should have_last_search_including(:q, build_geo_query(:precision => 10))
+    expect(connection).to have_last_search_including(:q, build_geo_query(:precision => 10))
   end
 
   it 'searches for nearby points with given precision factor' do
     search do
       with(:coordinates).near(40.7, -73.5, :precision_factor => 1.5)
     end
-    connection.should have_last_search_including(:q, build_geo_query(:precision_factor => 1.5))
+    expect(connection).to have_last_search_including(:q, build_geo_query(:precision_factor => 1.5))
   end
 
   it 'searches for nearby points with given boost' do
     search do
       with(:coordinates).near(40.7, -73.5, :boost => 2.0)
     end
-    connection.should have_last_search_including(:q, build_geo_query(:boost => 2.0))
+    expect(connection).to have_last_search_including(:q, build_geo_query(:boost => 2.0))
   end
 
   it 'performs both dismax search and location search' do
@@ -41,12 +41,8 @@ shared_examples_for 'geohash query' do
       fulltext 'pizza', :fields => :title
       with(:coordinates).near(40.7, -73.5)
     end
-    expected = 
-      "{!dismax fl='* score' qf='title_text'}pizza (#{build_geo_query})"
-    connection.should have_last_search_including(
-      :q,
-      %Q(_query_:"{!dismax qf='title_text'}pizza" (#{build_geo_query}))
-    )
+    expected = %Q((_query_:"{!edismax qf='title_text'}pizza" AND (#{build_geo_query})))
+    expect(connection).to have_last_search_including(:q, expected)
   end
 
   private
@@ -57,7 +53,7 @@ shared_examples_for 'geohash query' do
     boost = options[:boost] || 1.0
     hash = 'dr5xx3nytvgs'
     (precision..12).map do |i|
-      phrase = 
+      phrase =
         if i == 12 then hash
         else "#{hash[0, i]}*"
         end

data/spec/api/query/group_spec.rb

@@ -1,13 +1,13 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
-describe "field grouping" do
+describe "grouping" do
   it "sends grouping parameters to solr" do
     session.search Post do
       group :title
     end
 
-    connection.should have_last_search_including(:group, "true")
-    connection.should have_last_search_including(:"group.field", "title_ss")
+    expect(connection).to have_last_search_including(:group, "true")
+    expect(connection).to have_last_search_including(:"group.field", "title_ss")
   end
 
   it "sends grouping limit parameters to solr" do
@@ -17,7 +17,7 @@ describe "field grouping" do
       end
     end
 
-    connection.should have_last_search_including(:"group.limit", 2)
+    expect(connection).to have_last_search_including(:"group.limit", 2)
   end
 
   it "sends grouping sort parameters to solr" do
@@ -27,6 +27,28 @@ describe "field grouping" do
       end
     end
 
-    connection.should have_last_search_including(:"group.sort", "average_rating_ft asc")
+    expect(connection).to have_last_search_including(:"group.sort", "average_rating_ft asc")
+  end
+
+  it "sends grouping field parameters to solr" do
+    session.search Post do
+      group do
+        field :title
+      end
+    end
+
+    expect(connection).to have_last_search_including(:"group.field", "title_ss")
+  end
+
+  it "sends grouping query parameters to solr" do
+    session.search Post do
+      group do
+        query 'category 1' do
+          with(:category_ids, 1)
+        end
+      end
+    end
+
+    expect(connection).to have_last_search_including(:"group.query", "category_ids_im:1")
   end
 end

data/spec/api/query/highlighting_examples.rb

@@ -3,21 +3,21 @@ shared_examples_for "query with highlighting support" do
     search do
       keywords 'test'
     end
-    connection.should_not have_last_search_with(:hl)
+    expect(connection).not_to have_last_search_with(:hl)
   end
 
   it 'should enable highlighting when highlighting requested as keywords argument' do
     search do
       keywords 'test', :highlight => true
     end
-    connection.should have_last_search_with(:hl => 'on')
+    expect(connection).to have_last_search_with(:hl => 'on')
   end
 
   it 'should not set highlight fields parameter if highlight fields are not passed' do
     search do
       keywords 'test', :highlight => true, :fields => [:title]
     end
-    connection.should_not have_last_search_with(:'hl.fl')
+    expect(connection).not_to have_last_search_with(:'hl.fl')
   end
 
   it 'should enable highlighting on multiple fields when highlighting requested as array of fields via keywords argument' do
@@ -25,15 +25,15 @@ shared_examples_for "query with highlighting support" do
       keywords 'test', :highlight => [:title, :body]
     end
 
-    connection.should have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_textsv))
+    expect(connection).to have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_textsv))
   end
 
   it 'should raise UnrecognizedFieldError if try to highlight unexisting field via keywords argument' do
-    lambda {
+    expect {
       search do
         keywords 'test', :highlight => [:unknown_field]
       end
-    }.should raise_error(Sunspot::UnrecognizedFieldError)
+    }.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'should enable highlighting on multiple fields when highlighting requested as list of fields via block call' do
@@ -43,7 +43,7 @@ shared_examples_for "query with highlighting support" do
       end
     end
 
-    connection.should have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_textsv))
+    expect(connection).to have_last_search_with(:hl => 'on', :'hl.fl' => %w(title_text body_textsv))
   end
 
   it 'should enable highlighting on multiple fields for multiple search types' do
@@ -52,24 +52,24 @@ shared_examples_for "query with highlighting support" do
         highlight :body
       end
     end
-    connection.searches.last[:'hl.fl'].to_set.should == Set['body_text', 'body_textsv']
+    expect(connection.searches.last[:'hl.fl'].to_set).to eq(Set['body_text', 'body_textsv'])
   end
 
   it 'should raise UnrecognizedFieldError if try to highlight unexisting field via block call' do
-    lambda {
+    expect {
       search do
         keywords 'test' do
           highlight :unknown_field
         end
       end
-    }.should raise_error(Sunspot::UnrecognizedFieldError)
+    }.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'should set internal formatting' do
     search do
       keywords 'test', :highlight => true
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.simple.pre" => '@@@hl@@@',
       :"hl.simple.post" => '@@@endhl@@@'
     )
@@ -81,7 +81,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.fl" => %w(title_text)
     )
   end
@@ -90,7 +90,7 @@ shared_examples_for "query with highlighting support" do
     search do
       keywords 'test', :highlight => :body
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.simple.pre" => '@@@hl@@@',
       :"hl.simple.post" => '@@@endhl@@@'
     )
@@ -102,7 +102,7 @@ shared_examples_for "query with highlighting support" do
         highlight :max_snippets => 3
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.snippets" => 3
     )
   end
@@ -113,7 +113,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :max_snippets => 3
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.fl"       => %w(title_text),
       :"f.title_text.hl.snippets" => 3
     )
@@ -125,7 +125,7 @@ shared_examples_for "query with highlighting support" do
         highlight :fragment_size => 200
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.fragsize" => 200
     )
   end
@@ -136,7 +136,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :fragment_size => 200
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.fragsize" => 200
     )
   end
@@ -147,7 +147,7 @@ shared_examples_for "query with highlighting support" do
         highlight :merge_contiguous_fragments => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.mergeContiguous" => 'true'
     )
   end
@@ -158,7 +158,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :merge_contiguous_fragments => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.mergeContiguous" => 'true'
     )
   end
@@ -169,7 +169,7 @@ shared_examples_for "query with highlighting support" do
         highlight :phrase_highlighter => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.usePhraseHighlighter" => 'true'
     )
   end
@@ -180,7 +180,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :phrase_highlighter => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.usePhraseHighlighter" => 'true'
     )
   end
@@ -191,7 +191,7 @@ shared_examples_for "query with highlighting support" do
         highlight :phrase_highlighter => true, :require_field_match => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.requireFieldMatch" => 'true'
     )
   end
@@ -202,7 +202,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :phrase_highlighter => true, :require_field_match => true
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.requireFieldMatch" => 'true'
     )
   end
@@ -214,7 +214,7 @@ shared_examples_for "query with highlighting support" do
         highlight :body, :max_snippets => 1
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"hl.fl" => %w(title_text body_textsv),
       :"f.title_text.hl.snippets" => 2,
       :"f.body_textsv.hl.snippets" => 1
@@ -227,7 +227,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :formatter => 'formatter'
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.formatter" => 'formatter'
     )
   end
@@ -238,7 +238,7 @@ shared_examples_for "query with highlighting support" do
         highlight :title, :fragmenter => 'example_fragmenter'
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"f.title_text.hl.fragmenter" => 'example_fragmenter'
     )
   end