sunspot 1.1.0 → 1.2.0

data/spec/api/indexer/attributes_spec.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'bigdecimal'
 
 describe 'indexing attribute fields', :type => :indexer do
   it 'should correctly index a stored string attribute field' do
@@ -72,41 +73,29 @@ describe 'indexing attribute fields', :type => :indexer do
 
   it 'should correctly index a boolean field' do
     session.index(post(:featured => true))
-    connection.should have_add_with(:featured_b => 'true')
+    connection.should have_add_with(:featured_bs => 'true')
   end
 
   it 'should correctly index a false boolean field' do
     session.index(post(:featured => false))
-    connection.should have_add_with(:featured_b => 'false')
+    connection.should have_add_with(:featured_bs => 'false')
   end
 
   it 'should not index a nil boolean field' do
     session.index(post)
-    connection.should_not have_add_with(:featured_b)
+    connection.should_not have_add_with(:featured_bs)
   end
 
   it 'should index latitude and longitude as a pair' do
-    session.index(post(:coordinates => [40.7, -73.5]))
-    connection.should have_add_with(:lat => 40.7, :lng => -73.5)
+    session.index(post(:coordinates => Sunspot::Util::Coordinates.new(40.7, -73.5)))
+    connection.should have_add_with(:coordinates_s => 'dr5xx3nytvgs')
   end
 
-  [
-    [:lat, :lng],
-    [:lat, :lon],
-    [:lat, :long],
-    [:latitude, :longitude]
-  ].each do |lat_attr, lng_attr|
-    it "should index latitude and longitude from #{lat_attr.inspect}, #{lng_attr.inspect}" do
-      session.index(post(
-          :coordinates => OpenStruct.new(lat_attr => 40.7, lng_attr => -73.5)
-      ))
-      connection.should have_add_with(:lat => 40.7, :lng => -73.5)
-    end
-  end
-
-  it 'should index latitude and longitude from a block' do
-    session.index(Photo.new(:lat => 30, :lng => -60))
-    connection.should have_add_with(:lat => 30.0, :lng => -60.0)
+  it 'should index latitude and longitude passed as non-Floats' do
+    coordinates = Sunspot::Util::Coordinates.new(
+      BigDecimal.new('40.7'), BigDecimal.new('-73.5'))
+    session.index(post(:coordinates => coordinates))
+    connection.should have_add_with(:coordinates_s => 'dr5xx3nytvgs')
   end
 
   it 'should correctly index an attribute field with block access' do
@@ -146,4 +135,15 @@ describe 'indexing attribute fields', :type => :indexer do
       Sunspot.setup(Post) { integer :popularity, :more_like_this => true }
     end.should raise_error(ArgumentError)
   end
+
+  it 'should use a specified field name when the :as option is set' do
+    session.index(post(:title => 'A Title'))
+    connection.should have_add_with(:legacy_field_s => 'legacy A Title')
+  end
+
+  it 'should use a specified field name when the :as option is set for array values' do
+    session.index(post(:title => 'Another Title'))
+    connection.should have_add_with(:legacy_array_field_sm => ['first string', 'second string'])
+ 	end
 end
+

data/spec/api/query/connectives_examples.rb

@@ -137,7 +137,7 @@ shared_examples_for "query with connective scope" do
       end
     end
     connection.should have_last_search_including(
-      :fq, "-(id:Post\\ #{post.id} AND -category_ids_im:1)"
+      :fq, "-(id:(Post\\ #{post.id}) AND -category_ids_im:1)"
     )
   end
 
@@ -153,6 +153,19 @@ shared_examples_for "query with connective scope" do
     )
   end
 
+  it 'creates a disjunction with instance inclusion' do
+    post = Post.new
+    search do
+      any_of do
+        with(post)
+        with(:average_rating).greater_than(3.0)
+      end
+    end
+    connection.should have_last_search_including(
+      :fq, "(id:(Post\\ #{post.id}) OR average_rating_ft:[3\\.0 TO *])"
+    )
+  end
+
   it 'creates a disjunction with some text field components' do
     search do
       any_of do

data/spec/api/query/fulltext_examples.rb

@@ -70,8 +70,8 @@ shared_examples_for 'fulltext query' do
       subqueries(:q).last[:qf].split(' ').sort.should == %w(backwards_title_text body_textsv tags_textv title_text)
     end
 
-    it 'puts automatic dismax parameters in subquery' do
-      subqueries(:q).each { |subquery| subquery[:fl].should == '* score' }
+    it 'puts field list in main query' do
+      connection.should have_last_search_with(:fl => '* score')
     end
   end
 
@@ -243,7 +243,7 @@ shared_examples_for 'fulltext query' do
     connection.should have_last_search_with(
       :bq => [
         'average_rating_ft:[2\.0 TO *]^2.0',
-        'featured_b:true^1.5'
+        'featured_bs:true^1.5'
       ]
     )
   end

data/spec/api/query/geo_examples.rb

@@ -0,0 +1,69 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'bigdecimal'
+
+shared_examples_for 'geohash query' do
+  it 'searches for nearby points with defaults' do
+    search do
+      with(:coordinates).near(40.7, -73.5)
+    end
+    connection.should 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)
+  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))
+  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))
+  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))
+  end
+
+  it 'performs both dismax search and location search' do
+    search 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}))
+    )
+  end
+
+  private
+
+  def build_geo_query(options = {})
+    precision = options[:precision] || 7
+    precision_factor = options[:precision_factor] || 16.0
+    boost = options[:boost] || 1.0
+    hash = 'dr5xx3nytvgs'
+    (precision..12).map do |i|
+      phrase = 
+        if i == 12 then hash
+        else "#{hash[0, i]}*"
+        end
+      precision_boost = Sunspot::Util.format_float(boost*precision_factor**(i-12.0), 3)
+      "coordinates_s:#{phrase}^#{precision_boost}"
+    end.reverse.join(' OR ')
+  end
+end

data/spec/api/query/scope_examples.rb

@@ -39,7 +39,7 @@ shared_examples_for "scoped query" do
     search do
       with :featured, false
     end
-    connection.should have_last_search_including(:fq, 'featured_b:false')
+    connection.should have_last_search_including(:fq, 'featured_bs:false')
   end
 
   it 'scopes by less than match with float' do
@@ -77,13 +77,6 @@ shared_examples_for "scoped query" do
     connection.should have_last_search_including(:fq, 'average_rating_ft:[2\.0 TO 4\.0]')
   end
 
-  it 'automatically sorts ranges in between matches' do
-    search do
-      with(:blog_id).between(4..2)
-    end
-    connection.should have_last_search_including(:fq, 'blog_id_i:[2 TO 4]')
-  end
-
   it 'scopes by any match with integer' do
     search do
       with(:category_ids).any_of [2, 7, 12]
@@ -175,12 +168,40 @@ shared_examples_for "scoped query" do
     connection.should have_last_search_including(:fq, 'average_rating_ft:[* TO *]')
   end
 
+  it 'includes by object identity' do
+    post = Post.new
+    search do
+      with post
+    end
+    connection.should have_last_search_including(:fq, "id:(Post\\ #{post.id})")
+  end
+
+  it 'includes multiple objects passed as varargs by object identity' do
+    post1, post2 = Post.new, Post.new
+    search do
+      with post1, post2
+    end
+    connection.should have_last_search_including(
+      :fq, "id:(Post\\ #{post1.id} OR Post\\ #{post2.id})"
+    )
+  end
+
+  it 'includes multiple objects passed as array by object identity' do
+    posts = [Post.new, Post.new]
+    search do
+      with posts
+    end
+    connection.should have_last_search_including(
+      :fq, "id:(Post\\ #{posts.first.id} OR Post\\ #{posts.last.id})"
+    )
+  end
+
   it 'excludes by object identity' do
     post = Post.new
     search do
       without post
     end
-    connection.should have_last_search_including(:fq, "-id:Post\\ #{post.id}")
+    connection.should have_last_search_including(:fq, "-id:(Post\\ #{post.id})")
   end
 
   it 'excludes multiple objects passed as varargs by object identity' do
@@ -190,8 +211,7 @@ shared_examples_for "scoped query" do
     end
     connection.should have_last_search_including(
       :fq,
-      "-id:Post\\ #{post1.id}",
-      "-id:Post\\ #{post2.id}"
+      "-id:(Post\\ #{post1.id} OR Post\\ #{post2.id})"
     )
   end
 
@@ -202,8 +222,7 @@ shared_examples_for "scoped query" do
     end
     connection.should have_last_search_including(
       :fq,
-      "-id:Post\\ #{posts.first.id}",
-      "-id:Post\\ #{posts.last.id}"
+      "-id:(Post\\ #{posts.first.id} OR Post\\ #{posts.last.id})"
     )
   end
 

data/spec/api/query/standard_spec.rb

@@ -9,8 +9,8 @@ describe 'standard query', :type => :query do
   it_should_behave_like "fulltext query"
   it_should_behave_like "query with highlighting support"
   it_should_behave_like "sortable query"
-  it_should_behave_like "spatial query"
   it_should_behave_like "query with text field scoping"
+  it_should_behave_like "geohash query"
 
   it 'adds a no-op query to :q parameter when no :q provided' do
     session.search Post do

data/spec/api/search/faceting_spec.rb

@@ -128,7 +128,7 @@ describe 'faceting', :type => :search do
   end
 
   it 'returns boolean facet' do
-    stub_facet(:featured_b, 'true' => 3, 'false' => 1)
+    stub_facet(:featured_bs, 'true' => 3, 'false' => 1)
     result = session.search(Post) { facet(:featured) }
     facet_values(result, :featured).should == [true, false]
   end
@@ -267,6 +267,10 @@ describe 'faceting', :type => :search do
       facet_values_from_options(:limit => 1).should == [2]
     end
 
+    it 'does not limit facets if limit option is negative' do
+      facet_values_from_options(:limit => -2).should == [1, 3, 2]
+    end
+
     it 'returns all facets if limit greater than number of facets' do
       facet_values_from_options(:limit => 10).should == [2, 1, 3]
     end

data/spec/api/search/hits_spec.rb

@@ -106,11 +106,22 @@ describe 'hits', :type => :search do
     session.search(Post, Namespaced::Comment).hits.first.stored(:title).should == 'Title'
   end
 
+  it 'should return stored field values for searches against base type when subtype matches' do
+    class SubclassedPost < Post; end;
+    stub_full_results('instance' => SubclassedPost.new, 'title_ss' => 'Title')
+    session.search(Post).hits.first.stored(:title).should == 'Title'
+  end
+
   it 'should return stored text fields' do
     stub_full_results('instance' => Post.new, 'body_textsv' => 'Body')
     session.search(Post, Namespaced::Comment).hits.first.stored(:body).should == 'Body'
   end
 
+  it 'should return stored boolean fields' do
+    stub_full_results('instance' => Post.new, 'featured_bs' => true)
+    session.search(Post, Namespaced::Comment).hits.first.stored(:featured).should be_true
+  end
+
   it 'should return stored dynamic fields' do
     stub_full_results('instance' => Post.new, 'custom_string:test_ss' => 'Custom')
     session.search(Post, Namespaced::Comment).hits.first.stored(:custom_string, :test).should == 'Custom'
@@ -122,17 +133,8 @@ describe 'hits', :type => :search do
     session.search(Post).hits.first.stored(:last_indexed_at).should == time
   end
 
-  it 'should return geo distance' do
-    post = Post.new
-    stub_results(post)
-    connection.response['distances'] = {
-      "Post #{post.id}" => 1.23
-    }
-    session.search(Post).hits.first.distance.should == 1.23
-  end
-
-  it 'should return nil if no geo distance' do
-    stub_results(Post.new)
-    session.search(Post).hits.first.distance.should be_nil
+  it 'should return stored values for multi-valued fields' do
+    stub_full_results('instance' => User.new, 'role_ids_ims' => %w(1 4 5))
+    session.search(User).hits.first.stored(:role_ids).should == [1, 4, 5]
   end
 end

data/spec/api/session_proxy/class_sharding_session_proxy_spec.rb

@@ -40,7 +40,7 @@ describe Sunspot::SessionProxy::ClassShardingSessionProxy do
     end
   end
 
-  [:commit, :commit_if_dirty, :commit_if_delete_dirty].each do |method|
+  [:commit, :commit_if_dirty, :commit_if_delete_dirty, :optimize].each do |method|
     it "should delegate #{method} to all sessions" do
       [@proxy.post_session, @proxy.photo_session].each do |session|
         session.should_receive(method)

data/spec/api/session_proxy/sharding_session_proxy_spec.rb

@@ -32,7 +32,7 @@ describe Sunspot::SessionProxy::ShardingSessionProxy do
     end
   end
 
-  [:commit, :commit_if_dirty, :commit_if_delete_dirty].each do |method|
+  [:commit, :commit_if_dirty, :commit_if_delete_dirty, :optimize].each do |method|
     it "should delegate #{method} to all sessions" do
       @proxy.sessions.each do |session|
         session.should_receive(method)

data/spec/api/session_proxy/silent_fail_session_proxy_spec.rb

@@ -0,0 +1,24 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe Sunspot::SessionProxy::ShardingSessionProxy do
+  
+  FakeException = Class.new(StandardError)
+  SUPPORTED_METHODS = Sunspot::SessionProxy::SilentFailSessionProxy::SUPPORTED_METHODS
+
+  before do
+    @search_session = mock(Sunspot::Session.new)
+    @proxy = Sunspot::SessionProxy::SilentFailSessionProxy.new(@search_session)
+  end
+  
+  it "should call rescued_exception when an exception is caught" do
+    SUPPORTED_METHODS.each do |method|
+      e = FakeException.new(method)
+      @search_session.stub!(method).and_raise(e)
+      @proxy.should_receive(:rescued_exception).with(method, e)
+      @proxy.send(method)
+    end
+  end
+  
+  it_should_behave_like 'session proxy'
+  
+end

data/spec/api/session_spec.rb

@@ -35,6 +35,16 @@ shared_examples_for 'all sessions' do
     end
   end
 
+  context '#optimize()' do
+    before :each do
+      @session.optimize
+    end
+
+    it 'should optimize' do
+      connection.should have(1).optims
+    end
+  end
+
   context '#search()' do
     before :each do
       @session.search(Post)
@@ -152,12 +162,24 @@ describe 'Session' do
       @session.dirty?.should be_false
     end
 
+    it 'should not be dirty after an optimize' do
+      @session.index(Post.new)
+      @session.optimize
+      @session.dirty?.should be_false
+    end
+
     it 'should not be delete_dirty after a commit' do
       @session.remove(Post.new)
       @session.commit
       @session.delete_dirty?.should be_false
     end
 
+    it 'should not be delete_dirty after an optimize' do
+      @session.remove(Post.new)
+      @session.optimize
+      @session.delete_dirty?.should be_false
+    end
+
     it 'should not commit when commit_if_dirty called on clean session' do
       @session.commit_if_dirty
       connection.should have(0).commits

data/spec/integration/local_search_spec.rb

@@ -1,91 +1,64 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'local search' do
-  ORIGIN = [40.6749113, -73.9648859]
+  ORIGIN = [40.7246062, -73.9969018]
+  LOCATIONS = [
+    [40.7246062, -73.9969018], # dr5rsjtn50yf
+    [40.724606, -73.996902],   # dr5rsjtn50y9
+    [40.724606, -73.996901],   # dr5rsjtn50z3
+    [40.72461, -73.996906]     # dr5rsjtn51ec
+  ].map { |lat, lng| Sunspot::Util::Coordinates.new(lat, lng) }
+
   before :each do
     Sunspot.remove_all
-    @posts = [
-      Post.new(:coordinates => ORIGIN),
-      Post.new(:coordinates => [40.725304, -73.997211], :title => 'teacup'),
-      Post.new(:coordinates => [40.800069, -73.962283]),
-      Post.new(:coordinates => [43.706488, -72.292233]),
-      Post.new(:coordinates => [38.920303, -77.110934], :title => 'teacup'),
-      Post.new(:coordinates => [47.661557, -122.349938])
-    ]
-    @posts.each_with_index { |post, i| post.blog_id = @posts.length - i }
-    Sunspot.index!(@posts)
-  end
-
-  it 'should find all the posts within a given radius' do
-    search = Sunspot.search(Post) { |query| query.near(ORIGIN, :distance => 20) }
-    search.results.to_set.should == @posts[0..2].to_set
   end
 
-  it 'should perform a radial search with fulltext matching' do
-    search = Sunspot.search(Post) do |query|
-      query.keywords 'teacup'
-      query.near(ORIGIN, :distance => 20)
-    end
-    search.results.should == [@posts[1]]
-  end
-
-  it 'should use dismax for fulltext matching in local search' do
-    lambda do
-      search = Sunspot.new_search(Post)
-      search.build do |query|
-        query.keywords 'teacup['
-        query.near(ORIGIN, :distance => 20)
+  describe 'without fulltext' do
+    before :each do
+      @posts = LOCATIONS.map do |location|
+        Post.new(:coordinates => location)
       end
-      search.execute
-    end.should_not raise_error
-  end
+      Sunspot.index!(@posts)
+      @search = Sunspot.search(Post) do
+        with(:coordinates).near(ORIGIN[0], ORIGIN[1], :precision_factor => 4.0)
+      end
+    end
 
-  it 'should perform a radial search with attribute scoping' do
-    search = Sunspot.search(Post) do |query|
-      query.near(ORIGIN, :distance => 20)
-      query.with(:title, 'teacup')
+    it 'should return results in geo order' do
+      @search.results.should == @posts
     end
-    search.results.should == [@posts[1]]
-  end
 
-  it 'should perform a radial search with attribute scoping and distance sorting' do
-    search = Sunspot.search(Post) do |query|
-      query.near(ORIGIN, :sort => true)
-      query.with(:title, 'teacup')
+    it 'should asssign higher score to closer locations' do
+      hits = @search.hits
+      hits[1..-1].each_with_index do |hit, i|
+        hit.score.should < hits[i].score
+      end
     end
-    search.results.should == [@posts[1], @posts[4]]
   end
 
-  it 'should order by arbitrary field' do
-    search = Sunspot.search(Post) do |query|
-      query.near(ORIGIN, :distance => 20)
-      query.order_by(:blog_id)
+  describe 'with fulltext' do
+    before :each do
+      @posts = [
+        Post.new(:title => 'pizza', :coordinates => LOCATIONS[0]),
+        Post.new(:title => 'pizza', :coordinates => LOCATIONS[1]),
+        Post.new(:title => 'pasta calzone pizza antipasti', :coordinates => LOCATIONS[1])
+      ]
+      Sunspot.index!(@posts)
+      @search = Sunspot.search(Post) do
+        keywords 'pizza'
+        with(:coordinates).near(ORIGIN[0], ORIGIN[1])
+      end
     end
-    search.results.should == @posts[0..2].reverse
-  end
 
-  it 'should order by geo distance' do
-    search = Sunspot.search(Post) do |query|
-      query.near(ORIGIN, :distance => 20, :sort => true)
+    it 'should take both fulltext and distance into account in ordering' do
+      @search.results.should == @posts
     end
-    search.results.should == @posts[0..2]
-  end
 
-  it 'should order by geo distance with fulltext' do
-    lambda do
-      search = Sunspot.search(Post) do |query|
-        query.fulltext('teacup')
-        query.near(ORIGIN, :sort => true)
+    it 'should take both fulltext and distance into account in scoring' do
+      hits = @search.hits
+      hits[1..-1].each_with_index do |hit, i|
+        hit.score.should < hits[i].score
       end
-    end.should_not raise_error
-  end
-
-  it 'should return geographical distance from origin' do
-    search = Sunspot.search(Post) do |query|
-      query.near(ORIGIN, :sort => true)
-    end
-    search.hits.each do |hit|
-      hit.distance.should_not be_nil
     end
   end
 end