thinking-sphinx 3.1.0 → 3.1.1

data/lib/thinking_sphinx/active_record/association_proxy/attribute_matcher.rb

@@ -0,0 +1,38 @@
+class ThinkingSphinx::ActiveRecord::AssociationProxy::AttributeMatcher
+    def initialize(attribute, foreign_key)
+      @attribute, @foreign_key = attribute, foreign_key.to_s
+    end
+
+    def matches?
+      return false if many?
+
+      column_name_matches? || attribute_name_matches? || multi_singular_match?
+    end
+
+    private
+
+    attr_reader :attribute, :foreign_key
+
+    delegate :name, :multi?, :to => :attribute
+
+    def attribute_name_matches?
+      name == foreign_key
+    end
+
+    def column_name_matches?
+      column.__name.to_s == foreign_key
+    end
+
+    def column
+      attribute.respond_to?(:columns) ? attribute.columns.first :
+        attribute.column
+    end
+
+    def many?
+      attribute.respond_to?(:columns) && attribute.columns.many?
+    end
+
+    def multi_singular_match?
+      multi? && name.singularize == foreign_key
+    end
+  end

data/lib/thinking_sphinx/active_record/attribute/type.rb

@@ -40,6 +40,20 @@ class ThinkingSphinx::ActiveRecord::Attribute::Type
     end
   end
 
+  def big_integer?
+    database_column.type == :integer && database_column.sql_type[/bigint/i]
+  end
+
+  def column_name
+    attribute.columns.first.__name.to_s
+  end
+
+  def database_column
+    @database_column ||= klass.columns.detect { |db_column|
+      db_column.name == column_name
+    }
+  end
+
   def klass
     @klass ||= associations.any? ? associations.last.klass : model
   end
@@ -57,15 +71,12 @@ class ThinkingSphinx::ActiveRecord::Attribute::Type
   end
 
   def type_from_database
-    db_column = klass.columns.detect { |db_column|
-      db_column.name == attribute.columns.first.__name.to_s
-    }
+    raise ThinkingSphinx::MissingColumnError,
+      "column #{column_name} does not exist" if database_column.nil?
 
-    if db_column.type == :integer && db_column.sql_type[/bigint/i]
-      return :bigint
-    end
+    return :bigint if big_integer?
 
-    case db_column.type
+    case database_column.type
     when :datetime, :date
       :timestamp
     when :text
@@ -73,7 +84,7 @@ class ThinkingSphinx::ActiveRecord::Attribute::Type
     when :decimal
       :float
     else
-      db_column.type
+      database_column.type
     end
   end
 end

data/lib/thinking_sphinx/active_record/base.rb

@@ -50,7 +50,9 @@ module ThinkingSphinx::ActiveRecord::Base
           'You cannot search with Sphinx through ActiveRecord scopes'
       end
 
-      merger.merge! nil, :classes => [self]
+      result = merger.merge! nil, :classes => [self]
+      result.populate if result.options[:populate]
+      result
     end
   end
 end

data/lib/thinking_sphinx/active_record/callbacks/delta_callbacks.rb

@@ -30,7 +30,7 @@ class ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks <
   end
 
   def core_indices
-    @core_indices ||= indices.reject &:delta?
+    @core_indices ||= indices.select(&:delta_processor).reject(&:delta?)
   end
 
   def delta_indices

data/lib/thinking_sphinx/active_record/callbacks/update_callbacks.rb

@@ -28,7 +28,10 @@ class ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks <
   end
 
   def indices
-    @indices ||= configuration.indices_for_references reference
+    @indices ||= begin
+      all = configuration.indices_for_references(reference)
+      all.reject { |index| index.type == 'rt' }
+    end
   end
 
   def reference

data/lib/thinking_sphinx/active_record/index.rb

@@ -12,6 +12,10 @@ class ThinkingSphinx::ActiveRecord::Index < Riddle::Configuration::Index
     end
   end
 
+  def attributes
+    sources.collect(&:attributes).flatten
+  end
+
   def delta?
     @options[:delta?]
   end
@@ -40,10 +44,6 @@ class ThinkingSphinx::ActiveRecord::Index < Riddle::Configuration::Index
       adapter_for(model)
   end
 
-  def attributes
-    sources.collect(&:attributes).flatten
-  end
-
   def fields
     sources.collect(&:fields).flatten
   end

data/lib/thinking_sphinx/active_record/property_query.rb

@@ -4,26 +4,28 @@ class ThinkingSphinx::ActiveRecord::PropertyQuery
   end
 
   def to_s
-    identifier = [type, property.name].compact.join(' ')
-
-    "#{identifier} from #{source_type}; #{queries.join('; ')}"
-  end
-
-  private
+    if unsafe_habtm_column?
+      raise <<-MESSAGE
+Source queries cannot be used with HABTM joins if they use anything beyond the
+primary key.
+      MESSAGE
+    end
 
-  def queries
-    queries    = []
-    if column.string?
-      queries << column.__name.strip.gsub(/\n/, "\\\n")
+    if safe_habtm_column?
+      ThinkingSphinx::ActiveRecord::SimpleManyQuery.new(
+        property, source, type
+      ).to_s
     else
-      queries << to_sql
-      queries << range_sql if ranged?
+      "#{identifier} from #{source_type}; #{queries.join('; ')}"
     end
-    queries
   end
 
+  private
+
   attr_reader :property, :source, :type
 
+  delegate :unscoped, :to => :base_association_class, :prefix => true
+
   def base_association
     reflections.first
   end
@@ -31,7 +33,6 @@ class ThinkingSphinx::ActiveRecord::PropertyQuery
   def base_association_class
     base_association.klass
   end
-  delegate :unscoped, :to => :base_association_class, :prefix => true
 
   def column
     @column ||= property.columns.first
@@ -43,17 +44,8 @@ class ThinkingSphinx::ActiveRecord::PropertyQuery
     [reflection.through_reflection, reflection.source_reflection]
   end
 
-  def reflections
-    @reflections ||= begin
-      base = source.model
-
-      column.__stack.collect { |key|
-        reflection = base.reflections[key]
-        base = reflection.klass
-
-        extend_reflection reflection
-      }.flatten
-    end
+  def identifier
+    [type, property.name].compact.join(' ')
   end
 
   def joins
@@ -68,10 +60,25 @@ class ThinkingSphinx::ActiveRecord::PropertyQuery
     end
   end
 
+  def macros
+    reflections.collect &:macro
+  end
+
   def offset
     "* #{ThinkingSphinx::Configuration.instance.indices.count} + #{source.offset}"
   end
 
+  def queries
+    queries    = []
+    if column.string?
+      queries << column.__name.strip.gsub(/\n/, "\\\n")
+    else
+      queries << to_sql
+      queries << range_sql if ranged?
+    end
+    queries
+  end
+
   def quoted_foreign_key
     quote_with_table(base_association_class.table_name, base_association.foreign_key)
   end
@@ -98,6 +105,23 @@ class ThinkingSphinx::ActiveRecord::PropertyQuery
     ).to_sql
   end
 
+  def reflections
+    @reflections ||= begin
+      base = source.model
+
+      column.__stack.collect { |key|
+        reflection = base.reflections[key]
+        base = reflection.klass
+
+        extend_reflection reflection
+      }.flatten
+    end
+  end
+
+  def safe_habtm_column?
+    macros == [:has_and_belongs_to_many] && column.__name == :id
+  end
+
   def source_type
     property.source_type.to_s.dasherize
   end
@@ -105,12 +129,18 @@ class ThinkingSphinx::ActiveRecord::PropertyQuery
   def to_sql
     raise "Could not determine SQL for MVA" if reflections.empty?
 
-    relation = base_association_class_unscoped.select("#{quoted_foreign_key} #{offset} AS #{quote_column('id')}, #{quoted_primary_key} AS #{quote_column(property.name)}"
-    )
+    relation = base_association_class_unscoped.select("#{quoted_foreign_key} #{offset} AS #{quote_column('id')}, #{quoted_primary_key} AS #{quote_column(property.name)}")
     relation = relation.joins(joins) if joins.present?
     relation = relation.where("#{quoted_foreign_key} BETWEEN $start AND $end") if ranged?
+    relation = relation.where("#{quoted_foreign_key} IS NOT NULL")
     relation = relation.order("#{quoted_foreign_key} ASC") if type.nil?
 
     relation.to_sql
   end
+
+  def unsafe_habtm_column?
+    macros.include?(:has_and_belongs_to_many) && (
+      macros.length > 1 || column.__name != :id
+    )
+  end
 end

data/lib/thinking_sphinx/active_record/simple_many_query.rb

@@ -0,0 +1,35 @@
+class ThinkingSphinx::ActiveRecord::SimpleManyQuery <
+  ThinkingSphinx::ActiveRecord::PropertyQuery
+
+  def to_s
+    "#{identifier} from #{source_type}; #{queries.join('; ')}"
+  end
+
+  private
+
+  def reflection
+    @reflection ||= source.model.reflections[column.__stack.first]
+  end
+
+  def quoted_foreign_key
+    quote_with_table reflection.join_table, reflection.foreign_key
+  end
+
+  def quoted_primary_key
+    quote_with_table reflection.join_table, reflection.association_foreign_key
+  end
+
+  def range_sql
+    "SELECT MIN(#{quoted_foreign_key}), MAX(#{quoted_foreign_key}) FROM #{quote_column reflection.join_table}"
+  end
+
+  def to_sql
+    selects = [
+      "#{quoted_foreign_key} #{offset} AS #{quote_column('id')}",
+      "#{quoted_primary_key} AS #{quote_column(property.name)}"
+    ]
+    sql  = "SELECT #{selects.join(', ')} FROM #{quote_column reflection.join_table}"
+    sql += " WHERE (#{quoted_foreign_key} BETWEEN $start AND $end)" if ranged?
+    sql
+  end
+end

data/lib/thinking_sphinx/capistrano/v3.rb

@@ -1,6 +1,7 @@
 namespace :load do
   task :defaults do
     set :thinking_sphinx_roles, :db
+    set :thinking_sphinx_rails_env, -> { fetch(:stage) }
   end
 end
 
@@ -12,7 +13,7 @@ if you alter the structure of your indexes.
   task :rebuild do
     on roles fetch(:thinking_sphinx_roles) do
       within current_path do
-        with rails_env: fetch(:stage) do
+        with rails_env: fetch(:thinking_sphinx_rails_env) do
           execute :rake, "ts:rebuild"
         end
       end
@@ -21,9 +22,9 @@ if you alter the structure of your indexes.
 
   desc 'Stop Sphinx, clear Sphinx index files, generate configuration file, start Sphinx, repopulate all data.'
   task :regenerate do
-    on roles fetch(:thinking_sphinx_options) do
+    on roles fetch(:thinking_sphinx_roles) do
       within current_path do
-        with rails_env: fetch(:stage) do
+        with rails_env: fetch(:thinking_sphinx_rails_env) do
           execute :rake, 'ts:regenerate'
         end
       end
@@ -34,7 +35,7 @@ if you alter the structure of your indexes.
   task :index do
     on roles fetch(:thinking_sphinx_roles) do
       within current_path do
-        with rails_env: fetch(:stage) do
+        with rails_env: fetch(:thinking_sphinx_rails_env) do
           execute :rake, 'ts:index'
         end
       end
@@ -43,9 +44,9 @@ if you alter the structure of your indexes.
 
   desc 'Generate Sphinx indexes into the shared path.'
   task :generate do
-    on roles fetch(:thinking_sphinx_options) do
+    on roles fetch(:thinking_sphinx_roles) do
       within current_path do
-        with rails_env: fetch(:stage) do
+        with rails_env: fetch(:thinking_sphinx_rails_env) do
           execute :rake, 'ts:generate'
         end
       end
@@ -56,7 +57,7 @@ if you alter the structure of your indexes.
   task :restart do
     on roles fetch(:thinking_sphinx_roles) do
       within current_path do
-        with rails_env: fetch(:stage) do
+        with rails_env: fetch(:thinking_sphinx_rails_env) do
           %w(stop configure start).each do |task|
             execute :rake, "ts:#{task}"
           end
@@ -69,7 +70,7 @@ if you alter the structure of your indexes.
   task :start do
     on roles fetch(:thinking_sphinx_roles) do
       within current_path do
-        with rails_env: fetch(:stage) do
+        with rails_env: fetch(:thinking_sphinx_rails_env) do
           execute :rake, 'ts:start'
         end
       end
@@ -81,7 +82,7 @@ if you alter the structure of your indexes.
   task :configure do
     on roles fetch(:thinking_sphinx_roles) do
       within current_path do
-        with rails_env: fetch(:stage) do
+        with rails_env: fetch(:thinking_sphinx_rails_env) do
           execute :rake, 'ts:configure'
         end
       end
@@ -92,7 +93,7 @@ if you alter the structure of your indexes.
   task :stop do
     on roles fetch(:thinking_sphinx_roles) do
       within current_path do
-        with rails_env: fetch(:stage) do
+        with rails_env: fetch(:thinking_sphinx_rails_env) do
           execute :rake, 'ts:stop'
         end
       end

data/lib/thinking_sphinx/configuration.rb

@@ -74,7 +74,9 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
       end
     end
 
-    ThinkingSphinx::Configuration::DistributedIndices.new(indices).reconcile
+    if settings['distributed_indices'].nil? || settings['distributed_indices']
+      ThinkingSphinx::Configuration::DistributedIndices.new(indices).reconcile
+    end
 
     @preloaded_indices = true
   end
@@ -117,13 +119,18 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
   end
 
   def log_root
-    framework_root.join('log').realpath
+    real_path 'log'
   end
 
   def framework_root
     Pathname.new(framework.root)
   end
 
+  def real_path(*arguments)
+    path = framework_root.join(*arguments)
+    path.exist? ? path.realpath : path
+  end
+
   def settings_to_hash
     contents = YAML.load(ERB.new(File.read(settings_file)).result)
     contents && contents[environment] || {}
@@ -142,7 +149,12 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
     @indices_location = settings['indices_location'] || framework_root.join(
       'db', 'sphinx', environment
     ).to_s
-    @version = settings['version'] || '2.0.6'
+    @version = settings['version'] || '2.1.4'
+
+    if settings['common_sphinx_configuration']
+      common.common_sphinx_configuration  = true
+      indexer.common_sphinx_configuration = true
+    end
 
     configure_searchd
 
@@ -152,12 +164,17 @@ class ThinkingSphinx::Configuration < Riddle::Configuration
   end
 
   def tmp_path
-    path = framework_root.join('tmp')
-    File.exists?(path) ? path.realpath : path
+    real_path 'tmp'
+  end
+
+  def sphinx_sections
+    sections = [indexer, searchd]
+    sections.unshift common if settings['common_sphinx_configuration']
+    sections
   end
 
   def apply_sphinx_settings!
-    [indexer, searchd].each do |object|
+    sphinx_sections.each do |object|
       settings.each do |key, value|
         next unless object.class.settings.include?(key.to_sym)