thinking-sphinx 3.4.2 → 4.0.0

data/lib/thinking_sphinx/interfaces/daemon.rb

@@ -1,20 +1,16 @@
-class ThinkingSphinx::Interfaces::Daemon
-  include ThinkingSphinx::WithOutput
+# frozen_string_literal: true
 
+class ThinkingSphinx::Interfaces::Daemon < ThinkingSphinx::Interfaces::Base
   def start
-    if running?
+    if command :running
       raise ThinkingSphinx::SphinxAlreadyRunning, 'searchd is already running'
     end
 
-    if options[:nodetach]
-      ThinkingSphinx::Commands::StartAttached.call configuration, options
-    else
-      ThinkingSphinx::Commands::StartDetached.call configuration, options
-    end
+    command(options[:nodetach] ? :start_attached : :start_detached)
   end
 
   def status
-    if running?
+    if command :running
       stream.puts "The Sphinx daemon searchd is currently running."
     else
       stream.puts "The Sphinx daemon searchd is not currently running."
@@ -22,11 +18,10 @@ class ThinkingSphinx::Interfaces::Daemon
   end
 
   def stop
-    ThinkingSphinx::Commands::Stop.call configuration, options
+    command :stop
   end
 
   private
 
   delegate :controller, :to => :configuration
-  delegate :running?,   :to => :controller
 end

data/lib/thinking_sphinx/interfaces/real_time.rb

@@ -1,38 +1,43 @@
-class ThinkingSphinx::Interfaces::RealTime
-  include ThinkingSphinx::WithOutput
+# frozen_string_literal: true
 
+class ThinkingSphinx::Interfaces::RealTime < ThinkingSphinx::Interfaces::Base
   def initialize(configuration, options, stream = STDOUT)
     super
 
     configuration.preload_indices
 
-    FileUtils.mkdir_p configuration.indices_location
+    command :prepare
   end
 
   def clear
-    indices.each do |index|
-      index.render
-      Dir["#{index.path}.*"].each { |path| FileUtils.rm path }
-    end
-
-    path = configuration.searchd.binlog_path
-    FileUtils.rm_r(path) if File.exists?(path)
+    command :clear_real_time, :indices => indices
   end
 
   def index
-    return if indices.empty? || !configuration.controller.running?
+    return if indices.empty?
+    if !command :running
+      stream.puts <<-TXT
+The Sphinx daemon is not currently running. Real-time indices can only be
+populated by sending commands to a running daemon.
+      TXT
+      return
+    end
 
-    indices.each { |index| ThinkingSphinx::RealTime::Populator.populate index }
+    command :index_real_time, :indices => indices
   end
 
   private
 
+  def index_names
+    @index_names ||= options[:index_names] || []
+  end
+
   def indices
     @indices ||= begin
       indices = configuration.indices.select { |index| index.type == 'rt' }
 
-      if options[:index_filter]
-        indices.select! { |index| index.name == options[:index_filter] }
+      if index_names.any?
+        indices.select! { |index| index_names.include? index.name }
       end
 
       indices

data/lib/thinking_sphinx/interfaces/sql.rb

@@ -1,19 +1,16 @@
-class ThinkingSphinx::Interfaces::SQL
-  include ThinkingSphinx::WithOutput
+# frozen_string_literal: true
 
+class ThinkingSphinx::Interfaces::SQL < ThinkingSphinx::Interfaces::Base
   def initialize(configuration, options, stream = STDOUT)
     super
 
     configuration.preload_indices
 
-    FileUtils.mkdir_p configuration.indices_location
+    command :prepare
   end
 
   def clear
-    indices.each do |index|
-      index.render
-      Dir["#{index.path}.*"].each { |path| FileUtils.rm path }
-    end
+    command :clear_sql, :indices => (filtered? ? filtered_indices : indices)
   end
 
   def index(reconfigure = true, verbose = nil)
@@ -25,14 +22,29 @@ option is set automatically when invoked by rake, via rake's --silent and/or
     TXT
     return if indices.empty?
 
-    ThinkingSphinx::Commands::Configure.call configuration, options if reconfigure
-    ThinkingSphinx.before_index_hooks.each { |hook| hook.call }
+    command :configure if reconfigure
+    command :index_sql,
+      :indices => (filtered? ? filtered_indices.collect(&:name) : nil)
+  end
 
-    ThinkingSphinx::Commands::Index.call configuration, options, stream
+  def merge
+    command :merge_and_update
   end
 
   private
 
+  def filtered?
+    index_names.any?
+  end
+
+  def filtered_indices
+    indices.select { |index| index_names.include? index.name }
+  end
+
+  def index_names
+    @index_names ||= options[:index_names] || []
+  end
+
   def indices
     @indices ||= configuration.indices.select do |index|
       index.type == 'plain' || index.type.blank?

data/lib/thinking_sphinx/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Logger
   def self.log(notification, message, &block)
     ActiveSupport::Notifications.instrument(

data/lib/thinking_sphinx/masks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx::Masks
   #
 end

data/lib/thinking_sphinx/masks/group_enumerators_mask.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Masks::GroupEnumeratorsMask
   def initialize(search)
     @search = search
@@ -9,20 +11,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[:column]]
+      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[:column]]
+      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[:column]],
-        row[ThinkingSphinx::SphinxQL.count[:column]]
+      yield @search[index], row["sphinx_internal_group"],
+        row["sphinx_internal_count"]
     end
   end
 end

data/lib/thinking_sphinx/masks/pagination_mask.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Masks::PaginationMask
   def initialize(search)
     @search = search

data/lib/thinking_sphinx/masks/scopes_mask.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Masks::ScopesMask
   def initialize(search)
     @search = search

data/lib/thinking_sphinx/masks/weight_enumerator_mask.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Masks::WeightEnumeratorMask
   def initialize(search)
     @search = search
@@ -9,7 +11,7 @@ class ThinkingSphinx::Masks::WeightEnumeratorMask
 
   def each_with_weight(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row[ThinkingSphinx::SphinxQL.weight[:column]]
+      yield @search[index], row["weight()"]
     end
   end
 end

data/lib/thinking_sphinx/middlewares.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx::Middlewares; end
 
 %w[
-  middleware active_record_translator attribute_typer geographer glazier
-  ids_only inquirer sphinxql stale_id_checker stale_id_filter utf8 valid_options
+  middleware active_record_translator geographer glazier ids_only inquirer
+  sphinxql stale_id_checker stale_id_filter valid_options
 ].each do |middleware|
   require "thinking_sphinx/middlewares/#{middleware}"
 end
@@ -12,7 +14,7 @@ module ThinkingSphinx::Middlewares
     middlewares.each { |m| builder.use m }
   end
 
-  BASE_MIDDLEWARES = [ValidOptions, AttributeTyper, SphinxQL, Geographer, Inquirer]
+  BASE_MIDDLEWARES = [ValidOptions, SphinxQL, Geographer, Inquirer]
 
   DEFAULT = ::Middleware::Builder.new do
     use StaleIdFilter

data/lib/thinking_sphinx/middlewares/active_record_translator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::ActiveRecordTranslator <
   ThinkingSphinx::Middlewares::Middleware
 

data/lib/thinking_sphinx/middlewares/geographer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/core_ext/module/delegation'
 
 class ThinkingSphinx::Middlewares::Geographer <

data/lib/thinking_sphinx/middlewares/glazier.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::Glazier <
   ThinkingSphinx::Middlewares::Middleware
 

data/lib/thinking_sphinx/middlewares/ids_only.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::IdsOnly <
   ThinkingSphinx::Middlewares::Middleware
 

data/lib/thinking_sphinx/middlewares/inquirer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::Inquirer <
   ThinkingSphinx::Middlewares::Middleware
 

data/lib/thinking_sphinx/middlewares/middleware.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::Middleware
   def initialize(app)
     @app = app

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::SphinxQL <
   ThinkingSphinx::Middlewares::Middleware
 
@@ -159,8 +161,8 @@ SQL
 
     def values
       options[:select] ||= ['*',
-        "#{ThinkingSphinx::SphinxQL.group_by[:select]}",
-        "#{ThinkingSphinx::SphinxQL.count[:select]}"
+        "groupby() AS sphinx_internal_group",
+        "id AS sphinx_document_id, count(DISTINCT sphinx_document_id) AS sphinx_internal_count"
       ].join(', ') if group_attribute.present?
       options[:select]
     end

data/lib/thinking_sphinx/middlewares/stale_id_checker.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::StaleIdChecker <
   ThinkingSphinx::Middlewares::Middleware
 

data/lib/thinking_sphinx/middlewares/stale_id_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::StaleIdFilter <
   ThinkingSphinx::Middlewares::Middleware
 

data/lib/thinking_sphinx/middlewares/valid_options.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Middlewares::ValidOptions <
   ThinkingSphinx::Middlewares::Middleware
 

data/lib/thinking_sphinx/panes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx::Panes
   #
 end

data/lib/thinking_sphinx/panes/attributes_pane.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Panes::AttributesPane
   def initialize(context, object, raw)
     @raw = raw

data/lib/thinking_sphinx/panes/distance_pane.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Panes::DistancePane
   def initialize(context, object, raw)
     @raw = raw

data/lib/thinking_sphinx/panes/excerpts_pane.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Panes::ExcerptsPane
   def initialize(context, object, raw)
     @context, @object = context, object

data/lib/thinking_sphinx/panes/weight_pane.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Panes::WeightPane
   def initialize(context, object, raw)
     @raw = raw
   end
 
   def weight
-    @raw[ThinkingSphinx::SphinxQL.weight[:column]]
+    @raw["weight()"]
   end
 end

data/lib/thinking_sphinx/query.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx::Query
   def self.escape(query)
     Riddle::Query.escape query

data/lib/thinking_sphinx/railtie.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Railtie < Rails::Railtie
   initializer 'thinking_sphinx.initialisation' do
     ActiveSupport.on_load(:active_record) do

data/lib/thinking_sphinx/rake_interface.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::RakeInterface
   DEFAULT_OPTIONS = {:verbose => true}
 
@@ -7,7 +9,7 @@ class ThinkingSphinx::RakeInterface
   end
 
   def configure
-    ThinkingSphinx::Commands::Configure.call configuration, options
+    ThinkingSphinx::Commander.call :configure, configuration, options
   end
 
   def daemon

data/lib/thinking_sphinx/real_time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx::RealTime
   module Callbacks
     #
@@ -14,6 +16,7 @@ require 'thinking_sphinx/real_time/field'
 require 'thinking_sphinx/real_time/index'
 require 'thinking_sphinx/real_time/interpreter'
 require 'thinking_sphinx/real_time/populator'
+require 'thinking_sphinx/real_time/transcribe_instance'
 require 'thinking_sphinx/real_time/transcriber'
 require 'thinking_sphinx/real_time/translator'
 

data/lib/thinking_sphinx/real_time/attribute.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::RealTime::Attribute < ThinkingSphinx::RealTime::Property
   def multi?
     @options[:multi]

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::RealTime::Callbacks::RealTimeCallbacks
   def initialize(reference, path = [], &block)
     @reference, @path, @block = reference, path, block

data/lib/thinking_sphinx/real_time/field.rb

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

data/lib/thinking_sphinx/real_time/index.rb

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

data/lib/thinking_sphinx/real_time/index/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::RealTime::Index::Template
   attr_reader :index