thinking-sphinx 1.3.16 → 1.3.17

data/README.textile

@@ -159,3 +159,7 @@ Since I first released this library, there's been quite a few people who have su
 * Dimitri Krassovski
 * Sergey Kojin
 * Brad Sumersford
+* Amir Yalon
+* Edgars Beigarts
+* Ivan Ukhov
+* Tomáš Pospíšek

data/VERSION

@@ -1 +1 @@
-1.3.16
+1.3.17

data/features/thinking_sphinx/database.yml

@@ -0,0 +1,4 @@
+username: root
+host: localhost
+pool: 1
+min_messages: warning

data/features/{support → thinking_sphinx}/db/fixtures/comments.rb

@@ -4,7 +4,7 @@ Comment.create(
   :content      => "+1",
   :post_id      => 1,
   :category_id  => 1
-).update_attribute(:created_at, Time.utc(2001, 01, 01))
+).update_attribute(:created_at, Time.utc(2001, 01, 01).getlocal)
 
 Comment.create(
   :name         => "Menno",

data/features/{support → thinking_sphinx}/db/fixtures/developers.rb

@@ -1,3 +1,5 @@
+require 'faker'
+
 Developer.create :name => "Pat Allan", :city => "Melbourne", :state => "Victoria", :country => "Australia", :age => 26
 
 2.times do

data/features/{support → thinking_sphinx}/db/migrations/create_developers.rb

@@ -1,5 +1,3 @@
-require 'faker'
-
 ActiveRecord::Base.connection.create_table :developers, :force => true do |t|
   t.column :name,     :string,  :null => false
   t.column :city,     :string

data/features/{support → thinking_sphinx}/models/developer.rb

@@ -1,5 +1,5 @@
-require 'features/support/models/tag'
-require 'features/support/models/tagging'
+require 'features/thinking_sphinx/models/tag'
+require 'features/thinking_sphinx/models/tagging'
 
 class Developer < ActiveRecord::Base
   has_many :taggings, :as => :taggable

data/features/{support → thinking_sphinx}/models/extensible_beta.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "lib", "generic_delta_handler")
+require 'features/support/lib/generic_delta_handler'
 
 class ExtensibleBeta < ActiveRecord::Base
   define_index do

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -10,10 +10,10 @@ module Cucumber
       
       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"
+        @migrations_directory = "features/thinking_sphinx/db/migrations"
+        @models_directory     = "features/thinking_sphinx/models"
+        @fixtures_directory   = "features/thinking_sphinx/db/fixtures"
+        @database_file        = "features/thinking_sphinx/database.yml"
         
         @adapter  = ENV['DATABASE'] || 'mysql'
         @database = 'thinking_sphinx'

data/lib/thinking_sphinx.rb

@@ -70,7 +70,7 @@ module ThinkingSphinx
     if @@context.nil?
       @@sphinx_mutex.synchronize do
         if @@context.nil?
-          @@context = ThinkingSphinx::Context.new
+          set_context
           @@context.prepare
         end
       end
@@ -78,12 +78,22 @@ module ThinkingSphinx
     
     @@context
   end
+  
+  def self.set_context(*classes)    
+    @@context = ThinkingSphinx::Context.new(*classes)
+  end
 
   def self.reset_context!
     @@sphinx_mutex.synchronize do
       @@context = nil
     end
   end
+  
+  def self.indexed_models=(classes = [])
+    @@sphinx_mutex.synchronize do
+      set_context *classes
+    end
+  end
 
   def self.unique_id_expression(offset = nil)
     "* #{context.indexed_models.size} + #{offset || 0}"

data/lib/thinking_sphinx/active_record.rb

@@ -154,9 +154,7 @@ module ThinkingSphinx
         end
         
         self.sphinx_index_blocks << lambda {
-          index = ThinkingSphinx::Index::Builder.generate self, name, &block
-          add_sphinx_callbacks_and_extend(index.delta?)
-          add_sphinx_index index
+          add_sphinx_index name, &block
         }
         
         include ThinkingSphinx::ActiveRecord::Scopes
@@ -188,9 +186,18 @@ module ThinkingSphinx
         end
       end
       
-      def add_sphinx_index(index)
+      def add_sphinx_index(name, &block)
+        index = ThinkingSphinx::Index::Builder.generate self, name, &block
+
+        unless sphinx_indexes.any? { |i| i.name == index.name }
+          add_sphinx_callbacks_and_extend(index.delta?)
+          insert_sphinx_index index
+        end
+      end
+      
+      def insert_sphinx_index(index)
         self.sphinx_indexes << index
-        subclasses.each { |klass| klass.add_sphinx_index(index) }
+        subclasses.each { |klass| klass.insert_sphinx_index(index) }
       end
       
       def has_sphinx_indexes?

data/lib/thinking_sphinx/context.rb

@@ -1,8 +1,11 @@
 class ThinkingSphinx::Context
   attr_reader :indexed_models
   
-  def initialize
+  def initialize(*models)
     @indexed_models = []
+    models.each do |model|
+      add_indexed_model model
+    end
   end
   
   def prepare
@@ -47,12 +50,12 @@ class ThinkingSphinx::Context
     ThinkingSphinx::Configuration.instance.model_directories.each do |base|
       Dir["#{base}**/*.rb"].each do |file|
         model_name = file.gsub(/^#{base}([\w_\/\\]+)\.rb/, '\1')
-      
+        
         next if model_name.nil?
         next if ::ActiveRecord::Base.send(:subclasses).detect { |model|
-          model.name == model_name
+          model.name == model_name.camelize
         }
-      
+        
         begin
           model_name.camelize.constantize
         rescue LoadError

data/lib/thinking_sphinx/deltas/default_delta.rb

@@ -44,7 +44,7 @@ module ThinkingSphinx
         config = ThinkingSphinx::Configuration.instance
         rotate = ThinkingSphinx.sphinx_running? ? "--rotate" : ""
         
-        output = `#{config.bin_path}#{config.indexer_binary_name} --config #{config.config_file} #{rotate} #{model.delta_index_names.join(' ')}`
+        output = `#{config.bin_path}#{config.indexer_binary_name} --config '#{config.config_file}' #{rotate} #{model.delta_index_names.join(' ')}`
         puts(output) unless ThinkingSphinx.suppress_delta_output?
       end
       

data/lib/thinking_sphinx/index/builder.rb

@@ -119,13 +119,13 @@ module ThinkingSphinx
       # database.
       # 
       # Attributes are limited to the following types: integers, floats,
-      # datetimes (converted to timestamps), booleans and strings. Don't
-      # forget that Sphinx converts string attributes to integers, which are
-      # useful for sorting, but that's about it.
+      # datetimes (converted to timestamps), booleans, strings and MVAs
+      # (:multi). Don't forget that Sphinx converts string attributes to
+      # integers, which are useful for sorting, but that's about it.
       # 
-      # You can also have a collection of integers for multi-value attributes
-      # (MVAs). Generally these would be through a has_many relationship,
-      # like in this example:
+      # Collection of integers are known as multi-value attributes (MVAs).
+      # Generally these would be through a has_many relationship, like in this
+      # example:
       # 
       #   has posts(:id), :as => :post_ids
       # 

data/lib/thinking_sphinx/index/faux_column.rb

@@ -50,6 +50,10 @@ module ThinkingSphinx
         @name.is_a?(String) && @stack.empty?
       end
       
+      def to_ary
+        [self]
+      end
+      
       # This handles any 'invalid' method calls and sets them as the name,
       # and pushing the previous name into the stack. The object returns
       # itself.

data/lib/thinking_sphinx/search.rb

@@ -210,7 +210,9 @@ module ThinkingSphinx
       return options[:index] if options[:index]
       return '*' if classes.empty?
       
-      classes.collect { |klass| klass.sphinx_index_names }.flatten.join(',')
+      classes.collect { |klass|
+        klass.sphinx_index_names
+      }.flatten.uniq.join(',')
     end
     
     def each_with_groupby_and_count(&block)

data/lib/thinking_sphinx/source/internal_properties.rb

@@ -5,7 +5,6 @@ module ThinkingSphinx
         add_internal_attribute :sphinx_internal_id, nil,
           @model.primary_key_for_sphinx.to_sym
         add_internal_attribute :class_crc,          :integer, crc_column, true
-        add_internal_attribute :subclass_crcs,      :multi,   subclasses_to_s
         add_internal_attribute :sphinx_deleted,     :integer, "0"
 
         add_internal_facet :class_crc

data/spec/thinking_sphinx/active_record/delta_spec.rb

@@ -106,7 +106,7 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
     
     it "should call indexer for the delta index" do
       Person.sphinx_indexes.first.delta_object.should_receive(:`).with(
-        "#{ThinkingSphinx::Configuration.instance.bin_path}indexer --config #{ThinkingSphinx::Configuration.instance.config_file} --rotate person_delta"
+        "#{ThinkingSphinx::Configuration.instance.bin_path}indexer --config '#{ThinkingSphinx::Configuration.instance.config_file}' --rotate person_delta"
       )
       
       @person.send(:index_delta)

data/spec/thinking_sphinx/active_record_spec.rb

@@ -149,7 +149,7 @@ describe ThinkingSphinx::ActiveRecord do
         Beta.should_receive(:before_save).with(:toggle_delta).once
 
         Beta.define_index { indexes :name }
-        Beta.define_index {
+        Beta.define_index('foo') {
           indexes :name
           set_property :delta => true
         }
@@ -193,7 +193,7 @@ describe ThinkingSphinx::ActiveRecord do
         Beta.should_receive(:after_commit).with(:index_delta).once
 
         Beta.define_index { indexes :name }
-        Beta.define_index {
+        Beta.define_index('foo') {
           indexes :name
           set_property :delta => true
         }
@@ -541,11 +541,9 @@ describe ThinkingSphinx::ActiveRecord do
   
   describe '.core_index_names' do
     it "should return each index's core name" do
-      Alpha.define_index { indexes :name }
-      Alpha.define_index { indexes :name }
+      Alpha.define_index('foo') { indexes :name }
+      Alpha.define_index('bar') { indexes :name }
       Alpha.define_indexes
-      Alpha.sphinx_indexes.first.name = 'foo'
-      Alpha.sphinx_indexes.last.name = 'bar'
       
       Alpha.core_index_names.should == ['foo_core', 'bar_core']
     end
@@ -553,12 +551,10 @@ describe ThinkingSphinx::ActiveRecord do
   
   describe '.delta_index_names' do
     it "should return index delta names, for indexes with deltas enabled" do
-      Alpha.define_index { indexes :name }
-      Alpha.define_index { indexes :name }
+      Alpha.define_index('foo') { indexes :name }
+      Alpha.define_index('bar') { indexes :name }
       Alpha.define_indexes
-      Alpha.sphinx_indexes.first.name = 'foo'
       Alpha.sphinx_indexes.first.delta_object = stub('delta')
-      Alpha.sphinx_indexes.last.name = 'bar'
       
       Alpha.delta_index_names.should == ['foo_delta']
     end

data/spec/thinking_sphinx/index/builder_spec.rb

@@ -31,10 +31,10 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields[1].unique_name.should == :last_name
     end
     
-    it "should have two attributes alongside the four internal ones" do
-      @source.attributes.length.should == 6
-      @source.attributes[4].unique_name.should == :birthday
-      @source.attributes[5].unique_name.should == :internal_id
+    it "should have two attributes alongside the three internal ones" do
+      @source.attributes.length.should == 5
+      @source.attributes[3].unique_name.should == :birthday
+      @source.attributes[4].unique_name.should == :internal_id
     end
     
     it "should have one condition" do
@@ -95,8 +95,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
     
     it "should set the attribute name to have the _sort suffix" do
@@ -126,8 +126,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
     
     it "should set the attribute name to have the _facet suffix" do
@@ -158,8 +158,8 @@ describe ThinkingSphinx::Index::Builder do
       Alpha.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
   
@@ -177,8 +177,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
   
@@ -196,8 +196,8 @@ describe ThinkingSphinx::Index::Builder do
       Beta.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
   
@@ -215,8 +215,8 @@ describe ThinkingSphinx::Index::Builder do
       Alpha.sphinx_facets.delete_at(-1)
     end
     
-    it "should have just one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have just one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
   end
   
@@ -234,8 +234,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have two attributes alongside the four internal ones" do
-      @source.attributes.length.should == 6
+    it "should have two attributes alongside the three internal ones" do
+      @source.attributes.length.should == 5
     end
     
     it "should set the facet attribute name to have the _facet suffix" do
@@ -266,8 +266,8 @@ describe ThinkingSphinx::Index::Builder do
       Person.sphinx_facets.delete_at(-1)
     end
     
-    it "should have two attributes alongside the four internal ones" do
-      @source.attributes.length.should == 6
+    it "should have two attributes alongside the three internal ones" do
+      @source.attributes.length.should == 5
     end
     
     it "should set the facet attribute name to have the _facet suffix" do
@@ -305,8 +305,8 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields.length.should == 1
     end
     
-    it "should have one attribute alongside the four internal ones" do
-      @source.attributes.length.should == 5
+    it "should have one attribute alongside the three internal ones" do
+      @source.attributes.length.should == 4
     end
     
     it "should set the attribute name to have the _facet suffix" do
@@ -365,10 +365,10 @@ describe ThinkingSphinx::Index::Builder do
       @source.fields[1].unique_name.should == :last_name
     end
     
-    it "should have two attributes alongside the four internal ones" do
-      @source.attributes.length.should == 6
-      @source.attributes[4].unique_name.should == :birthday
-      @source.attributes[5].unique_name.should == :internal_id
+    it "should have two attributes alongside the three internal ones" do
+      @source.attributes.length.should == 5
+      @source.attributes[3].unique_name.should == :birthday
+      @source.attributes[4].unique_name.should == :internal_id
     end
   end
   
@@ -401,13 +401,13 @@ describe ThinkingSphinx::Index::Builder do
       end
     end
     
-    it "should have two attributes alongside the eight internal ones" do
-      @index.attributes.length.should == 10
+    it "should have two attributes alongside the six internal ones" do
+      @index.attributes.length.should == 8
     end
     
-    it "should have one attribute in each source alongside the four internal ones" do
+    it "should have one attribute in each source alongside the three internal ones" do
       @index.sources.each do |source|
-        source.attributes.length.should == 5
+        source.attributes.length.should == 4
       end
     end
   end

data/spec/thinking_sphinx/index/faux_column_spec.rb

@@ -27,4 +27,10 @@ describe ThinkingSphinx::Index::FauxColumn do
       ]
     end
   end
-end
+  
+  describe '#to_ary' do
+    it "should return an array with the instance inside it" do
+      subject.to_ary.should == [subject]
+    end
+  end
+end

data/spec/thinking_sphinx_spec.rb

@@ -16,6 +16,22 @@ describe ThinkingSphinx do
     end
   end
   
+  describe '.set_context' do
+    before :each do
+      ThinkingSphinx.reset_context!
+    end
+    
+    it "should set the context instance" do
+      ThinkingSphinx.set_context
+      ThinkingSphinx.context.should be_a(ThinkingSphinx::Context)
+    end
+    
+    it "should pass through any given arguments to the initialiser" do
+      ThinkingSphinx::Context.should_receive(:new).with(Alpha, Beta)
+      ThinkingSphinx.set_context Alpha, Beta
+    end
+  end
+  
   describe '.reset_context!' do
     it "should remove the existing Context instance" do
       existing = ThinkingSphinx.context
@@ -27,6 +43,17 @@ describe ThinkingSphinx do
     end
   end
   
+  describe '.indexed_models=' do
+    before :each do
+      ThinkingSphinx.reset_context!
+    end
+    
+    it "should set the indexed models for the context" do
+      ThinkingSphinx.indexed_models = [Alpha, Beta]
+      ThinkingSphinx.context.indexed_models.should == ['Alpha', 'Beta']
+    end
+  end
+  
   describe '.define_indexes?' do
     it "should define indexes by default" do
       ThinkingSphinx.define_indexes?.should be_true

data/tasks/distribution.rb

@@ -31,6 +31,13 @@ Jeweler::Tasks.new do |gem|
   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

@@ -7,6 +7,7 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts << "-c"
 end
+task :spec => :check_dependencies
 
 desc "Run all feature-set configurations"
 task :features do |t|
@@ -26,6 +27,9 @@ namespace :features do
   
   add_task :mysql,      "Run feature-set against MySQL"
   add_task :postgresql, "Run feature-set against PostgreSQL"
+  
+  task :mysql      => :check_dependencies
+  task :postgresql => :check_dependencies
 end
 
 desc "Generate RCov reports"

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.3.16
+  prerelease: false
+  segments: 
+  - 1
+  - 3
+  - 17
+  version: 1.3.17
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,39 +14,131 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-16 00:00:00 +11:00
+date: 2010-06-05 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 15
+        - 6
         version: 1.15.6
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: riddle
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 10
         version: 1.0.10
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: after_commit
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 6
         version: 1.0.6
-    version: 
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
+        version: 1.2.9
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: will_paginate
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        - 11
+        version: 2.3.11
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: ginger
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 0
+        version: 1.2.0
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: faker
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 1
+        version: 0.3.1
+  type: :development
+  version_requirements: *id009
 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: []
@@ -113,18 +210,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
@@ -158,66 +257,66 @@ 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/database.yml
-- features/support/db/fixtures/alphas.rb
-- features/support/db/fixtures/authors.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/developers.rb
-- features/support/db/fixtures/dogs.rb
-- features/support/db/fixtures/extensible_betas.rb
-- features/support/db/fixtures/foxes.rb
-- features/support/db/fixtures/gammas.rb
-- features/support/db/fixtures/music.rb
-- features/support/db/fixtures/people.rb
-- features/support/db/fixtures/posts.rb
-- features/support/db/fixtures/robots.rb
-- features/support/db/fixtures/tags.rb
-- features/support/db/migrations/create_alphas.rb
-- features/support/db/migrations/create_animals.rb
-- features/support/db/migrations/create_authors.rb
-- features/support/db/migrations/create_authors_posts.rb
-- features/support/db/migrations/create_betas.rb
-- 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_developers.rb
-- features/support/db/migrations/create_extensible_betas.rb
-- features/support/db/migrations/create_gammas.rb
-- features/support/db/migrations/create_genres.rb
-- features/support/db/migrations/create_music.rb
-- features/support/db/migrations/create_people.rb
-- features/support/db/migrations/create_posts.rb
-- features/support/db/migrations/create_robots.rb
-- features/support/db/migrations/create_taggings.rb
-- features/support/db/migrations/create_tags.rb
 - features/support/env.rb
 - features/support/lib/generic_delta_handler.rb
-- features/support/models/alpha.rb
-- features/support/models/animal.rb
-- features/support/models/author.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/developer.rb
-- features/support/models/dog.rb
-- features/support/models/extensible_beta.rb
-- features/support/models/fox.rb
-- features/support/models/gamma.rb
-- features/support/models/genre.rb
-- features/support/models/medium.rb
-- features/support/models/music.rb
-- features/support/models/person.rb
-- features/support/models/post.rb
-- features/support/models/robot.rb
-- features/support/models/tag.rb
-- features/support/models/tagging.rb
+- features/thinking_sphinx/database.example.yml
+- features/thinking_sphinx/database.yml
+- features/thinking_sphinx/db/fixtures/alphas.rb
+- features/thinking_sphinx/db/fixtures/authors.rb
+- features/thinking_sphinx/db/fixtures/betas.rb
+- features/thinking_sphinx/db/fixtures/boxes.rb
+- features/thinking_sphinx/db/fixtures/categories.rb
+- features/thinking_sphinx/db/fixtures/cats.rb
+- features/thinking_sphinx/db/fixtures/comments.rb
+- features/thinking_sphinx/db/fixtures/developers.rb
+- features/thinking_sphinx/db/fixtures/dogs.rb
+- features/thinking_sphinx/db/fixtures/extensible_betas.rb
+- features/thinking_sphinx/db/fixtures/foxes.rb
+- features/thinking_sphinx/db/fixtures/gammas.rb
+- features/thinking_sphinx/db/fixtures/music.rb
+- features/thinking_sphinx/db/fixtures/people.rb
+- features/thinking_sphinx/db/fixtures/posts.rb
+- features/thinking_sphinx/db/fixtures/robots.rb
+- features/thinking_sphinx/db/fixtures/tags.rb
+- features/thinking_sphinx/db/migrations/create_alphas.rb
+- features/thinking_sphinx/db/migrations/create_animals.rb
+- features/thinking_sphinx/db/migrations/create_authors.rb
+- features/thinking_sphinx/db/migrations/create_authors_posts.rb
+- features/thinking_sphinx/db/migrations/create_betas.rb
+- features/thinking_sphinx/db/migrations/create_boxes.rb
+- features/thinking_sphinx/db/migrations/create_categories.rb
+- features/thinking_sphinx/db/migrations/create_comments.rb
+- features/thinking_sphinx/db/migrations/create_developers.rb
+- features/thinking_sphinx/db/migrations/create_extensible_betas.rb
+- features/thinking_sphinx/db/migrations/create_gammas.rb
+- features/thinking_sphinx/db/migrations/create_genres.rb
+- features/thinking_sphinx/db/migrations/create_music.rb
+- features/thinking_sphinx/db/migrations/create_people.rb
+- features/thinking_sphinx/db/migrations/create_posts.rb
+- features/thinking_sphinx/db/migrations/create_robots.rb
+- 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/animal.rb
+- features/thinking_sphinx/models/author.rb
+- features/thinking_sphinx/models/beta.rb
+- features/thinking_sphinx/models/box.rb
+- features/thinking_sphinx/models/cat.rb
+- features/thinking_sphinx/models/category.rb
+- features/thinking_sphinx/models/comment.rb
+- features/thinking_sphinx/models/developer.rb
+- features/thinking_sphinx/models/dog.rb
+- features/thinking_sphinx/models/extensible_beta.rb
+- features/thinking_sphinx/models/fox.rb
+- features/thinking_sphinx/models/gamma.rb
+- features/thinking_sphinx/models/genre.rb
+- features/thinking_sphinx/models/medium.rb
+- features/thinking_sphinx/models/music.rb
+- features/thinking_sphinx/models/person.rb
+- features/thinking_sphinx/models/post.rb
+- features/thinking_sphinx/models/robot.rb
+- features/thinking_sphinx/models/tag.rb
+- features/thinking_sphinx/models/tagging.rb
 - 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

data/features/support/database.yml

@@ -1,5 +0,0 @@
-username: thinking_sphinx
-host: localhost
-password: thinking_sphinx
-pool: 1
-min_messages: warning