friendlyfashion-thinking-sphinx 2.0.13.3 → 2.0.14.1

data/lib/thinking_sphinx/configuration.rb

@@ -53,7 +53,7 @@ module ThinkingSphinx
 
     SourceOptions = Riddle::Configuration::SQLSource.settings.map { |setting|
       setting.to_s
-    } - %w( type sql_query_pre sql_query sql_joined_field sql_file_field
+    } - %w( type sql_query sql_joined_field sql_file_field
       sql_query_range sql_attr_uint sql_attr_bool sql_attr_bigint sql_query_info
       sql_attr_timestamp sql_attr_str2ordinal sql_attr_float sql_attr_multi
       sql_attr_string sql_attr_str2wordcount sql_column_buffers sql_field_string
@@ -263,14 +263,6 @@ module ThinkingSphinx
 
     attr_accessor :timeout
 
-    def client
-      client = Riddle::Client.new shuffled_addresses, port,
-        configuration.searchd.client_key
-      client.max_matches = configuration.searchd.max_matches || 1000
-      client.timeout = timeout || 0
-      client
-    end
-
     def models_by_crc
       @models_by_crc ||= begin
         ThinkingSphinx.context.indexed_models.inject({}) do |hash, model|
@@ -347,17 +339,6 @@ module ThinkingSphinx
       }
     end
 
-    def shuffled_addresses
-      return address unless shuffle
-
-      addresses = Array(address)
-      if addresses.respond_to?(:shuffle)
-        addresses.shuffle
-      else
-        address.sort_by { rand }
-      end
-    end
-
     def initial_model_directories
       directories = ["#{app_root}/app/models/"] +
         Dir.glob("#{app_root}/vendor/plugins/*/app/models/")

data/lib/thinking_sphinx/connection.rb

@@ -0,0 +1,71 @@
+class ThinkingSphinx::Connection
+  def self.pool
+    @pool ||= Innertube::Pool.new(
+      Proc.new { Rails.logger.debug '>>> CONNECTING <<<'; ThinkingSphinx::Connection.new },
+      Proc.new { |connection| connection.close }
+    )
+  end
+
+  def self.take
+    retries  = 0
+    original = nil
+    begin
+      pool.take do |connection|
+        connection.reset
+        begin
+          yield connection
+        rescue Riddle::ConnectionError, Riddle::ResponseError => error
+          original = error
+          raise Innertube::Pool::BadResource
+        end
+      end
+    rescue Innertube::Pool::BadResource
+      retries += 1
+      retry if retries < 3
+      raise original
+    end
+  end
+
+  def initialize
+    client.open
+  end
+
+  def client
+    @client ||= begin
+      client = Riddle::Client.new shuffled_addresses, configuration.port,
+        client_key
+      client.max_matches = _max_matches
+      client.timeout     = configuration.timeout || 0
+      client
+    end
+  end
+
+  private
+
+  def client_key
+    configuration.configuration.searchd.client_key
+  end
+
+  def configuration
+    ThinkingSphinx::Configuration.instance
+  end
+
+  def _max_matches
+    configuration.configuration.searchd.max_matches || 1000
+  end
+
+  def method_missing(method, *arguments, &block)
+    client.send method, *arguments, &block
+  end
+
+  def shuffled_addresses
+    return configuration.address unless configuration.shuffle
+
+    addresses = Array(configuration.address)
+    if addresses.respond_to?(:shuffle)
+      addresses.shuffle
+    else
+      address.sort_by { rand }
+    end
+  end
+end

data/lib/thinking_sphinx/context.rb

@@ -62,9 +62,14 @@ class ThinkingSphinx::Context
 
         begin
           camelized_model.constantize
-        rescue LoadError
+        rescue LoadError, NameError
           # Make sure that STI subclasses in subfolders are loaded.
-          model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
+          if camelized_model.gsub!(/.+::/, '').nil?
+            STDERR.puts "ThinkingSphinx: error loading #{file}"
+            next
+          else
+            retry
+          end
         rescue Exception => err
           STDERR.puts "Warning: Error loading #{file}:"
           STDERR.puts err.message

data/lib/thinking_sphinx/search.rb

@@ -359,13 +359,15 @@ module ThinkingSphinx
       populate
 
       index = options[:index] || "#{model.core_index_names.first}"
-      client.excerpts(
-        {
-          :docs   => [string.to_s],
-          :words  => query,
-          :index  => index.split(',').first.strip
-        }.merge(options[:excerpt_options] || {})
-      ).first
+      take_client do |client|
+        client.excerpts(
+          {
+            :docs   => [string.to_s],
+            :words  => query,
+            :index  => index.split(',').first.strip
+          }.merge(options[:excerpt_options] || {})
+        ).first
+      end
     end
 
     def search(*args)
@@ -391,10 +393,16 @@ module ThinkingSphinx
       ThinkingSphinx::FacetSearch.new(*args)
     end
 
-    def client
-      client = options[:client] || config.client
-
-      prepare client
+    def take_client
+      if options[:client]
+        prepare options[:client]
+        yield options[:client]
+      else
+        ThinkingSphinx::Connection.take do |client|
+          prepare client
+          yield client
+        end
+      end
     end
 
     def append_to(client)
@@ -426,12 +434,14 @@ module ThinkingSphinx
         retry_on_stale_index do
           retry_on_index_not_preread do
             begin
+              @results = nil
               log query do
-                @results = client.query query, indexes, comment
+                take_client do |client|
+                  @results = client.query query, indexes, comment
+                end
               end
               total = @results[:total_found].to_i
               log "Found #{total} result#{'s' unless total == 1}"
-
               log "Sphinx Daemon returned warning: #{warning}" if warning?
 
               if error?
@@ -470,7 +480,7 @@ module ThinkingSphinx
         replace instances_from_matches
         add_excerpter
         add_sphinx_attributes
-        add_matching_fields if client.rank_mode == :fieldmask
+        add_matching_fields if options[:rank_mode] == :fieldmask
       end
     end
 

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '2.0.13.3'
+  Version = '2.0.14.1'
 end

data/lib/thinking_sphinx.rb

@@ -1,5 +1,6 @@
 require 'thread'
 require 'active_record'
+require 'innertube'
 require 'yaml'
 require 'riddle'
 
@@ -11,6 +12,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'

data/spec/thinking_sphinx/active_record/delta_spec.rb

@@ -78,7 +78,7 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
 
       @client = Riddle::Client.new
       @client.stub!(:update => true)
-      ThinkingSphinx::Configuration.instance.stub!(:client => @client)
+      ThinkingSphinx::Connection.stub(:take).and_yield @client
     end
 
     it "shouldn't index if delta indexing is disabled" do

data/spec/thinking_sphinx/active_record/scopes_spec.rb

@@ -142,7 +142,8 @@ describe ThinkingSphinx::ActiveRecord::Scopes do
       @config = ThinkingSphinx::Configuration.instance
       @client = Riddle::Client.new
 
-      @config.stub!(:client => @client)
+      ThinkingSphinx::Connection.stub(:take).and_yield(@client)
+
       @client.stub!(:query => {:matches => [], :total_found => 43})
       Alpha.sphinx_scope(:by_name) { |name| {:conditions => {:name => name}} }
       Alpha.sphinx_scope(:ids_only) { {:ids_only => true} }

data/spec/thinking_sphinx/active_record_spec.rb

@@ -271,7 +271,7 @@ describe ThinkingSphinx::ActiveRecord do
       @client.stub!(:update => true)
       @person = Person.find(:first)
 
-      @configuration.stub!(:client => @client)
+      ThinkingSphinx::Connection.stub(:take).and_yield(@client)
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => false) }
     end
 
@@ -481,7 +481,7 @@ describe ThinkingSphinx::ActiveRecord do
     before :each do
       @client = stub('client')
       ThinkingSphinx.stub!(:sphinx_running? => true)
-      ThinkingSphinx::Configuration.instance.stub!(:client => @client)
+      ThinkingSphinx::Connection.stub(:take).and_yield(@client)
     end
 
     it "should direct the update to the supplied index" do

data/spec/thinking_sphinx/adapters/abstract_adapter_spec.rb

@@ -127,6 +127,24 @@ describe ThinkingSphinx::AbstractAdapter do
         should == :postgresql
     end
 
+   it "translates a JDBC adapter with MySQL connection string to MySQL" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::JdbcAdapter')
+      connection.stub(:config => {:adapter => 'jdbc',
+                                  :url => 'jdbc:mysql://127.0.0.1:3306/sphinx'})
+
+      ThinkingSphinx::AbstractAdapter.standard_adapter_for_model(model).
+        should == :mysql
+    end
+
+    it "translates a JDBC adapter with PostgresSQL connection string to PostgresSQL" do
+      klass.stub(:name => 'ActiveRecord::ConnectionAdapters::JdbcAdapter')
+      connection.stub(:config => {:adapter => 'jdbc',
+                                  :url => 'jdbc:postgresql://127.0.0.1:3306/sphinx'})
+
+      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'})

data/spec/thinking_sphinx/configuration_spec.rb

@@ -241,74 +241,6 @@ describe ThinkingSphinx::Configuration do
     end
   end
 
-  describe '#client' do
-    before :each do
-      @config = ThinkingSphinx::Configuration.instance
-      @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
-      @config.client.should be_a(Riddle::Client)
-    end
-
-    it "should use the configuration address" do
-      @config.client.server.should == 'domain.url'
-    end
-
-    it "should use the configuration port" do
-      @config.client.port.should == 3333
-    end
-
-    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
-
-    describe 'when shuffle is enabled' do
-      let(:client) { double('client', :max_matches= => nil, :timeout= => nil) }
-
-      before :each do
-        @config.shuffle = true
-      end
-
-      it "should shuffle client servers" do
-        @config.address = ['1.1.1.1', '2.2.2.2']
-        @config.address.stub!(:shuffle => ['2.2.2.2', '1.1.1.1'])
-
-        Riddle::Client.should_receive(:new) do |addresses, port, key|
-          addresses.should == ['2.2.2.2', '1.1.1.1']
-          client
-        end
-        @config.client
-      end
-    end
-
-    describe 'when shuffle is disabled' do
-      let(:client) { double('client', :max_matches= => nil, :timeout= => nil) }
-
-      before :each do
-        @config.shuffle = false
-      end
-
-      it "should not shuffle client servers" do
-        @config.address = ['1.1.1.1', '2.2.2.2.', '3.3.3.3', '4.4.4.4', '5.5.5.5']
-
-        @config.address.should_not_receive(:shuffle)
-        Riddle::Client.should_receive(:new) do |addresses, port, key|
-          addresses.should == ['1.1.1.1', '2.2.2.2.', '3.3.3.3', '4.4.4.4', '5.5.5.5']
-          client
-        end
-        @config.client
-      end
-    end
-  end
-
   describe '#models_by_crc' do
     before :each do
       @config = ThinkingSphinx::Configuration.instance

data/spec/thinking_sphinx/connection_spec.rb

@@ -0,0 +1,77 @@
+require 'spec_helper'
+
+describe ThinkingSphinx::Connection do
+  describe '#client' do
+    let(:connection) { ThinkingSphinx::Connection.new }
+
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+      @config.address     = 'domain.url'
+      @config.port        = 3333
+      @config.configuration.searchd.max_matches = 100
+      @config.timeout = 1
+
+      pending
+    end
+
+    it "should return an instance of Riddle::Client" do
+      connection.client.should be_a(Riddle::Client)
+    end
+
+    it "should use the configuration address" do
+      connection.client.server.should == 'domain.url'
+    end
+
+    it "should use the configuration port" do
+      connection.client.port.should == 3333
+    end
+
+    it "should use the configuration max matches" do
+      connection.client.max_matches.should == 100
+    end
+
+    it "should use the configuration timeout" do
+      connection.client.timeout.should == 1
+    end
+
+    describe 'when shuffle is enabled' do
+      let(:client) { double('client', :max_matches= => nil, :timeout= => nil,
+        :open => true) }
+
+      before :each do
+        @config.shuffle = true
+      end
+
+      it "should shuffle client servers" do
+        @config.address = ['1.1.1.1', '2.2.2.2']
+        @config.address.stub!(:shuffle => ['2.2.2.2', '1.1.1.1'])
+
+        Riddle::Client.should_receive(:new) do |addresses, port, key|
+          addresses.should == ['2.2.2.2', '1.1.1.1']
+          client
+        end
+        connection.client
+      end
+    end
+
+    describe 'when shuffle is disabled' do
+      let(:client) { double('client', :max_matches= => nil, :timeout= => nil,
+        :open => true) }
+
+      before :each do
+        @config.shuffle = false
+      end
+
+      it "should not shuffle client servers" do
+        @config.address = ['1.1.1.1', '2.2.2.2.', '3.3.3.3', '4.4.4.4', '5.5.5.5']
+
+        @config.address.should_not_receive(:shuffle)
+        Riddle::Client.should_receive(:new) do |addresses, port, key|
+          addresses.should == ['1.1.1.1', '2.2.2.2.', '3.3.3.3', '4.4.4.4', '5.5.5.5']
+          client
+        end
+        connection.client
+      end
+    end
+  end
+end

data/spec/thinking_sphinx/context_spec.rb

@@ -34,16 +34,17 @@ describe ThinkingSphinx::Context do
     it "should report name errors but not raise them" do
       class_name.stub(:constantize).and_raise(NameError)
       STDERR.stub!(:puts => '')
-      STDERR.should_receive(:puts).with('Warning: Error loading a.rb:')
+      STDERR.should_receive(:puts).with('ThinkingSphinx: error loading a.rb')
 
       lambda {
         ts_context.prepare
       }.should_not raise_error
     end
 
-    it "should retry if the first load fails and contains a directory" do
-      model_name_lower.should_receive(:gsub!).twice.and_return(true, nil)
+    it "should report load errors but not raise them" do
       class_name.stub(:constantize).and_raise(LoadError)
+      STDERR.stub!(:puts => '')
+      STDERR.should_receive(:puts).with('ThinkingSphinx: error loading a.rb')
 
       lambda {
         ts_context.prepare