thinking-sphinx 1.3.20 → 1.4.0

data/lib/thinking_sphinx/tasks.rb

@@ -1,4 +1,5 @@
 require 'fileutils'
+require 'timeout'
 
 namespace :thinking_sphinx do
   task :app_env do
@@ -52,6 +53,12 @@ namespace :thinking_sphinx do
       config = ThinkingSphinx::Configuration.instance
       pid    = sphinx_pid
       config.controller.stop
+      
+      # Ensure searchd is stopped, but don't try too hard
+      Timeout.timeout(5) do
+        sleep(1) until config.controller.stop
+      end
+      
       puts "Stopped search daemon (pid #{pid})."
     end
   end

data/spec/thinking_sphinx/active_record/has_many_association_spec.rb

@@ -63,6 +63,7 @@ describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
     it "should add a filter for the attribute in a sphinx scope call" do
       Friendship.should_receive(:search).with do |options|
         options[:with][:person_id].should == @person.id
+        Friendship
       end
       
       @person.friendships.reverse

data/spec/thinking_sphinx/active_record/scopes_spec.rb

@@ -87,10 +87,9 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       search.by_foo('foo').search.options[:conditions].should == {:foo => 'foo', :name => 'foo'}
     end
 
-    # FIXME: Probably the other way around is more logical? How to do this?
-    it "should apply the default scope options after other scope options to the underlying search object" do
+    it "should apply the default scope options before other scope options to the underlying search object" do
       search = ThinkingSphinx::Search.new(:classes => [Alpha])
-      search.by_name('bar').search.options[:conditions].should == {:name => 'foo'}
+      search.by_name('bar').search.options[:conditions].should == {:name => 'bar'}
     end
   end
 

data/spec/thinking_sphinx/adapters/abstract_adapter_spec.rb

@@ -0,0 +1,134 @@
+require 'spec_helper'
+
+describe ThinkingSphinx::AbstractAdapter do
+  describe '.detect' do
+    let(:model) { stub('model') }
+    
+    it "returns a MysqlAdapter object for :mysql" do
+      ThinkingSphinx::AbstractAdapter.stub(:adapter_for_model => :mysql)
+      
+      adapter = ThinkingSphinx::AbstractAdapter.detect(model)
+      adapter.should be_a(ThinkingSphinx::MysqlAdapter)
+    end
+    
+    it "returns a PostgreSQLAdapter object for :postgresql" do
+      ThinkingSphinx::AbstractAdapter.stub(:adapter_for_model => :postgresql)
+      
+      adapter = ThinkingSphinx::AbstractAdapter.detect(model)
+      adapter.should be_a(ThinkingSphinx::PostgreSQLAdapter)
+    end
+    
+    it "raises an exception for other responses" do
+      ThinkingSphinx::AbstractAdapter.stub(:adapter_for_model => :sqlite)
+      
+      lambda {
+        ThinkingSphinx::AbstractAdapter.detect(model)
+      }.should raise_error
+    end
+  end
+  
+  describe '.adapter_for_model' do
+    let(:model) { stub('model') }
+    
+    after :each do
+      ThinkingSphinx.database_adapter = nil
+    end
+    
+    it "translates strings to symbols" do
+      ThinkingSphinx.database_adapter = 'foo'
+      
+      ThinkingSphinx::AbstractAdapter.adapter_for_model(model).should == :foo
+    end
+    
+    it "passes through symbols unchanged" do
+      ThinkingSphinx.database_adapter = :bar
+      
+      ThinkingSphinx::AbstractAdapter.adapter_for_model(model).should == :bar
+    end
+    
+    it "returns standard_adapter_for_model if database_adapter is not set" do
+      ThinkingSphinx.database_adapter = nil
+      ThinkingSphinx::AbstractAdapter.stub!(:standard_adapter_for_model => :baz)
+      
+      ThinkingSphinx::AbstractAdapter.adapter_for_model(model).should == :baz
+    end
+    
+    it "calls the lambda and returns it if one is provided" do
+      ThinkingSphinx.database_adapter = lambda { |model| :foo }
+      
+      ThinkingSphinx::AbstractAdapter.adapter_for_model(model).should == :foo
+    end
+  end
+  
+  describe '.standard_adapter_for_model' do
+    let(:klass)      { stub('connection class') }
+    let(:connection) { stub('connection', :class => klass) }
+    let(:model)      { stub('model', :connection => connection) }
+    
+    it "translates a normal MySQL adapter" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::MysqlAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a MySQL plus adapter" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::MysqlplusAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a MySQL2 adapter" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::Mysql2Adapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a NullDB adapter to MySQL" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::NullDBAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a normal PostgreSQL adapter" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :postgresql
+    end
+    
+    it "translates a JDBC MySQL adapter to MySQL" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::JdbcAdapter')
+      connection.stub(:config => {:adapter => 'jdbcmysql'})
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+    
+    it "translates a JDBC PostgreSQL adapter to PostgreSQL" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::JdbcAdapter')
+      connection.stub(:config => {:adapter => 'jdbcpostgresql'})
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :postgresql
+    end
+    
+    it "returns other JDBC adapters without translation" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::JdbcAdapter')
+      connection.stub(:config => {:adapter => 'jdbcmssql'})
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == 'jdbcmssql'
+    end
+    
+    it "returns other unknown adapters without translation" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::FooAdapter')
+      
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == 'ActiveRecord::ConnectionAdapters::FooAdapter'
+    end
+  end
+end

data/spec/thinking_sphinx/configuration_spec.rb

@@ -118,6 +118,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
 
@@ -235,6 +237,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
@@ -252,6 +255,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
 
@@ -29,17 +26,6 @@ Jeweler::Tasks.new do |gem|
     "spec/**/*_spec.rb"
   ]
   
-  gem.add_dependency 'activerecord', '>= 1.15.6', '< 3.0.0'
-  gem.add_dependency 'riddle',       '>= 1.0.10'
-  gem.add_dependency 'after_commit', '>= 1.0.6'
-  
-  gem.add_development_dependency "yard",          ">= 0"
-  gem.add_development_dependency "rspec",         ">= 1.2.9"
-  gem.add_development_dependency "cucumber",      ">= 0"
-  gem.add_development_dependency "will_paginate", "2.3.11"
-  gem.add_development_dependency "ginger",        "1.2.0"
-  gem.add_development_dependency "faker",         "0.3.1"
-  
   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

@@ -1,13 +1,12 @@
 require 'rubygems'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 desc "Run the specs under spec"
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts << "-c"
+RSpec::Core::RakeTask.new do |t|
+  t.pattern = 'spec/**/*_spec.rb'
 end
-# task :spec => :check_dependencies
+task :spec => :check_dependencies
 
 desc "Run all feature-set configurations"
 task :features do |t|
@@ -32,36 +31,45 @@ namespace :features do
   task :postgresql => :check_dependencies
 end
 
-desc "Generate RCov reports"
-Spec::Rake::SpecTask.new(:rcov) do |t|
-  t.libs << 'lib'
-  t.spec_files = FileList['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,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 20
-  version: 1.3.20
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -14,17 +15,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +09: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: 39
         segments: 
         - 1
         - 15
@@ -32,129 +35,254 @@ dependencies:
         version: 1.15.6
     - - <
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
-  type: :runtime
-  version_requirements: *id001
+  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: 31
         segments: 
         - 1
+        - 2
         - 0
-        - 10
-        version: 1.0.10
-  type: :runtime
-  version_requirements: *id002
+        version: 1.2.0
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: after_commit
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: after_commit
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 1
         - 0
-        - 6
-        version: 1.0.6
-  type: :runtime
-  version_requirements: *id003
+        - 7
+        version: 1.0.7
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: yard
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: mysql
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 45
+        segments: 
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: pg
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 0
+        version: 0.9.0
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  name: jeweler
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: -1876988220
+        segments: 
+        - 1
+        - 5
+        - 0
+        - pre5
+        version: 1.5.0.pre5
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  name: yard
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 0
+        - 6
+        - 1
+        version: 0.6.1
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
   name: rspec
+  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
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rspec-core
+  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-expectations
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
         - 2
-        - 9
-        version: 1.2.9
+        - 0
+        - 1
+        version: 2.0.1
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  name: rspec-mocks
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 2
+        - 0
+        - 1
+        version: 2.0.1
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: rcov
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
+        hash: 43
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 8
+        version: 0.9.8
+  requirement: *id012
+- !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  name: cucumber
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 9
+        - 4
+        version: 0.9.4
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: will_paginate
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
         segments: 
         - 2
         - 3
-        - 11
-        version: 2.3.11
-  type: :development
-  version_requirements: *id007
+        - 15
+        version: 2.3.15
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
-  name: ginger
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: ginger
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 2
         - 0
         version: 1.2.0
-  type: :development
-  version_requirements: *id008
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
-  name: faker
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: faker
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 3
         - 1
         version: 0.3.1
-  type: :development
-  version_requirements: *id009
+  requirement: *id016
 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: []
@@ -212,6 +340,25 @@ files:
 - tasks/distribution.rb
 - tasks/rails.rake
 - 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
@@ -222,8 +369,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
@@ -260,6 +409,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
@@ -280,30 +430,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
@@ -332,8 +463,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 
@@ -341,6 +472,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -349,6 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -360,6 +493,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
@@ -370,8 +522,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
@@ -408,6 +562,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
@@ -428,30 +583,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