thinking-sphinx 3.4.2 → 4.0.0

data/lib/thinking_sphinx/active_record/depolymorph/base_reflection.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+class ThinkingSphinx::ActiveRecord::Depolymorph::BaseReflection
+  def initialize(reflection, name, class_name)
+    @reflection = reflection
+    @name       = name
+    @class_name = class_name
+
+    @options = reflection.options.clone
+  end
+
+  def call
+    # Should be implemented by subclasses.
+  end
+
+  private
+
+  attr_reader :reflection, :name, :class_name
+
+  def klass
+    reflection.class
+  end
+
+  def options
+    @options.delete :polymorphic
+    @options[:class_name]    = class_name
+    @options[:foreign_key] ||= "#{reflection.name}_id"
+    @options[:foreign_type]  = reflection.foreign_type
+
+    @options
+  end
+end

data/lib/thinking_sphinx/active_record/depolymorph/conditions_reflection.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+# The conditions approach is only available in Rails 3. This behaviour is
+# superseded by ScopedReflection for Rails 4.0.
+class ThinkingSphinx::ActiveRecord::Depolymorph::ConditionsReflection <
+  ThinkingSphinx::ActiveRecord::Depolymorph::BaseReflection
+
+  def call
+    klass.new reflection.macro, name, options, active_record
+  end
+
+  private
+
+  delegate :foreign_type, :active_record, :to => :reflection
+
+  def condition
+    "::ts_join_alias::.#{quoted_foreign_type} = '#{class_name}'"
+  end
+
+  def options
+    super
+
+    case @options[:conditions]
+    when nil
+      @options[:conditions] = condition
+    when Array
+      @options[:conditions] << condition
+    when Hash
+      @options[:conditions].merge! foreign_type => @options[:class_name]
+    else
+      @options[:conditions] = "#{@options[:conditions]} AND #{condition}"
+    end
+
+    @options
+  end
+
+  def quoted_foreign_type
+    active_record.connection.quote_column_name foreign_type
+  end
+end

data/lib/thinking_sphinx/active_record/depolymorph/overridden_reflection.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+# This overriding approach is only available in Rails 5.2+. This behaviour
+# was preceded by AssociationReflection for Rails 4.1-5.1.
+class ThinkingSphinx::ActiveRecord::Depolymorph::OverriddenReflection <
+  ThinkingSphinx::ActiveRecord::Depolymorph::BaseReflection
+
+  module JoinConstraint
+    def build_join_constraint(table, foreign_table)
+      super.and(
+        foreign_table[options[:foreign_type]].eq(
+          options[:class_name].constantize.base_class.name
+        )
+      )
+    end
+  end
+
+  def self.overridden_classes
+    @overridden_classes ||= {}
+  end
+
+  def call
+    klass.new name, nil, options, reflection.active_record
+  end
+
+  private
+
+  def klass
+    self.class.overridden_classes[reflection.class] ||= begin
+      subclass = Class.new reflection.class
+      subclass.include JoinConstraint
+      subclass
+    end
+  end
+end

data/lib/thinking_sphinx/active_record/depolymorph/scoped_reflection.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+# This scoped approach is only available in Rails 4.0. This behaviour is
+# superseded by AssociationReflection for Rails 4.1, and was preceded by
+# ConditionsReflection for Rails 3.2.
+class ThinkingSphinx::ActiveRecord::Depolymorph::ScopedReflection <
+  ThinkingSphinx::ActiveRecord::Depolymorph::BaseReflection
+
+  def call
+    klass.new reflection.macro, name, scope, options,
+      reflection.active_record
+  end
+
+  private
+
+  def scope
+    lambda { |association|
+      reflection = association.reflection
+      klass      = reflection.class_name.constantize
+      where(
+        association.parent.aliased_table_name.to_sym =>
+        {reflection.foreign_type => klass.base_class.name}
+      )
+    }
+  end
+end

data/lib/thinking_sphinx/active_record/field.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Field <
   ThinkingSphinx::ActiveRecord::Property
   include ThinkingSphinx::Core::Field

data/lib/thinking_sphinx/active_record/filter_reflection.rb

@@ -1,76 +1,18 @@
-class ThinkingSphinx::ActiveRecord::FilterReflection
-  attr_reader :reflection, :class_name
-
-  delegate :foreign_type, :active_record, :to => :reflection
-
-  def self.call(reflection, name, class_name)
-    filter = new(reflection, class_name)
-    klass  = reflection.class
-    arity  = klass.instance_method(:initialize).arity
-
-    if defined?(ActiveRecord::Reflection::MacroReflection) && arity == 4
-      klass.new name, filter.scope, filter.options, reflection.active_record
-    elsif reflection.respond_to?(:scope)
-      klass.new reflection.macro, name, filter.scope, filter.options,
-        reflection.active_record
-    else
-      klass.new reflection.macro, name, filter.options,
-        reflection.active_record
-    end
-  end
-
-  def initialize(reflection, class_name)
-    @reflection, @class_name = reflection, class_name
-    @options = reflection.options.clone
-  end
-
-  def options
-    @options.delete :polymorphic
-    @options[:class_name]    = class_name
-    @options[:foreign_key] ||= "#{reflection.name}_id"
-    @options[:foreign_type]  = reflection.foreign_type
-
-    if reflection.respond_to?(:scope)
-      @options[:sphinx_internal_filtered] = true
-      return @options
-    end
+# frozen_string_literal: true
 
-    case @options[:conditions]
-    when nil
-      @options[:conditions] = condition
-    when Array
-      @options[:conditions] << condition
-    when Hash
-      @options[:conditions].merge!(reflection.foreign_type => @options[:class_name])
-    else
-      @options[:conditions] << " AND #{condition}"
-    end
-
-    @options
-  end
-
-  def scope
-    if ::Joiner::Joins.instance_methods.include?(:join_association_class)
-      return nil
-    end
-
-    lambda { |association|
-      reflection = association.reflection
-      klass      = reflection.class_name.constantize
-      where(
-        association.parent.aliased_table_name.to_sym =>
-        {reflection.foreign_type => klass.base_class.name}
-      )
-    }
-  end
-
-  private
-
-  def condition
-    "::ts_join_alias::.#{quoted_foreign_type} = '#{class_name}'"
+class ThinkingSphinx::ActiveRecord::FilterReflection
+  ReflectionGenerator = case ActiveRecord::VERSION::STRING.to_f
+  when 5.2..7.0
+    ThinkingSphinx::ActiveRecord::Depolymorph::OverriddenReflection
+  when 4.1..5.1
+    ThinkingSphinx::ActiveRecord::Depolymorph::AssociationReflection
+  when 4.0
+    ThinkingSphinx::ActiveRecord::Depolymorph::ScopedReflection
+  when 3.2
+    ThinkingSphinx::ActiveRecord::Depolymorph::ConditionsReflection
   end
 
-  def quoted_foreign_type
-    active_record.connection.quote_column_name foreign_type
+  def self.call(reflection, name, class_name)
+    ReflectionGenerator.new(reflection, name, class_name).call
   end
 end

data/lib/thinking_sphinx/active_record/index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Index < Riddle::Configuration::Index
   include ThinkingSphinx::Core::Index
 

data/lib/thinking_sphinx/active_record/interpreter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Interpreter <
   ::ThinkingSphinx::Core::Interpreter
 

data/lib/thinking_sphinx/active_record/join_association.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::JoinAssociation <
   ::ActiveRecord::Associations::JoinDependency::JoinAssociation
 

data/lib/thinking_sphinx/active_record/log_subscriber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::LogSubscriber < ActiveSupport::LogSubscriber
   def guard(event)
     identifier = color 'Sphinx', GREEN, true

data/lib/thinking_sphinx/active_record/polymorpher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Polymorpher
   def initialize(source, column, class_names)
     @source, @column, @class_names = source, column, class_names

data/lib/thinking_sphinx/active_record/property.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::Property
   include ThinkingSphinx::Core::Property
 

data/lib/thinking_sphinx/active_record/property_query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::PropertyQuery
   def initialize(property, source, type = nil)
     @property, @source, @type = property, source, type

data/lib/thinking_sphinx/active_record/property_sql_presenter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::PropertySQLPresenter
   attr_reader :property, :adapter, :associations
 

data/lib/thinking_sphinx/active_record/simple_many_query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::SimpleManyQuery <
   ThinkingSphinx::ActiveRecord::PropertyQuery
 

data/lib/thinking_sphinx/active_record/source_joins.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::SourceJoins
   def self.call(model, source)
     new(model, source).call

data/lib/thinking_sphinx/active_record/sql_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module ActiveRecord
     class SQLBuilder

data/lib/thinking_sphinx/active_record/sql_builder/clause_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module ActiveRecord
     class SQLBuilder::ClauseBuilder

data/lib/thinking_sphinx/active_record/sql_builder/query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module ActiveRecord
     class SQLBuilder::Query

data/lib/thinking_sphinx/active_record/sql_builder/statement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'thinking_sphinx/active_record/sql_builder/clause_builder'
 
 module ThinkingSphinx

data/lib/thinking_sphinx/active_record/sql_source.rb

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module ActiveRecord
     class SQLSource < Riddle::Configuration::SQLSource
       include ThinkingSphinx::Core::Settings
-      attr_reader :model, :database_settings, :options
+
+      attr_reader :model, :options
       attr_accessor :fields, :attributes, :associations, :conditions,
         :groupings, :polymorphs
 
@@ -12,9 +15,8 @@ module ThinkingSphinx
 
       def initialize(model, options = {})
         @model             = model
-        @database_settings = model.connection.instance_variable_get(:@config).clone
         @options           = {
-          :utf8? => (@database_settings[:encoding].to_s[/^utf8/])
+          :utf8? => (database_settings[:encoding].to_s[/^utf8/])
         }.merge options
 
         @fields            = []
@@ -132,6 +134,16 @@ module ThinkingSphinx
         ThinkingSphinx::Configuration.instance
       end
 
+      def database_settings
+        @database_settings ||= begin
+          if model.connection.respond_to?(:config)
+            model.connection.config.clone
+          else
+            model.connection.instance_variable_get(:@config).clone
+          end
+        end
+      end
+
       def prepare_for_render
         polymorphs.each &:morph!
         append_presenter_to_attribute_array

data/lib/thinking_sphinx/active_record/sql_source/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::ActiveRecord::SQLSource::Template
   attr_reader :source
 

data/lib/thinking_sphinx/attribute_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::AttributeTypes
   def self.call
     @call ||= new.call

data/lib/thinking_sphinx/batched_search.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::BatchedSearch
   attr_accessor :searches
 

data/lib/thinking_sphinx/callbacks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Callbacks
   attr_reader :instance
 

data/lib/thinking_sphinx/capistrano.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if defined?(Capistrano::VERSION)
   if Gem::Version.new(Capistrano::VERSION).release >= Gem::Version.new('3.0.0')
     recipe_version = 3

data/lib/thinking_sphinx/capistrano/v2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Capistrano::Configuration.instance(:must_exist).load do
   _cset(:thinking_sphinx_roles)   { :db }
   _cset(:thinking_sphinx_options) { {:roles => fetch(:thinking_sphinx_roles)} }

data/lib/thinking_sphinx/capistrano/v3.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 namespace :load do
   task :defaults do
     set :thinking_sphinx_roles, :db

data/lib/thinking_sphinx/commander.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class ThinkingSphinx::Commander
+  def self.call(command, configuration, options, stream = STDOUT)
+    raise ThinkingSphinx::UnknownCommand unless registry.keys.include?(command)
+
+    registry[command].call configuration, options, stream
+  end
+
+  def self.registry
+    @registry ||= {
+      :clear_real_time  => ThinkingSphinx::Commands::ClearRealTime,
+      :clear_sql        => ThinkingSphinx::Commands::ClearSQL,
+      :configure        => ThinkingSphinx::Commands::Configure,
+      :index_sql        => ThinkingSphinx::Commands::IndexSQL,
+      :index_real_time  => ThinkingSphinx::Commands::IndexRealTime,
+      :merge            => ThinkingSphinx::Commands::Merge,
+      :merge_and_update => ThinkingSphinx::Commands::MergeAndUpdate,
+      :prepare          => ThinkingSphinx::Commands::Prepare,
+      :rotate           => ThinkingSphinx::Commands::Rotate,
+      :running          => ThinkingSphinx::Commands::Running,
+      :start_attached   => ThinkingSphinx::Commands::StartAttached,
+      :start_detached   => ThinkingSphinx::Commands::StartDetached,
+      :stop             => ThinkingSphinx::Commands::Stop
+    }
+  end
+end