thinking-sphinx 1.5.0 → 2.0.0.rc1

data/lib/thinking_sphinx/core/array.rb

@@ -0,0 +1,13 @@
+# FIXME
+module ThinkingSphinx
+  class Search
+  end
+end
+
+module SearchAsArray
+  def ===(object)
+    object.is_a?(ThinkingSphinx::Search) || super
+  end
+end
+
+Array.extend SearchAsArray

data/lib/thinking_sphinx/deltas.rb

@@ -1,6 +1,4 @@
 require 'thinking_sphinx/deltas/default_delta'
-require 'thinking_sphinx/deltas/delete_job'
-require 'thinking_sphinx/deltas/index_job'
 
 module ThinkingSphinx
   module Deltas

data/lib/thinking_sphinx/deltas/default_delta.rb

@@ -2,54 +2,58 @@ module ThinkingSphinx
   module Deltas
     class DefaultDelta
       attr_accessor :column
-
+      
       def initialize(index, options)
         @index  = index
         @column = options.delete(:delta_column) || :delta
       end
-
+      
       def index(model, instance = nil)
         return true unless ThinkingSphinx.updates_enabled? &&
           ThinkingSphinx.deltas_enabled?
         return true if instance && !toggled(instance)
-
+        
         update_delta_indexes model
         delete_from_core     model, instance if instance
-
+        
         true
       end
-
+      
       def toggle(instance)
-        instance.send "#{@column}=", true
+        instance.delta = true
       end
-
+      
       def toggled(instance)
-        instance.send "#{@column}"
+        instance.delta
       end
-
+      
       def reset_query(model)
         "UPDATE #{model.quoted_table_name} SET " +
         "#{model.connection.quote_column_name(@column.to_s)} = #{adapter.boolean(false)} " +
         "WHERE #{model.connection.quote_column_name(@column.to_s)} = #{adapter.boolean(true)}"
       end
-
+      
       def clause(model, toggled)
         "#{model.quoted_table_name}.#{model.connection.quote_column_name(@column.to_s)}" +
         " = #{adapter.boolean(toggled)}"
       end
-
+      
       private
-
+      
       def update_delta_indexes(model)
-        ThinkingSphinx::Deltas::IndexJob.new(model.delta_index_names).perform
+        config = ThinkingSphinx::Configuration.instance
+        rotate = ThinkingSphinx.sphinx_running? ? "--rotate" : ""
+        
+        output = `#{config.bin_path}#{config.indexer_binary_name} --config '#{config.config_file}' #{rotate} #{model.delta_index_names.join(' ')}`
+        puts(output) unless ThinkingSphinx.suppress_delta_output?
       end
-
+      
       def delete_from_core(model, instance)
-        ThinkingSphinx::Deltas::DeleteJob.new(
-          model.core_index_names, instance.sphinx_document_id
-        ).perform
+        model.core_index_names.each do |index_name|
+          model.delete_in_index index_name, instance.sphinx_document_id
+        end
       end
-
+      
       def adapter
         @adapter = @index.model.sphinx_database_adapter
       end

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,69 +30,70 @@ DESC
           end
         end
         args << fetch(:thinking_sphinx_configure_args, '')
-
+        
         commands = <<-CMD
-        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
+        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
         ./configure #{args.join(" ")}
         make
         #{try_sudo} make install
-        rm -rf sphinx-0.9.9 sphinx-0.9.9.tar.gz
+        rm -rf sphinx-0.9.8.1 sphinx-0.9.8.1.tar.gz
         CMD
         run commands.split(/\n\s+/).join(" && ")
       end
-
-      desc "Install Thinking Sphinx as a gem"
+    
+      desc "Install Thinking Sphinx as a gem from GitHub"
       task :ts do
-        run "#{try_sudo} gem install thinking-sphinx"
+        run "#{try_sudo} gem install thinking-sphinx --source http://gemcutter.org"
       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
-      rake "thinking_sphinx:configure thinking_sphinx:start"
+      configure
+      rake "thinking_sphinx:start"
     end
-
+  
     desc "Stop the Sphinx daemon"
     task :stop do
-      rake "thinking_sphinx:configure thinking_sphinx:stop"
+      configure
+      rake "thinking_sphinx:stop"
     end
-
+  
     desc "Stop and then start the Sphinx daemon"
     task :restart do
-      rake "thinking_sphinx:configure thinking_sphinx:stop \
-        thinking_sphinx:start"
+      stop
+      start
     end
-
+  
     desc "Stop, re-index and then start the Sphinx daemon"
     task :rebuild do
-      rake "thinking_sphinx:configure thinking_sphinx:stop \
-        thinking_sphinx:reindex \
-        thinking_sphinx:start"
+      stop
+      index
+      start
     end
-
-    desc "Add the shared folder for sphinx files"
+  
+    desc "Add the shared folder for sphinx files for the production environment"
     task :shared_sphinx_folder, :roles => :web do
-      rails_env = fetch(:rails_env, "production")
-      run "mkdir -p #{shared_path}/sphinx/#{rails_env}"
+      run "mkdir -p #{shared_path}/db/sphinx/production"
     end
 
     def rake(*tasks)
       rails_env = fetch(:rails_env, "production")
       rake = fetch(:rake, "rake")
       tasks.each do |t|
-        run "if [ -d #{release_path} ]; then cd #{release_path}; else cd #{current_path}; fi; if [ -f Rakefile ]; then #{rake} RAILS_ENV=#{rails_env} #{t}; fi;"
+        run "if [ -d #{release_path} ]; then cd #{release_path}; else cd #{current_path}; fi; #{rake} RAILS_ENV=#{rails_env} #{t}"
       end
     end
   end

data/lib/thinking_sphinx/excerpter.rb

@@ -1,7 +1,6 @@
 module ThinkingSphinx
   class Excerpter
-    CoreMethods = %w( kind_of? object_id respond_to? respond_to_missing? should
-      should_not stub! )
+    CoreMethods = %w( kind_of? object_id respond_to? 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

@@ -1,11 +1,10 @@
 module ThinkingSphinx
   class Facet
-    attr_reader :property, :value_source
-
-    def initialize(property, value_source = nil)
-      @property     = property
-      @value_source = value_source
-
+    attr_reader :property
+    
+    def initialize(property)
+      @property = property
+      
       if property.columns.length != 1
         raise "Can't translate Facets on multiple-column field or attribute"
       end
@@ -16,15 +15,14 @@ module ThinkingSphinx
       when Facet
         facet.name
       when String, Symbol
-        return :class if facet.to_s == 'sphinx_internal_class'
         facet.to_s.gsub(/(_facet|_crc)$/,'').to_sym
       end
     end
-
+    
     def self.attribute_name_for(name)
       name.to_s == 'class' ? 'class_crc' : "#{name}_facet"
     end
-
+    
     def self.attribute_name_from_value(name, value)
       case value
       when String
@@ -39,10 +37,10 @@ module ThinkingSphinx
         name
       end
     end
-
+    
     def self.translate?(property)
       return true if property.is_a?(Field)
-
+      
       case property.type
       when :string
         true
@@ -52,11 +50,11 @@ module ThinkingSphinx
         !property.all_ints?
       end
     end
-
+    
     def name
       property.unique_name
     end
-
+    
     def attribute_name
       if translate?
         Facet.attribute_name_for(@property.unique_name)
@@ -64,23 +62,18 @@ module ThinkingSphinx
         @property.unique_name.to_s
       end
     end
-
+    
     def translate?
       Facet.translate?(@property)
     end
-
+    
     def type
       @property.is_a?(Field) ? :string : @property.type
     end
-
-    def float?
-      @property.type == :float
-    end
-
-    def value(object, attribute_hash)
-      attribute_value = attribute_hash['@groupby']
+    
+    def value(object, attribute_value)
       return translate(object, attribute_value) if translate? || float?
-
+      
       case @property.type
       when :datetime
         Time.at(attribute_value)
@@ -90,46 +83,43 @@ module ThinkingSphinx
         attribute_value
       end
     end
-
+    
     def to_s
       name
     end
-
+    
     private
-
+    
     def translate(object, attribute_value)
       objects = source_objects(object)
-      return if objects.blank?
-
-      method = value_source || column.__name
-      object = objects.one? ? objects.first : objects.detect { |item|
-        result = item.send(method)
-        case result
-        when String
-          result.to_crc32 == attribute_value
-        when NilClass
-          false
-        else
-          result == attribute_value
-        end
-      }
-
-      object ? object.send(method) : nil
+      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
+        objects.first.send(column.__name)
+      end
     end
-
+    
     def source_objects(object)
       column.__stack.each { |method|
         object = Array(object).collect { |item|
           item.send(method)
         }.flatten.compact
-
+        
         return nil if object.empty?
       }
       Array(object)
     end
-
+    
     def column
       @property.columns.first
     end
+    
+    def float?
+      @property.type == :float
+    end
   end
 end

data/lib/thinking_sphinx/facet_search.rb

@@ -29,7 +29,7 @@ module ThinkingSphinx
         names = options[:all_facets] ?
           facet_names_for_all_classes : facet_names_common_to_all_classes
         
-        names.delete class_facet unless options[:class_facet]
+        names.delete "class_crc" unless options[:class_facet]
         names
       end
     end
@@ -44,23 +44,23 @@ module ThinkingSphinx
     end
     
     def populate
-      return if facet_names.empty?
-      
-      ThinkingSphinx::Search.bundle_searches(facet_names) { |sphinx, name|
-        sphinx.search *(args + [facet_search_options(name)])
-      }.each_with_index { |search, index|
-        add_from_results facet_names[index], search
-      }
+      facet_names.each do |name|
+        search_options = facet_search_options.merge(:group_by => name)
+        add_from_results name, ThinkingSphinx.search(
+          *(args + [search_options])
+        )
+      end
     end
     
-    def facet_search_options(facet_name)
+    def facet_search_options
+      config = ThinkingSphinx::Configuration.instance
+      max    = config.configuration.searchd.max_matches || 1000
+      
       options.merge(
         :group_function => :attr,
-        :limit          => max_matches,
-        :max_matches    => max_matches,
-        :page           => 1,
-        :group_by       => facet_name,
-        :ids_only       => !translate?(facet_name)
+        :limit          => max,
+        :max_matches    => max,
+        :page           => 1
       )
     end
     
@@ -101,34 +101,21 @@ module ThinkingSphinx
       }
     end
     
-    def translate?(name)
-      facet = facet_from_name(name)
-      facet.translate? || facet.float?
-    end
-    
-    def config
-      ThinkingSphinx::Configuration.instance
-    end
-    
-    def max_matches
-      @max_matches ||= config.configuration.searchd.max_matches || 1000
-    end
-    
-    # example: facet = country_facet; name = :country
-    def add_from_results(facet, search)
-      name  = ThinkingSphinx::Facet.name_for(facet)
-      facet = facet_from_name(facet)
+    def add_from_results(facet, results)
+      name = ThinkingSphinx::Facet.name_for(facet)
       
       self[name]  ||= {}
       
-      return if search.empty?
+      return if results.empty?
+      
+      facet = facet_from_object(results.first, facet) if facet.is_a?(String)
       
-      search.each_with_match do |result, match|
-        facet_value = facet.value(result, match[:attributes])
+      results.each_with_groupby_and_count { |result, group, count|
+        facet_value = facet.value(result, group)
         
         self[name][facet_value] ||= 0
-        self[name][facet_value]  += match[:attributes]["@count"]
-      end
+        self[name][facet_value]  += count
+      }
     end
     
     def underlying_value(key, value)
@@ -143,28 +130,7 @@ module ThinkingSphinx
     end
     
     def facet_from_object(object, name)
-      facet = nil
-      klass = object.class
-      
-      while klass != ::ActiveRecord::Base && facet.nil?
-        facet = klass.sphinx_facets.detect { |facet|
-          facet.attribute_name == name
-        }
-        klass = klass.superclass
-      end
-      
-      facet
-    end
-    
-    def facet_from_name(name)
-      name = ThinkingSphinx::Facet.name_for(name)
-      all_facets.detect { |facet|
-        facet.name == name
-      }
-    end
-    
-    def class_facet
-      Riddle.loaded_version.to_i < 2 ? 'class_crc' : 'sphinx_internal_class'
+      object.sphinx_facets.detect { |facet| facet.attribute_name == name }
     end
   end
 end