moneypools-thinking-sphinx 1.2.13 → 1.3.1

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
+:patch: 1
 :major: 1
-:minor: 2
-:patch: 13
+:build: 
+:minor: 3

data/features/searching_across_models.feature

@@ -17,4 +17,4 @@ Feature: Searching across multiple model
   Scenario: Retrieving results from multiple models
     Given Sphinx is running
     When I search for ten
-    Then I should get 6 results
+    Then I should get 4 results

data/features/step_definitions/common_steps.rb

@@ -1,6 +1,5 @@
 Before do
   $queries_executed = []
-  ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
   
   @model      = nil
   @method     = :search

data/features/step_definitions/facet_steps.rb

@@ -1,4 +1,4 @@
-When "I am requesting facet results$" do
+When /^I am requesting facet results$/ do
   @results = nil
   @method  = :facets
 end

data/features/support/db/fixtures/robots.rb

@@ -1,6 +1,6 @@
 # Reset the primary key to allow us to create robots with specific internal_ids
 class Robot < ActiveRecord::Base
-  set_primary_key :id
+  set_primary_key :alternate_primary_key
 end
 
 Robot.create :name => 'Fritz',      :internal_id => 'F0001'

data/features/support/db/migrations/create_robots.rb

@@ -1,5 +1,4 @@
-ActiveRecord::Base.connection.create_table :robots, :id => false, :force => true do |t|
-  t.column :alternate_primary_key,  "int(11) DEFAULT NULL auto_increment PRIMARY KEY"
+ActiveRecord::Base.connection.create_table :robots, :primary_key => :alternate_primary_key, :force => true do |t|
   t.column :name,                   :string,  :null => false
   t.column :internal_id,            :string,  :null => false
 end

data/features/support/env.rb

@@ -3,4 +3,16 @@ require 'cucumber'
 require 'spec'
 require 'fileutils'
 require 'ginger'
-require 'will_paginate'
+require 'will_paginate'
+require 'active_record'
+
+$:.unshift File.dirname(__FILE__) + '/../../lib'
+
+require 'cucumber/thinking_sphinx/internal_world'
+
+world = Cucumber::ThinkingSphinx::InternalWorld.new
+world.configure_database
+
+require 'thinking_sphinx'
+
+world.setup

data/features/support/models/robot.rb

@@ -5,4 +5,8 @@ class Robot < ActiveRecord::Base
   define_index do
     indexes :name
   end
+  
+  def id
+    internal_id
+  end
 end

data/lib/cucumber/thinking_sphinx/external_world.rb

@@ -0,0 +1,41 @@
+module Cucumber
+  module ThinkingSphinx
+    class ExternalWorld
+      def initialize(suppress_delta_output = true)
+        set_flags suppress_delta_output
+        create_indexes_folder
+        prepare_and_start_daemon
+        configure_cleanup
+      end
+      
+      private
+      
+      def config
+        @config ||= ::ThinkingSphinx::Configuration.instance
+      end
+      
+      def set_flags(suppress_delta_output)
+        ::ThinkingSphinx.deltas_enabled        = true
+        ::ThinkingSphinx.updates_enabled       = true
+        ::ThinkingSphinx.suppress_delta_output = suppress_delta_output
+      end
+      
+      def create_indexes_folder
+        FileUtils.mkdir_p config.searchd_file_path
+      end
+      
+      def prepare_and_start_daemon
+        config.build
+        config.controller.index
+        config.controller.start
+      end 
+      
+      def configure_cleanup
+        Kernel.at_exit do
+          config.controller.stop
+          sleep(0.5) # Ensure Sphinx has shut down completely
+        end
+      end
+    end
+  end
+end

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -0,0 +1,125 @@
+require 'cucumber/thinking_sphinx/sql_logger'
+
+module Cucumber
+  module ThinkingSphinx
+    class InternalWorld
+      attr_accessor :temporary_directory, :migrations_directory,
+        :models_directory, :fixtures_directory, :database_file
+      attr_accessor :adapter, :database, :username,
+        :password, :host
+      
+      def initialize
+        @temporary_directory  = "#{Dir.pwd}/tmp"
+        @migrations_directory = "features/support/db/migrations"
+        @models_directory     = "features/support/models"
+        @fixtures_directory   = "features/support/db/fixtures"
+        @database_file        = "features/support/database.yml"
+        
+        @adapter  = ENV['DATABASE'] || 'mysql'
+        @database = 'thinking_sphinx'
+        @username = 'thinking_sphinx'
+        # @password = 'thinking_sphinx'
+        @host     = 'localhost'
+      end
+      
+      def setup
+        make_temporary_directory
+        
+        configure_cleanup
+        configure_thinking_sphinx
+        configure_active_record
+        
+        prepare_data
+        setup_sphinx
+        
+        self
+      end
+      
+      def configure_database
+        ActiveRecord::Base.establish_connection database_settings
+        self
+      end
+      
+      private
+      
+      def config
+        @config ||= ::ThinkingSphinx::Configuration.instance
+      end
+      
+      def make_temporary_directory
+        FileUtils.mkdir_p temporary_directory
+        Dir["#{temporary_directory}/*"].each do |file|
+          FileUtils.rm_rf file
+        end
+      end
+      
+      def configure_thinking_sphinx
+        config.config_file        = "#{temporary_directory}/sphinx.conf"
+        config.searchd_log_file   = "#{temporary_directory}/searchd.log"
+        config.query_log_file     = "#{temporary_directory}/searchd.query.log"
+        config.pid_file           = "#{temporary_directory}/searchd.pid"
+        config.searchd_file_path  = "#{temporary_directory}/indexes/"
+        
+        ::ThinkingSphinx.suppress_delta_output = true
+      end
+      
+      def configure_cleanup
+        Kernel.at_exit do
+          ::ThinkingSphinx::Configuration.instance.controller.stop
+          sleep(0.5) # Ensure Sphinx has shut down completely
+          ActiveRecord::Base.logger.close
+        end
+      end
+      
+      def yaml_database_settings
+        return {} unless File.exist?(@database_file)
+        
+        YAML.load open(@database_file)
+      end
+      
+      def database_settings
+        {
+          :adapter  => @adapter,
+          :database => @database,
+          :username => @username,
+          :password => @password,
+          :host     => @host
+        }.merge yaml_database_settings
+      end
+      
+      def configure_active_record
+        ActiveRecord::Base.logger = Logger.new(
+          open("#{temporary_directory}/active_record.log", "a")
+        )
+        
+        ActiveRecord::Base.connection.class.send(
+          :include, Cucumber::ThinkingSphinx::SqlLogger
+        )
+      end
+      
+      def prepare_data
+        ::ThinkingSphinx.deltas_enabled = false
+        
+        load_files migrations_directory
+        load_files models_directory
+        load_files fixtures_directory
+        
+        ::ThinkingSphinx.deltas_enabled = true
+      end
+      
+      def load_files(path)
+        Dir["#{path}/*.rb"].each do |file|
+          require file.gsub(/\.rb$/, '')
+        end
+      end
+      
+      def setup_sphinx
+        FileUtils.mkdir_p config.searchd_file_path
+        
+        config.build
+        config.controller.index
+        config.controller.start
+      end
+    end
+  end
+end

data/lib/cucumber/thinking_sphinx/sql_logger.rb

@@ -0,0 +1,20 @@
+module Cucumber
+  module ThinkingSphinx
+    module SqlLogger
+      def self.included(base)
+        base.send :alias_method_chain, :execute, :query_record
+      end
+      
+      IGNORED_SQL = [
+        /^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/,
+        /^SELECT @@ROWCOUNT/, /^SHOW FIELDS/
+      ]
+      
+      def execute_with_query_record(sql, name = nil, &block)
+        $queries_executed ||= []
+        $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
+        execute_without_query_record(sql, name, &block)
+      end
+    end
+  end
+end

data/lib/thinking_sphinx.rb

@@ -131,12 +131,13 @@ module ThinkingSphinx
   def self.suppress_delta_output=(value)
     @@suppress_delta_output = value
   end
-
+  
+  @@use_group_by_shortcut = nil
   # Checks to see if MySQL will allow simplistic GROUP BY statements. If not,
   # or if not using MySQL, this will return false.
   #
   def self.use_group_by_shortcut?
-    !!(
+    @@use_group_by_shortcut ||= !!(
       mysql? && ::ActiveRecord::Base.connection.select_all(
         "SELECT @@global.sql_mode, @@session.sql_mode;"
       ).all? { |key,value| value.nil? || value[/ONLY_FULL_GROUP_BY/].nil? }

data/lib/thinking_sphinx/active_record.rb

@@ -269,13 +269,13 @@ module ThinkingSphinx
       client.update(
         "#{self.class.sphinx_indexes.first.name}_core",
         ['sphinx_deleted'],
-        {self.sphinx_document_id => 1}
+        {self.sphinx_document_id => [1]}
       ) if self.in_core_index?
       
       client.update(
         "#{self.class.sphinx_indexes.first.name}_delta",
         ['sphinx_deleted'],
-        {self.sphinx_document_id => 1}
+        {self.sphinx_document_id => [1]}
       ) if self.class.sphinx_indexes.any? { |index| index.delta? } &&
         self.toggled_delta?
     rescue ::ThinkingSphinx::ConnectionError

data/lib/thinking_sphinx/adapters/mysql_adapter.rb

@@ -13,7 +13,7 @@ module ThinkingSphinx
     end
     
     def group_concatenate(clause, separator = ' ')
-      "GROUP_CONCAT(DISTINCT #{clause} SEPARATOR '#{separator}')"
+      "GROUP_CONCAT(DISTINCT IFNULL(#{clause}, '0') SEPARATOR '#{separator}')"
     end
     
     def cast_to_string(clause)

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -10,18 +10,17 @@ module ThinkingSphinx
     end
     
     def concatenate(clause, separator = ' ')
-      clause.split(', ').collect { |field|
-        case field
-        when /COALESCE/, "'')"
-          field
-        else
-          "COALESCE(CAST(#{field} as varchar), '')"
-        end
-      }.join(" || '#{separator}' || ")
+      if clause[/^COALESCE/]
+        clause.split('), ').join(") || '#{separator}' || ")
+      else
+        clause.split(', ').collect { |field|
+          "CAST(COALESCE(#{field}, '') as varchar)"
+        }.join(" || '#{separator}' || ")
+      end
     end
     
     def group_concatenate(clause, separator = ' ')
-      "array_to_string(array_accum(#{clause}), '#{separator}')"
+      "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
     end
     
     def cast_to_string(clause)
@@ -37,8 +36,16 @@ module ThinkingSphinx
     end
     
     def convert_nulls(clause, default = '')
-      default = "'#{default}'"  if default.is_a?(String)
-      default = 'NULL'          if default.nil?
+      default = case default
+      when String
+        "'#{default}'"
+      when NilClass
+        'NULL'
+      when Fixnum
+        "#{default}::bigint"
+      else
+        default
+      end
       
       "COALESCE(#{clause}, #{default})"
     end

data/lib/thinking_sphinx/attribute.rb

@@ -101,14 +101,14 @@ module ThinkingSphinx
         when :datetime
           adapter.cast_to_datetime(part)
         when :multi
-          part = adapter.cast_to_datetime(part) if is_many_datetimes?
-          adapter.convert_nulls(part, 0)
+          part = adapter.cast_to_datetime(part)   if is_many_datetimes?
+          part = adapter.convert_nulls(part, '0') if is_many_ints?
+          part
         else
           part
         end
       }.join(', ')
       
-      # clause = adapter.cast_to_datetime(clause)             if type == :datetime
       clause = adapter.crc(clause)                          if @crc
       clause = adapter.concatenate(clause, separator)       if concat_ws?
       clause = adapter.group_concatenate(clause, separator) if is_many?

data/lib/thinking_sphinx/deltas.rb

@@ -1,5 +1,4 @@
 require 'thinking_sphinx/deltas/default_delta'
-require 'thinking_sphinx/deltas/datetime_delta'
 
 module ThinkingSphinx
   module Deltas
@@ -9,7 +8,6 @@ module ThinkingSphinx
       when TrueClass, :default
         DefaultDelta.new index, index.local_options
       when :delayed
-        require 'thinking_sphinx/deltas/delayed_delta'
         DelayedDelta.new index, index.local_options
       when :datetime
         DatetimeDelta.new index, index.local_options

data/lib/thinking_sphinx/tasks.rb

@@ -65,14 +65,12 @@ namespace :thinking_sphinx do
   
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :index => :app_env do
-    ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    
     config = ThinkingSphinx::Configuration.instance
     unless ENV["INDEX_ONLY"] == "true"
       puts "Generating Configuration to #{config.config_file}"
       config.build
     end
-        
+    
     FileUtils.mkdir_p config.searchd_file_path
     cmd = "#{config.bin_path}#{config.indexer_binary_name} --config \"#{config.config_file}\" --all"
     cmd << " --rotate" if sphinx_running?
@@ -86,30 +84,6 @@ namespace :thinking_sphinx do
     Rake::Task["thinking_sphinx:index"].invoke
     Rake::Task["thinking_sphinx:start"].invoke
   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 :delayed_delta => :app_env do
-    require 'delayed/worker'
-    
-    Delayed::Worker.new(
-      :min_priority => ENV['MIN_PRIORITY'],
-      :max_priority => ENV['MAX_PRIORITY']
-    ).start
-  end
 end
 
 namespace :ts do
@@ -123,10 +97,6 @@ namespace :ts do
   task :stop    => "thinking_sphinx:stop"
   desc "Index data for Sphinx using Thinking Sphinx's settings"
   task :in      => "thinking_sphinx:index"
-  namespace :in do
-    desc "Index Thinking Sphinx datetime delta indexes"
-    task :delta => "thinking_sphinx:index:delta"
-  end
   task :index   => "thinking_sphinx:index"
   desc "Restart Sphinx"
   task :restart => "thinking_sphinx:restart"
@@ -136,8 +106,6 @@ namespace :ts do
   task :config  => "thinking_sphinx:configure"
   desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
   task :rebuild => "thinking_sphinx:rebuild"
-  desc "Process stored delta index requests"
-  task :dd      => "thinking_sphinx:delayed_delta"
 end
 
 def sphinx_pid

data/spec/lib/thinking_sphinx/active_record_spec.rb

@@ -203,7 +203,7 @@ describe ThinkingSphinx::ActiveRecord do
     
     it "should update the core index's deleted flag if in core index" do
       @client.should_receive(:update).with(
-        "person_core", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
+        "person_core", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
       
       @person.toggle_deleted
@@ -212,7 +212,7 @@ describe ThinkingSphinx::ActiveRecord do
     it "shouldn't update the core index's deleted flag if the record isn't in it" do
       @person.stub!(:in_core_index? => false)
       @client.should_not_receive(:update).with(
-        "person_core", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
+        "person_core", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
       
       @person.toggle_deleted
@@ -231,7 +231,7 @@ describe ThinkingSphinx::ActiveRecord do
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
       @person.delta = true
       @client.should_receive(:update).with(
-        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
+        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
       
       @person.toggle_deleted
@@ -242,7 +242,7 @@ describe ThinkingSphinx::ActiveRecord do
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
       @person.delta = false
       @client.should_not_receive(:update).with(
-        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
+        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
       
       @person.toggle_deleted
@@ -253,7 +253,7 @@ describe ThinkingSphinx::ActiveRecord do
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
       @person.delta = 0
       @client.should_not_receive(:update).with(
-        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
+        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
 
       @person.toggle_deleted
@@ -262,7 +262,7 @@ describe ThinkingSphinx::ActiveRecord do
     it "shouldn't update the delta index if delta indexes are disabled" do
       ThinkingSphinx.deltas_enabled = true
       @client.should_not_receive(:update).with(
-        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
+        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
       )
       
       @person.toggle_deleted

data/spec/lib/thinking_sphinx_spec.rb

@@ -93,6 +93,10 @@ describe ThinkingSphinx do
       ::ActiveRecord::Base.stub!(
         :connection => @connection
       )
+      
+      ThinkingSphinx.module_eval do
+        class_variable_set :@@use_group_by_shortcut, nil
+      end
     end
     
     it "should return true if no ONLY_FULL_GROUP_BY" do

data/tasks/distribution.rb

@@ -33,21 +33,8 @@ Jeweler::Tasks.new do |gem|
   gem.add_dependency 'activerecord', '>= 1.15.6'
   
   gem.post_install_message = <<-MESSAGE
-With the release of Thinking Sphinx 1.1.18, there is one important change to
-note: previously, the default morphology for indexing was 'stem_en'. The new
-default is nil, to avoid any unexpected behavior. If you wish to keep the old
-value though, you will need to add the following settings to your
-config/sphinx.yml file:
-
-development:
-  morphology: stem_en
-test:
-  morphology: stem_en
-production:
-  morphology: stem_en
-
-To understand morphologies/stemmers better, visit the following link:
-http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+If you're upgrading, you should read this:
+http://freelancing-god.github.com/ts/en/upgrading.html
 
 MESSAGE
 end

data/tasks/testing.rb

@@ -10,17 +10,17 @@ end
 
 desc "Run all feature-set configurations"
 task :features do |t|
-  puts   "rake features:mysql"
-  system "rake features:mysql"
-  puts   "rake features:postgresql"
-  system "rake features:postgresql"
+  databases = ENV['DATABASES'] || 'mysql,postgresql'
+  databases.split(',').each do |database|
+    puts   "rake features:#{database}"
+    system "rake features:#{database}"
+  end
 end
 
 namespace :features do
   def add_task(name, description)
     Cucumber::Rake::Task.new(name, description) do |t|
-      t.cucumber_opts = "--format pretty"
-      t.profile = name
+      t.cucumber_opts = "--format pretty features/*.feature DATABASE=#{name}"
     end
   end
   
@@ -62,22 +62,11 @@ end
 
 desc "Build cucumber.yml file"
 task :cucumber_defaults do
-  default_requires = %w(
-    --require features/support/env.rb
-    --require features/support/db/mysql.rb
-    --require features/support/db/active_record.rb
-    --require features/support/post_database.rb
-  ).join(" ")
-  
-  step_definitions = FileList["features/step_definitions/**.rb"].collect { |path|
+  steps = FileList["features/step_definitions/**.rb"].collect { |path|
     "--require #{path}"
   }.join(" ")
   
-  features = FileList["features/*.feature"].join(" ")
-  
   File.open('cucumber.yml', 'w') { |f|
-    f.write "default: \"#{default_requires} #{step_definitions}\"\n\n"
-    f.write "mysql: \"#{default_requires} #{step_definitions} #{features}\"\n\n"
-    f.write "postgresql: \"#{default_requires.gsub(/mysql/, 'postgresql')} #{step_definitions} #{features}\""
+    f.write "default: \"--require features/support/env.rb #{steps}\"\n"
   }
 end

data/vendor/riddle/lib/riddle.rb

@@ -18,7 +18,7 @@ module Riddle #:nodoc:
     Rev     = 1533
     # Release number to mark my own fixes, beyond feature parity with
     # Sphinx itself.
-    Release = 10
+    Release = 11
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')

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

@@ -5,14 +5,14 @@ module Riddle
       @path           = path
     end
     
-    def index
-      run_index('--all')
-    end
-
-    def partially_index(indexes)
-      run_index(indexes.join(" "))
+    def index(*indexes)
+      indexes << '--all' if indexes.empty?
+      
+      cmd = "indexer --config #{@path} #{indexes.join(' ')}"
+      cmd << " --rotate" if running?
+      `#{cmd}`
     end
-
+    
     def start
       return if running?
       
@@ -51,12 +51,5 @@ module Riddle
     rescue
       false
     end
-
-    private
-    def run_index(name)
-      cmd = "indexer --config #{@path} #{name}"
-      cmd << " --rotate" if running?
-      `#{cmd}`
-    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moneypools-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.13
+  version: 1.3.1
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -05:00
+date: 2009-11-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,9 @@ files:
 - LICENCE
 - README.textile
 - VERSION.yml
+- lib/cucumber/thinking_sphinx/external_world.rb
+- lib/cucumber/thinking_sphinx/internal_world.rb
+- lib/cucumber/thinking_sphinx/sql_logger.rb
 - lib/thinking_sphinx.rb
 - lib/thinking_sphinx/active_record.rb
 - lib/thinking_sphinx/active_record/attribute_updates.rb
@@ -50,12 +53,7 @@ files:
 - lib/thinking_sphinx/core/array.rb
 - lib/thinking_sphinx/core/string.rb
 - lib/thinking_sphinx/deltas.rb
-- lib/thinking_sphinx/deltas/datetime_delta.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
-- lib/thinking_sphinx/deltas/delayed_delta.rb
-- lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb
-- lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb
-- lib/thinking_sphinx/deltas/delayed_delta/job.rb
 - lib/thinking_sphinx/deploy/capistrano.rb
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
@@ -105,21 +103,8 @@ homepage: http://ts.freelancing-gods.com
 licenses: []
 
 post_install_message: |+
-  With the release of Thinking Sphinx 1.1.18, there is one important change to
-  note: previously, the default morphology for indexing was 'stem_en'. The new
-  default is nil, to avoid any unexpected behavior. If you wish to keep the old
-  value though, you will need to add the following settings to your
-  config/sphinx.yml file:
-  
-  development:
-    morphology: stem_en
-  test:
-    morphology: stem_en
-  production:
-    morphology: stem_en
-  
-  To understand morphologies/stemmers better, visit the following link:
-  http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+  If you're upgrading, you should read this:
+  http://freelancing-god.github.com/ts/en/upgrading.html
   
 rdoc_options: 
 - --charset=UTF-8
@@ -145,12 +130,9 @@ signing_key:
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
 test_files: 
-- features/a.rb
 - features/alternate_primary_key.feature
 - features/attribute_transformation.feature
 - features/attribute_updates.feature
-- features/datetime_deltas.feature
-- features/delayed_delta_indexing.feature
 - features/deleting_instances.feature
 - features/direct_attributes.feature
 - features/excerpts.feature
@@ -167,8 +149,6 @@ test_files:
 - features/step_definitions/alpha_steps.rb
 - features/step_definitions/beta_steps.rb
 - features/step_definitions/common_steps.rb
-- features/step_definitions/datetime_delta_steps.rb
-- features/step_definitions/delayed_delta_indexing_steps.rb
 - features/step_definitions/extensible_delta_indexing_steps.rb
 - features/step_definitions/facet_steps.rb
 - features/step_definitions/find_arguments_steps.rb
@@ -177,8 +157,8 @@ test_files:
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sphinx_steps.rb
 - features/sti_searching.feature
+- features/support/database.example.yml
 - features/support/db/active_record.rb
-- features/support/db/database.example.yml
 - features/support/db/fixtures/alphas.rb
 - features/support/db/fixtures/authors.rb
 - features/support/db/fixtures/betas.rb
@@ -186,7 +166,6 @@ test_files:
 - features/support/db/fixtures/categories.rb
 - features/support/db/fixtures/cats.rb
 - features/support/db/fixtures/comments.rb
-- features/support/db/fixtures/delayed_betas.rb
 - features/support/db/fixtures/developers.rb
 - features/support/db/fixtures/dogs.rb
 - features/support/db/fixtures/extensible_betas.rb
@@ -195,7 +174,6 @@ test_files:
 - features/support/db/fixtures/posts.rb
 - features/support/db/fixtures/robots.rb
 - features/support/db/fixtures/tags.rb
-- features/support/db/fixtures/thetas.rb
 - features/support/db/migrations/create_alphas.rb
 - features/support/db/migrations/create_animals.rb
 - features/support/db/migrations/create_authors.rb
@@ -204,7 +182,6 @@ test_files:
 - features/support/db/migrations/create_boxes.rb
 - features/support/db/migrations/create_categories.rb
 - features/support/db/migrations/create_comments.rb
-- features/support/db/migrations/create_delayed_betas.rb
 - features/support/db/migrations/create_developers.rb
 - features/support/db/migrations/create_extensible_betas.rb
 - features/support/db/migrations/create_gammas.rb
@@ -213,7 +190,6 @@ test_files:
 - features/support/db/migrations/create_robots.rb
 - features/support/db/migrations/create_taggings.rb
 - features/support/db/migrations/create_tags.rb
-- features/support/db/migrations/create_thetas.rb
 - features/support/db/mysql.rb
 - features/support/db/postgresql.rb
 - features/support/env.rb
@@ -226,7 +202,6 @@ test_files:
 - features/support/models/cat.rb
 - features/support/models/category.rb
 - features/support/models/comment.rb
-- features/support/models/delayed_beta.rb
 - features/support/models/developer.rb
 - features/support/models/dog.rb
 - features/support/models/extensible_beta.rb
@@ -236,9 +211,7 @@ test_files:
 - features/support/models/robot.rb
 - features/support/models/tag.rb
 - features/support/models/tagging.rb
-- features/support/models/theta.rb
 - features/support/post_database.rb
-- features/support/z.rb
 - spec/lib/thinking_sphinx/active_record/delta_spec.rb
 - spec/lib/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/lib/thinking_sphinx/active_record/scopes_spec.rb
@@ -248,7 +221,6 @@ test_files:
 - spec/lib/thinking_sphinx/configuration_spec.rb
 - spec/lib/thinking_sphinx/core/array_spec.rb
 - spec/lib/thinking_sphinx/core/string_spec.rb
-- spec/lib/thinking_sphinx/deltas/job_spec.rb
 - spec/lib/thinking_sphinx/excerpter_spec.rb
 - spec/lib/thinking_sphinx/facet_search_spec.rb
 - spec/lib/thinking_sphinx/facet_spec.rb

data/features/a.rb

@@ -1,17 +0,0 @@
-# This file exists because Cucumber likes to auto-load all ruby files
-puts <<-MESSAGE
-Cucumber 0.1.12 defaults to loading all ruby files within the features folder
-alphabetically. This is annoying, because some files need to be loaded before
-others (and others perhaps not at all, given missing dependencies). Hence this
-place-holder imaginatively named 'a.rb', to force this message.
-
-A work-around is to use cucumber profiles. You will find the default profile in
-cucumber.yml should serve your needs fine, unless you add new step definitions.
-When you do that, you can regenerate the YAML file by running:
-rake cucumber_defaults
-
-And then run specific features as follows is slightly more verbose, but it
-works, whereas this doesn't.
-cucumber -p default features/something.feature
-MESSAGE
-exit 0

data/features/datetime_deltas.feature

@@ -1,66 +0,0 @@
-Feature: Datetime Delta Indexing
-  In order to have delta indexing on frequently-updated sites
-  Developers
-  Should be able to use an existing datetime column to track changes
-  
-  Scenario: Delta Index should not fire automatically
-    Given Sphinx is running
-    And I am searching on thetas
-    When I search for one
-    Then I should get 1 result
-  
-    When I change the name of theta one to eleven
-    And I wait for Sphinx to catch up
-    And I search for one
-    Then I should get 1 result
-    
-    When I search for eleven
-    Then I should get 0 results
-  
-  Scenario: Delta Index should fire when jobs are run
-    Given Sphinx is running
-    And I am searching on thetas
-    When I search for two
-    Then I should get 1 result
-  
-    When I change the name of theta two to twelve
-    And I wait for Sphinx to catch up
-    And I search for twelve
-    Then I should get 0 results
-    
-    When I index the theta datetime delta
-    And I wait for Sphinx to catch up
-    And I search for twelve
-    Then I should get 1 result
-    
-    When I search for two
-    Then I should get 0 results
-  
-  Scenario: New records should be merged into the core index
-    Given Sphinx is running
-    And I am searching on thetas
-    When I search for thirteen
-    Then I should get 0 results
-    
-    When I create a new theta named thirteen
-    And I search for thirteen
-    Then I should get 0 results
-    
-    When I index the theta datetime delta
-    And I wait for Sphinx to catch up
-    And I search for thirteen
-    Then I should get 1 result
-    
-    When I search for the document id of theta thirteen in the theta_core index
-    Then it should exist
-  
-  Scenario: Deleting records
-    Given Sphinx is running
-    And I am searching on thetas
-    When I search for three
-    Then I should get 1 result
-    
-    When I delete the theta named three
-    And I wait for Sphinx to catch up
-    And I search for three
-    Then I should get 0 results

data/features/delayed_delta_indexing.feature

@@ -1,37 +0,0 @@
-Feature: Delayed Delta Indexing
-  In order to have delta indexing on frequently-updated sites
-  Developers
-  Should be able to use delayed_job to handle delta indexes to lower system load
-  
-  Scenario: Delta Index should not fire automatically
-    Given Sphinx is running
-    And I am searching on delayed betas
-    When I search for one
-    Then I should get 1 result
-  
-    When I change the name of delayed beta one to eleven
-    And I wait for Sphinx to catch up
-    And I search for one
-    Then I should get 1 result
-    
-    When I search for eleven
-    Then I should get 0 results
-  
-  Scenario: Delta Index should fire when jobs are run
-    Given Sphinx is running
-    And I am searching on delayed betas
-    When I search for one
-    Then I should get 1 result
-  
-    When I change the name of delayed beta two to twelve
-    And I wait for Sphinx to catch up
-    And I search for twelve
-    Then I should get 0 results
-    
-    When I run the delayed jobs
-    And I wait for Sphinx to catch up
-    And I search for twelve
-    Then I should get 1 result
-    
-    When I search for two
-    Then I should get 0 results

data/features/step_definitions/datetime_delta_steps.rb

@@ -1,15 +0,0 @@
-When /^I index the theta datetime delta$/ do
-  Theta.sphinx_indexes.first.delta_object.delayed_index(Theta)
-end
-
-When /^I change the name of theta (\w+) to (\w+)$/ do |current, replacement|
-  Theta.find_by_name(current).update_attributes(:name => replacement)
-end
-
-When /^I create a new theta named (\w+)$/ do |name|
-  Theta.create(:name => name)
-end
-
-When /^I delete the theta named (\w+)$/ do |name|
-  Theta.find_by_name(name).destroy
-end

data/features/step_definitions/delayed_delta_indexing_steps.rb

@@ -1,7 +0,0 @@
-When /^I run the delayed jobs$/ do
-  Delayed::Job.work_off.inspect
-end
-
-When /^I change the name of delayed beta (\w+) to (\w+)$/ do |current, replacement|
-  DelayedBeta.find_by_name(current).update_attributes(:name => replacement)
-end

data/features/support/db/fixtures/delayed_betas.rb

@@ -1,10 +0,0 @@
-DelayedBeta.create :name => "one"
-DelayedBeta.create :name => "two"
-DelayedBeta.create :name => "three"
-DelayedBeta.create :name => "four"
-DelayedBeta.create :name => "five"
-DelayedBeta.create :name => "six"
-DelayedBeta.create :name => "seven"
-DelayedBeta.create :name => "eight"
-DelayedBeta.create :name => "nine"
-DelayedBeta.create :name => "ten"

data/features/support/db/fixtures/thetas.rb

@@ -1,10 +0,0 @@
-Theta.create :name => "one"
-Theta.create :name => "two"
-Theta.create :name => "three"
-Theta.create :name => "four"
-Theta.create :name => "five"
-Theta.create :name => "six"
-Theta.create :name => "seven"
-Theta.create :name => "eight"
-Theta.create :name => "nine"
-Theta.create :name => "ten"

data/features/support/db/migrations/create_delayed_betas.rb

@@ -1,17 +0,0 @@
-ActiveRecord::Base.connection.create_table :delayed_betas, :force => true do |t|
-  t.column  :name, :string,  :null => false
-  t.column :delta, :boolean, :null => false, :default => false
-end
-
-ActiveRecord::Base.connection.create_table :delayed_jobs, :force => true do |t|
-  t.column :priority, :integer, :default => 0
-  t.column :attempts, :integer, :default => 0
-  t.column :handler, :text
-  t.column :last_error, :string
-  t.column :run_at, :datetime
-  t.column :locked_at, :datetime
-  t.column :failed_at, :datetime
-  t.column :locked_by, :string
-  t.column :created_at, :datetime
-  t.column :updated_at, :datetime
-end

data/features/support/db/migrations/create_thetas.rb

@@ -1,5 +0,0 @@
-ActiveRecord::Base.connection.create_table :thetas, :force => true do |t|
-  t.column :name,       :string,    :null => false
-  t.column :created_at, :datetime,  :null => false
-  t.column :updated_at, :datetime,  :null => false
-end

data/features/support/models/delayed_beta.rb

@@ -1,7 +0,0 @@
-class DelayedBeta < ActiveRecord::Base
-  define_index do
-    indexes :name, :sortable => true
-    
-    set_property :delta => :delayed
-  end
-end

data/features/support/models/theta.rb

@@ -1,7 +0,0 @@
-class Theta < ActiveRecord::Base
-  define_index do
-    indexes :name, :sortable => true
-    
-    set_property :delta => :datetime, :threshold => 1.hour
-  end
-end

data/features/support/z.rb

@@ -1,19 +0,0 @@
-# This file exists because Cucumber likes to auto-load all ruby files
-puts <<-MESSAGE
-Cucumber 0.1.13 defaults to loading all ruby files within the features folder,
-with something approaching reverse-alphabetical order, and preferring the
-features/support folder over everything else. This is annoying, because some
-files need to be loaded before others (and others perhaps not at all, given
-missing dependencies). Hence this place-holder imaginatively named 'z.rb', to
-force this message.
-
-A work-around is to use cucumber profiles. You will find the default profile in
-cucumber.yml should serve your needs fine, unless you add new step definitions.
-When you do that, you can regenerate the YAML file by running:
-rake cucumber_defaults
-
-And then run specific features as follows is slightly more verbose, but it
-works, whereas this doesn't.
-cucumber -p default features/something.feature
-MESSAGE
-exit 0

data/lib/thinking_sphinx/deltas/datetime_delta.rb

@@ -1,50 +0,0 @@
-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}#{config.indexer_binary_name} --config #{config.config_file} #{rotate} #{delta_index_name model}`
-        output += `#{config.bin_path}#{config.indexer_binary_name} --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}.#{model.connection.quote_column_name(@column.to_s)}" +
-          " > #{adapter.time_difference(@threshold)}"
-        else
-          nil
-        end
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/deltas/delayed_delta.rb

@@ -1,34 +0,0 @@
-begin
-  require 'delayed_job'
-rescue LoadError
-  raise "You must have delayed_job installed as a gem or plugin to use a delayed delta"
-end
-
-require 'thinking_sphinx/deltas/delayed_delta/delta_job'
-require 'thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job'
-require 'thinking_sphinx/deltas/delayed_delta/job'
-
-module ThinkingSphinx
-  module Deltas
-    class DelayedDelta < ThinkingSphinx::Deltas::DefaultDelta
-      def index(model, instance = nil)
-        return true unless ThinkingSphinx.updates_enabled? && ThinkingSphinx.deltas_enabled?
-        return true if instance && !toggled(instance)
-      
-        ThinkingSphinx::Deltas::Job.enqueue(
-          ThinkingSphinx::Deltas::DeltaJob.new(delta_index_name(model)),
-          ThinkingSphinx::Configuration.instance.delayed_job_priority
-        )
-        
-        Delayed::Job.enqueue(
-          ThinkingSphinx::Deltas::FlagAsDeletedJob.new(
-            core_index_name(model), instance.sphinx_document_id
-          ),
-          ThinkingSphinx::Configuration.instance.delayed_job_priority
-        ) if instance
-        
-        true
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/deltas/delayed_delta/delta_job.rb

@@ -1,24 +0,0 @@
-module ThinkingSphinx
-  module Deltas
-    class DeltaJob
-      attr_accessor :index
-      
-      def initialize(index)
-        @index = index
-      end
-      
-      def perform
-        return true unless ThinkingSphinx.updates_enabled? &&
-          ThinkingSphinx.deltas_enabled?
-        
-        config = ThinkingSphinx::Configuration.instance
-        client = Riddle::Client.new config.address, config.port
-        
-        output = `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file} --rotate #{index}`
-        puts output unless ThinkingSphinx.suppress_delta_output?
-        
-        true
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/deltas/delayed_delta/flag_as_deleted_job.rb

@@ -1,27 +0,0 @@
-module ThinkingSphinx
-  module Deltas
-    class FlagAsDeletedJob
-      attr_accessor :index, :document_id
-      
-      def initialize(index, document_id)
-        @index, @document_id = index, document_id
-      end
-      
-      def perform
-        return true unless ThinkingSphinx.updates_enabled?
-        
-        config = ThinkingSphinx::Configuration.instance
-        client = Riddle::Client.new config.address, config.port
-        
-        client.update(
-          @index,
-          ['sphinx_deleted'],
-          {@document_id => [1]}
-        ) if ThinkingSphinx.sphinx_running? &&
-          ThinkingSphinx::Search.search_for_id(@document_id, @index)
-        
-        true
-      end
-    end
-  end
-end

data/lib/thinking_sphinx/deltas/delayed_delta/job.rb

@@ -1,26 +0,0 @@
-module ThinkingSphinx
-  module Deltas
-    class Job < Delayed::Job
-      def self.enqueue(object, priority = 0)
-        super unless duplicates_exist(object)
-      end
-      
-      def self.cancel_thinking_sphinx_jobs
-        if connection.tables.include?("delayed_jobs")
-          delete_all("handler LIKE '--- !ruby/object:ThinkingSphinx::Deltas::%'")
-        end
-      end
-
-      private
-
-      def self.duplicates_exist(object)
-        count(
-          :conditions => {
-            :handler    => object.to_yaml,
-            :locked_at  => nil
-          }
-        ) > 0
-      end
-    end
-  end
-end

data/spec/lib/thinking_sphinx/deltas/job_spec.rb

@@ -1,32 +0,0 @@
-require 'spec/spec_helper'
-
-describe ThinkingSphinx::Deltas::Job do
-  describe '.cancel_thinking_sphinx_jobs' do
-    before :each do
-      ThinkingSphinx::Deltas::Job.stub!(:delete_all => true)
-    end
-    
-    it "should not delete any rows if the delayed_jobs table does not exist" do
-      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => [])
-      ThinkingSphinx::Deltas::Job.should_not_receive(:delete_all)
-      
-      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    end
-    
-    it "should delete rows if the delayed_jobs table does exist" do
-      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => ['delayed_jobs'])
-      ThinkingSphinx::Deltas::Job.should_receive(:delete_all)
-      
-      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    end
-    
-    it "should delete only Thinking Sphinx jobs" do
-      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => ['delayed_jobs'])
-      ThinkingSphinx::Deltas::Job.should_receive(:delete_all) do |sql|
-        sql.should match(/handler LIKE '--- !ruby\/object:ThinkingSphinx::Deltas::\%'/)
-      end
-      
-      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
-    end
-  end
-end