thinking-sphinx 3.1.0 → 3.1.1

data/lib/thinking_sphinx/connection.rb

@@ -12,7 +12,7 @@ module ThinkingSphinx::Connection
       :reconnect => true
     }.merge(configuration.settings['connection_options'] || {})
 
-    connection_class.new address, options[:port], options
+    connection_class.new options
   end
 
   def self.connection_class
@@ -85,7 +85,8 @@ module ThinkingSphinx::Connection
     def query(*statements)
       results_for *statements
     rescue => error
-      wrapper           = ThinkingSphinx::QueryExecutionError.new error.message
+      message           = "#{error.message} - #{statements.join('; ')}"
+      wrapper           = ThinkingSphinx::QueryExecutionError.new message
       wrapper.statement = statements.join('; ')
       raise wrapper
     ensure
@@ -94,8 +95,8 @@ module ThinkingSphinx::Connection
   end
 
   class MRI < Client
-    def initialize(address, port, options)
-      @address, @port, @options = address, port, options
+    def initialize(options)
+      @options = options
     end
 
     def base_error
@@ -104,12 +105,10 @@ module ThinkingSphinx::Connection
 
     private
 
-    attr_reader :address, :port, :options
+    attr_reader :options
 
     def client
       @client ||= Mysql2::Client.new({
-        :host  => address,
-        :port  => port,
         :flags => Mysql2::Client::MULTI_STATEMENTS
       }.merge(options))
     rescue base_error => error
@@ -126,8 +125,8 @@ module ThinkingSphinx::Connection
   class JRuby < Client
     attr_reader :address, :options
 
-    def initialize(address, port, options)
-      @address = "jdbc:mysql://#{address}:#{port}?allowMultiQueries=true"
+    def initialize(options)
+      @address = "jdbc:mysql://#{options[:host]}:#{options[:port]}/?allowMultiQueries=true"
       @options = options
     end
 

data/lib/thinking_sphinx/errors.rb

@@ -9,8 +9,10 @@ class ThinkingSphinx::SphinxError < StandardError
       replacement = ThinkingSphinx::SyntaxError.new(error.message)
     when /query error/
       replacement = ThinkingSphinx::QueryError.new(error.message)
-    when /Can't connect to MySQL server/
-      replacement = ThinkingSphinx::ConnectionError.new(error.message)
+    when /Can't connect to MySQL server/, /Communications link failure/
+      replacement = ThinkingSphinx::ConnectionError.new(
+        "Error connecting to Sphinx via the MySQL protocol. #{error.message}"
+      )
     else
       replacement = new(error.message)
     end
@@ -42,3 +44,6 @@ end
 
 class ThinkingSphinx::NoIndicesError < StandardError
 end
+
+class ThinkingSphinx::MissingColumnError < StandardError
+end

data/lib/thinking_sphinx/facet.rb

@@ -11,7 +11,7 @@ class ThinkingSphinx::Facet
 
   def results_from(raw)
     raw.inject({}) { |hash, row|
-      hash[row[group_column]] = row[ThinkingSphinx::SphinxQL.count]
+      hash[row[group_column]] = row['sphinx_internal_count']
       hash
     }
   end
@@ -19,7 +19,7 @@ class ThinkingSphinx::Facet
   private
 
   def group_column
-    @properties.any?(&:multi?) ? ThinkingSphinx::SphinxQL.group_by : name
+    @properties.any?(&:multi?) ? 'sphinx_internal_group' : name
   end
 
   def use_field?

data/lib/thinking_sphinx/facet_search.rb

@@ -101,8 +101,10 @@ class ThinkingSphinx::FacetSearch
 
   def options_for(facet)
     options.merge(
-      :select      => (options[:select] || '*') +
-        ", #{ThinkingSphinx::SphinxQL.group_by}, #{ThinkingSphinx::SphinxQL.count}",
+      :select      => [(options[:select] || '*'),
+        "#{ThinkingSphinx::SphinxQL.group_by} as sphinx_internal_group",
+        "#{ThinkingSphinx::SphinxQL.count} as sphinx_internal_count"
+      ].join(', '),
       :group_by    => facet.name,
       :indices     => index_names_for(facet),
       :max_matches => max_matches,

data/lib/thinking_sphinx/logger.rb

@@ -0,0 +1,7 @@
+class ThinkingSphinx::Logger
+  def self.log(notification, message, &block)
+    ActiveSupport::Notifications.instrument(
+      "#{notification}.thinking_sphinx", notification => message, &block
+    )
+  end
+end

data/lib/thinking_sphinx/masks/group_enumerators_mask.rb

@@ -9,20 +9,20 @@ class ThinkingSphinx::Masks::GroupEnumeratorsMask
 
   def each_with_count(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row[ThinkingSphinx::SphinxQL.count]
+      yield @search[index], row['sphinx_internal_count']
     end
   end
 
   def each_with_group(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row[ThinkingSphinx::SphinxQL.group_by]
+      yield @search[index], row['sphinx_internal_group']
     end
   end
 
   def each_with_group_and_count(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row[ThinkingSphinx::SphinxQL.group_by],
-        row[ThinkingSphinx::SphinxQL.count]
+      yield @search[index], row['sphinx_internal_group'],
+        row['sphinx_internal_count']
     end
   end
 end

data/lib/thinking_sphinx/middlewares/inquirer.rb

@@ -5,7 +5,7 @@ class ThinkingSphinx::Middlewares::Inquirer <
     @contexts = contexts
     @batch    = nil
 
-    contexts.first.log :query, combined_queries do
+    ThinkingSphinx::Logger.log :query, combined_queries do
       batch.results
     end
 
@@ -52,7 +52,7 @@ class ThinkingSphinx::Middlewares::Inquirer <
       }
 
       total = context[:meta]['total_found']
-      context.log :message, "Found #{total} result#{'s' unless total == 1}"
+      ThinkingSphinx::Logger.log :message, "Found #{total} result#{'s' unless total == 1}"
     end
 
     private

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -65,7 +65,8 @@ class ThinkingSphinx::Middlewares::SphinxQL <
     end
 
     def constantize_inheritance_column(klass)
-      klass.connection.select_values(inheritance_column_select(klass)).compact.each(&:constantize)
+      values = klass.connection.select_values inheritance_column_select(klass)
+      values.reject(&:blank?).each(&:constantize)
     end
 
     def descendants
@@ -155,7 +156,10 @@ SQL
     end
 
     def values
-      options[:select] ||= "*, #{ThinkingSphinx::SphinxQL.group_by}, #{ThinkingSphinx::SphinxQL.count}" if group_attribute.present?
+      options[:select] ||= ['*',
+        "#{ThinkingSphinx::SphinxQL.group_by} as sphinx_internal_group",
+        "#{ThinkingSphinx::SphinxQL.count} as sphinx_internal_count"
+      ].join(', ') if group_attribute.present?
       options[:select]
     end
 

data/lib/thinking_sphinx/middlewares/stale_id_filter.rb

@@ -12,7 +12,7 @@ class ThinkingSphinx::Middlewares::StaleIdFilter <
       raise error if @retries <= 0
 
       append_stale_ids error.ids
-      @context.log :message, log_message
+      ThinkingSphinx::Logger.log :message, log_message
 
       @retries -= 1 and retry
     end

data/lib/thinking_sphinx/real_time/callbacks/real_time_callbacks.rb

@@ -4,7 +4,7 @@ class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks
   end
 
   def after_save(instance)
-    return unless real_time_indices?
+    return unless real_time_indices? && callbacks_enabled?
 
     real_time_indices.each do |index|
       objects_for(instance).each do |object|
@@ -17,6 +17,11 @@ class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks
 
   attr_reader :reference, :path
 
+  def callbacks_enabled?
+    setting = configuration.settings['real_time_callbacks']
+    setting.nil? || setting
+  end
+
   def configuration
     ThinkingSphinx::Configuration.instance
   end

data/lib/thinking_sphinx/real_time/property.rb

@@ -17,6 +17,7 @@ class ThinkingSphinx::RealTime::Property
     return @column.__name unless @column.__name.is_a?(Symbol)
 
     base = @column.__stack.inject(object) { |base, node| base.try(node) }
-    base.try(@column.__name)
+    base = base.try(@column.__name)
+    base.is_a?(String) ? base.gsub("\u0000", '') : base
   end
 end

data/lib/thinking_sphinx/real_time/transcriber.rb

@@ -12,9 +12,13 @@ class ThinkingSphinx::RealTime::Transcriber
       values  << property.translate(instance)
     end
 
-    sphinxql = Riddle::Query::Insert.new index.name, columns, values
-    ThinkingSphinx::Connection.take do |connection|
-      connection.execute sphinxql.replace!.to_sql
+    insert = Riddle::Query::Insert.new index.name, columns, values
+    sphinxql = insert.replace!.to_sql
+    
+    ThinkingSphinx::Logger.log :query, sphinxql do
+      ThinkingSphinx::Connection.take do |connection|
+        connection.execute sphinxql
+      end 
     end
   end
 

data/lib/thinking_sphinx/search.rb

@@ -83,10 +83,6 @@ class ThinkingSphinx::Search < Array
     context[:raw]
   end
 
-  def respond_to?(method, include_private = false)
-    super || context[:results].respond_to?(method, include_private)
-  end
-
   def to_a
     populate
     context[:results].collect { |result|
@@ -105,6 +101,10 @@ class ThinkingSphinx::Search < Array
     @mask_stack ||= masks.collect { |klass| klass.new self }
   end
 
+  def masks_respond_to?(method)
+    mask_stack.any? { |mask| mask.can_handle? method }
+  end
+
   def method_missing(method, *args, &block)
     mask_stack.each do |mask|
       return mask.send(method, *args, &block) if mask.can_handle?(method)
@@ -115,9 +115,19 @@ class ThinkingSphinx::Search < Array
     context[:results].send(method, *args, &block)
   end
 
+  def respond_to_missing?(method, include_private = false)
+    super ||
+      masks_respond_to?(method) ||
+      results_respond_to?(method, include_private)
+  end
+
   def middleware
     @options[:middleware] || default_middleware
   end
+
+  def results_respond_to?(method, include_private = true)
+    context[:results].respond_to?(method, include_private)
+  end
 end
 
 require 'thinking_sphinx/search/batch_inquirer'

data/lib/thinking_sphinx/search/context.rb

@@ -17,10 +17,4 @@ class ThinkingSphinx::Search::Context
   def []=(key, value)
     @memory[key] = value
   end
-
-  def log(notification, message, &block)
-    ActiveSupport::Notifications.instrument(
-      "#{notification}.thinking_sphinx", notification => message, &block
-    )
-  end
 end

data/lib/thinking_sphinx/test.rb

@@ -4,9 +4,9 @@ class ThinkingSphinx::Test
     config.settings['quiet_deltas'] = suppress_delta_output
   end
 
-  def self.start
+  def self.start(options = {})
     config.render_to_file
-    config.controller.index
+    config.controller.index if options[:index].nil? || options[:index]
     config.controller.start
   end
 
@@ -35,6 +35,15 @@ class ThinkingSphinx::Test
     end
   end
 
+  def self.clear
+    [
+      config.indices_location,
+      config.searchd.binlog_path
+    ].each do |path|
+      FileUtils.rm_r(path) if File.exists?(path)
+    end
+  end
+
   def self.config
     @config ||= ::ThinkingSphinx::Configuration.instance
   end

data/lib/thinking_sphinx/wildcard.rb

@@ -11,7 +11,7 @@ class ThinkingSphinx::Wildcard
   end
 
   def call
-    query.gsub(/("#{pattern}(.*?#{pattern})?"|(?![!-])#{pattern})/u) do
+    query.gsub(extended_pattern) do
       pre, proper, post = $`, $&, $'
       # E.g. "@foo", "/2", "~3", but not as part of a token pattern
       is_operator = pre == '@' ||
@@ -31,4 +31,10 @@ class ThinkingSphinx::Wildcard
   private
 
   attr_reader :query, :pattern
+
+  def extended_pattern
+    Regexp.new(
+      "(\"#{pattern}(.*?#{pattern})?\"|(?![!-])#{pattern})".encode('UTF-8')
+    )
+  end
 end

data/spec/acceptance/association_scoping_spec.rb

@@ -1,23 +1,63 @@
 require 'acceptance/spec_helper'
 
 describe 'Scoping association search calls by foreign keys', :live => true do
-  it "limits results to those matching the foreign key" do
-    pat       = User.create :name => 'Pat'
-    melbourne = Article.create :title => 'Guide to Melbourne', :user => pat
-    paul      = User.create :name => 'Paul'
-    dublin    = Article.create :title => 'Guide to Dublin',    :user => paul
-    index
-
-    pat.articles.search('Guide').to_a.should == [melbourne]
+  describe 'for ActiveRecord indices' do
+    it "limits results to those matching the foreign key" do
+      pat       = User.create :name => 'Pat'
+      melbourne = Article.create :title => 'Guide to Melbourne', :user => pat
+      paul      = User.create :name => 'Paul'
+      dublin    = Article.create :title => 'Guide to Dublin',    :user => paul
+      index
+
+      pat.articles.search('Guide').to_a.should == [melbourne]
+    end
+
+    it "limits id-only results to those matching the foreign key" do
+      pat       = User.create :name => 'Pat'
+      melbourne = Article.create :title => 'Guide to Melbourne', :user => pat
+      paul      = User.create :name => 'Paul'
+      dublin    = Article.create :title => 'Guide to Dublin',    :user => paul
+      index
+
+      pat.articles.search_for_ids('Guide').to_a.should == [melbourne.id]
+    end
+  end
+
+  describe 'for real-time indices' do
+    it "limits results to those matching the foreign key" do
+      porsche = Manufacturer.create :name => 'Porsche'
+      spyder = Car.create :name => '918 Spyder', :manufacturer => porsche
+
+      audi = Manufacturer.create :name => 'Audi'
+      r_eight = Car.create :name => 'R8 Spyder', :manufacturer => audi
+
+      porsche.cars.search('Spyder').to_a.should == [spyder]
+    end
+
+    it "limits id-only results to those matching the foreign key" do
+      porsche = Manufacturer.create :name => 'Porsche'
+      spyder = Car.create :name => '918 Spyder', :manufacturer => porsche
+
+      audi = Manufacturer.create :name => 'Audi'
+      r_eight = Car.create :name => 'R8 Spyder', :manufacturer => audi
+
+      porsche.cars.search_for_ids('Spyder').to_a.should == [spyder.id]
+    end
   end
 
-  it "limits id-only results to those matching the foreign key" do
-    pat       = User.create :name => 'Pat'
-    melbourne = Article.create :title => 'Guide to Melbourne', :user => pat
-    paul      = User.create :name => 'Paul'
-    dublin    = Article.create :title => 'Guide to Dublin',    :user => paul
-    index
+  describe 'with has_many :through associations' do
+    it 'limits results to those matching the foreign key' do
+      pancakes = Product.create :name => 'Low fat Pancakes'
+      waffles  = Product.create :name => 'Low fat Waffles'
+
+      food = Category.create :name => 'food'
+      flat = Category.create :name => 'flat'
+
+      pancakes.categories << food
+      pancakes.categories << flat
+      waffles.categories  << food
 
-    pat.articles.search_for_ids('Guide').to_a.should == [melbourne.id]
+      flat.products.search('Low').to_a.should == [pancakes]
+    end
   end
 end

data/spec/acceptance/geosearching_spec.rb

@@ -30,10 +30,16 @@ describe 'Searching by latitude and longitude', :live => true do
     index
 
     cities = City.search(:geo => [-0.616241, 2.602712], :order => 'geodist ASC')
+    if ENV['SPHINX_VERSION'].try :[], /2.2.\d/
+      expected = {:mysql => 249907.171875, :postgresql => 249912.03125}
+    else
+      expected = {:mysql => 250326.906250, :postgresql => 250331.234375}
+    end
+
     if ActiveRecord::Base.configurations['test']['adapter'][/postgres/]
-      cities.first.geodist.should == 250331.234375
+      cities.first.geodist.should == expected[:postgresql]
     else # mysql
-      cities.first.geodist.should == 250326.906250
+      cities.first.geodist.should == expected[:mysql]
     end
   end
 

data/spec/acceptance/real_time_updates_spec.rb

@@ -0,0 +1,9 @@
+require 'acceptance/spec_helper'
+
+describe 'Updates to records in real-time indices', :live => true do
+  it "handles fields with unicode nulls" do
+    product = Product.create! :name => "Widget \u0000"
+
+    Product.search.first.should == product
+  end
+end