thinking-sphinx 2.0.0.rc2 → 2.0.0

data/spec/thinking_sphinx/association_spec.rb

@@ -13,7 +13,7 @@ describe ThinkingSphinx::Association do
         :name           => 'polly',
         :active_record  => 'AR'
       )
-      @non_poly_reflection = stub('reflection')
+      @non_poly_reflection = stub('reflection', :name => 'non_polly')
       
       Person.stub!(:reflect_on_association => @normal_reflection)
       ThinkingSphinx::Association.stub!(
@@ -110,29 +110,6 @@ describe ThinkingSphinx::Association do
     end
   end
   
-  describe '#to_sql' do
-    before :each do
-      @reflection = stub('reflection', :klass => Person)
-      @association = ThinkingSphinx::Association.new(nil, @reflection)
-      @parent = stub('parent', :aliased_table_name => "ALIAS TABLE NAME")
-      @join = stub('join assoc',
-        :association_join => "full association join SQL",
-        :parent           => @parent
-      )
-      @association.join = @join
-    end
-    
-    it "should return the join's association join value" do
-      @association.to_sql.should == "full association join SQL"
-    end
-    
-    it "should replace ::ts_join_alias:: with the aliased table name" do
-      @join.stub!(:association_join => "text with ::ts_join_alias:: gone")
-      
-      @association.to_sql.should == "text with `ALIAS TABLE NAME` gone"
-    end
-  end
-  
   describe '#is_many?' do
     before :each do
       @parent = stub('assoc', :is_many? => :parent_is_many)

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -22,6 +22,14 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.detect
     end
     
+    it "should require 1.10-beta if that is the detected version" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/1.10')
+      
+      @config.stub!(:version => '1.10-beta')
+      ThinkingSphinx::AutoVersion.detect
+    end
+    
     it "should output a warning if the detected version is something else" do
       STDERR.should_receive(:puts)
       

data/spec/thinking_sphinx/configuration_spec.rb

@@ -107,6 +107,8 @@ describe ThinkingSphinx::Configuration do
         config.app_root = "/here/somewhere"
       end
       ThinkingSphinx::Configuration.instance.app_root.should == "/here/somewhere"
+      
+      ThinkingSphinx::Configuration.instance.reset
     end
   end
 
@@ -123,9 +125,9 @@ describe ThinkingSphinx::Configuration do
       }
 
       open("#{Rails.root}/config/sphinx.yml", "w") do |f|
-        f.write  YAML.dump(@settings)
+        f.write YAML.dump(@settings)
       end
-
+      
       ThinkingSphinx::Configuration.instance.send(:parse_config)
       ThinkingSphinx::Configuration.instance.bin_path.should match(/\/$/)
 
@@ -186,7 +188,7 @@ describe ThinkingSphinx::Configuration do
       config.source_options.delete option.to_sym
     end
     
-    config.source_options[:sql_query_pre] = nil  
+    config.source_options[:sql_query_pre] = []  
   end
   
   it "should not blow away delta or utf options if sql pre is specified in config" do
@@ -200,7 +202,7 @@ describe ThinkingSphinx::Configuration do
     file.should match(/sql_query_pre = a pre query\n\s*sql_query_pre = UPDATE `\w+` SET `delta` = 0 WHERE `delta` = 1/im)
     file.should match(/sql_query_pre = a pre query\n\s*sql_query_pre = \n/im)
     
-    config.source_options[:sql_query_pre] = nil
+    config.source_options[:sql_query_pre] = []
   end
 
   it "should set any explicit prefixed or infixed fields" do
@@ -228,6 +230,7 @@ describe ThinkingSphinx::Configuration do
       @config.address     = 'domain.url'
       @config.port        = 3333
       @config.configuration.searchd.max_matches = 100
+      @config.timeout = 1
     end
     
     it "should return an instance of Riddle::Client" do
@@ -245,6 +248,10 @@ describe ThinkingSphinx::Configuration do
     it "should use the configuration max matches" do
       @config.client.max_matches.should == 100
     end
+
+    it "should use the configuration timeout" do
+      @config.client.timeout.should == 1
+    end
   end
   
   describe '#models_by_crc' do

data/spec/thinking_sphinx/context_spec.rb

@@ -53,8 +53,9 @@ describe ThinkingSphinx::Context do
 
     it "should catch database errors with a warning" do
       @class_name.should_receive(:constantize).and_raise(Mysql::Error)
-      STDERR.should_receive(:puts).with('Warning: Error loading a.rb')
-
+      STDERR.stub!(:puts => '')
+      STDERR.should_receive(:puts).with('Warning: Error loading a.rb:')
+      
       lambda {
         @context.prepare
       }.should_not raise_error

data/spec/thinking_sphinx/search_spec.rb

@@ -218,6 +218,34 @@ describe ThinkingSphinx::Search do
       ThinkingSphinx::Search.new(:classes => [Alpha, Beta]).first
     end
     
+    it "should restrict includes to the relevant classes" do
+      Alpha.should_receive(:find) do |type, options|
+        options[:include].should == [:betas]
+        [@alpha_a, @alpha_b]
+      end
+      
+      Beta.should_receive(:find) do |type, options|
+        options[:include].should == [:gammas]
+        [@beta_a, @beta_b]
+      end
+      
+      ThinkingSphinx::Search.new(:include => [:betas, :gammas]).first
+    end
+    
+    it "should restrict single includes to the relevant classes" do
+      Alpha.should_receive(:find) do |type, options|
+        options[:include].should == :betas
+        [@alpha_a, @alpha_b]
+      end
+      
+      Beta.should_receive(:find) do |type, options|
+        options[:include].should be_nil
+        [@beta_a, @beta_b]
+      end
+      
+      ThinkingSphinx::Search.new(:include => :betas).first
+    end
+    
     describe 'query' do
       it "should concatenate arguments with spaces" do
         @client.should_receive(:query) do |query, index, comment|
@@ -276,6 +304,32 @@ describe ThinkingSphinx::Search do
           'foo@bar.com -foo-bar', :star => /[\w@.-]+/u
         ).first
       end
+      
+      it "should ignore multi-field limitations" do
+        @client.should_receive(:query) do |query, index, comment|
+          query.should == '@(foo,bar) *baz*'
+        end
+        
+        ThinkingSphinx::Search.new('@(foo,bar) baz', :star => true).first
+      end
+      
+      it "should ignore multi-field limitations with spaces" do
+        @client.should_receive(:query) do |query, index, comment|
+          query.should == '@(foo bar) *baz*'
+        end
+        
+        ThinkingSphinx::Search.new('@(foo bar) baz', :star => true).first
+      end
+      
+      it "should ignore multi-field limitations in the middle of queries" do
+        @client.should_receive(:query) do |query, index, comment|
+          query.should == '*baz* @foo *bar* @(foo,bar) *baz*'
+        end
+        
+        ThinkingSphinx::Search.new(
+          'baz @foo bar @(foo,bar) baz', :star => true
+        ).first
+      end
     end
     
     describe 'comment' do
@@ -510,31 +564,6 @@ describe ThinkingSphinx::Search do
         filter.attribute.should == 'sphinx_internal_id'
         filter.exclude?.should be_true
       end
-      
-      describe 'in :conditions' do
-        it "should add as filters for known attributes in :conditions option" do
-          ThinkingSphinx::Search.new('general',
-            :conditions => {:word => 'specific', :lat => 1.5},
-            :classes    => [Alpha]
-          ).first
-          
-          filter = @client.filters.last
-          filter.values.should == [1.5]
-          filter.attribute.should == 'lat'
-          filter.exclude?.should be_false        
-        end
-        
-        it "should not add the filter to the query string" do
-          @client.should_receive(:query) do |query, index, comment|
-            query.should == 'general @word specific'
-          end
-          
-          ThinkingSphinx::Search.new('general',
-            :conditions => {:word => 'specific', :lat => 1.5},
-            :classes    => [Alpha]
-          ).first
-        end
-      end
     end
     
     describe 'sort mode' do
@@ -1202,6 +1231,19 @@ describe ThinkingSphinx::Search do
       @search.freeze.should be_a(ThinkingSphinx::Search)
     end
   end
+  
+  describe '#client' do
+    let(:client) { Riddle::Client.new }
+    it "should respect the client in options" do
+      search = ThinkingSphinx::Search.new :client => client
+      search.client.should == client
+    end
+    
+    it "should get a new client from the configuration singleton by default" do
+      ThinkingSphinx::Configuration.instance.stub!(:client => client)
+      ThinkingSphinx::Search.new.client.should == client
+    end
+  end
 end
 
 describe ThinkingSphinx::Search, "playing nice with Search model" do

data/tasks/distribution.rb

@@ -1,6 +1,3 @@
-require 'yard'
-require 'jeweler'
-
 desc 'Generate documentation'
 YARD::Rake::YardocTask.new
 
@@ -28,9 +25,6 @@ Jeweler::Tasks.new do |gem|
     "spec/**/*_spec.rb"
   ]
   
-  gem.add_dependency 'activerecord', '>= 3.0.0.rc'
-  gem.add_dependency 'riddle',       '>= 1.0.12'
-  
   gem.post_install_message = <<-MESSAGE
 If you're upgrading, you should read this:
 http://freelancing-god.github.com/ts/en/upgrading.html

data/tasks/testing.rb

@@ -31,35 +31,45 @@ namespace :features do
   task :postgresql => :check_dependencies
 end
 
-desc "Generate RCov reports"
-RSpec::Core::RakeTask.new(:rcov) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.rcov = true
-  t.rcov_opts = [
-    '--exclude', 'spec',
-    '--exclude', 'gems',
-    '--exclude', 'riddle',
-    '--exclude', 'ruby'
-  ]
-end
-
 namespace :rcov do
+  desc "Generate RCov reports"
+  RSpec::Core::RakeTask.new(:rspec) do |t|
+    t.pattern = 'spec/**/*_spec.rb'
+    t.rcov = true
+    t.rcov_opts = [
+      '--exclude', 'spec',
+      '--exclude', 'gems',
+      '--exclude', 'riddle',
+      '--exclude', 'ruby',
+      '--aggregate coverage.data'
+    ]
+  end
+  
   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}"
       t.rcov = true
       t.rcov_opts = [
         '--exclude', 'spec',
         '--exclude', 'gems',
         '--exclude', 'riddle',
-        '--exclude', 'features'
+        '--exclude', 'features',
+        '--aggregate coverage.data'
       ]
     end
   end
   
   add_task :mysql,      "Run feature-set against MySQL with rcov"
   add_task :postgresql, "Run feature-set against PostgreSQL with rcov"
+  
+  task :all do
+    rm 'coverage.data' if File.exist?('coverage.data')
+    rm 'rerun.txt'     if File.exist?('rerun.txt')
+    
+    Rake::Task['rcov:rspec'].invoke
+    Rake::Task['rcov:mysql'].invoke
+    Rake::Task['rcov:postgresql'].invoke
+  end
 end
 
 desc "Build cucumber.yml file"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 977940591
-  prerelease: true
+  hash: 15
+  prerelease: false
   segments: 
   - 2
   - 0
   - 0
-  - rc2
-  version: 2.0.0.rc2
+  version: 2.0.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -16,42 +15,250 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-23 00:00:00 +08:00
+date: 2010-11-15 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7712042
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
-        - rc
-        version: 3.0.0.rc
-  type: :runtime
-  version_requirements: *id001
+        version: 3.0.0
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: riddle
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: riddle
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 31
         segments: 
         - 1
+        - 2
         - 0
-        - 12
-        version: 1.0.12
-  type: :runtime
-  version_requirements: *id002
+        version: 1.2.0
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: mysql
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: pg
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 9
+        - 0
+        version: 0.9.0
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: jeweler
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: -1876988220
+        segments: 
+        - 1
+        - 5
+        - 0
+        - pre5
+        version: 1.5.0.pre5
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: yard
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec-core
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec-expectations
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rspec-mocks
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: rcov
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 0
+        - 9
+        - 8
+        version: 0.9.8
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: cucumber
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: will_paginate
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 961915916
+        segments: 
+        - 3
+        - 0
+        - pre
+        version: 3.0.pre
+  requirement: *id013
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: ginger
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  requirement: *id014
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: faker
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  requirement: *id015
 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: []
@@ -79,6 +286,7 @@ files:
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
 - lib/thinking_sphinx/auto_version.rb
+- lib/thinking_sphinx/bundled_search.rb
 - lib/thinking_sphinx/class_facet.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/context.rb
@@ -106,6 +314,25 @@ files:
 - lib/thinking_sphinx/test.rb
 - tasks/distribution.rb
 - tasks/testing.rb
+- features/abstract_inheritance.feature
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/deleting_instances.feature
+- features/direct_attributes.feature
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/facets.feature
+- features/facets_across_model.feature
+- features/field_sorting.feature
+- features/handling_edits.feature
+- features/retry_stale_indexes.feature
+- features/searching_across_models.feature
+- features/searching_by_index.feature
+- features/searching_by_model.feature
+- features/searching_with_find_arguments.feature
+- features/sphinx_detection.feature
+- features/sphinx_scopes.feature
 - features/step_definitions/alpha_steps.rb
 - features/step_definitions/beta_steps.rb
 - features/step_definitions/common_steps.rb
@@ -116,8 +343,10 @@ files:
 - features/step_definitions/scope_steps.rb
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sphinx_steps.rb
+- features/sti_searching.feature
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
+- features/thinking_sphinx/database.example.yml
 - features/thinking_sphinx/db/fixtures/alphas.rb
 - features/thinking_sphinx/db/fixtures/authors.rb
 - features/thinking_sphinx/db/fixtures/betas.rb
@@ -154,6 +383,7 @@ files:
 - features/thinking_sphinx/db/migrations/create_taggings.rb
 - features/thinking_sphinx/db/migrations/create_tags.rb
 - features/thinking_sphinx/models/alpha.rb
+- features/thinking_sphinx/models/andrew.rb
 - features/thinking_sphinx/models/animal.rb
 - features/thinking_sphinx/models/author.rb
 - features/thinking_sphinx/models/beta.rb
@@ -174,30 +404,11 @@ files:
 - features/thinking_sphinx/models/robot.rb
 - features/thinking_sphinx/models/tag.rb
 - features/thinking_sphinx/models/tagging.rb
-- features/abstract_inheritance.feature
-- features/alternate_primary_key.feature
-- features/attribute_transformation.feature
-- features/attribute_updates.feature
-- features/deleting_instances.feature
-- features/direct_attributes.feature
-- features/excerpts.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_index.feature
-- features/searching_by_model.feature
-- features/searching_with_find_arguments.feature
-- features/sphinx_detection.feature
-- features/sphinx_scopes.feature
-- features/sti_searching.feature
-- features/thinking_sphinx/database.example.yml
 - spec/thinking_sphinx/active_record/delta_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_spec.rb
+- spec/thinking_sphinx/adapters/abstract_adapter_spec.rb
 - spec/thinking_sphinx/association_spec.rb
 - spec/thinking_sphinx/attribute_spec.rb
 - spec/thinking_sphinx/auto_version_spec.rb
@@ -225,8 +436,8 @@ post_install_message: |+
   If you're upgrading, you should read this:
   http://freelancing-god.github.com/ts/en/upgrading.html
   
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -241,14 +452,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -257,6 +466,25 @@ signing_key:
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
 test_files: 
+- features/abstract_inheritance.feature
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/deleting_instances.feature
+- features/direct_attributes.feature
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/facets.feature
+- features/facets_across_model.feature
+- features/field_sorting.feature
+- features/handling_edits.feature
+- features/retry_stale_indexes.feature
+- features/searching_across_models.feature
+- features/searching_by_index.feature
+- features/searching_by_model.feature
+- features/searching_with_find_arguments.feature
+- features/sphinx_detection.feature
+- features/sphinx_scopes.feature
 - features/step_definitions/alpha_steps.rb
 - features/step_definitions/beta_steps.rb
 - features/step_definitions/common_steps.rb
@@ -267,8 +495,10 @@ test_files:
 - features/step_definitions/scope_steps.rb
 - features/step_definitions/search_steps.rb
 - features/step_definitions/sphinx_steps.rb
+- features/sti_searching.feature
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
+- features/thinking_sphinx/database.example.yml
 - features/thinking_sphinx/db/fixtures/alphas.rb
 - features/thinking_sphinx/db/fixtures/authors.rb
 - features/thinking_sphinx/db/fixtures/betas.rb
@@ -305,6 +535,7 @@ test_files:
 - features/thinking_sphinx/db/migrations/create_taggings.rb
 - features/thinking_sphinx/db/migrations/create_tags.rb
 - features/thinking_sphinx/models/alpha.rb
+- features/thinking_sphinx/models/andrew.rb
 - features/thinking_sphinx/models/animal.rb
 - features/thinking_sphinx/models/author.rb
 - features/thinking_sphinx/models/beta.rb
@@ -325,30 +556,11 @@ test_files:
 - features/thinking_sphinx/models/robot.rb
 - features/thinking_sphinx/models/tag.rb
 - features/thinking_sphinx/models/tagging.rb
-- features/abstract_inheritance.feature
-- features/alternate_primary_key.feature
-- features/attribute_transformation.feature
-- features/attribute_updates.feature
-- features/deleting_instances.feature
-- features/direct_attributes.feature
-- features/excerpts.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_index.feature
-- features/searching_by_model.feature
-- features/searching_with_find_arguments.feature
-- features/sphinx_detection.feature
-- features/sphinx_scopes.feature
-- features/sti_searching.feature
-- features/thinking_sphinx/database.example.yml
 - spec/thinking_sphinx/active_record/delta_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_spec.rb
+- spec/thinking_sphinx/adapters/abstract_adapter_spec.rb
 - spec/thinking_sphinx/association_spec.rb
 - spec/thinking_sphinx/attribute_spec.rb
 - spec/thinking_sphinx/auto_version_spec.rb