freelancing-god-thinking-sphinx 1.1.1 → 1.1.2

data/README

@@ -94,3 +94,8 @@ Since I first released this library, there's been quite a few people who have su
 - Henrik Nyh
 - Emil Tin
 - Doug Cole
+- Ed Hickey
+- Evan Weaver
+- Thibaut Barrere
+- Kristopher Chambers
+- Dmitrij Smalko

data/lib/thinking_sphinx.rb

@@ -31,7 +31,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 1
-    Tiny  = 1
+    Tiny  = 2
     
     String = [Major, Minor, Tiny].join('.')
   end
@@ -131,13 +131,11 @@ module ThinkingSphinx
   end
   
   def self.sphinx_running?
-    pid_file = ThinkingSphinx::Configuration.instance.pid_file
-    
-    if pid_file && File.exists?(pid_file)
-      pid = `cat #{pid_file}`[/\d+/]
-      `ps -p #{pid} | wc -l`.to_i > 1
-    else
-      false
-    end
+    !!sphinx_pid
+  end
+  
+  def self.sphinx_pid
+    pid_file = ThinkingSphinx::Configuration.instance.pid_file    
+    `cat #{pid_file}`[/\d+/] if File.exists?(pid_file)
   end
 end

data/lib/thinking_sphinx/active_record/delta.rb

@@ -42,7 +42,11 @@ module ThinkingSphinx
             # if running in the test environment.
             #
             def index_delta(instance = nil)
-              self.sphinx_indexes.first.delta_object.index(self, instance)
+              delta_object.index(self, instance)
+            end
+            
+            def delta_object
+              self.sphinx_indexes.first.delta_object
             end
           end
           
@@ -50,14 +54,18 @@ module ThinkingSphinx
           
           # Set the delta value for the model to be true.
           def toggle_delta
-            self.class.sphinx_indexes.first.delta_object.toggle(self)
+            self.class.delta_object.toggle(self) if should_toggle_delta?
           end
           
           # Build the delta index for the related model. This won't be called
           # if running in the test environment.
           # 
           def index_delta
-            self.class.index_delta(self)
+            self.class.index_delta(self) if self.class.delta_object.toggled(self)
+          end
+          
+          def should_toggle_delta?
+            !self.respond_to?(:changed?) || self.changed? || self.new_record?
           end
         end
       end

data/lib/thinking_sphinx/attribute.rb

@@ -175,7 +175,7 @@ module ThinkingSphinx
       when "ActiveRecord::ConnectionAdapters::MysqlAdapter"
         "UNIX_TIMESTAMP(#{clause})"
       when "ActiveRecord::ConnectionAdapters::PostgreSQLAdapter"
-        clause # Rails' datetimes are timestamps in PostgreSQL
+        "cast(extract(epoch from #{clause}) as int)"
       else
         clause
       end
@@ -263,11 +263,7 @@ module ThinkingSphinx
       when @associations.values.flatten.length > 1
         :string
       else
-        klass = @associations.values.flatten.first ? 
-          @associations.values.flatten.first.reflection.klass : @model
-        klass.columns.detect { |col|
-          @columns.collect { |c| c.__name.to_s }.include? col.name
-        }.type
+        translated_type_from_database
       end
     end
     
@@ -281,5 +277,33 @@ module ThinkingSphinx
         }
       }
     end
+    
+    def type_from_database
+      klass = @associations.values.flatten.first ? 
+        @associations.values.flatten.first.reflection.klass : @model
+      
+      klass.columns.detect { |col|
+        @columns.collect { |c| c.__name.to_s }.include? col.name
+      }.type
+    end
+    
+    def translated_type_from_database
+      case type_from_db = type_from_database
+      when :datetime, :string, :float, :boolean, :integer
+        type_from_db
+      when :decimal
+        :float
+      when :timestamp, :date
+        :datetime
+      else
+        raise <<-MESSAGE
+
+Cannot automatically map column type #{type_from_db} to an equivalent Sphinx
+type (integer, float, boolean, datetime, string as ordinal). You could try to
+explicitly convert the column's value in your define_index block:
+  has "CAST(column AS INT)", :type => :integer, :as => :column
+        MESSAGE
+      end
+    end
   end
 end

data/lib/thinking_sphinx/configuration.rb

@@ -55,7 +55,7 @@ module ThinkingSphinx
         
     attr_accessor :config_file, :searchd_log_file, :query_log_file,
       :pid_file, :searchd_file_path, :address, :port, :allow_star,
-      :database_yml_file, :app_root, :bin_path
+      :database_yml_file, :app_root, :bin_path, :model_directories
     
     attr_accessor :source_options, :index_options
     
@@ -85,6 +85,7 @@ module ThinkingSphinx
       self.searchd_file_path    = "#{self.app_root}/db/sphinx/#{environment}"
       self.allow_star           = false
       self.bin_path             = ""
+      self.model_directories    = ["#{app_root}/app/models/"]
       
       self.source_options  = {}
       self.index_options   = {
@@ -135,21 +136,22 @@ module ThinkingSphinx
     # messy dependencies issues).
     # 
     def load_models
-      base = "#{app_root}/app/models/"
-      Dir["#{base}**/*.rb"].each do |file|
-        model_name = file.gsub(/^#{base}([\w_\/\\]+)\.rb/, '\1')
+      self.model_directories.each do |base|
+        Dir["#{base}**/*.rb"].each do |file|
+          model_name = file.gsub(/^#{base}([\w_\/\\]+)\.rb/, '\1')
         
-        next if model_name.nil?
-        next if ::ActiveRecord::Base.send(:subclasses).detect { |model|
-          model.name == model_name
-        }
+          next if model_name.nil?
+          next if ::ActiveRecord::Base.send(:subclasses).detect { |model|
+            model.name == model_name
+          }
         
-        begin
-          model_name.camelize.constantize
-        rescue LoadError
-          model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
-        rescue NameError
-          next
+          begin
+            model_name.camelize.constantize
+          rescue LoadError
+            model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
+          rescue NameError
+            next
+          end
         end
       end
     end
@@ -240,6 +242,11 @@ module ThinkingSphinx
       end unless conf.nil?
       
       self.bin_path += '/' unless self.bin_path.blank?
+      
+      if self.allow_star
+        self.index_options[:enable_star]    = true
+        self.index_options[:min_prefix_len] = 1
+      end
     end
     
     def set_sphinx_setting(object, key, value, allowed = {})

data/lib/thinking_sphinx/deltas.rb

@@ -1,5 +1,6 @@
 require 'thinking_sphinx/deltas/default_delta'
 require 'thinking_sphinx/deltas/delayed_delta'
+require 'thinking_sphinx/deltas/datetime_delta'
 
 module ThinkingSphinx
   module Deltas
@@ -9,6 +10,8 @@ module ThinkingSphinx
         DefaultDelta.new index, options
       when :delayed
         DelayedDelta.new index, options
+      when :datetime
+        DatetimeDelta.new index, options
       when FalseClass, nil
         nil
       else

data/lib/thinking_sphinx/deltas/datetime_delta.rb

@@ -0,0 +1,61 @@
+module ThinkingSphinx
+  module Deltas
+    class DatetimeDelta < ThinkingSphinx::Deltas::DefaultDelta
+      attr_accessor :column, :threshold
+      
+      def initialize(index, options)
+        @index      = index
+        @column     = options.delete(:delta_column) || :updated_at
+        @threshold  = options.delete(:threshold)    || 1.day
+      end
+      
+      def index(model, instance = nil)
+        # do nothing
+        true
+      end
+      
+      def delayed_index(model)
+        config = ThinkingSphinx::Configuration.instance
+        rotate = ThinkingSphinx.sphinx_running? ? "--rotate" : ""
+        
+        output = `#{config.bin_path}indexer --config #{config.config_file} #{rotate} #{delta_index_name model}`
+        output += `#{config.bin_path}indexer --config #{config.config_file} #{rotate} --merge #{core_index_name model} #{delta_index_name model} --merge-dst-range sphinx_deleted 0 0`
+        puts output unless ThinkingSphinx.suppress_delta_output?
+        
+        true
+      end
+            
+      def toggle(instance)
+        # do nothing
+      end
+      
+      def toggled(instance)
+        instance.send(@column) > @threshold.ago
+      end
+      
+      def reset_query(model)
+        nil
+      end
+      
+      def clause(model, toggled)
+        if toggled
+          "#{model.quoted_table_name}.#{@index.quote_column(@column.to_s)}" +
+          " > #{time_difference}"
+        else
+          nil
+        end
+      end
+      
+      def time_difference
+        case @index.adapter
+        when :mysql
+          "DATE_SUB(NOW(), INTERVAL #{@threshold} SECOND)"
+        when :postgres
+          "current_timestamp - interval '#{@threshold} seconds'"
+        else
+          raise "Unknown Database Adapter"
+        end
+      end
+    end
+  end
+end

data/lib/thinking_sphinx/deltas/default_delta.rb

@@ -5,7 +5,7 @@ module ThinkingSphinx
       
       def initialize(index, options)
         @index  = index
-        @column = options.delete(:column) || :delta
+        @column = options.delete(:delta_column) || :delta
       end
       
       def index(model, instance = nil)
@@ -31,6 +31,15 @@ module ThinkingSphinx
         instance.delta = true
       end
       
+      def toggled(instance)
+        instance.delta
+      end
+      
+      def reset_query(model)
+        "UPDATE #{model.quoted_table_name} SET " +
+        "#{@index.quote_column(@column.to_s)} = #{@index.db_boolean(false)}"
+      end
+      
       def clause(model, toggled)
         "#{model.quoted_table_name}.#{@index.quote_column(@column.to_s)}" +
         " = #{@index.db_boolean(toggled)}"
@@ -44,7 +53,7 @@ module ThinkingSphinx
       
       def delta_index_name(model)
         "#{model.source_of_sphinx_index.name.underscore.tr(':/\\', '_')}_delta"
-      end
+      end      
     end
   end
 end

data/lib/thinking_sphinx/index.rb

@@ -126,7 +126,7 @@ module ThinkingSphinx
       assocs = all_associations
       
       where_clause = ""
-      if self.delta?
+      if self.delta? && !@delta_object.clause(@model, options[:delta]).blank?
         where_clause << " AND #{@delta_object.clause(@model, options[:delta])}"
       end
       unless @conditions.empty?
@@ -190,7 +190,10 @@ GROUP BY #{ (
       
       sql = "SELECT #{min_statement}, #{max_statement} " +
             "FROM #{@model.quoted_table_name} "
-      sql << "WHERE #{@delta_object.clause(@model, options[:delta])}" if self.delta?
+      if self.delta? && !@delta_object.clause(@model, options[:delta]).blank?
+        sql << "WHERE #{@delta_object.clause(@model, options[:delta])}"
+      end
+      
       sql
     end
     
@@ -436,8 +439,8 @@ GROUP BY #{ (
     end
     
     def sql_query_pre_for_core
-      if self.delta?
-        ["UPDATE #{@model.quoted_table_name} SET #{@delta_object.clause(@model, false)}"]
+      if self.delta? && !@delta_object.reset_query(@model).blank?
+        [@delta_object.reset_query(@model)]
       else
         []
       end

data/lib/thinking_sphinx/rails_additions.rb

@@ -29,6 +29,18 @@ Array.send(
   :include, ThinkingSphinx::ArrayExtractOptions
 ) unless Array.instance_methods.include?("extract_options!")
 
+module ThinkingSphinx
+  module AbstractQuotedTableName
+    def quote_table_name(name)
+      quote_column_name(name)
+    end
+  end
+end
+
+ActiveRecord::ConnectionAdapters::AbstractAdapter.send(
+  :include, ThinkingSphinx::AbstractQuotedTableName
+) unless ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_methods.include?("quote_table_name")
+
 module ThinkingSphinx
   module MysqlQuotedTableName
     def quote_table_name(name) #:nodoc:

data/spec/unit/thinking_sphinx/active_record/delta_spec.rb

@@ -72,7 +72,7 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
     before :each do
       ThinkingSphinx::Configuration.stub_method(:environment => "spec")
       ThinkingSphinx.stub_method(:deltas_enabled? => true, :sphinx_running? => true)
-      Person.sphinx_indexes.first.delta_object.stub_method(:` => "")
+      Person.delta_object.stub_methods(:` => "", :toggled => true)
       
       @person = Person.new
       @person.stub_method(

data/tasks/thinking_sphinx_tasks.rb

@@ -37,8 +37,9 @@ namespace :thinking_sphinx do
   desc "Stop Sphinx using Thinking Sphinx's settings"
   task :stop => :app_env do
     raise RuntimeError, "searchd is not running." unless sphinx_running?
-    pid = sphinx_pid
-    system "kill #{pid}"
+    config = ThinkingSphinx::Configuration.instance
+    pid    = sphinx_pid
+    system "searchd --stop --config #{config.config_file}"
     puts "Stopped search daemon (pid #{pid})."
   end
   
@@ -69,8 +70,22 @@ namespace :thinking_sphinx do
     system cmd
   end
   
+  namespace :index do
+    task :delta => :app_env do
+      ThinkingSphinx.indexed_models.select { |model|
+        model.constantize.sphinx_indexes.any? { |index| index.delta? }
+      }.each do |model|
+        model.constantize.sphinx_indexes.select { |index|
+          index.delta? && index.delta_object.respond_to?(:delayed_index)
+        }.each { |index|
+          index.delta_object.delayed_index(index.model)
+        }
+      end
+    end
+  end
+  
   desc "Process stored delta index requests"
-  task :delta => :app_env do
+  task :delayed_delta => :app_env do
     require 'delayed/worker'
     
     Delayed::Worker.new(
@@ -90,6 +105,9 @@ namespace :ts do
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :in      => "thinking_sphinx:index"
   desc "Index data for Sphinx using Thinking Sphinx's settings"
+  namespace :in do
+    task :delta => "thinking_sphinx:index:delta"
+  end
   task :index   => "thinking_sphinx:index"
   desc "Restart Sphinx"
   task :restart => "thinking_sphinx:restart"
@@ -98,19 +116,13 @@ namespace :ts do
   desc "Generate the Sphinx configuration file using Thinking Sphinx's settings"
   task :config  => "thinking_sphinx:configure"
   desc "Process stored delta index requests"
-  task :delta   => "thinking_sphinx:delta"
+  task :dd      => "thinking_sphinx:delayed_delta"
 end
 
 def sphinx_pid
-  config = ThinkingSphinx::Configuration.instance
-  
-  if File.exists?(config.pid_file)
-    `cat #{config.pid_file}`[/\d+/]
-  else
-    nil
-  end
+  ThinkingSphinx.sphinx_pid
 end
 
 def sphinx_running?
-  sphinx_pid && `ps -p #{sphinx_pid} | wc -l`.to_i > 1
+  ThinkingSphinx.sphinx_running?
 end

data/vendor/riddle/lib/riddle/controller.rb

@@ -10,7 +10,7 @@ module Riddle
       cmd << " --rotate" if running?
       `#{cmd}`
     end
-
+    
     def start
       return if running?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-03 00:00:00 -08:00
+date: 2009-01-08 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/collection.rb
 - lib/thinking_sphinx/configuration.rb
+- lib/thinking_sphinx/deltas/datetime_delta.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
 - lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb
 - lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb