outoftime-sunspot 0.8.9 → 0.9.0

data/spec/api/search_retrieval_spec.rb

@@ -15,34 +15,86 @@ describe 'retrieving search' do
     session.search(Post).results.should == [post_2, post_1]
   end
 
-  it 'should return search total as attribute of results if pagination is provided' do
-    stub_results(Post.new, 4)
-    session.search(Post, :page => 1).results.total_entries.should == 4
-  end
+  if ENV['USE_WILL_PAGINATE']
+
+    it 'should return search total as attribute of results if pagination is provided' do
+      stub_results(Post.new, 4)
+      session.search(Post, :page => 1).results.total_entries.should == 4
+    end
 
-  it 'should return vanilla array if pagination is provided but WillPaginate is not available' do
-    stub_results(Post.new)
-    without_class(WillPaginate) do
+  else
+
+    it 'should return vanilla array if pagination is provided but WillPaginate is not available' do
+      stub_results(Post.new)
       session.search(Post, :page => 1).results.should_not respond_to(:total_entries)
     end
+
   end
 
-  it 'should return raw results without loading instances' do
+  it 'should return hits without loading instances' do
     post_1, post_2 = Array.new(2) { Post.new }
     stub_results(post_1, post_2)
-    %w(load load_all).each { |message| MockAdapter::DataAccessor.should_not_receive(message) }
-    session.search(Post, :page => 1).raw_results.map do |raw_result|
-      [raw_result.class_name, raw_result.primary_key]
+    %w(load load_all).each do |message|
+      MockAdapter::DataAccessor.should_not_receive(message)
+    end
+    session.search(Post).hits.map do |hit|
+      [hit.class_name, hit.primary_key]
     end.should == [['Post', post_1.id.to_s], ['Post', post_2.id.to_s]]
   end
 
+  it 'should return instance from hit' do
+    posts = Array.new(2) { Post.new }
+    stub_results(*posts)
+    session.search(Post).hits.first.instance.should == posts.first
+  end
+
+  it 'should hydrate all hits when an instance is requested from a hit' do
+    posts = Array.new(2) { Post.new }
+    stub_results(*posts)
+    search = session.search(Post)
+    search.hits.first.instance
+    %w(load load_all).each do |message|
+      MockAdapter::DataAccessor.should_not_receive(message)
+    end
+    search.hits.last.instance.should == posts.last
+  end
+
+  it 'should attach score to hits' do
+    stub_full_results('instance' => Post.new, 'score' => 1.23)
+    session.search(Post).hits.first.score.should == 1.23
+  end
+
+  it 'should return stored field values in hits' do
+    stub_full_results('instance' => Post.new, 'title_ss' => 'Title')
+    session.search(Post).hits.first.stored(:title).should == 'Title'
+  end
+
+  it 'should return stored field values for searches against multiple types' do
+    stub_full_results('instance' => Post.new, 'title_ss' => 'Title')
+    session.search(Post, Namespaced::Comment).hits.first.stored(:title).should == 'Title'
+  end
+
+  it 'should typecast stored field values in hits' do
+    time = Time.utc(2008, 7, 8, 2, 45)
+    stub_full_results('instance' => Post.new, 'last_indexed_at_ds' => time.xmlschema)
+    session.search(Post).hits.first.stored(:last_indexed_at).should == time
+  end
+
+  it 'should allow access to the data accessor' do
+    stub_results(posts = Post.new)
+    search = session.search Post do
+      data_accessor_for(Post).custom_title = 'custom title'
+    end
+    search.results.first.title.should == 'custom title'
+  end
+
   it 'should return total' do
     stub_results(Post.new, Post.new, 4)
     session.search(Post, :page => 1).total.should == 4
   end
 
   it 'should return field name for facet' do
-    stub_facet(:title_s, {})
+    stub_facet(:title_ss, {})
     result = session.search Post do
       facet :title
     end
@@ -50,7 +102,7 @@ describe 'retrieving search' do
   end
 
   it 'should return string facet' do
-    stub_facet(:title_s, 'Author 1' => 2, 'Author 2' => 1)
+    stub_facet(:title_ss, 'Author 1' => 2, 'Author 2' => 1)
     result = session.search Post do
       facet :title
     end
@@ -58,7 +110,7 @@ describe 'retrieving search' do
   end
 
   it 'should return counts for facet' do
-    stub_facet(:title_s, 'Author 1' => 2, 'Author 2' => 1)
+    stub_facet(:title_ss, 'Author 1' => 2, 'Author 2' => 1)
     result = session.search Post do
       facet :title
     end
@@ -82,12 +134,31 @@ describe 'retrieving search' do
   end
 
   it 'should return time facet' do
-    stub_facet(:published_at_d, '2009-04-07T20:25:23Z' => 3, '2009-04-07T20:26:19Z' => 1)
+    stub_facet(
+      :published_at_d,
+      '2009-04-07T20:25:23Z' => 3,
+      '2009-04-07T20:26:19Z' => 1
+    )
     result = session.search Post do
       facet :published_at
     end
-    facet_values(result, :published_at).should == [Time.gm(2009, 04, 07, 20, 25, 23),
-                                                   Time.gm(2009, 04, 07, 20, 26, 19)]
+    facet_values(result, :published_at).should ==
+      [Time.gm(2009, 04, 07, 20, 25, 23),
+       Time.gm(2009, 04, 07, 20, 26, 19)]
+  end
+
+  it 'should return date facet' do
+    stub_facet(
+      :expire_date_d,
+      '2009-07-13T00:00:00Z' => 3,
+      '2009-04-01T00:00:00Z' => 1
+    )
+    result = session.search(Post) do
+      facet :expire_date
+    end
+    facet_values(result, :expire_date).should ==
+      [Date.new(2009, 07, 13),
+       Date.new(2009, 04, 01)]
   end
 
   it 'should return boolean facet' do
@@ -96,34 +167,140 @@ describe 'retrieving search' do
     facet_values(result, :featured).should == [true, false]
   end
 
+  it 'should return class facet' do
+    stub_facet(:class_name, 'Post' => 3, 'Namespaced::Comment' => 1)
+    result = session.search(Post) { facet(:class) }
+    facet_values(result, :class).should == [Post, Namespaced::Comment]
+  end
+
+  it 'should return date range facet' do
+    stub_date_facet(:published_at_d, 60*60*24, '2009-07-08T04:00:00Z' => 2, '2009-07-07T04:00:00Z' => 1)
+    start_time = Time.utc(2009, 7, 7, 4)
+    end_time = start_time + 2*24*60*60
+    result = session.search(Post) { facet(:published_at, :time_range => start_time..end_time) }
+    facet = result.facet(:published_at)
+    facet.rows.first.value.should == (start_time..(start_time+24*60*60))
+    facet.rows.last.value.should == ((start_time+24*60*60)..end_time)
+  end
+
+  it 'should return query facet' do
+    stub_query_facet(
+      'average_rating_f:[3\.0 TO 5\.0]' => 3,
+      'average_rating_f:[1\.0 TO 3\.0]' => 1
+    )
+    search = session.search(Post) do
+      facet :average_rating do
+        row 3.0..5.0 do
+          with :average_rating, 3.0..5.0
+        end
+        row 1.0..3.0 do
+          with :average_rating, 1.0..3.0
+        end
+      end
+    end
+    facet = search.facet(:average_rating)
+    facet.rows.first.value.should == (3.0..5.0)
+    facet.rows.first.count.should == 3
+    facet.rows.last.value.should == (1.0..3.0)
+    facet.rows.last.count.should == 1
+  end
+
+  it 'should return query facet specified in dynamic call' do
+    stub_query_facet(
+      'custom_string\:test_s:(foo OR bar)' => 3
+    )
+    search = session.search(Post) do
+      dynamic :custom_string do
+        facet :test do
+          row :foo_bar do
+            with :test, %w(foo bar)
+          end
+        end
+      end
+    end
+    facet = search.facet(:test)
+    facet.rows.first.value.should == :foo_bar
+    facet.rows.first.count.should == 3
+  end
+
   it 'should return dynamic string facet' do
     stub_facet(:"custom_string:test_s", 'two' => 2, 'one' => 1)
     result = session.search(Post) { dynamic(:custom_string) { facet(:test) }}
     result.dynamic_facet(:custom_string, :test).rows.map { |row| row.value }.should == ['two', 'one']
   end
 
+  it 'should return instantiated facet values' do
+    blogs = Array.new(2) { Blog.new }
+    stub_facet(:blog_id_i, blogs[0].id.to_s => 2, blogs[1].id.to_s => 1)
+    result = session.search(Post) { facet(:blog_id) }
+    result.facet(:blog_id).rows.map { |row| row.instance }.should == blogs
+  end
+
+  it 'should only query the persistent store once for an instantiated facet' do
+    query_count = Blog.query_count
+    blogs = Array.new(2) { Blog.new }
+    stub_facet(:blog_id_i, blogs[0].id.to_s => 2, blogs[1].id.to_s => 1)
+    result = session.search(Post) { facet(:blog_id) }
+    result.facet(:blog_id).rows.each { |row| row.instance }
+    (Blog.query_count - query_count).should == 1
+  end
+
   private
 
+  def stub_full_results(*results)
+    count =
+      if results.last.is_a?(Integer) then results.pop
+      else results.length
+      end
+    docs = results.map do |result|
+      instance = result.delete('instance')
+      result.merge('id' => "#{instance.class.name} #{instance.id}")
+    end
+    response = {
+      'response' => {
+        'docs' => docs,
+        'numFound' => count
+      }
+    }
+    connection.stub!(:select).and_return(response)
+  end
+
   def stub_results(*results)
-    total_hits = if results.last.is_a?(Integer) then results.pop
-                 else results.length
-                 end
-    response = mock('response')
-    response.stub!(:hits).and_return(results.map { |result| { 'id' => "#{result.class.name} #{result.id}" }})
-    response.stub!(:total_hits).and_return(total_hits)
-    connection.stub!(:query).and_return(response)
+    stub_full_results(
+      *results.map do |result|
+        if result.is_a?(Integer)
+          result
+        else
+          { 'instance' => result }
+        end
+      end
+    )
   end
 
   def stub_facet(name, values)
-    response = mock('response')
-    facets = values.map do |data, count|
-      value = Solr::Response::Standard::FacetValue.new
-      value.name = data
-      value.value = count
-      value
-    end.sort_by { |value| -value.value }
-    response.stub!(:field_facets).with(name.to_s).and_return(facets)
-    connection.stub!(:query).and_return(response)
+    connection.stub!(:select).and_return(
+      'facet_counts' => {
+        'facet_fields' => {
+          name.to_s => values.to_a.sort_by { |value, count| -count }.flatten
+        }
+      }
+    )
+  end
+
+  def stub_date_facet(name, gap, values)
+    connection.stub!(:select).and_return(
+      'facet_counts' => {
+        'facet_dates' => {
+          name.to_s => { 'gap' => "+#{gap}SECONDS" }.merge(values)
+        }
+      }
+    )
+  end
+
+  def stub_query_facet(values)
+    connection.stub!(:select).and_return(
+      'facet_counts' => { 'facet_queries' => values }
+    )
   end
 
   def facet_values(result, field_name)

data/spec/api/session_spec.rb

@@ -1,56 +1,111 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
+shared_examples_for 'all sessions' do
+  context '#index()' do
+    before :each do
+      @session.index(Post.new)
+    end
+
+    it 'should add document to connection' do
+      connection.should have(1).adds
+    end
+  end
+
+  context '#index!()' do
+    before :each do
+      @session.index!(Post.new)
+    end
+
+    it 'should add document to connection' do
+      connection.should have(1).adds
+    end
+
+    it 'should commit' do
+      connection.should have(1).commits
+    end
+  end
+
+  context '#commit()' do
+    before :each do
+      @session.commit
+    end
+
+    it 'should commit' do
+      connection.should have(1).commits
+    end
+  end
+
+  context '#search()' do
+    before :each do
+      @session.search(Post)
+    end
+
+    it 'should search' do
+      connection.should have(1).searches
+    end
+  end
+end
+
 describe 'Session' do
-  context 'using singleton session' do
+  before :each do
+    @connection_factory = Mock::ConnectionFactory.new
+    Sunspot::Session.connection_class = @connection_factory
+  end
+
+  after :each do
+    Sunspot::Session.connection_class = nil
+    Sunspot.reset!
+  end
+
+  context 'singleton session' do
     before :each do
       Sunspot.reset!
-      connection.should_receive(:add).twice
-      connection.should_receive(:commit).twice
-      connection.should_receive(:query)
+      @session = Sunspot
     end
 
+    it_should_behave_like 'all sessions'
+
     it 'should open connection with defaults if nothing specified' do
-      Solr::Connection.stub!(:new).with('http://localhost:8983/solr').and_return(connection)
-      Sunspot.index(Post.new)
-      Sunspot.index!(Post.new)
       Sunspot.commit
-      Sunspot.search(Post)
+      connection.adapter.opts[:url].should == 'http://127.0.0.1:8983/solr'
     end
 
     it 'should open a connection with custom host' do
-      Solr::Connection.stub!(:new).with('http://127.0.0.1:8981/solr').and_return(connection)
       Sunspot.config.solr.url = 'http://127.0.0.1:8981/solr'
-      Sunspot.index(Post.new)
-      Sunspot.index!(Post.new)
       Sunspot.commit
-      Sunspot.search(Post)
+      connection.adapter.opts[:url].should == 'http://127.0.0.1:8981/solr'
+    end
+
+    it 'should use Net::HTTP adapter by default' do
+      Sunspot.commit
+      connection.adapter.connector.adapter_name.should == :net_http
+    end
+
+    it 'should use Net::HTTP adapter when specified' do
+      Sunspot.config.http_client = :curb
+      Sunspot.commit
+      connection.adapter.connector.adapter_name.should == :curb
     end
   end
 
-  context 'using custom session' do
+  context 'custom session' do
     before :each do
-      connection.should_receive(:add).twice
-      connection.should_receive(:commit).twice
-      connection.should_receive(:query)
+      @session = Sunspot::Session.new
     end
 
+    it_should_behave_like 'all sessions'
+
     it 'should open a connection with custom host' do
-      Solr::Connection.stub!(:new).with('http://127.0.0.1:8982/solr').and_return(connection)
       session = Sunspot::Session.new do |config|
         config.solr.url = 'http://127.0.0.1:8982/solr'
       end
-      session.index(Post.new)
-      session.index!(Post.new)
       session.commit
-      session.search(Post)
+      connection.adapter.opts[:url].should == 'http://127.0.0.1:8982/solr'
     end
   end
 
   context 'dirty sessions' do
     before :each do
-      connection.stub!(:add)
-      connection.stub!(:commit)
-      Solr::Connection.stub!(:new).and_return(connection)
       @session = Sunspot::Session.new
     end
 
@@ -85,18 +140,18 @@ describe 'Session' do
     end
 
     it 'should not commit when commit_if_dirty called on clean session' do
-      connection.should_not_receive(:commit)
       @session.commit_if_dirty
+      connection.should have(0).commits
     end
 
     it 'should commit when commit_if_dirty called on dirty session' do
-      connection.should_receive(:commit)
       @session.index(Post.new)
       @session.commit_if_dirty
+      connection.should have(1).commits
     end
   end
 
   def connection
-    @connection ||= mock('Connection').as_null_object
+    @connection_factory.instance
   end
 end

data/spec/api/sunspot_spec.rb

@@ -4,17 +4,15 @@ describe Sunspot do
   describe "reset!" do
     it "should reset current session" do
       old_session = Sunspot.send(:session)
-      Sunspot.reset!
-
+      Sunspot.reset!(true)
       Sunspot.send(:session).should_not == old_session
     end
-    it "should keep keep configuration" do
-      Sunspot.config.solr.url = "http://localhost:9999/path/solr"
 
+    it "should keep keep configuration if specified" do
+      Sunspot.config.solr.url = "http://localhost:9999/path/solr"
       config_before_reset = Sunspot.config
-      Sunspot.reset!
-
+      Sunspot.reset!(true)
       Sunspot.config.should == config_before_reset
     end
   end
-end
+end

data/spec/integration/faceting_spec.rb

@@ -1,3 +1,5 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
 describe 'search faceting' do
   def self.test_field_type(name, attribute, field, value1, value2)
     context "with field of type #{name}" do
@@ -36,4 +38,132 @@ describe 'search faceting' do
   test_field_type('Time', :published_at, :published_at, Time.mktime(2008, 02, 17, 17, 45, 04),
                                                         Time.mktime(2008, 07, 02, 03, 56, 22))
   test_field_type('Boolean', :featured, :featured, true, false)
+
+  context 'facet options' do
+    before :all do
+      Sunspot.remove_all
+      facet_values = %w(zero one two three four)
+      facet_values.each_with_index do |value, i|
+        i.times { Sunspot.index(Post.new(:title => value, :blog_id => 1)) }
+      end
+      Sunspot.index(Post.new(:title => 'zero', :blog_id => 2))
+      Sunspot.commit
+    end
+
+    it 'should limit the number of facet rows' do
+      search = Sunspot.search(Post) do
+        facet :title, :limit => 3
+      end
+      search.facet(:title).should have(3).rows
+    end
+
+    it 'should not return zeros by default' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        facet :title
+      end
+      search.facet(:title).rows.map { |row| row.value }.should_not include('zero')
+    end
+
+    it 'should return zeros when specified' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        facet :title, :zeros => true
+      end
+      search.facet(:title).rows.map { |row| row.value }.should include('zero')
+    end
+
+    it 'should return a specified minimum count' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        facet :title, :minimum_count => 2
+      end
+      search.facet(:title).rows.map { |row| row.value }.should == %w(four three two)
+    end
+
+    it 'should order facets lexically' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        facet :title, :sort => :index
+      end
+      search.facet(:title).rows.map { |row| row.value }.should == %w(four one three two)
+    end
+
+    it 'should order facets by count' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        facet :title, :sort => :count
+      end
+      search.facet(:title).rows.map { |row| row.value }.should == %w(four three two one)
+    end
+  end
+
+  context 'date facets' do
+    before :all do
+      Sunspot.remove_all
+      time = Time.utc(2009, 7, 8)
+      Sunspot.index!(
+        (0..2).map { |i| Post.new(:published_at => time + i*60*60*16) }
+      )
+    end
+
+    it 'should return time ranges' do
+      time = Time.utc(2009, 7, 8)
+      search = Sunspot.search(Post) do
+        facet :published_at, :time_range => time..(time + 60*60*24*2), :sort => :count
+      end
+      search.facet(:published_at).rows.first.value.should == (time..(time + 60*60*24))
+      search.facet(:published_at).rows.first.count.should == 2
+      search.facet(:published_at).rows.last.value.should == ((time + 60*60*24)..(time + 60*60*24*2))
+      search.facet(:published_at).rows.last.count.should == 1
+    end
+  end
+
+  context 'class facets' do
+    before :all do
+      Sunspot.remove_all
+      Sunspot.index!(Post.new, Post.new, Namespaced::Comment.new)
+    end
+
+    it 'should return classes' do
+      search = Sunspot.search(Post, Namespaced::Comment) do
+        facet(:class, :sort => :count)
+      end
+      search.facet(:class).rows.first.value.should == Post
+      search.facet(:class).rows.first.count.should == 2
+      search.facet(:class).rows.last.value.should == Namespaced::Comment
+      search.facet(:class).rows.last.count.should == 1
+    end
+  end
+
+  context 'query facets' do
+    before :all do
+      Sunspot.remove_all
+      Sunspot.index!(
+        [1.1, 1.2, 3.2, 3.4, 3.9, 4.1].map do |rating|
+          Post.new(:ratings_average => rating)
+        end
+      )
+    end
+
+    it 'should return specified facets' do
+      search = Sunspot.search(Post) do
+        facet :rating_range do
+          for rating in [1.0, 2.0, 3.0, 4.0]
+            range = rating..(rating + 1.0)
+            row range do
+              with :average_rating, rating..(rating + 1.0)
+            end
+          end
+        end
+      end
+      facet = search.facet(:rating_range)
+      facet.rows[0].value.should == (3.0..4.0)
+      facet.rows[0].count.should == 3
+      facet.rows[1].value.should == (1.0..2.0)
+      facet.rows[1].count.should == 2
+      facet.rows[2].value.should == (4.0..5.0)
+      facet.rows[2].count.should == 1
+    end
+  end
 end