sunspot 1.0.5 → 1.1.0

data/spec/api/search/faceting_spec.rb

@@ -53,7 +53,7 @@ describe 'faceting', :type => :search do
   end
 
   it 'returns float facet' do
-    stub_facet(:average_rating_f, '9.3' => 2, '1.1' => 1)
+    stub_facet(:average_rating_ft, '9.3' => 2, '1.1' => 1)
     result = session.search Post do
       facet :average_rating
     end
@@ -62,7 +62,7 @@ describe 'faceting', :type => :search do
 
   it 'returns time facet' do
     stub_facet(
-      :published_at_d,
+      :published_at_dt,
       '2009-04-07T20:25:23Z' => 3,
       '2009-04-07T20:26:19Z' => 2,
       '2050-04-07T20:27:15Z' => 1
@@ -181,7 +181,7 @@ describe 'faceting', :type => :search do
   end
 
   it 'returns 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)
+    stub_date_facet(:published_at_dt, 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) }
@@ -191,7 +191,7 @@ describe 'faceting', :type => :search do
   end
 
   it 'returns date range facet sorted by count' do
-    stub_date_facet(:published_at_d, 60*60*24, '2009-07-08T04:00:00Z' => 2, '2009-07-07T04:00:00Z' => 1)
+    stub_date_facet(:published_at_dt, 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, :sort => :count) }
@@ -202,8 +202,8 @@ describe 'faceting', :type => :search do
 
   it 'returns query facet' do
     stub_query_facet(
-      'average_rating_f:[3\.0 TO 5\.0]' => 3,
-      'average_rating_f:[1\.0 TO 3\.0]' => 1
+      'average_rating_ft:[3\.0 TO 5\.0]' => 3,
+      'average_rating_ft:[1\.0 TO 3\.0]' => 1
     )
     search = session.search(Post) do
       facet :average_rating do
@@ -236,10 +236,10 @@ describe 'faceting', :type => :search do
 
     before :each do
       stub_query_facet(
-        'average_rating_f:[1\.0 TO 2\.0]' => 2,
-        'average_rating_f:[2\.0 TO 3\.0]' => 3,
-        'average_rating_f:[3\.0 TO 4\.0]' => 1,
-        'average_rating_f:[4\.0 TO 5\.0]' => 0
+        'average_rating_ft:[1\.0 TO 2\.0]' => 2,
+        'average_rating_ft:[2\.0 TO 3\.0]' => 3,
+        'average_rating_ft:[3\.0 TO 4\.0]' => 1,
+        'average_rating_ft:[4\.0 TO 5\.0]' => 0
       )
     end
 

data/spec/api/search/hits_spec.rb

@@ -107,7 +107,7 @@ describe 'hits', :type => :search do
   end
 
   it 'should return stored text fields' do
-    stub_full_results('instance' => Post.new, 'body_texts' => 'Body')
+    stub_full_results('instance' => Post.new, 'body_textsv' => 'Body')
     session.search(Post, Namespaced::Comment).hits.first.stored(:body).should == 'Body'
   end
 

data/spec/api/search/results_spec.rb

@@ -25,6 +25,11 @@ describe 'search results', :type => :search do
     session.search(Post, Namespaced::Comment).results.should == results
   end
 
+  it 'gracefully returns empty results when response is nil' do
+    stub_nil_results
+    session.search(Post).results.should == []
+  end
+
   if ENV['USE_WILL_PAGINATE']
 
     it 'returns search total as attribute of results' do
@@ -50,6 +55,11 @@ describe 'search results', :type => :search do
     session.search(Post) { paginate(:page => 1) }.total.should == 4
   end
 
+  it 'returns total for nil search' do
+    stub_nil_results
+    session.search(Post).total.should == 0
+  end
+
   it 'returns available results if some results are not available from data store' do
     posts = [Post.new, Post.new]
     posts.last.destroy

data/spec/api/server_spec.rb

@@ -46,6 +46,12 @@ describe Sunspot::Server do
     @server.run
   end
 
+  it 'runs Solr with specified Solr jar' do
+    @server.solr_jar = SUNSPOT_START_JAR
+    FileUtils.should_receive(:cd).with(File.dirname(SUNSPOT_START_JAR))
+    @server.run
+  end
+
   describe 'with logging' do
     before :each do
       @server.log_level = 'info'

data/spec/api/session_proxy/master_slave_session_proxy_spec.rb

@@ -7,8 +7,8 @@ describe Sunspot::SessionProxy::MasterSlaveSessionProxy do
   end
 
   {
-    :master_session => Sunspot::Session.public_instance_methods(false) - [:search, 'search', :new_search, 'new_search', :config, 'config'],
-    :slave_session => [:search, :new_search]
+    :master_session => Sunspot::Session.public_instance_methods(false) - [:search, 'search', :new_search, 'new_search', :more_like_this, 'more_like_this', :new_more_like_this, 'new_more_like_this', :config, 'config'],
+    :slave_session => [:search, :new_search, :more_like_this, :new_more_like_this]
   }.each_pair do |delegate, methods|
     methods.each do |method|
       it "should delegate #{method} to #{delegate}" do

data/spec/api/session_proxy/thread_local_session_proxy_spec.rb

@@ -1,4 +1,5 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'weakref'
 
 describe Sunspot::SessionProxy::ThreadLocalSessionProxy do
   before :each do
@@ -19,6 +20,22 @@ describe Sunspot::SessionProxy::ThreadLocalSessionProxy do
     session1.should_not eql(session2)
   end
 
+  it 'should not have the same session for the same thread in different proxy instances' do
+    proxy2 = Sunspot::SessionProxy::ThreadLocalSessionProxy.new(@config)
+    @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/spec_helper.rb

@@ -1 +1,3 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
+
+Dir.glob(File.join(File.dirname(__FILE__), '**', '*_examples.rb')).each { |shared| require(shared) }

data/spec/helpers/query_helper.rb

@@ -10,4 +10,29 @@ module QueryHelper
   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)}$/)
+        return match[1]
+      end
+    end
+    nil
+  end
+
+  def subqueries(param)
+    q = connection.searches.last[:q]
+    subqueries = []
+    subqueries = q.scan(%r(_query_:"\{!dismax (.*?)\}(.*?)"))
+    subqueries.map do |subquery|
+      params = {}
+      subquery[0].scan(%r((\S+?)='(.+?)')) do |key, value|
+        params[key.to_sym] = value
+      end
+      unless subquery[1].empty?
+        params[:v] = subquery[1]
+      end
+      params
+    end
+  end
 end

data/spec/helpers/search_helper.rb

@@ -1,4 +1,8 @@
 module SearchHelper
+  def stub_nil_results
+    connection.response = { 'response' => nil }
+  end
+
   def stub_full_results(*results)
     count =
       if results.last.is_a?(Integer) then results.pop

data/spec/integration/faceting_spec.rb

@@ -109,6 +109,14 @@ describe 'search faceting' do
       search.facet(:title).rows.map { |row| row.value }.should == %w(four three two one)
     end
 
+    it 'should limit facet values by prefix' do
+      search = Sunspot.search(Post) do
+        with :blog_id, 1
+        facet :title, :prefix => 't'
+      end
+      search.facet(:title).rows.map { |row| row.value }.sort.should == %w(three two)
+    end
+
     it 'should return :all facet' do
       search = Sunspot.search(Post) do
         with :blog_id, 1

data/spec/integration/keyword_search_spec.rb

@@ -10,7 +10,7 @@ describe 'keyword search' do
       @posts << Post.new(:title => 'A nail abbreviates the recovering insight outside the moron',
                          :body => 'The interpreted strain scans the buffer around the upper temper')
       @posts << Post.new(:title => 'The toast abbreviates the recovering spirit',
-                         :body => 'Does the wind interpret the buffer, moron?')
+                         :body => 'Does the host\'s wind interpret the buffer, moron?')
       Sunspot.index!(*@posts)
       @comment = Namespaced::Comment.new(:body => 'Hey there where ya goin, not exactly knowin, who says you have to call just one place toast.')
       Sunspot.index!(@comment)
@@ -47,6 +47,45 @@ describe 'keyword search' do
       end.results
       results.should == [@posts[1]]
     end
+
+    it 'matches multiple keywords on different fields using subqueries' do
+      search = Sunspot.search(Post) do
+        keywords 'moron', :fields => [:title]
+        keywords 'wind',  :fields => [:body]
+      end
+      search.results.should == []
+
+      search = Sunspot.search(Post) do
+        keywords 'moron',   :fields => [:title]
+        keywords 'buffer',  :fields => [:body]
+      end
+      search.results.should == [@posts[1]]
+    end
+
+    it 'matches multiple keywords with escaped characters' do
+      search = Sunspot.search(Post) do
+        keywords 'spirit',   :fields => [:title]
+        keywords 'host\'s',  :fields => [:body]
+      end
+      search.results.should == [@posts[2]]
+    end
+
+    it 'matches multiple keywords with phrase-based search' do
+      search = Sunspot.search(Post) do
+        keywords 'spirit', :fields => [:title]
+        keywords '"interpret the buffer"', :fields => [:body]
+        keywords '"does the"', :fields => [:body]
+      end
+      search.results.should == [@posts[2]]
+    end
+
+    it 'matches multiple keywords different options' do
+      search = Sunspot.search(Post) do
+        keywords 'insufficient nonexistent', :fields => [:title], :minimum_match => 1
+        keywords 'wind does', :fields => [:body], :minimum_match => 2
+      end
+      search.results.should == [@posts[0]]
+    end
   end
 
   describe 'with field boost' do
@@ -75,7 +114,7 @@ describe 'keyword search' do
 
     it 'should assign a higher score to the higher-boosted document' do
       search = Sunspot.search(Post) { keywords 'test' }
-      search.hits.map { |hit| hit.primary_key }.should == 
+      search.hits.map { |hit| hit.primary_key }.should ==
         @posts.map { |post| post.id.to_s }
       search.hits.first.score.should > search.hits.last.score
     end
@@ -110,7 +149,7 @@ describe 'keyword search' do
       hits.first.instance.should == @comments.first
       hits.first.score.should > hits.last.score
     end
-    
+
     it 'assigns a higher score to documents in which the search terms appear in a higher boosted phrase field' do
       hits = Sunspot.search(Namespaced::Comment) do
         keywords 'test text' do
@@ -242,4 +281,37 @@ describe 'keyword search' do
       @sorted_hits[4].score.should == @sorted_hits[5].score
     end
   end
+
+  describe 'with function queries' do
+    before :each do
+      Sunspot.remove_all
+    end
+
+    after :each do
+      @search.results.should == @posts
+      @search.hits.first.score.should > @search.hits.last.score
+    end
+
+    it 'boosts via function query with float' do
+      @posts = [Post.new(:title => 'test', :ratings_average => 4.0),
+                Post.new(:title => 'test', :ratings_average => 2.0)]
+      Sunspot.index!(@posts)
+      @search = Sunspot.search(Post) do
+        keywords('test') do
+          boost function { :average_rating }
+        end
+      end
+    end
+
+    it 'boosts via function query with date' do
+      @posts = [Post.new(:title => 'test', :published_at => Time.now),
+                Post.new(:title => 'test', :published_at => Time.now - 60*60*24*31*6)] # roughly six months ago
+      Sunspot.index!(@posts)
+      @search = Sunspot.search(Post) do
+        keywords('test') do
+          boost function { recip(ms(Time.now, :published_at), 3.16e-11, 1, 1) }
+        end
+      end
+    end
+  end
 end

data/spec/integration/local_search_spec.rb

@@ -55,7 +55,7 @@ describe 'local search' do
     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)

data/spec/integration/more_like_this_spec.rb

@@ -0,0 +1,43 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'more_like_this' do
+  before :all do
+    Sunspot.remove_all
+    @posts = [
+      Post.new(:body => "one two three", :tags => %w(ruby sunspot rsolr)),
+      Post.new(:body => "four five six", :tags => %w(ruby solr lucene)),
+      Post.new(:body => "two three four", :tags => %w(python sqlalchemy)),
+      Post.new(:body => "three four five", :tags => %w(ruby sunspot mat)),
+      Post.new(:body => "six seven eight", :tags => %w(bogus airplane))
+    ]
+    Sunspot.index!(@posts)
+  end
+
+  it 'should return results for all MLT fields' do
+    Sunspot.more_like_this(@posts.first).results.to_set.should == @posts[1..3].to_set
+  end
+
+  it 'should return results for specified text field' do
+    Sunspot.more_like_this(@posts.first) do 
+      fields :body
+    end.results.to_set.should == @posts[2..3].to_set
+  end
+
+  it 'should return empty result set if no results' do
+    Sunspot.more_like_this(@posts.last) do
+      with(:title, 'bogus')
+    end.results.should == []
+  end
+
+  describe 'when non-indexed object searched' do
+    before(:each) { @mlt = Sunspot.more_like_this(Post.new) }
+
+    it 'should return empty result set' do
+      @mlt.results.should == []
+    end
+
+    it 'shoult return a total of 0' do
+      @mlt.total.should == 0
+    end
+  end
+end

data/spec/mocks/comment.rb

@@ -13,7 +13,7 @@ end
 Sunspot.setup(Namespaced::Comment) do
   text :body, :author_name
   string :author_name
-  time :published_at
+  time :published_at, :trie => true
   long :hash
   double :average_rating
   dynamic_float :custom_float, :multiple => true

data/spec/mocks/connection.rb

@@ -24,11 +24,14 @@ module Mock
   class Connection
     attr_reader :adds, :commits, :searches, :message, :opts, :deletes_by_query
     attr_accessor :response
+    attr_writer :expected_handler
+    undef_method :select # annoyingly defined on Object
 
     def initialize(opts = {})
       @opts = opts
       @message = OpenStruct.new
       @adds, @deletes, @deletes_by_query, @commits, @searches = Array.new(5) { [] }
+      @expected_handler = :select
     end
 
     def add(documents)
@@ -47,11 +50,18 @@ module Mock
       @commits << Time.now
     end
 
-    def select(request)
-      @searches << @last_search = request
+    def request(path, params)
+      unless path == "/#{@expected_handler}"
+        raise ArgumentError, "Expected request to #{@expected_handler} request handler"
+      end
+      @searches << @last_search = params
       @response || {}
     end
 
+    def method_missing(method, *args, &block)
+      request("/#{method}", *args)
+    end
+
     def has_add_with?(*documents)
       @adds.any? do |add|
         documents.all? do |document|
@@ -81,16 +91,7 @@ module Mock
     end
 
     def has_last_search_with?(params)
-      return unless @last_search
-      if params.respond_to?(:all?)
-        params.all? do |key, value|
-          if @last_search.has_key?(key)
-            @last_search[key] == value
-          end
-        end
-      else
-        @last_search.has_key?(params)
-      end
+      with?(@last_search, params) if @last_search
     end
 
     def has_last_search_including?(key, *values)
@@ -103,5 +104,19 @@ module Mock
         end
       end
     end
+
+    private
+
+    def with?(request, params)
+      if params.respond_to?(:all?)
+        params.all? do |key, value|
+          if request.has_key?(key)
+            request[key] == value
+          end
+        end
+      else
+        request.has_key?(params)
+      end
+    end
   end
 end

data/spec/mocks/post.rb

@@ -3,7 +3,7 @@ require File.join(File.dirname(__FILE__), 'super_class')
 
 class Post < SuperClass
   attr_accessor :title, :body, :blog_id, :published_at, :ratings_average,
-                :author_name, :featured, :expire_date, :coordinates
+                :author_name, :featured, :expire_date, :coordinates, :tags
   alias_method :featured?, :featured
 
   def category_ids
@@ -32,15 +32,16 @@ end
 
 Sunspot.setup(Post) do
   text :title, :boost => 2
-  text :body, :stored => true
+  text :body, :stored => true, :more_like_this => true
   text :backwards_title do
     title.reverse if title
   end
+  text :tags, :more_like_this => true
   string :title, :stored => true
   integer :blog_id, :references => Blog
   integer :category_ids, :multiple => true
-  float :average_rating, :using => :ratings_average
-  time :published_at
+  float :average_rating, :using => :ratings_average, :trie => true
+  time :published_at, :trie => true
   date :expire_date
   boolean :featured, :using => :featured?
   string :sort_title do

data/spec/spec_helper.rb

@@ -1,5 +1,3 @@
-using_gems = false
-
 if rsolr_gem_version = ENV['RSOLR_GEM_VERSION']
   STDERR.puts("Forcing rsolr gem version #{rsolr_gem_version}")
   using_gems = true
@@ -7,35 +5,20 @@ if rsolr_gem_version = ENV['RSOLR_GEM_VERSION']
   gem 'rsolr', rsolr_gem_version
 end
 
+require 'ostruct'
 begin
   require 'spec'
-  begin
-    require 'ruby-debug'
-  rescue LoadError => e
-    if using_gems
-      module Kernel
-        def debugger
-          STDERR.puts('Debugger is not available')
-        end
-      end
-    else
-      raise(e)
-    end
-  end
   if ENV['USE_WILL_PAGINATE']
     require 'will_paginate'
     require 'will_paginate/collection'
   end
 rescue LoadError => e
-  require 'rubygems'
-  if using_gems
-    raise(e)
-  else
-    using_gems = true
+  if require 'rubygems'
     retry
+  else
+    raise(e)
   end
 end
-require 'ostruct'
 
 unless gem_name = ENV['SUNSPOT_TEST_GEM']
   $:.unshift(File.dirname(__FILE__) + '/../lib')

data/tasks/gemspec.rake

@@ -10,7 +10,7 @@ Sunspot::GemTasks.new(:build => :copy_rdoc) do |s|
   s.description = <<TEXT
 Sunspot is a library providing a powerful, all-ruby API for the Solr search engine. Sunspot manages the configuration of persistent Ruby classes for search and indexing and exposes Solr's most powerful features through a collection of DSLs. Complex search operations can be performed without hand-writing any boolean queries or building Solr parameters by hand.
 TEXT
-  s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch', 'Brian Atkinson', 'Tom Coleman', 'Matt Mitchell', 'Nathan Beyer']
+  s.authors = ['Mat Brown', 'Peer Allan', 'Dmitriy Dzema', 'Benjamin Krause', 'Marcel de Graaf', 'Brandon Keepers', 'Peter Berkenbosch', 'Brian Atkinson', 'Tom Coleman', 'Matt Mitchell', 'Nathan Beyer', 'Kieran Topping', 'Nicolas Braem', 'Jeremy Ashkenas']
   s.rubyforge_project = 'sunspot'
   s.files = FileList['[A-Z]*', '{bin,installer,lib,spec,tasks,templates}/**/*', 'solr/{etc,lib,webapps}/**/*', 'solr/solr/{conf,lib}/*', 'solr/start.jar']
   s.add_runtime_dependency 'rsolr', '0.12.1'