sunspot 2.1.0 → 2.1.1

data/lib/sunspot/session_proxy/id_sharding_session_proxy.rb

@@ -45,23 +45,31 @@ module Sunspot
       # 
       # See Sunspot.remove_by_id
       #
-      def remove_by_id(clazz, id)
-        session_for_index_id(
-          Adapters::InstanceAdapter.index_id_for(clazz, id)
-        ).remove_by_id(clazz, id)
+      def remove_by_id(clazz, *ids)
+        ids.flatten!
+        ids_by_session(clazz, ids).each do |session, ids|
+          session.remove_by_id(clazz, ids)
+        end
       end
 
       # 
       # See Sunspot.remove_by_id!
       #
-      def remove_by_id!(clazz, id)
-        session_for_index_id(
-          Adapters::InstanceAdapter.index_id_for(clazz, id)
-        ).remove_by_id!(clazz, id)
+      def remove_by_id!(clazz, *ids)
+        ids.flatten!
+        ids_by_session(clazz, ids).each do |session, ids|
+          session.remove_by_id!(clazz, ids)
+        end
       end
 
       private
 
+      def ids_by_session(clazz, ids)
+        ids.group_by do |id|
+          session_for_index_id(Adapters::InstanceAdapter.index_id_for(clazz, id))
+        end
+      end
+
       def session_for_index_id(index_id)
         @sessions[id_hash(index_id) % @sessions.length]
       end

data/lib/sunspot/setup.rb

@@ -38,6 +38,12 @@ module Sunspot
       end
     end
 
+    def add_join_field_factory(name, type, options = {}, &block)
+      field_factory = FieldFactory::Join.new(name, type, options, &block)
+      @field_factories[field_factory.signature] = field_factory
+      @field_factories_cache[field_factory.name] = field_factory
+    end
+
     # 
     # Add field_factories for fulltext search
     #

data/lib/sunspot/version.rb

@@ -1,3 +1,3 @@
 module Sunspot
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'
 end

data/spec/api/class_set_spec.rb

@@ -2,7 +2,7 @@ require "spec_helper"
 
 describe Sunspot::ClassSet do
   it "is enumerable" do
-    class1, class2 = stub(:name => "Class1"), stub(:name => "Class2")
+    class1, class2 = double(:name => "Class1"), double(:name => "Class2")
 
     set = described_class.new
     set << class1 << class2
@@ -13,11 +13,11 @@ describe Sunspot::ClassSet do
   it "replaces classes with the same name" do
     set = described_class.new
 
-    class1 = stub(:name => "Class1")
+    class1 = double(:name => "Class1")
     set << class1
     set.to_a.should == [class1]
 
-    class1_dup = stub(:name => "Class1")
+    class1_dup = double(:name => "Class1")
     set << class1_dup
     set.to_a.should == [class1_dup]
   end

data/spec/api/indexer/fixed_fields_spec.rb

@@ -11,6 +11,11 @@ describe 'indexing fixed fields', :type => :indexer do
     connection.should have_add_with(:type => ['Post', 'SuperClass', 'MockRecord'])
   end
 
+  it 'should not index join fields' do
+    session.index PhotoContainer.new
+    connection.should_not have_add_with(:photo_caption => 'blah')
+  end
+
   it 'should index class name' do
     session.index post
     connection.should have_add_with(:class_name => 'Post')

data/spec/api/indexer/removal_spec.rb

@@ -11,10 +11,20 @@ describe 'document removal', :type => :indexer do
     connection.should 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
+  it 'removes an object by type and ids' do
+    session.remove_by_id(Post, 1, 2)
+    connection.should have_delete('Post 1', 'Post 2')
+  end
+
+  it 'removes an object by type and ids array' do
+    session.remove_by_id(Post, [1, 2])
+    connection.should have_delete('Post 1', 'Post 2')
+  end
+
+  it 'removes an object by type and ids and immediately commits' do
+    connection.should_receive(:delete_by_id).with(['Post 1', 'Post 2', 'Post 3']).ordered
     connection.should_receive(:commit).ordered
-    session.remove_by_id!(Post, 1)
+    session.remove_by_id!(Post, 1, 2, 3)
   end
 
   it 'removes an object from the index and immediately commits' do

data/spec/api/query/faceting_examples.rb

@@ -112,6 +112,25 @@ shared_examples_for "facetable query" do
       end.should 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
+      connection.should 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
       search do
         blog_filter = with(:blog_id, 1)

data/spec/api/query/join_spec.rb

@@ -0,0 +1,19 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe 'join' do
+  it 'should search by join' do
+    session.search PhotoContainer do
+      with(:caption, 'blah')
+    end
+    connection.should have_last_search_including(
+      :fq, "{!join from=photo_container_id to=id}caption_s:blah")
+  end
+
+  it 'should greater_than search by join' do
+    session.search PhotoContainer do
+      with(:photo_rating).greater_than(3)
+    end
+    connection.should have_last_search_including(
+      :fq, "{!join from=photo_container_id to=id}average_rating_ft:{3\\.0 TO *}")
+  end
+end

data/spec/api/query/standard_spec.rb

@@ -12,6 +12,7 @@ describe 'standard query', :type => :query do
   it_should_behave_like "query with text field scoping"
   it_should_behave_like "geohash query"
   it_should_behave_like "spatial query"
+  it_should_behave_like "stats query"
 
   it 'adds a no-op query to :q parameter when no :q provided' do
     session.search Post do

data/spec/api/query/stats_examples.rb

@@ -0,0 +1,66 @@
+shared_examples_for 'stats query' do
+  it 'does not use stats unless requested' do
+    search
+    connection.should_not have_last_search_with(:stats)
+  end
+
+  it 'uses stats when requested' do
+    search do
+      stats :average_rating
+    end
+    connection.should have_last_search_with(:stats => true)
+  end
+
+  it 'requests single field stats' do
+    search do
+      stats :average_rating
+    end
+    connection.should have_last_search_with(:"stats.field" => %w{average_rating_ft})
+  end
+
+  it 'requests multiple field stats' do
+    search do
+      stats :average_rating, :published_at
+    end
+    connection.should have_last_search_with(:"stats.field" => %w{average_rating_ft published_at_dt})
+  end
+
+  it 'facets on a stats field' do
+    search do
+      stats :average_rating do
+        facet :featured
+      end
+    end
+    connection.should have_last_search_with(:"f.average_rating_ft.stats.facet" => %w{featured_bs})
+  end
+
+  it 'only facets on a stats field when requested' do
+    search do
+      stats :average_rating
+    end
+    connection.should_not have_last_search_with(:"f.average_rating_ft.stats.facet")
+  end
+
+  it 'facets on multiple stats fields' do
+    search do
+      stats :average_rating, :published_at do
+        facet :featured
+      end
+    end
+    connection.should have_last_search_with(
+      :"f.average_rating_ft.stats.facet" => %w{featured_bs},
+      :"f.published_at_dt.stats.facet" => %w{featured_bs}
+    )
+  end
+
+  it 'supports facets on stats field' do
+    search do
+      stats :average_rating do
+        facet :featured, :primary_category_id
+      end
+    end
+    connection.should have_last_search_with(
+      :"f.average_rating_ft.stats.facet" => %w{featured_bs primary_category_id_i}
+    )
+  end
+end

data/spec/api/search/paginated_collection_spec.rb

@@ -7,7 +7,7 @@ describe "PaginatedCollection" do
 
   describe "#send" do
     it 'should allow send' do
-      expect { subject.send(:current_page) }.not_to raise_error(NoMethodError)
+      expect { subject.send(:current_page) }.to_not raise_error
     end
   end
 

data/spec/api/search/stats_spec.rb

@@ -0,0 +1,94 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe 'stats', :type => :search do
+  it 'returns field name for stats field' do
+    stub_stats(:average_rating_ft, {})
+    result = session.search Post do
+      stats :average_rating
+    end
+    result.stats(:average_rating).field_name.should == :average_rating
+  end
+
+  it 'returns min for stats field' do
+    stub_stats(:average_rating_ft, { 'min' => 1.0 })
+    result = session.search Post do
+      stats :average_rating
+    end
+    result.stats(:average_rating).min.should == 1.0
+  end
+
+  it 'returns max for stats field' do
+    stub_stats(:average_rating_ft, { 'max' => 5.0 })
+    result = session.search Post do
+      stats :average_rating
+    end
+    result.stats(:average_rating).max.should == 5.0
+  end
+
+  it 'returns count for stats field' do
+    stub_stats(:average_rating_ft, { 'count' => 120 })
+    result = session.search Post do
+      stats :average_rating
+    end
+    result.stats(:average_rating).count.should == 120
+  end
+
+  it 'returns sum for stats field' do
+    stub_stats(:average_rating_ft, { 'sum' => 2200.0 })
+    result = session.search Post do
+      stats :average_rating
+    end
+    result.stats(:average_rating).sum.should == 2200.0
+  end
+
+  it 'returns facet rows for stats field' do
+    stub_stats_facets(:average_rating_ft, 'featured_bs' => {
+      'false' => {},
+      'true' => {}
+    })
+    result = session.search Post do
+      stats :average_rating do
+        facet :featured
+      end
+    end
+    stats_facet_values(result, :average_rating, :featured).should == [false, true]
+  end
+
+  it 'returns facet stats for stats field' do
+    stub_stats_facets(:average_rating_ft, 'featured_bs' => {
+      'true' => { 'min' => 2.0, 'max' => 4.0 }
+    })
+    result = session.search Post do
+      stats :average_rating do
+        facet :featured
+      end
+    end
+    stats_facet_stats(result, :average_rating, :featured, true).min.should == 2.0
+    stats_facet_stats(result, :average_rating, :featured, true).max.should == 4.0
+  end
+
+  it 'returns instantiated stats facet values' do
+    blogs = 2.times.map { Blog.new }
+    stub_stats_facets(:average_rating_ft, 'blog_id_i' => {
+      blogs[0].id.to_s => {}, blogs[1].id.to_s => {} })
+    search = session.search(Post) do
+      stats :average_rating do
+        facet :blog_id
+      end
+    end
+    search.stats(:average_rating).facet(:blog_id).rows.map { |row| row.instance }.should == blogs
+  end
+
+  it 'only returns verified instances when requested' do
+    blog = Blog.new
+    stub_stats_facets(:average_rating_ft, 'blog_id_i' => {
+      blog.id.to_s => {}, '0' => {} })
+
+    search = session.search(Post) do
+      stats :average_rating do
+        facet :blog_id
+      end
+    end
+    search.stats(:average_rating).facet(:blog_id).rows(:verified => true).map { |row| row.instance }.should == [blog]
+  end
+end

data/spec/api/session_proxy/class_sharding_session_proxy_spec.rb

@@ -18,11 +18,17 @@ describe Sunspot::SessionProxy::ClassShardingSessionProxy do
 
   [:remove_by_id, :remove_by_id!].each do |method|
     it "should delegate #{method} to appropriate shard" do
-      @proxy.post_session.should_receive(method).with(Post, 1)
-      @proxy.photo_session.should_receive(method).with(Photo, 1)
+      @proxy.post_session.should_receive(method).with(Post, [1])
+      @proxy.photo_session.should_receive(method).with(Photo, [1])
       @proxy.send(method, Post, 1)
       @proxy.send(method, Photo, 1)
     end
+    it "should delegate #{method} to appropriate shard given ids" do
+      @proxy.post_session.should_receive(method).with(Post, [1, 2])
+      @proxy.photo_session.should_receive(method).with(Photo, [1, 2])
+      @proxy.send(method, Post, 1, 2)
+      @proxy.send(method, Photo, [1, 2])
+    end
   end
 
   [:remove_all, :remove_all!].each do |method|

data/spec/api/session_proxy/id_sharding_session_proxy_spec.rb

@@ -19,10 +19,22 @@ describe Sunspot::SessionProxy::ShardingSessionProxy do
 
   [:remove_by_id, :remove_by_id!].each do |method|
     it "should delegate #{method} to appropriate session" do
-      @proxy.sessions[0].should_receive(method).with(Post, 2)
-      @proxy.sessions[1].should_receive(method).with(Post, 1)
+      @proxy.sessions[1].should_receive(method).with(Post, [3])
+      @proxy.sessions[0].should_receive(method).with(Post, [2])
+      @proxy.sessions[1].should_receive(method).with(Post, [1])
       @proxy.send(method, Post, 1)
       @proxy.send(method, Post, 2)
+      @proxy.send(method, Post, 3)
+    end
+    it "should delegate #{method} to appropriate session given splatted index ids" do
+      @proxy.sessions[0].should_receive(method).with(Post, [2])
+      @proxy.sessions[1].should_receive(method).with(Post, [1, 3])
+      @proxy.send(method, Post, 1, 2, 3)
+    end
+    it "should delegate #{method} to appropriate session given array of index ids" do
+      @proxy.sessions[0].should_receive(method).with(Post, [2])
+      @proxy.sessions[1].should_receive(method).with(Post, [1, 3])
+      @proxy.send(method, Post, [1, 2, 3])
     end
   end
 

data/spec/api/session_proxy/retry_5xx_session_proxy_spec.rb

@@ -33,14 +33,14 @@ describe Sunspot::SessionProxy::Retry5xxSessionProxy do
   end
 
   it "should behave normally without a stubbed exception" do
-    @sunspot_session.should_receive(:index).and_return(mock)
+    @sunspot_session.should_receive(:index).and_return(double)
     Sunspot.index(post)
   end
 
   it "should be successful with a single exception followed by a sucess" do
     e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_rsolr_response(503))
     @sunspot_session.should_receive(:index).and_return do
-      @sunspot_session.should_receive(:index).and_return(mock)
+      @sunspot_session.should_receive(:index).and_return(double)
       raise e
     end
     Sunspot.index(post)
@@ -49,7 +49,7 @@ describe Sunspot::SessionProxy::Retry5xxSessionProxy do
   it "should return the error response after two exceptions" do
     fake_response = fake_rsolr_response(503)
     e = FakeRSolrErrorHttp.new(fake_rsolr_request, fake_response)
-    fake_success = mock('success')
+    fake_success = double('success')
 
     @sunspot_session.should_receive(:index).and_return do
       @sunspot_session.should_receive(:index).and_return do

data/spec/api/session_proxy/silent_fail_session_proxy_spec.rb

@@ -6,7 +6,7 @@ describe Sunspot::SessionProxy::ShardingSessionProxy do
   SUPPORTED_METHODS = Sunspot::SessionProxy::SilentFailSessionProxy::SUPPORTED_METHODS
 
   before do
-    @search_session = mock(Sunspot::Session.new)
+    @search_session = double(Sunspot::Session.new)
     @proxy = Sunspot::SessionProxy::SilentFailSessionProxy.new(@search_session)
   end
   

data/spec/helpers/search_helper.rb

@@ -54,6 +54,28 @@ module SearchHelper
     }
   end
 
+  def stub_stats(name, values)
+    connection.response = {
+      'stats' => {
+        'stats_fields' => {
+          name.to_s => { :facets => {} }.merge(values)
+        }
+      }
+    }
+  end
+
+  def stub_stats_facets(name, facets)
+    connection.response = {
+      'stats' => {
+        'stats_fields' => {
+          name.to_s => {
+            'facets' => facets
+          }
+        }
+      }
+    }
+  end
+
   def stub_query_facet(values)
     connection.response = { 'facet_counts' => { 'facet_queries' => values } }
   end
@@ -65,4 +87,12 @@ module SearchHelper
   def facet_counts(result, field_name)
     result.facet(field_name).rows.map { |row| row.count }
   end
+
+  def stats_facet_values(result, field_name, facet_name)
+    result.stats(field_name).facet(facet_name).rows.map(&:value)
+  end
+
+  def stats_facet_stats(result, field_name, facet_name, value)
+    result.stats(field_name).facet(facet_name).rows.find { |r| r.value == value }
+  end
 end