thinking-sphinx 2.0.3 → 2.0.4

data/lib/thinking_sphinx/deploy/capistrano.rb

@@ -3,13 +3,13 @@ Capistrano::Configuration.instance(:must_exist).load do
     namespace :install do
       desc <<-DESC
         Install Sphinx by source
-        
+
         If Postgres is available, Sphinx will use it.
-        
+
         If the variable :thinking_sphinx_configure_args is set, it will
         be passed to the Sphinx configure script. You can use this to
         install Sphinx in a non-standard location:
-        
+
           set :thinking_sphinx_configure_args, "--prefix=$HOME/software"
 DESC
 
@@ -22,7 +22,7 @@ DESC
         rescue Capistrano::CommandError => e
           puts "Continuing despite error: #{e.message}"
         end
-      
+
         args = []
         if with_postgres
           run "pg_config --pkgincludedir" do |channel, stream, data|
@@ -30,60 +30,60 @@ DESC
           end
         end
         args << fetch(:thinking_sphinx_configure_args, '')
-        
+
         commands = <<-CMD
-        wget -q http://www.sphinxsearch.com/downloads/sphinx-0.9.8.1.tar.gz >> sphinx.log
-        tar xzvf sphinx-0.9.8.1.tar.gz
-        cd sphinx-0.9.8.1
+        wget -q http://sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz >> sphinx.log
+        tar xzvf sphinx-0.9.9.tar.gz
+        cd sphinx-0.9.9
         ./configure #{args.join(" ")}
         make
         #{try_sudo} make install
-        rm -rf sphinx-0.9.8.1 sphinx-0.9.8.1.tar.gz
+        rm -rf sphinx-0.9.9 sphinx-0.9.9.tar.gz
         CMD
         run commands.split(/\n\s+/).join(" && ")
       end
-    
-      desc "Install Thinking Sphinx as a gem from GitHub"
+
+      desc "Install Thinking Sphinx as a gem"
       task :ts do
-        run "#{try_sudo} gem install thinking-sphinx --source http://gemcutter.org"
+        run "#{try_sudo} gem install thinking-sphinx"
       end
     end
-  
+
     desc "Generate the Sphinx configuration file"
     task :configure do
       rake "thinking_sphinx:configure"
     end
-  
+
     desc "Index data"
     task :index do
       rake "thinking_sphinx:index"
     end
-  
+
     desc "Start the Sphinx daemon"
     task :start do
       configure
       rake "thinking_sphinx:start"
     end
-  
+
     desc "Stop the Sphinx daemon"
     task :stop do
       configure
       rake "thinking_sphinx:stop"
     end
-  
+
     desc "Stop and then start the Sphinx daemon"
     task :restart do
       stop
       start
     end
-  
+
     desc "Stop, re-index and then start the Sphinx daemon"
     task :rebuild do
       stop
       index
       start
     end
-  
+
     desc "Add the shared folder for sphinx files"
     task :shared_sphinx_folder, :roles => :web do
       rails_env = fetch(:rails_env, "production")

data/lib/thinking_sphinx/excerpter.rb

@@ -1,6 +1,7 @@
 module ThinkingSphinx
   class Excerpter
-    CoreMethods = %w( kind_of? object_id respond_to? should should_not stub! )
+    CoreMethods = %w( kind_of? object_id respond_to? respond_to_missing? should
+      should_not stub! )
     # Hide most methods, to allow them to be passed through to the instance.
     instance_methods.select { |method|
       method.to_s[/^__/].nil? && !CoreMethods.include?(method.to_s)

data/lib/thinking_sphinx/facet.rb

@@ -98,16 +98,15 @@ module ThinkingSphinx
     
     def translate(object, attribute_value)
       objects = source_objects(object)
-      return nil if objects.nil? || objects.empty?
-      
-      if objects.length > 1
-        objects.collect { |item| item.send(column.__name) }.detect { |item|
-          item.to_crc32 == attribute_value
-        }
-      else
-        method = value_source || column.__name
-        objects.first.send(method)
-      end
+      return if objects.blank?
+
+      method = value_source || column.__name
+      object = objects.one? ? objects.first : objects.detect { |item|
+        result = item.send(method)
+        result && result.to_crc32 == attribute_value
+      }
+
+      object.try(method)
     end
     
     def source_objects(object)

data/lib/thinking_sphinx/index/builder.rb

@@ -251,6 +251,16 @@ module ThinkingSphinx
         FauxColumn.new(assoc, *args)
       end
       
+      # Use this method to generate SQL for your attributes, conditions, etc.
+      # You can pass in as whatever ActiveRecord::Base.sanitize_sql accepts.
+      # 
+      #   where sanitize_sql(["active = ?", true])
+      #   #=> WHERE active = 1
+      # 
+      def sanitize_sql(*args)
+        @index.model.send(:sanitize_sql, *args)
+      end
+      
       private
       
       def source

data/lib/thinking_sphinx/railtie.rb

@@ -3,6 +3,10 @@ require 'rails'
 
 module ThinkingSphinx
   class Railtie < Rails::Railtie
+    
+    initializer 'thinking_sphinx.sphinx' do
+      ThinkingSphinx::AutoVersion.detect
+    end
 
     initializer "thinking_sphinx.active_record" do
       ActiveSupport.on_load :active_record do

data/lib/thinking_sphinx/search.rb

@@ -7,12 +7,12 @@ module ThinkingSphinx
   # search_for_ids methods will do the job in exactly the same manner when
   # called from a model.
   # 
-  class Search
+  class Search < Array
     CoreMethods = %w( == class class_eval extend frozen? id instance_eval
       instance_of? instance_values instance_variable_defined?
       instance_variable_get instance_variable_set instance_variables is_a?
-      kind_of? member? method methods nil? object_id respond_to? send should
-      type )
+      kind_of? member? method methods nil? object_id respond_to?
+      respond_to_missing? send should type )
     SafeMethods = %w( partition private_methods protected_methods
       public_methods send class )
     
@@ -489,7 +489,10 @@ module ThinkingSphinx
     end
 
     def self.log(message, &block)
-      return if ThinkingSphinx::ActiveRecord::LogSubscriber.logger.nil?
+      if ThinkingSphinx::ActiveRecord::LogSubscriber.logger.nil?
+        yield if block_given?
+        return
+      end
 
       if block_given?
         ::ActiveSupport::Notifications.

data/lib/thinking_sphinx/tasks.rb

@@ -6,9 +6,11 @@ namespace :thinking_sphinx do
     if defined?(Rails)
       Rails.application.require_environment!
       Rails.configuration.cache_classes = false
+    elsif defined?(Merb)
+      Rake::Task[:merb_env].invoke
+    elsif defined?(Sinatra)
+      Sinatra::Application.environment = ENV['RACK_ENV']
     end
-    
-    Rake::Task[:merb_env].invoke    if defined?(Merb)
   end
   
   desc "Output the current Thinking Sphinx version"

data/spec/thinking_sphinx/active_record/delta_spec.rb

@@ -17,27 +17,27 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
   
   describe "suspended_delta method" do
     before :each do
-      ThinkingSphinx.deltas_enabled = true
+      ThinkingSphinx.deltas_suspended = false
       Person.sphinx_indexes.first.delta_object.stub!(:` => "")
     end
 
     it "should execute the argument block with deltas disabled" do
-      ThinkingSphinx.should_receive(:deltas_enabled=).once.with(false)
-      ThinkingSphinx.should_receive(:deltas_enabled=).once.with(true)
+      ThinkingSphinx.should_receive(:deltas_suspended=).once.with(true)
+      ThinkingSphinx.should_receive(:deltas_suspended=).once.with(false)
       lambda { Person.suspended_delta { raise 'i was called' } }.should(
         raise_error(Exception)
       )
     end
 
     it "should restore deltas_enabled to its original setting" do
-      ThinkingSphinx.deltas_enabled = false
-      ThinkingSphinx.should_receive(:deltas_enabled=).twice.with(false)
+      ThinkingSphinx.deltas_suspended = true
+      ThinkingSphinx.should_receive(:deltas_suspended=).twice.with(true)
       Person.suspended_delta { 'no-op' }
     end
 
     it "should restore deltas_enabled to its original setting even if there was an exception" do
-      ThinkingSphinx.deltas_enabled = false
-      ThinkingSphinx.should_receive(:deltas_enabled=).twice.with(false)
+      ThinkingSphinx.deltas_suspended = true
+      ThinkingSphinx.should_receive(:deltas_suspended=).twice.with(true)
       lambda { Person.suspended_delta { raise 'bad error' } }.should(
         raise_error(Exception)
       )

data/spec/thinking_sphinx/active_record_spec.rb

@@ -388,6 +388,10 @@ describe ThinkingSphinx::ActiveRecord do
       @person = Person.find(:first)
     end
     
+    after :each do
+      Person.clear_primary_key_for_sphinx
+    end
+    
     after :each do
       Person.set_sphinx_primary_key nil
     end

data/spec/thinking_sphinx/attribute_spec.rb

@@ -81,9 +81,9 @@ describe ThinkingSphinx::Attribute do
   
   describe '#is_many?' do
     before :each do
-      @assoc_a = stub('assoc', :is_many? => true)
-      @assoc_b = stub('assoc', :is_many? => true)
-      @assoc_c = stub('assoc', :is_many? => true)
+      @assoc_a = ThinkingSphinx::Association.new(nil, nil)
+      @assoc_b = ThinkingSphinx::Association.new(nil, nil)
+      @assoc_c = ThinkingSphinx::Association.new(nil, nil)
       
       @attribute = ThinkingSphinx::Attribute.new(
         @source, [ThinkingSphinx::Index::FauxColumn.new(:col_name)]
@@ -91,6 +91,9 @@ describe ThinkingSphinx::Attribute do
       @attribute.associations = {
         :a => @assoc_a, :b => @assoc_b, :c => @assoc_c
       }
+      @attribute.associations.values.each { |assoc|
+        assoc.stub!(:is_many? => true)
+      }
     end
     
     it "should return true if all associations return true to is_many?" do

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -30,7 +30,7 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.detect
     end
     
-    it "should require 1.10-beta if that is the detected version" do
+    it "should require 1.10-beta if using 1.10-beta compiled with id64 support" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/1.10')
       
@@ -38,15 +38,23 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.detect
     end
     
-    it "should output a warning if the detected version is something else" do
-      STDERR.should_receive(:puts).twice
+    it "should require 2.0.1 if using Sphinx 2.0.1 beta" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/2.0.1')
+      
+      @config.stub!(:version => '2.0.1-beta')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
+    it "should output a warning if the detected version is unsupported" do
+      STDERR.should_receive(:puts).with(/unsupported/i)
       
       @config.stub!(:version => '0.9.7')
       ThinkingSphinx::AutoVersion.detect
     end
     
     it "should output a warning if the version cannot be determined" do
-      STDERR.should_receive(:puts)
+      STDERR.should_receive(:puts).at_least(:once)
       
       @config.stub!(:version => nil)
       ThinkingSphinx::AutoVersion.detect

data/spec/thinking_sphinx/configuration_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe ThinkingSphinx::Configuration do
   describe "environment class method" do
     before :each do
-      Thread.current[:thinking_sphinx_environment] = nil
+      ThinkingSphinx::Configuration.reset_environment
       
       ENV["RAILS_ENV"] = nil
     end

data/spec/thinking_sphinx/context_spec.rb

@@ -41,6 +41,7 @@ describe ThinkingSphinx::Context do
       }.should_not raise_error
     end
 
+    # Fails in Ruby 1.9 (or maybe it's an RSpec update). Not sure why.
     it "should retry if the first pass fails and contains a directory" do
       @model_name_lower.stub!(:gsub!).and_return(true, nil)
       @class_name.stub(:constantize).and_raise(LoadError)

data/spec/thinking_sphinx/facet_search_spec.rb

@@ -98,14 +98,6 @@ describe ThinkingSphinx::FacetSearch do
           :classes => [Person], :facets => :state
         )
       end
-      
-      it "should handle multiple facets" do
-        ThinkingSphinx.should_receive(:search).twice.and_return(search)
-        
-        ThinkingSphinx::FacetSearch.new(
-          :classes => [Person], :facets => [:state, :city]
-        )
-      end
     end
     
     describe "empty result set for attributes" do

data/spec/thinking_sphinx/facet_spec.rb

@@ -311,6 +311,18 @@ describe ThinkingSphinx::Facet do
         ThinkingSphinx::Facet.new(field).value(friendship, {'name_facet' => 'buried'.to_crc32}).
           should == 'buried'
       end
+      
+      it "should not error with multi-level association values containing a nil value" do
+        person      = Person.find(:first)
+        tag         = person.tags.build(:name => nil)
+        tag         = person.tags.build(:name => "buried")
+        friendship  = Friendship.new(:person => person)
+        
+        field  = ThinkingSphinx::Field.new(
+          @source, ThinkingSphinx::Index::FauxColumn.new(:person, :tags, :name)
+        )
+        lambda{ThinkingSphinx::Facet.new(field).value(friendship, {'name_facet' => 'buried'.to_crc32})}.should_not raise_error
+      end
     end
     
     describe 'for float attributes' do

data/spec/thinking_sphinx/field_spec.rb

@@ -90,9 +90,9 @@ describe ThinkingSphinx::Field do
   
   describe "is_many? method" do
     before :each do
-      @assoc_a = stub('assoc', :is_many? => true)
-      @assoc_b = stub('assoc', :is_many? => true)
-      @assoc_c = stub('assoc', :is_many? => true)
+      @assoc_a = ThinkingSphinx::Association.new(nil, nil)
+      @assoc_b = ThinkingSphinx::Association.new(nil, nil)
+      @assoc_c = ThinkingSphinx::Association.new(nil, nil)
       
       @field = ThinkingSphinx::Field.new(
         @source, [ThinkingSphinx::Index::FauxColumn.new(:col_name)]
@@ -100,6 +100,9 @@ describe ThinkingSphinx::Field do
       @field.associations = {
         :a => @assoc_a, :b => @assoc_b, :c => @assoc_c
       }
+      @field.associations.values.each { |assoc|
+        assoc.stub!(:is_many? => true)
+      }
     end
     
     it "should return true if all associations return true to is_many?" do

data/spec/thinking_sphinx/index/builder_spec.rb

@@ -492,4 +492,17 @@ describe ThinkingSphinx::Index::Builder do
       index.name.should == 'custom'
     end
   end
+  
+  describe "sanitize_sql" do
+    def index
+      @index ||= ThinkingSphinx::Index::Builder.generate(Person) do
+        indexes first_name, last_name
+        where sanitize_sql(["gender = ?", "female"])
+      end
+    end
+    
+    it "should be aliased to ActiveRecord::Base.sanitize_sql" do
+      index.sources.first.conditions.first.should == index.model.send(:sanitize_sql, ["gender = ?", "female"])
+    end
+  end
 end

data/spec/thinking_sphinx/search_spec.rb

@@ -924,7 +924,8 @@ describe ThinkingSphinx::Search do
         it "should not add excerpts method if objects already have one" do
           @search.last.excerpts.should_not be_a(ThinkingSphinx::Excerpter)
         end
-      
+        
+        # Fails in Ruby 1.9 (or maybe it's an RSpec update). Not sure why.
         it "should set up the excerpter with the instances and search" do
           [@alpha_a, @beta_b, @alpha_b, @beta_a].each do |object|
             ThinkingSphinx::Excerpter.should_receive(:new).with(@search, object)

data/spec/thinking_sphinx_spec.rb

@@ -23,7 +23,7 @@ describe ThinkingSphinx do
       ThinkingSphinx.reset_context!
       ThinkingSphinx.context.should_not == existing
       
-      Thread.current[:thinking_sphinx_context] = existing
+      ThinkingSphinx.reset_context! existing
     end
   end
     
@@ -49,7 +49,6 @@ describe ThinkingSphinx do
   
   describe '.deltas_enabled?' do
     it "should index deltas by default" do
-      ThinkingSphinx.deltas_enabled = nil
       ThinkingSphinx.deltas_enabled?.should be_true
     end
   end
@@ -134,7 +133,7 @@ describe ThinkingSphinx do
         :connection => @connection
       )
       
-      Thread.current[:thinking_sphinx_use_group_by_shortcut] = nil
+      ThinkingSphinx.reset_use_group_by_shortcut
     end
     
     it "should return true if no ONLY_FULL_GROUP_BY" do