sunspot 2.0.0 → 2.5.0

data/spec/api/indexer/fulltext_spec.rb

@@ -3,41 +3,41 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 describe 'indexing fulltext fields' do
   it 'indexes text field' do
     session.index(post(:title => 'A Title'))
-    connection.should have_add_with(:title_text => 'A Title')
+    expect(connection).to have_add_with(:title_text => 'A Title')
   end
 
   it 'indexes stored text field' do
     session.index(post(:body => 'Test body'))
-    connection.should have_add_with(:body_textsv => 'Test body')
+    expect(connection).to have_add_with(:body_textsv => 'Test body')
   end
 
   it 'indexes text field with boost' do
     session.index(post(:title => 'A Title'))
-    connection.adds.last.first.field_by_name(:title_text).attrs[:boost].should == 2
+    expect(connection.adds.last.first.field_by_name(:title_text).attrs[:boost]).to eq(2)
   end
 
   it 'indexes multiple values for a text field' do
     session.index(post(:body => %w(some title)))
-    connection.should have_add_with(:body_textsv => %w(some title))
+    expect(connection).to have_add_with(:body_textsv => %w(some title))
   end
 
   it 'indexes text via a block accessor' do
     session.index(post(:title => 'backwards'))
-    connection.should have_add_with(:backwards_title_text => 'sdrawkcab')
+    expect(connection).to have_add_with(:backwards_title_text => 'sdrawkcab')
   end
 
   it 'indexes document level boost using block' do
     session.index(post(:ratings_average => 4.0))
-    connection.adds.last.first.attrs[:boost].should == 1.25
+    expect(connection.adds.last.first.attrs[:boost]).to eq(1.25)
   end
 
   it 'indexes document level boost using attribute' do
     session.index(Namespaced::Comment.new(:boost => 1.5))
-    connection.adds.last.first.attrs[:boost].should == 1.5
+    expect(connection.adds.last.first.attrs[:boost]).to eq(1.5)
   end
 
   it 'indexes document level boost defined statically' do
     session.index(Photo.new)
-    connection.adds.last.first.attrs[:boost].should == 0.75
+    expect(connection.adds.last.first.attrs[:boost]).to eq(0.75)
   end
 end

data/spec/api/indexer/removal_spec.rb

@@ -3,44 +3,54 @@ require File.expand_path('spec_helper', File.dirname(__FILE__))
 describe 'document removal', :type => :indexer do
   it 'removes an object from the index' do
     session.remove(post)
-    connection.should have_delete("Post #{post.id}")
+    expect(connection).to have_delete("Post #{post.id}")
   end
 
   it 'removes an object by type and id' do
     session.remove_by_id(Post, 1)
-    connection.should have_delete('Post 1')
+    expect(connection).to have_delete('Post 1')
   end
 
-  it 'removes an object by type and id and immediately commits' do
-    connection.should_receive(:delete_by_id).with(['Post 1']).ordered
-    connection.should_receive(:commit).ordered
-    session.remove_by_id!(Post, 1)
+  it 'removes an object by type and ids' do
+    session.remove_by_id(Post, 1, 2)
+    expect(connection).to have_delete('Post 1', 'Post 2')
+  end
+
+  it 'removes an object by type and ids array' do
+    session.remove_by_id(Post, [1, 2])
+    expect(connection).to have_delete('Post 1', 'Post 2')
+  end
+
+  it 'removes an object by type and ids and immediately commits' do
+    expect(connection).to receive(:delete_by_id).with(['Post 1', 'Post 2', 'Post 3']).ordered
+    expect(connection).to receive(:commit).ordered
+    session.remove_by_id!(Post, 1, 2, 3)
   end
 
   it 'removes an object from the index and immediately commits' do
-    connection.should_receive(:delete_by_id).ordered
-    connection.should_receive(:commit).ordered
+    expect(connection).to receive(:delete_by_id).ordered
+    expect(connection).to receive(:commit).ordered
     session.remove!(post)
   end
 
   it 'removes everything from the index' do
     session.remove_all
-    connection.should have_delete_by_query("*:*")
+    expect(connection).to have_delete_by_query("*:*")
   end
 
   it 'removes everything from the index and immediately commits' do
-    connection.should_receive(:delete_by_query).ordered
-    connection.should_receive(:commit).ordered
+    expect(connection).to receive(:delete_by_query).ordered
+    expect(connection).to receive(:commit).ordered
     session.remove_all!
   end
 
   it 'removes everything of a given class from the index' do
     session.remove_all(Post)
-    connection.should have_delete_by_query("type:Post")
+    expect(connection).to have_delete_by_query("type:Post")
   end
 
   it 'correctly escapes namespaced classes when removing everything from the index' do
-    connection.should_receive(:delete_by_query).with('type:Namespaced\:\:Comment')
+    expect(connection).to receive(:delete_by_query).with('type:Namespaced\:\:Comment')
     session.remove_all(Namespaced::Comment)
   end
 
@@ -48,6 +58,6 @@ describe 'document removal', :type => :indexer do
     session.remove(Post) do
       with(:title, 'monkeys')
     end
-    connection.should have_delete_by_query("(type:Post AND title_ss:monkeys)")
+    expect(connection).to have_delete_by_query("(type:Post AND title_ss:monkeys)")
   end
 end

data/spec/api/indexer_spec.rb

@@ -7,8 +7,8 @@ describe 'indexer', :type => :indexer do
     Object.class_eval { remove_const(:ReloadableClass) }
     Object::ReloadableClass = Class.new(MockRecord)
     Sunspot.setup(ReloadableClass) {}
-    lambda do
+    expect do
       Sunspot.search(ReloadableClass) { with(:title, 'title') }
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 end

data/spec/api/query/advanced_manipulation_examples.rb

@@ -12,11 +12,11 @@ shared_examples_for "query with advanced manipulation" do
     end
 
     it "modifies existing param" do
-      connection.should have_last_search_with(:rows  => 40)
+      expect(connection).to have_last_search_with(:rows  => 40)
     end
 
     it "adds new param" do
-      connection.should have_last_search_with(:qt => 'complicated')
+      expect(connection).to have_last_search_with(:qt => 'complicated')
     end
   end
 
@@ -29,7 +29,7 @@ shared_examples_for "query with advanced manipulation" do
     end
 
     it 'should use specified request handler' do
-      connection.should have_last_search_with({})
+      expect(connection).to have_last_search_with({})
     end
   end
 end

data/spec/api/query/connectives_examples.rb

@@ -6,7 +6,7 @@ shared_examples_for "query with connective scope" do
         with :blog_id, 2
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(category_ids_im:1 OR blog_id_i:2)'
     )
   end
@@ -21,7 +21,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq,
       '(blog_id_i:2 OR (category_ids_im:1 AND average_rating_ft:{3\.0 TO *}))'
     )
@@ -37,7 +37,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(category_ids_im:1 OR (-average_rating_ft:{3\.0 TO *} AND blog_id_i:1))'
     )
   end
@@ -49,7 +49,7 @@ shared_examples_for "query with connective scope" do
         with :category_ids, 1
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, 'blog_id_i:2', 'category_ids_im:1'
     )
   end
@@ -61,7 +61,7 @@ shared_examples_for "query with connective scope" do
         without(:average_rating).greater_than(3.0)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '-(-category_ids_im:1 AND average_rating_ft:{3\.0 TO *})'
     )
   end
@@ -79,7 +79,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '-(title_ss:Yes AND -(blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_ft:2\.0)))'
     )
   end
@@ -96,7 +96,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(title_ss:Yes OR (blog_id_i:1 AND -(-category_ids_im:4 AND average_rating_ft:2\.0)))'
     )
   end
@@ -123,7 +123,7 @@ shared_examples_for "query with connective scope" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(title_ss:Yes OR blog_id_i:1 OR category_ids_im:4)'
     )
   end
@@ -136,7 +136,7 @@ shared_examples_for "query with connective scope" do
         with(:category_ids, 1)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, "-(id:(Post\\ #{post.id}) AND -category_ids_im:1)"
     )
   end
@@ -148,7 +148,7 @@ shared_examples_for "query with connective scope" do
         with(:average_rating).greater_than(3.0)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '-(average_rating_ft:[* TO *] AND -average_rating_ft:{3\.0 TO *})'
     )
   end
@@ -161,7 +161,7 @@ shared_examples_for "query with connective scope" do
         with(:average_rating).greater_than(3.0)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, "(id:(Post\\ #{post.id}) OR average_rating_ft:{3\\.0 TO *})"
     )
   end
@@ -175,7 +175,7 @@ shared_examples_for "query with connective scope" do
         with(:blog_id, 1)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(title_text:test* OR blog_id_i:1)'
     )
   end
@@ -184,7 +184,7 @@ shared_examples_for "query with connective scope" do
     search do
       any_of {}
     end
-    connection.should_not have_last_search_including(:fq, '')
+    expect(connection).not_to have_last_search_including(:fq, '')
   end
 
   it 'creates a conjunction of in_radius queries' do
@@ -194,8 +194,20 @@ shared_examples_for "query with connective scope" do
         with(:coordinates_new).in_radius(42, 56, 50)
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(_query_:"{!geofilt sfield=coordinates_new_ll pt=23,-46 d=100}" OR _query_:"{!geofilt sfield=coordinates_new_ll pt=42,56 d=50}")'
     )
   end
+  
+  it 'creates a conjunction of in_bounding_box queries' do
+    search do
+      any_of do
+        with(:coordinates_new).in_bounding_box([23, -46], [25, -44])
+        with(:coordinates_new).in_bounding_box([42, 56], [43, 58])
+      end
+    end
+    expect(connection).to have_last_search_including(
+      :fq, '(coordinates_new_ll:[23,-46 TO 25,-44] OR coordinates_new_ll:[42,56 TO 43,58])'
+    )
+  end
 end

data/spec/api/query/dsl_spec.rb

@@ -1,18 +1,36 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe 'query DSL', :type => :query do
+  let(:blog_id) { 1 }
+
   it 'should allow building search using block argument rather than instance_eval' do
-    @blog_id = 1
     session.search Post do |query|
-      query.with(:blog_id, @blog_id)
+      query.field_list [:blog_id, :title]
+      query.with(:blog_id, blog_id)
+    end
+    expect(connection).to have_last_search_including(:fq, 'blog_id_i:1')
+    expect(connection).to have_last_search_with(fl: [:id, :blog_id_i, :title_ss])
+  end
+
+  it 'should allow field_list specified as arguments' do
+    session.search Post do |query|
+      query.field_list :blog_id, :title
+      query.with(:blog_id, blog_id)
     end
-    connection.should have_last_search_including(:fq, 'blog_id_i:1')
+    expect(connection).to have_last_search_with(fl: [:id, :blog_id_i, :title_ss])
+  end
+
+  it 'should allow to skip stored fields retrieval' do
+    session.search Post do |query|
+      query.with(:blog_id, blog_id)
+      query.without_stored_fields
+    end
+    expect(connection).to have_last_search_with(fl: [:id])
   end
 
   it 'should accept a block in the #new_search method' do
-    search = session.new_search(Post) { with(:blog_id, 1) }
+    search = session.new_search(Post) { with(:blog_id, blog_id) }
     search.execute
-    connection.should have_last_search_including(:fq, 'blog_id_i:1')
+    expect(connection).to have_last_search_including(:fq, 'blog_id_i:1')
   end
 end
-

data/spec/api/query/dynamic_fields_examples.rb

@@ -5,7 +5,7 @@ shared_examples_for "query with dynamic field support" do
         with :test, 'string'
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_string\:test_ss:string')
+    expect(connection).to have_last_search_including(:fq, 'custom_string\:test_ss:string')
   end
 
   it 'restricts by dynamic integer field with less than restriction' do
@@ -14,7 +14,7 @@ shared_examples_for "query with dynamic field support" do
         with(:test).less_than(1)
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_integer\:test_i:{* TO 1}')
+    expect(connection).to have_last_search_including(:fq, 'custom_integer\:test_i:{* TO 1}')
   end
 
   it 'restricts by dynamic float field with between restriction' do
@@ -23,7 +23,7 @@ shared_examples_for "query with dynamic field support" do
         with(:test).between(2.2..3.3)
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_float\:test_fm:[2\.2 TO 3\.3]')
+    expect(connection).to have_last_search_including(:fq, 'custom_float\:test_fm:[2\.2 TO 3\.3]')
   end
 
   it 'restricts by dynamic time field with any of restriction' do
@@ -33,7 +33,7 @@ shared_examples_for "query with dynamic field support" do
                             Time.parse('2009-02-13 18:00:00 UTC')])
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_time\:test_d:(2009\-02\-10T14\:00\:00Z OR 2009\-02\-13T18\:00\:00Z)')
+    expect(connection).to have_last_search_including(:fq, 'custom_time\:test_d:(2009\-02\-10T14\:00\:00Z OR 2009\-02\-13T18\:00\:00Z)')
   end
 
   it 'restricts by dynamic boolean field with equality restriction' do
@@ -42,7 +42,7 @@ shared_examples_for "query with dynamic field support" do
         with :test, false
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_boolean\:test_b:false')
+    expect(connection).to have_last_search_including(:fq, 'custom_boolean\:test_b:false')
   end
 
   it 'negates a dynamic field restriction' do
@@ -51,7 +51,7 @@ shared_examples_for "query with dynamic field support" do
         without :test, 'foo'
       end
     end
-    connection.should have_last_search_including(:fq, '-custom_string\:test_ss:foo')
+    expect(connection).to have_last_search_including(:fq, '-custom_string\:test_ss:foo')
   end
 
   it 'scopes by a dynamic field inside a disjunction' do
@@ -63,7 +63,7 @@ shared_examples_for "query with dynamic field support" do
         with :title, 'bar'
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :fq, '(custom_string\:test_ss:foo OR title_ss:bar)'
     )
   end
@@ -74,7 +74,7 @@ shared_examples_for "query with dynamic field support" do
         order_by :test, :desc
       end
     end
-    connection.should have_last_search_with(:sort => 'custom_integer:test_i desc')
+    expect(connection).to have_last_search_with(:sort => 'custom_integer:test_i desc')
   end
 
   it 'orders by a dynamic field and static field, with given precedence' do
@@ -84,25 +84,25 @@ shared_examples_for "query with dynamic field support" do
       end
       order_by :sort_title, :asc
     end
-    connection.should have_last_search_with(:sort => 'custom_integer:test_i desc, sort_title_s asc')
+    expect(connection).to have_last_search_with(:sort => 'custom_integer:test_i desc, sort_title_s asc')
   end
 
   it 'raises an UnrecognizedFieldError if an unknown dynamic field is searched by' do
-    lambda do
+    expect do
       search do
         dynamic(:bogus) { with :some, 'value' }
       end
-    end.should raise_error(Sunspot::UnrecognizedFieldError)
+    end.to raise_error(Sunspot::UnrecognizedFieldError)
   end
 
   it 'raises a NoMethodError if pagination is attempted in a dynamic query' do
-    lambda do
+    expect do
       search do
         dynamic :custom_string do
           paginate :page => 3, :per_page => 10
         end
       end
-    end.should raise_error(NoMethodError)
+    end.to raise_error(NoMethodError)
   end
 
   it 'requests field facet on dynamic field' do
@@ -111,7 +111,7 @@ shared_examples_for "query with dynamic field support" do
         facet(:test)
       end
     end
-    connection.should have_last_search_including(:"facet.field", 'custom_string:test_ss')
+    expect(connection).to have_last_search_including(:"facet.field", 'custom_string:test_ss')
   end
 
   it 'requests named field facet on dynamic field' do
@@ -120,7 +120,7 @@ shared_examples_for "query with dynamic field support" do
         facet(:test, :name => :bogus)
       end
     end
-    connection.should have_last_search_including(:"facet.field", '{!key=bogus}custom_string:test_ss')
+    expect(connection).to have_last_search_including(:"facet.field", '{!key=bogus}custom_string:test_ss')
   end
 
   it 'requests query facet with internal dynamic field' do
@@ -133,7 +133,7 @@ shared_examples_for "query with dynamic field support" do
         end
       end
     end
-    connection.should have_last_search_with(
+    expect(connection).to have_last_search_with(
       :"facet.query" => 'custom_string\:test_ss:foo'
     )
   end
@@ -148,7 +148,7 @@ shared_examples_for "query with dynamic field support" do
         end
       end
     end
-    connection.should have_last_search_including(
+    expect(connection).to have_last_search_including(
       :"facet.query",
       'custom_string\:test_ss:foo'
     )
@@ -160,6 +160,6 @@ shared_examples_for "query with dynamic field support" do
         with(:test, 1.23)
       end
     end
-    connection.should have_last_search_including(:fq, 'custom_float\\:test_fm:1\\.23')
+    expect(connection).to have_last_search_including(:fq, 'custom_float\\:test_fm:1\\.23')
   end
 end