erichummel-sunspot 1.2.1 → 2.0.0.pre.111215

data/spec/api/indexer/batch_spec.rb

@@ -1,8 +1,9 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe 'batch indexing', :type => :indexer do
+  let(:posts) { Array.new(2) { |index| Post.new :title => "Post number #{index}!" } }
+
   it 'should send all batched adds in a single request' do
-    posts = Array.new(2) { Post.new }
     session.batch do
       for post in posts
         session.index(post)
@@ -12,7 +13,6 @@ describe 'batch indexing', :type => :indexer do
   end
 
   it 'should add all batched adds' do
-    posts = Array.new(2) { Post.new }
     session.batch do
       for post in posts
         session.index(post)
@@ -36,11 +36,37 @@ describe 'batch indexing', :type => :indexer do
     pending 'batching all operations'
     connection.should_not_receive(:add)
     connection.should_not_receive(:remove)
-    posts = Array.new(2) { Post.new }
     session.batch do
       session.index(posts[0])
       session.remove(posts[1])
     end
     connection.adds
   end
+
+  describe "nesting of batches" do
+    let(:a_nested_batch) do
+      session.batch do
+        session.index posts[0]
+
+        session.batch do
+          session.index posts[1]
+        end
+      end
+    end
+
+    it "behaves like two sets of batches, does the inner first, then outer" do
+      session.batch { session.index posts[1] }
+      session.batch { session.index posts[0] }
+
+      two_sets_of_batches_adds = connection.adds.dup
+      connection.adds.clear
+
+      a_nested_batch
+      nested_batches_adds = connection.adds
+
+      nested_batches_adds.first.first.field_by_name(:title_ss).value.should eq(
+        two_sets_of_batches_adds.first.first.field_by_name(:title_ss).value
+      )
+    end
+  end
 end

data/spec/api/query/function_spec.rb

@@ -36,6 +36,15 @@ describe 'function query' do
     end
     connection.should have_last_search_including(:bf, 'product(average_rating_ft,10)')
   end
+
+  it "should handle the sub function in a function query block" do
+    session.search Post do
+      keywords('pizza') do
+        boost(function { sub(:average_rating, 10) })
+      end
+    end
+    connection.should have_last_search_including(:bf, 'sub(average_rating_ft,10)')
+  end
  
   it "should handle nested functions in a function query block" do
     session.search Post do

data/spec/api/query/group_spec.rb

@@ -0,0 +1,32 @@
+require File.expand_path('spec_helper', File.dirname(__FILE__))
+
+describe "field 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")
+  end
+
+  it "sends grouping limit parameters to solr" do
+    session.search Post do
+      group :title do
+        limit 2
+      end
+    end
+
+    connection.should have_last_search_including(:"group.limit", 2)
+  end
+
+  it "sends grouping sort parameters to solr" do
+    session.search Post do
+      group :title do
+        order_by :average_rating
+      end
+    end
+
+    connection.should have_last_search_including(:"group.sort", "average_rating_ft asc")
+  end
+end

data/spec/api/query/highlighting_examples.rb

@@ -220,4 +220,26 @@ shared_examples_for "query with highlighting support" do
       :"f.body_textsv.hl.snippets" => 1
     )
   end
+
+  it 'sets the formatter for highlight output' do
+    search do
+      keywords 'test' do
+        highlight :title, :formatter => 'formatter'
+      end
+    end
+    connection.should have_last_search_with(
+      :"f.title_text.hl.formatter" => 'formatter'
+    )
+  end
+
+  it 'sets the text snippet generator for highlighted text' do
+    search do
+      keywords 'test' do
+        highlight :title, :fragmenter => 'example_fragmenter'
+      end
+    end
+    connection.should have_last_search_with(
+      :"f.title_text.hl.fragmenter" => 'example_fragmenter'
+    )
+  end
 end

data/spec/api/query/ordering_pagination_examples.rb

@@ -25,6 +25,20 @@ shared_examples_for 'sortable query' do
     connection.should have_last_search_with(:rows => 15, :start => 0)
   end
 
+  it 'paginates with an offset' do
+    search do
+      paginate :per_page => 15, :offset => 3
+    end
+    connection.should have_last_search_with(:rows => 15, :start => 3)
+  end
+
+  it 'paginates with an offset as a string' do
+    search do
+      paginate :per_page => 15, :offset => '3'
+    end
+    connection.should have_last_search_with(:rows => 15, :start => 3)
+  end
+
   it 'paginates from string argument' do
     search do
       paginate :page => '3', :per_page => '15'
@@ -61,6 +75,13 @@ shared_examples_for 'sortable query' do
     connection.should have_last_search_with(:sort => 'score desc')
   end
 
+  it 'orders by geodist' do
+    search do
+      order_by_geodist :coordinates_new, 32, -68, :desc
+    end
+    connection.should have_last_search_with(:sort => 'geodist(coordinates_new_ll,32,-68) desc')
+  end
+
   it 'throws an ArgumentError if a bogus order direction is given' do
     lambda do
       search do

data/spec/api/query/spatial_examples.rb

@@ -0,0 +1,27 @@
+require 'bigdecimal'
+
+shared_examples_for "spatial query" do
+  it 'filters by radius' do
+    search do
+      with(:coordinates_new).in_radius(23, -46, 100)
+    end
+
+    connection.should have_last_search_including(:fq, "{!geofilt sfield=coordinates_new_ll pt=23,-46 d=100}")
+  end
+
+  it 'filters by radius via bbox (inexact)' do
+    search do
+      with(:coordinates_new).in_radius(23, -46, 100, :bbox => true)
+    end
+
+    connection.should have_last_search_including(:fq, "{!bbox sfield=coordinates_new_ll pt=23,-46 d=100}")
+  end
+
+  it 'filters by bounding box' do
+    search do
+      with(:coordinates_new).in_bounding_box([45, -94], [46, -93])
+    end
+
+    connection.should have_last_search_including(:fq, "coordinates_new_ll:[45,-94 TO 46,-93]")
+  end
+end

data/spec/api/query/standard_spec.rb

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

data/spec/api/search/hits_spec.rb

@@ -32,6 +32,12 @@ describe 'hits', :type => :search do
     session.search(Post).hits.first.instance.should == posts.first
   end
 
+  it 'should return the instance primary key when you use it as a param' do
+    posts = Array.new(2) { Post.new }
+    stub_results(*posts)
+    session.search(Post).hits.first.to_param.should == posts.first.id.to_s
+  end
+
   it 'should provide iterator over hits with instances' do
     posts = Array.new(2) { Post.new }
     stub_results(*posts)
@@ -102,6 +108,11 @@ describe 'hits', :type => :search do
     session.search(Post, Namespaced::Comment).hits.first.stored(:featured).should be_true
   end
 
+  it 'should return stored boolean fields that evaluate to false' do
+    stub_full_results('instance' => Post.new, 'featured_bs' => false)
+    session.search(Post, Namespaced::Comment).hits.first.stored(:featured).should == false
+  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'

data/spec/api/search/paginated_collection_spec.rb

@@ -14,6 +14,16 @@ describe "PaginatedCollection" do
     it { subject.next_page.should eql(2) }
     it { subject.out_of_bounds?.should_not be_true }
     it { subject.offset.should eql(0) }
+
+    it 'should allow setting total_count' do
+      subject.total_count = 1
+      subject.total_count.should eql(1)
+    end
+
+    it 'should allow setting total_entries' do
+      subject.total_entries = 1
+      subject.total_entries.should eql(1)
+    end
   end
 
   context "behaves like Kaminari" do

data/spec/api/search/results_spec.rb

@@ -42,6 +42,12 @@ describe 'search results', :type => :search do
     session.search(Post) { paginate(:page => 1) }.total.should == 4
   end
 
+  it 'returns query time' do
+    stub_nil_results
+    connection.response['responseHeader'] = { 'QTime' => 42 }
+    session.search(Post) { paginate(:page => 1) }.query_time.should == 42
+  end
+
   it 'returns total for nil search' do
     stub_nil_results
     session.search(Post).total.should == 0

data/spec/api/session_proxy/thread_local_session_proxy_spec.rb

@@ -25,17 +25,6 @@ describe Sunspot::SessionProxy::ThreadLocalSessionProxy do
     @proxy.session.should_not eql(proxy2.session)
   end
 
-  it 'should garbage collect session instance when proxy dereferenced' do
-    ref = WeakRef.new(@proxy.session)
-    @proxy = nil
-    GC.start
-    # need to do this a second time since the reference to the session is
-    # destroyed in the finalizer during the first GC run, and thus isn't picked
-    # up by that run.
-    GC.start 
-    lambda { ref.inspect }.should raise_error(WeakRef::RefError)
-  end
-
   (Sunspot::Session.public_instance_methods(false) - ['config', :config]).each do |method|
     it "should delegate #{method.inspect} to its session" do
       args = Array.new(Sunspot::Session.instance_method(method).arity.abs) do

data/spec/api/session_spec.rb

@@ -85,6 +85,18 @@ describe 'Session' do
       Sunspot.commit
       connection.opts[:url].should == 'http://127.0.0.1:8981/solr'
     end
+
+    it 'should open a connection with custom read timeout' do
+      Sunspot.config.solr.read_timeout = 0.5
+      Sunspot.commit
+      connection.opts[:read_timeout].should == 0.5
+    end
+
+    it 'should open a connection with custom open timeout' do
+      Sunspot.config.solr.open_timeout = 0.5
+      Sunspot.commit
+      connection.opts[:open_timeout].should == 0.5
+    end
   end
 
   context 'custom session' do

data/spec/api/sunspot_spec.rb

@@ -1,6 +1,17 @@
 require File.expand_path('spec_helper', File.dirname(__FILE__))
 
 describe Sunspot do
+
+  describe "setup" do
+    it "should register the class in Sunspot.searchable" do
+      Sunspot.setup(Blog) do
+        text :name
+      end
+      Sunspot.searchable.should_not be_empty
+      Sunspot.searchable.should include(Blog)
+    end
+  end
+
   describe "reset!" do
     it "should reset current session" do
       old_session = Sunspot.send(:session)

data/spec/helpers/indexer_helper.rb

@@ -1,16 +1,4 @@
 module IndexerHelper
-  def config
-    Sunspot::Configuration.build
-  end
-
-  def connection
-    @connection ||= Mock::Connection.new
-  end
-
-  def session
-    @session ||= Sunspot::Session.new(config, connection)
-  end
-
   def post(attrs = {})
     @post ||= Post.new(attrs)
   end

data/spec/helpers/integration_helper.rb

@@ -0,0 +1,8 @@
+module IntegrationHelper
+  def self.included(base)
+    base.before(:all) do
+      Sunspot.config.solr.url = ENV['SOLR_URL'] || 'http://localhost:8983/solr'
+      Sunspot.reset!(true)
+    end
+  end
+end

data/spec/helpers/mock_session_helper.rb

@@ -0,0 +1,13 @@
+module MockSessionHelper
+  def config
+    @config ||= Sunspot::Configuration.build
+  end
+
+  def connection
+    @connection ||= Mock::Connection.new
+  end
+
+  def session
+    @session ||= Sunspot::Session.new(config, connection)
+  end
+end

data/spec/helpers/query_helper.rb

@@ -1,16 +1,4 @@
 module QueryHelper
-  def config
-    @config ||= Sunspot::Configuration.build
-  end
-
-  def connection
-    @connection ||= Mock::Connection.new
-  end
-
-  def session
-    @session ||= Sunspot::Session.new(config, connection)
-  end
-
   def get_filter_tag(boolean_query)
     connection.searches.last[:fq].each do |fq|
       if match = fq.match(/^\{!tag=(.+)\}#{Regexp.escape(boolean_query)}$/)

data/spec/helpers/search_helper.rb

@@ -65,16 +65,4 @@ module SearchHelper
   def facet_counts(result, field_name)
     result.facet(field_name).rows.map { |row| row.count }
   end
-
-  def config
-    @config ||= Sunspot::Configuration.build
-  end
-
-  def connection
-    @connection ||= Mock::Connection.new
-  end
-
-  def session
-    @session ||= Sunspot::Session.new(config, connection)
-  end
 end

data/spec/integration/dynamic_fields_spec.rb

@@ -1,3 +1,5 @@
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
+
 describe 'dynamic fields' do
   before :each do
     Sunspot.remove_all

data/spec/integration/faceting_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path('spec_helper', File.dirname(__FILE__))
+require File.expand_path('../spec_helper', File.dirname(__FILE__))
 
 describe 'search faceting' do
   def self.test_field_type(name, attribute, field, *args)
@@ -134,6 +134,19 @@ describe 'search faceting' do
       search.facet(:title).rows.first.value.should == :none
       search.facet(:title).rows.first.count.should == 1
     end
+
+    it 'gives correct facet count when group == true and truncate == true' do
+      search = Sunspot.search(Post) do
+        group :title do
+          truncate
+        end
+
+        facet :title, :extra => :any
+      end
+
+      # Should be 5 instead of 11
+      search.facet(:title).rows.first.count.should == 5
+    end
   end
 
   context 'multiselect faceting' do

data/spec/integration/field_grouping_spec.rb

@@ -0,0 +1,66 @@
+require File.expand_path("../spec_helper", File.dirname(__FILE__))
+require File.expand_path("../helpers/search_helper", File.dirname(__FILE__))
+
+describe "field grouping" do
+  before :each do
+    Sunspot.remove_all
+
+    @posts = [
+      Post.new(:title => "Title1", :ratings_average => 4),
+      Post.new(:title => "Title1", :ratings_average => 5),
+      Post.new(:title => "Title2", :ratings_average => 3)
+    ]
+
+    Sunspot.index!(*@posts)
+  end
+
+  it "allows grouping by a field" do
+    search = Sunspot.search(Post) do
+      group :title
+    end
+
+    search.group(:title).groups.should include { |g| g.value == "Title1" }
+    search.group(:title).groups.should include { |g| g.value == "Title2" }
+  end
+
+  it "provides access to the number of matches before grouping" do
+    search = Sunspot.search(Post) do
+      group :title
+    end
+
+    search.group(:title).matches.should == @posts.length
+  end
+
+  it "allows grouping by multiple fields" do
+    search = Sunspot.search(Post) do
+      group :title, :sort_title
+    end
+
+    search.group(:title).groups.should_not be_empty
+    search.group(:sort_title).groups.should_not be_empty
+  end
+
+  it "allows specification of the number of documents per group" do
+    search = Sunspot.search(Post) do
+      group :title do
+        limit 2
+      end
+    end
+
+    title1_group = search.group(:title).groups.detect { |g| g.value == "Title1" }
+    title1_group.hits.length.should == 2
+  end
+
+  it "allows specification of the sort within groups" do
+    search = Sunspot.search(Post) do
+      group :title do
+        order_by(:average_rating, :desc)
+      end
+    end
+
+    highest_ranked_post = @posts.sort_by { |p| -p.ratings_average }.first
+
+    title1_group = search.group(:title).groups.detect { |g| g.value == "Title1" }
+    title1_group.hits.first.primary_key.to_i.should == highest_ranked_post.id
+  end
+end