thinking-sphinx 1.4.14 → 1.5.0

data/features/attribute_updates.feature

@@ -2,13 +2,13 @@ Feature: Update attributes directly to Sphinx
   In order for updates to be more seamless
   The plugin
   Should update Sphinx's attributes where possible
-  
+
   Scenario: Updating attributes in Sphinx without delta indexes
     Given Sphinx is running
     And I am searching on alphas
     When I filter by 3 on value
     Then I should get 1 result
-    
+
     When I change the value of alpha four to 13
     And I wait for Sphinx to catch up
     And I filter by 13 on value
@@ -16,7 +16,7 @@ Feature: Update attributes directly to Sphinx
     Then I should get 1 result
     When I use index alternative_core
     Then I should get 1 result
-    
+
     When I change the value of alpha four to 4
     And I wait for Sphinx to catch up
     And I filter by 13 on value
@@ -30,47 +30,49 @@ Feature: Update attributes directly to Sphinx
     And I am searching on betas
     When I filter by 8 on value
     Then I should get 1 result
-    
+
     When I change the value of beta eight to 18
     And I wait for Sphinx to catch up
     And I filter by 18 on value
     Then I should get 1 result
-    
+
     When I search for the document id of beta eight in the secondary_beta_delta index
     Then it should not exist
-  
+
   Scenario: Updating attributes in a delta index
     Given Sphinx is running
     And I am searching on betas
-    
+
     When I change the name of beta nine to nineteen
     And I change the value of beta nineteen to 19
     And I wait for Sphinx to catch up
-    
+
     When I filter by 19 on value
     And I use index secondary_beta_delta
+    And I clear the connection pool
     Then I should get 1 result
-    
+
   Scenario: Updating attributes in a delta index with deltas disabled
     Given Sphinx is running
     And I am searching on betas
-  
+
     When I change the name of beta eleven to twentyone
     And I disable delta updates
     And I change the value of beta twentyone to 21
     And I wait for Sphinx to catch up
-  
+    And I clear the connection pool
+
     When I filter by 21 on value
     And I use index secondary_beta_delta
     Then I should get 1 result
     And I enable delta updates
-  
+
   Scenario: Updating boolean attribute in Sphinx
     Given Sphinx is running
     And I am searching on alphas
     When I filter by active alphas
     Then I should get 10 results
-    
+
     When I flag alpha five as inactive
     And I wait for Sphinx to catch up
     And I filter by active alphas

data/features/deleting_instances.feature

@@ -2,50 +2,52 @@ Feature: Keeping Sphinx in line with deleted model instances
   In order to avoid deleted items being returned by Sphinx
   Thinking Sphinx
   Should keep deleted items out of search results
-  
+
   Scenario: Deleting instances from the core index
     Given Sphinx is running
     And I am searching on betas
     When I search for three
     Then I should get 1 result
-    
+
     When I destroy beta three
     And I wait for Sphinx to catch up
     And I search for three
     Then I should get 0 results
-  
+
   Scenario: Deleting subclasses when the parent class is indexed
     Given Sphinx is running
     And I am searching on cats
     When I search for moggy
     Then I should get 1 result
-    
+
     When I destroy cat moggy
     And I wait for Sphinx to catch up
     And I search for moggy
     Then I should get 0 results
-  
+
   Scenario: Deleting created instances from the delta index
     Given Sphinx is running
     And I am searching on betas
-    When I create a new beta named eleven
+    When I create a new beta named eighteen
     And I wait for Sphinx to catch up
-    And I search for eleven
+    And I clear the connection pool
+    And I search for eighteen
     Then I should get 1 result
-    
-    When I destroy beta eleven
+
+    When I destroy beta eighteen
     And I wait for Sphinx to catch up
-    And I search for eleven
+    And I search for eighteen
     Then I should get 0 results
-  
+
   Scenario: Deleting edited instances from the delta index
     Given Sphinx is running
     And I am searching on betas
     When I change the name of beta four to fourteen
     And I wait for Sphinx to catch up
+    And I clear the connection pool
     And I search for fourteen
     Then I should get 1 result
-    
+
     When I destroy beta fourteen
     And I wait for Sphinx to catch up
     And I search for fourteen
@@ -56,9 +58,10 @@ Feature: Keeping Sphinx in line with deleted model instances
     And I am searching on betas
     When I create a new beta named thirteen
     And I wait for Sphinx to catch up
+    And I clear the connection pool
     And I search for thirteen
     Then I should get 1 result
-    
+
     And I disable delta updates
     And I destroy beta thirteen
     And I wait for Sphinx to catch up

data/features/handling_edits.feature

@@ -2,72 +2,75 @@ Feature: Keeping Sphinx in line with model changes when requested
   In order to keep indexes as up to date as possible
   Thinking Sphinx
   Should return the expected results depending on whether delta indexes are used
-  
+
   Scenario: Returning instance from old data if there is no delta
     Given Sphinx is running
     And I am searching on alphas
     When I search for two
     Then I should get 1 result
-    
+
     When I change the name of alpha two to twelve
     And I wait for Sphinx to catch up
     And I search for two
     Then I should get 1 result
-  
+
   Scenario: Not returning an instance from old data if there is a delta
     Given Sphinx is running
     And I am searching on betas
     When I search for two
     Then I should get 1 result
-  
+
     When I change the name of beta two to twelve
     And I wait for Sphinx to catch up
+    And I clear the connection pool
     And I search for two
     Then I should get 0 results
-  
+
   Scenario: Returning instance from new data if there is a delta
     Given Sphinx is running
     And I am searching on betas
     When I search for one
     Then I should get 1 result
-  
+
     When I change the name of beta one to eleventeen
     And I wait for Sphinx to catch up
+    And I clear the connection pool
     And I search for one
     Then I should get 0 results
-    
+
     When I search for eleventeen
     Then I should get 1 result
-  
+
   Scenario: Returning new records if there's a delta
     Given Sphinx is running
     And I am searching on betas
     When I search for fifteen
     Then I should get 0 results
-    
+
     When I create a new beta named fifteen
     And I wait for Sphinx to catch up
+    And I clear the connection pool
     And I search for fifteen
     Then I should get 1 result
-  
+
   Scenario: Avoiding delta updates if there hasn't been changes
     Given Sphinx is running
     And I am searching on betas
     When I search for five
     Then I should get 1 result
-    
+
     When I change the name of beta five to five
     And I wait for Sphinx to catch up
     And I search for five
     Then I should get 1 result
-    
+
     When I search for the document id of beta five in the beta_core index
     Then it should exist if using Rails 2.1 or newer
     When I search for the document id of beta five in the secondary_beta_core index
     Then it should exist if using Rails 2.1 or newer
     When I search for the document id of beta five in the secondary_beta_delta index
     Then it should not exist if using Rails 2.1 or newer
-  
+
   Scenario: Handling edits with a delta when Sphinx isn't running
     Given Sphinx is running
     And I am searching on betas
@@ -76,19 +79,19 @@ Feature: Keeping Sphinx in line with model changes when requested
     And I start Sphinx
     And I search for sixteen
     Then I should get 1 result
-  
+
   Scenario: Handling edits when updates are disabled
     Given Sphinx is running
     And updates are disabled
     And I am searching on betas
-    
+
     When I search for seven
     Then I should get 1 result
-    
+
     When I change the name of beta seven to seventeen
     And I wait for Sphinx to catch up
     And I search for seven
     Then I should get 1 result
-    
+
     When I search for seventeen
     Then I should get 0 results

data/features/searching_by_index.feature

@@ -2,21 +2,21 @@ Feature: Searching within a single index
   In order to use Thinking Sphinx's core functionality
   A developer
   Should be able to search on a single index
- 
+
   Scenario: Searching with alternative index
     Given Sphinx is running
     And I am searching on alphas
     When I order by value
     And I use index alternative_core
     Then I should get 7 results
- 
+
   Scenario: Searching with default index
     Given Sphinx is running
     And I am searching on alphas
     When I order by value
     And I use index alpha_core
     Then I should get 10 results
- 
+
   Scenario: Searching without specified index
     Given Sphinx is running
     And I am searching on alphas
@@ -26,14 +26,15 @@ Feature: Searching within a single index
   Scenario: Deleting instances from the core index
     Given Sphinx is running
     And I am searching on alphas
-    
+
     When I create a new alpha named eleven
     And I process the alpha_core index
     And I process the alternative_core index
     And I wait for Sphinx to catch up
+    And I clear the connection pool
     And I search for eleven
     Then I should get 1 result
-    
+
     When I destroy alpha eleven
     And I wait for Sphinx to catch up
     And I search for eleven

data/features/step_definitions/common_steps.rb

@@ -1,6 +1,6 @@
 Before do
   $queries_executed = []
-  
+
   @model      = nil
   @method     = :search
   @query      = ""
@@ -10,7 +10,7 @@ Before do
   @with_all   = {}
   @options    = {}
   @results    = nil
-  
+
   Given "updates are enabled"
 end
 
@@ -46,6 +46,10 @@ When /^I search for (\w+)$/ do |query|
   @query = query
 end
 
+When /^I clear the connection pool$/ do
+  ThinkingSphinx::Connection.pool.clear
+end
+
 When /^I search for "([^\"]*)"$/ do |query|
   @results = nil
   @query = query
@@ -154,7 +158,7 @@ Then /^the (\w+) of each result should indicate order$/ do |attribute|
     unless prev.nil?
       current.send(attribute.to_sym).should >= prev.send(attribute.to_sym)
     end
-    
+
     current
   end
 end
@@ -170,7 +174,7 @@ Then /^I can iterate by result and (\w+)$/ do |attribute|
       attr_value.should be_kind_of(Integer)
     end
   }
-  
+
   results.send("each_with_#{attribute}", &iteration)
 end
 

data/features/support/env.rb

@@ -5,9 +5,6 @@ require 'bundler'
 Bundler.require :default, :development
 
 $:.unshift File.dirname(__FILE__) + '/../../lib'
-Dir[File.join(File.dirname(__FILE__), '../../vendor/*/lib')].each do |path|
-  $:.unshift path
-end
 
 require 'cucumber/thinking_sphinx/internal_world'
 

data/lib/thinking_sphinx.rb

@@ -1,6 +1,7 @@
 require 'thread'
 require 'active_record'
 require 'after_commit'
+require 'innertube'
 require 'yaml'
 require 'riddle'
 
@@ -12,6 +13,7 @@ require 'thinking_sphinx/association'
 require 'thinking_sphinx/attribute'
 require 'thinking_sphinx/bundled_search'
 require 'thinking_sphinx/configuration'
+require 'thinking_sphinx/connection'
 require 'thinking_sphinx/context'
 require 'thinking_sphinx/excerpter'
 require 'thinking_sphinx/facet'
@@ -25,7 +27,6 @@ require 'thinking_sphinx/rails_additions'
 require 'thinking_sphinx/search'
 require 'thinking_sphinx/search_methods'
 require 'thinking_sphinx/deltas'
-require 'thinking_sphinx/version'
 
 require 'thinking_sphinx/adapters/abstract_adapter'
 require 'thinking_sphinx/adapters/mysql_adapter'
@@ -295,6 +296,12 @@ module ThinkingSphinx
     )
   end
 
+  def self.before_index_hooks
+    @before_index_hooks
+  end
+
+  @before_index_hooks = []
+
   extend ThinkingSphinx::SearchMethods::ClassMethods
 end
 

data/lib/thinking_sphinx/active_record.rb

@@ -276,9 +276,9 @@ module ThinkingSphinx
       def delete_in_index(index, document_id)
         return unless ThinkingSphinx.sphinx_running?
 
-        ThinkingSphinx::Configuration.instance.client.update(
-          index, ['sphinx_deleted'], {document_id => [1]}
-        )
+        ThinkingSphinx::Connection.take do |client|
+          client.update index, ['sphinx_deleted'], {document_id => [1]}
+        end
       rescue Riddle::ConnectionError, Riddle::ResponseError,
         ThinkingSphinx::SphinxError, Errno::ETIMEDOUT, Timeout::Error
         # Not the end of the world if Sphinx isn't running.

data/lib/thinking_sphinx/active_record/attribute_updates.rb

@@ -40,10 +40,11 @@ module ThinkingSphinx
       end
 
       def update_index(index_name, attribute_names, attribute_values)
-        config = ThinkingSphinx::Configuration.instance
-        config.client.update index_name, attribute_names, {
-          sphinx_document_id => attribute_values
-        }
+        ThinkingSphinx::Connection.take do |client|
+          client.update index_name, attribute_names, {
+            sphinx_document_id => attribute_values
+          }
+        end
       rescue Riddle::ConnectionError, Riddle::ResponseError,
         ThinkingSphinx::SphinxError, Errno::ETIMEDOUT
         # Not the end of the world if Sphinx isn't running.

data/lib/thinking_sphinx/adapters/abstract_adapter.rb

@@ -51,6 +51,13 @@ module ThinkingSphinx
           :mysql
         when "jdbcpostgresql"
           :postgresql
+        when "jdbc"
+          match = /^jdbc:(mysql|postgresql):\/\//.match(model.connection.config[:url])
+          if match
+            match[1].to_sym
+          else
+            model.connection.config[:adapter]
+          end
         else
           model.connection.config[:adapter].to_sym
         end