warp-thinking-sphinx 1.2.12 → 1.3.10

data/spec/{lib/thinking_sphinx → thinking_sphinx}/search_spec.rb

@@ -302,6 +302,23 @@ describe ThinkingSphinx::Search do
         @client.match_mode.should == :extended2
       end
     end
+
+    describe 'sphinx_select' do
+      it "should default to *" do
+        ThinkingSphinx::Search.new.first
+        
+        @client.select.should == "*"
+      end
+      
+      it "should get set on the client if specified" do
+        ThinkingSphinx::Search.new('general',
+          :sphinx_select => "*, foo as bar"
+        ).first
+        
+        @client.select.should == "*, foo as bar"
+      end
+
+    end
     
     describe 'pagination' do
       it "should set the limit using per_page" do
@@ -816,6 +833,10 @@ describe ThinkingSphinx::Search do
         :per_page => 30, :limit => 40
       ).per_page.should == 40
     end
+    
+    it "should allow for string arguments" do
+      ThinkingSphinx::Search.new(:per_page => '10').per_page.should == 10
+    end
   end
   
   describe '#total_pages' do
@@ -834,6 +855,14 @@ describe ThinkingSphinx::Search do
       
       ThinkingSphinx::Search.new.total_pages.should == 2
     end
+    
+    it "should return 0 if there is no index and therefore no results" do
+      @client.stub!(:query => {
+        :matches => [], :total_found => nil, :total => nil
+      })
+      
+      ThinkingSphinx::Search.new.total_pages.should == 0
+    end
   end
   
   describe '#next_page' do
@@ -860,6 +889,14 @@ describe ThinkingSphinx::Search do
     it "should return the total number of results, not just the amount on the page" do
       ThinkingSphinx::Search.new.total_entries.should == 41
     end
+    
+    it "should return 0 if there is no index and therefore no results" do
+      @client.stub!(:query => {
+        :matches => [], :total_found => nil
+      })
+      
+      ThinkingSphinx::Search.new.total_entries.should == 0
+    end
   end
   
   describe '#offset' do
@@ -870,6 +907,10 @@ describe ThinkingSphinx::Search do
     it "should increase by the per_page value for each page in" do
       ThinkingSphinx::Search.new(:per_page => 25, :page => 2).offset.should == 25
     end
+
+    it "should prioritise explicit :offset over calculated if given" do
+      ThinkingSphinx::Search.new(:offset => 5).offset.should == 5
+    end
   end
   
   describe '#indexes' do

data/spec/{lib/thinking_sphinx → thinking_sphinx}/source_spec.rb

@@ -161,7 +161,7 @@ describe ThinkingSphinx::Source do
       end
       
       it "should filter the primary key with the offset" do
-        model_count = ThinkingSphinx.indexed_models.size
+        model_count = ThinkingSphinx.context.indexed_models.size
         @query.should match(/WHERE `id` = \(\(\$id - 1\) \/ #{model_count}\)/)
       end
     end

data/spec/thinking_sphinx_spec.rb

@@ -0,0 +1,204 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx do
+  describe '.context' do
+    it "should return a Context instance" do
+      ThinkingSphinx.context.should be_a(ThinkingSphinx::Context)
+    end
+    
+    it "should remember changes to the Context instance" do
+      models = ThinkingSphinx.context.indexed_models
+      
+      ThinkingSphinx.context.indexed_models.replace([:model])
+      ThinkingSphinx.context.indexed_models.should == [:model]
+      
+      ThinkingSphinx.context.indexed_models.replace(models)
+    end
+  end
+  
+  describe '.reset_context!' do
+    it "should remove the existing Context instance" do
+      existing = ThinkingSphinx.context
+      
+      ThinkingSphinx.reset_context!
+      ThinkingSphinx.context.should_not == existing
+      
+      Thread.current[:thinking_sphinx_context] = existing
+    end
+  end
+  
+  describe '.define_indexes?' do
+    it "should define indexes by default" do
+      ThinkingSphinx.define_indexes?.should be_true
+    end
+  end
+  
+  describe '.define_indexes=' do
+    it "should disable index definition" do
+      ThinkingSphinx.define_indexes = false
+      ThinkingSphinx.define_indexes?.should be_false
+    end
+  
+    it "should enable index definition" do
+      ThinkingSphinx.define_indexes = false
+      ThinkingSphinx.define_indexes?.should be_false
+      ThinkingSphinx.define_indexes = true
+      ThinkingSphinx.define_indexes?.should be_true
+    end
+  end
+  
+  describe '.deltas_enabled?' do
+    it "should index deltas by default" do
+      ThinkingSphinx.deltas_enabled = nil
+      ThinkingSphinx.deltas_enabled?.should be_true
+    end
+  end
+  
+  describe '.deltas_enabled=' do
+    it "should disable delta indexing" do
+      ThinkingSphinx.deltas_enabled = false
+      ThinkingSphinx.deltas_enabled?.should be_false
+    end
+  
+    it "should enable delta indexing" do
+      ThinkingSphinx.deltas_enabled = false
+      ThinkingSphinx.deltas_enabled?.should be_false
+      ThinkingSphinx.deltas_enabled = true
+      ThinkingSphinx.deltas_enabled?.should be_true
+    end
+  end
+  
+  describe '.updates_enabled?' do
+    it "should update indexes by default" do
+      ThinkingSphinx.updates_enabled = nil
+      ThinkingSphinx.updates_enabled?.should be_true
+    end
+  end
+  
+  describe '.updates_enabled=' do
+    it "should disable index updating" do
+      ThinkingSphinx.updates_enabled = false
+      ThinkingSphinx.updates_enabled?.should be_false
+    end
+  
+    it "should enable index updating" do
+      ThinkingSphinx.updates_enabled = false
+      ThinkingSphinx.updates_enabled?.should be_false
+      ThinkingSphinx.updates_enabled = true
+      ThinkingSphinx.updates_enabled?.should be_true
+    end
+  end
+  
+  describe '.sphinx_running?' do
+    it "should always say Sphinx is running if flagged as being on a remote machine" do
+      ThinkingSphinx.remote_sphinx = true
+      ThinkingSphinx.stub!(:sphinx_running_by_pid? => false)
+    
+      ThinkingSphinx.sphinx_running?.should be_true
+    end
+  
+    it "should actually pay attention to Sphinx if not on a remote machine" do
+      ThinkingSphinx.remote_sphinx = false
+      ThinkingSphinx.stub!(:sphinx_running_by_pid? => false)
+      ThinkingSphinx.sphinx_running?.should be_false
+    
+      ThinkingSphinx.stub!(:sphinx_running_by_pid? => true)
+      ThinkingSphinx.sphinx_running?.should be_true
+    end
+  end
+  
+  describe '.version' do
+    it "should return the version from the stored YAML file" do
+      version = Jeweler::VersionHelper.new(
+        File.join(File.dirname(__FILE__), '..')
+      ).to_s
+      
+      ThinkingSphinx.version.should == version
+    end
+  end
+  
+  describe "use_group_by_shortcut? method" do
+    before :each do
+      adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter
+      unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
+        pending "No MySQL"
+        return
+      end
+      
+      @connection = stub('adapter',
+        :select_all => true,
+        :class      => ActiveRecord::ConnectionAdapters::MysqlAdapter,
+        :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcmysql' : 'mysql'}
+      )
+      ::ActiveRecord::Base.stub!(
+        :connection => @connection
+      )
+      
+      Thread.current[:thinking_sphinx_use_group_by_shortcut] = nil
+    end
+    
+    it "should return true if no ONLY_FULL_GROUP_BY" do
+      @connection.stub!(
+        :select_all => {:a => "OTHER SETTINGS"}
+      )
+      
+      ThinkingSphinx.use_group_by_shortcut?.should be_true
+    end
+  
+    it "should return true if NULL value" do
+      @connection.stub!(
+        :select_all => {:a => nil}
+      )
+      
+      ThinkingSphinx.use_group_by_shortcut?.should be_true
+    end
+  
+    it "should return false if ONLY_FULL_GROUP_BY is set" do
+      @connection.stub!(
+        :select_all => {:a => "OTHER SETTINGS,ONLY_FULL_GROUP_BY,blah"}
+      )
+      
+      ThinkingSphinx.use_group_by_shortcut?.should be_false
+    end
+    
+    it "should return false if ONLY_FULL_GROUP_BY is set in any of the values" do
+      @connection.stub!(
+        :select_all => {
+          :a => "OTHER SETTINGS",
+          :b => "ONLY_FULL_GROUP_BY"
+        }
+      )
+      
+      ThinkingSphinx.use_group_by_shortcut?.should be_false
+    end
+    
+    describe "if not using MySQL" do
+      before :each do
+        adapter = defined?(JRUBY_VERSION) ? 'JdbcAdapter' : 'PostgreSQLAdapter'
+        unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
+          pending "No PostgreSQL"
+          return
+        end
+        
+        @connection = stub(adapter).as_null_object
+        @connection.stub!(
+          :select_all => true,
+          :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'}
+        )
+        ::ActiveRecord::Base.stub!(
+          :connection => @connection
+        )
+      end
+    
+      it "should return false" do
+        ThinkingSphinx.use_group_by_shortcut?.should be_false
+      end
+    
+      it "should not call select_all" do
+        @connection.should_not_receive(:select_all)
+        
+        ThinkingSphinx.use_group_by_shortcut?
+      end
+    end
+  end
+end

data/tasks/distribution.rb

@@ -2,9 +2,7 @@ require 'yard'
 require 'jeweler'
 
 desc 'Generate documentation'
-YARD::Rake::YardocTask.new do |t|
-  # t.title = 'Thinking Sphinx - ActiveRecord Sphinx Plugin'
-end
+YARD::Rake::YardocTask.new
 
 Jeweler::Tasks.new do |gem|
   gem.name        = "warp-thinking-sphinx"
@@ -22,8 +20,7 @@ Jeweler::Tasks.new do |gem|
     "README.textile",
     "tasks/**/*.rb",
     "tasks/**/*.rake",
-    "vendor/**/*",
-    "VERSION.yml"
+    "VERSION"
   ]
   gem.test_files = FileList[
     "features/**/*",
@@ -31,23 +28,12 @@ Jeweler::Tasks.new do |gem|
   ]
 
   gem.add_dependency 'activerecord', '>= 1.15.6'
+  gem.add_dependency 'riddle',       '>= 1.0.8'
+  gem.add_dependency 'after_commit', '>= 1.0.5'
 
   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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: warp-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.12
+  version: 1.3.10
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-23 00:00:00 +08:00
+date: 2009-12-11 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.15.6
     version: 
+- !ruby/object:Gem::Dependency 
+  name: riddle
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.8
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: after_commit
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.0.5
+    version: 
 description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 email: pat@freelancing-gods.com
 executables: []
@@ -33,7 +53,10 @@ extra_rdoc_files:
 files: 
 - LICENCE
 - README.textile
-- VERSION.yml
+- VERSION
+- 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
@@ -45,17 +68,14 @@ files:
 - lib/thinking_sphinx/adapters/postgresql_adapter.rb
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
+- lib/thinking_sphinx/auto_version.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
+- lib/thinking_sphinx/context.rb
 - 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
@@ -72,58 +92,18 @@ files:
 - lib/thinking_sphinx/source/internal_properties.rb
 - lib/thinking_sphinx/source/sql.rb
 - lib/thinking_sphinx/tasks.rb
+- lib/thinking_sphinx/test.rb
 - rails/init.rb
 - tasks/distribution.rb
 - tasks/rails.rake
 - tasks/testing.rb
-- vendor/after_commit/LICENSE
-- vendor/after_commit/README
-- vendor/after_commit/Rakefile
-- vendor/after_commit/init.rb
-- vendor/after_commit/lib/after_commit.rb
-- vendor/after_commit/lib/after_commit/active_record.rb
-- vendor/after_commit/lib/after_commit/connection_adapters.rb
-- vendor/after_commit/test/after_commit_test.rb
-- vendor/delayed_job/lib/delayed/job.rb
-- vendor/delayed_job/lib/delayed/message_sending.rb
-- vendor/delayed_job/lib/delayed/performable_method.rb
-- vendor/delayed_job/lib/delayed/worker.rb
-- vendor/riddle/lib/riddle.rb
-- vendor/riddle/lib/riddle/client.rb
-- vendor/riddle/lib/riddle/client/filter.rb
-- vendor/riddle/lib/riddle/client/message.rb
-- vendor/riddle/lib/riddle/client/response.rb
-- vendor/riddle/lib/riddle/configuration.rb
-- vendor/riddle/lib/riddle/configuration/distributed_index.rb
-- vendor/riddle/lib/riddle/configuration/index.rb
-- vendor/riddle/lib/riddle/configuration/indexer.rb
-- vendor/riddle/lib/riddle/configuration/remote_index.rb
-- vendor/riddle/lib/riddle/configuration/searchd.rb
-- vendor/riddle/lib/riddle/configuration/section.rb
-- vendor/riddle/lib/riddle/configuration/source.rb
-- vendor/riddle/lib/riddle/configuration/sql_source.rb
-- vendor/riddle/lib/riddle/configuration/xml_source.rb
-- vendor/riddle/lib/riddle/controller.rb
 has_rdoc: true
 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
@@ -149,119 +129,114 @@ signing_key:
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
 test_files: 
-- features/a.rb
 - features/attribute_transformation.feature
-- features/attribute_updates.feature
-- features/datetime_deltas.feature
-- features/delayed_delta_indexing.feature
-- features/deleting_instances.feature
-- features/extensible_delta_indexing.feature
-- features/facets.feature
-- features/facets_across_model.feature
-- features/handling_edits.feature
 - features/retry_stale_indexes.feature
-- features/searching_across_models.feature
-- features/searching_by_model.feature
-- features/searching_with_find_arguments.feature
+- features/sphinx_scopes.feature
 - features/sphinx_detection.feature
-- 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/gamma_steps.rb
 - features/step_definitions/extensible_delta_indexing_steps.rb
 - features/step_definitions/facet_steps.rb
-- features/step_definitions/find_arguments_steps.rb
-- features/step_definitions/gamma_steps.rb
-- features/step_definitions/search_steps.rb
+- features/step_definitions/alpha_steps.rb
 - features/step_definitions/sphinx_steps.rb
+- features/step_definitions/search_steps.rb
+- features/step_definitions/common_steps.rb
+- features/step_definitions/find_arguments_steps.rb
 - features/step_definitions/scope_steps.rb
-- features/sti_searching.feature
-- features/support/db/active_record.rb
-- features/support/db/database.example.yml
-- features/support/db/fixtures/alphas.rb
-- features/support/db/fixtures/betas.rb
-- features/support/db/fixtures/boxes.rb
-- 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/facets.feature
+- features/searching_by_index.feature
+- features/facets_across_model.feature
+- features/abstract_inheritance.feature
+- features/handling_edits.feature
+- features/support/database.example.yml
+- features/support/db/fixtures/music.rb
 - features/support/db/fixtures/developers.rb
+- features/support/db/fixtures/robots.rb
+- features/support/db/fixtures/tags.rb
+- features/support/db/fixtures/comments.rb
+- features/support/db/fixtures/foxes.rb
 - features/support/db/fixtures/dogs.rb
-- features/support/db/fixtures/extensible_betas.rb
-- features/support/db/fixtures/gammas.rb
-- features/support/db/fixtures/people.rb
+- features/support/db/fixtures/betas.rb
 - features/support/db/fixtures/posts.rb
-- features/support/db/fixtures/tags.rb
-- features/support/db/fixtures/thetas.rb
+- features/support/db/fixtures/alphas.rb
+- features/support/db/fixtures/categories.rb
 - features/support/db/fixtures/authors.rb
-- features/support/db/fixtures/robots.rb
-- features/support/db/migrations/create_alphas.rb
-- features/support/db/migrations/create_animals.rb
-- features/support/db/migrations/create_betas.rb
-- features/support/db/migrations/create_boxes.rb
+- features/support/db/fixtures/gammas.rb
+- features/support/db/fixtures/extensible_betas.rb
+- features/support/db/fixtures/people.rb
+- features/support/db/fixtures/boxes.rb
+- features/support/db/fixtures/cats.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_robots.rb
+- features/support/db/migrations/create_music.rb
+- features/support/db/migrations/create_betas.rb
+- features/support/db/migrations/create_authors_posts.rb
+- features/support/db/migrations/create_posts.rb
+- features/support/db/migrations/create_alphas.rb
 - features/support/db/migrations/create_developers.rb
-- features/support/db/migrations/create_extensible_betas.rb
+- features/support/db/migrations/create_authors.rb
+- features/support/db/migrations/create_tags.rb
 - features/support/db/migrations/create_gammas.rb
 - features/support/db/migrations/create_people.rb
-- features/support/db/migrations/create_posts.rb
+- features/support/db/migrations/create_extensible_betas.rb
+- features/support/db/migrations/create_animals.rb
+- features/support/db/migrations/create_comments.rb
+- features/support/db/migrations/create_genres.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/migrations/create_authors.rb
-- features/support/db/migrations/create_authors_posts.rb
-- features/support/db/migrations/create_robots.rb
-- features/support/db/mysql.rb
-- features/support/db/postgresql.rb
-- features/support/env.rb
+- features/support/db/migrations/create_boxes.rb
 - features/support/lib/generic_delta_handler.rb
-- features/support/models/alpha.rb
-- features/support/models/animal.rb
+- features/support/env.rb
+- features/support/models/music.rb
 - features/support/models/beta.rb
-- features/support/models/box.rb
-- features/support/models/cat.rb
-- features/support/models/category.rb
-- features/support/models/comment.rb
-- features/support/models/delayed_beta.rb
+- features/support/models/gamma.rb
 - features/support/models/developer.rb
+- features/support/models/fox.rb
+- features/support/models/tag.rb
+- features/support/models/robot.rb
+- features/support/models/cat.rb
+- features/support/models/medium.rb
+- features/support/models/person.rb
+- features/support/models/alpha.rb
+- features/support/models/box.rb
+- features/support/models/author.rb
 - features/support/models/dog.rb
+- features/support/models/animal.rb
+- features/support/models/category.rb
 - features/support/models/extensible_beta.rb
-- features/support/models/gamma.rb
-- features/support/models/person.rb
-- features/support/models/post.rb
-- features/support/models/tag.rb
+- features/support/models/genre.rb
+- features/support/models/comment.rb
 - features/support/models/tagging.rb
-- features/support/models/theta.rb
-- features/support/models/author.rb
-- features/support/models/robot.rb
-- features/support/post_database.rb
-- features/support/z.rb
+- features/support/models/post.rb
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/searching_by_model.feature
+- features/attribute_updates.feature
+- features/searching_with_find_arguments.feature
 - features/alternate_primary_key.feature
+- features/searching_across_models.feature
+- features/sti_searching.feature
+- features/deleting_instances.feature
 - features/direct_attributes.feature
-- features/excerpts.feature
-- features/sphinx_scopes.feature
-- 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
-- spec/lib/thinking_sphinx/active_record_spec.rb
-- spec/lib/thinking_sphinx/association_spec.rb
-- spec/lib/thinking_sphinx/attribute_spec.rb
-- 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
-- spec/lib/thinking_sphinx/field_spec.rb
-- spec/lib/thinking_sphinx/index/builder_spec.rb
-- spec/lib/thinking_sphinx/index/faux_column_spec.rb
-- spec/lib/thinking_sphinx/index_spec.rb
-- spec/lib/thinking_sphinx/rails_additions_spec.rb
-- spec/lib/thinking_sphinx/search_methods_spec.rb
-- spec/lib/thinking_sphinx/search_spec.rb
-- spec/lib/thinking_sphinx/source_spec.rb
-- spec/lib/thinking_sphinx_spec.rb
+- spec/thinking_sphinx/core/string_spec.rb
+- spec/thinking_sphinx/core/array_spec.rb
+- spec/thinking_sphinx/auto_version_spec.rb
+- spec/thinking_sphinx/field_spec.rb
+- spec/thinking_sphinx/context_spec.rb
+- spec/thinking_sphinx/active_record/has_many_association_spec.rb
+- spec/thinking_sphinx/active_record/scopes_spec.rb
+- spec/thinking_sphinx/active_record/delta_spec.rb
+- spec/thinking_sphinx/active_record_spec.rb
+- spec/thinking_sphinx/search_methods_spec.rb
+- spec/thinking_sphinx/index_spec.rb
+- spec/thinking_sphinx/source_spec.rb
+- spec/thinking_sphinx/search_spec.rb
+- spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/facet_spec.rb
+- spec/thinking_sphinx/facet_search_spec.rb
+- spec/thinking_sphinx/attribute_spec.rb
+- spec/thinking_sphinx/association_spec.rb
+- spec/thinking_sphinx/index/builder_spec.rb
+- spec/thinking_sphinx/index/faux_column_spec.rb
+- spec/thinking_sphinx/excerpter_spec.rb
+- spec/thinking_sphinx/rails_additions_spec.rb
+- spec/thinking_sphinx_spec.rb