RubyGems - thinking-sphinx - Versions diffs - 3.4.2 → 4.0.0 - Mend

thinking-sphinx 3.4.2 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (333) hide show

data/lib/thinking_sphinx/configuration/consistent_ids.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Configuration::ConsistentIds
   def initialize(indices)
     @indices = indices

data/lib/thinking_sphinx/configuration/defaults.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Configuration::Defaults
   ADDRESS = '127.0.0.1'
   PORT    = 9306

data/lib/thinking_sphinx/configuration/distributed_indices.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Configuration::DistributedIndices
   def initialize(indices)
     @indices = indices

data/lib/thinking_sphinx/configuration/duplicate_names.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Configuration::DuplicateNames
   def initialize(indices)
     @indices = indices

data/lib/thinking_sphinx/configuration/minimum_fields.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Configuration::MinimumFields
   def initialize(indices)
     @indices = indices

data/lib/thinking_sphinx/connection.rb CHANGED

@@ -1,16 +1,15 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Connection
   MAXIMUM_RETRIES = 3
   def self.new
     configuration = ThinkingSphinx::Configuration.instance
-    # If you use localhost, MySQL insists on a socket connection, but Sphinx
-    # requires a TCP connection. Using 127.0.0.1 fixes that.
-    address = configuration.searchd.address || '127.0.0.1'
-    address = '127.0.0.1' if address == 'localhost'
     options = {
-      :host      => address,
+      :host      => configuration.searchd.address,
       :port      => configuration.searchd.mysql41,
+      :socket    => configuration.searchd.socket,
       :reconnect => true
     }.merge(configuration.settings['connection_options'] || {})

data/lib/thinking_sphinx/connection/client.rb CHANGED

@@ -1,4 +1,25 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Connection::Client
+  def initialize(options)
+    if options[:socket].present?
+      options[:socket] = options[:socket].remove /:mysql41$/
+      options.delete :host
+      options.delete :port
+    else
+      options.delete :socket
+      # If you use localhost, MySQL insists on a socket connection, but in this
+      # situation we want a TCP connection. Using 127.0.0.1 fixes that.
+      if options[:host].nil? || options[:host] == "localhost"
+        options[:host] = "127.0.0.1"
+      end
+    end
+    @options = options
+  end
   def close
     close! unless ThinkingSphinx::Connection.persistent?
   end

data/lib/thinking_sphinx/connection/jruby.rb CHANGED

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Connection::JRuby < ThinkingSphinx::Connection::Client
   attr_reader :address, :options
   def initialize(options)
-    @address = "jdbc:mysql://#{options[:host]}:#{options[:port]}/?allowMultiQueries=true"
-    @options = options
+    options.delete :socket
+    super
+    @address = "jdbc:mysql://#{@options[:host]}:#{@options[:port]}/?allowMultiQueries=true"
   end
   def base_error

data/lib/thinking_sphinx/connection/mri.rb CHANGED

@@ -1,8 +1,6 @@
-class ThinkingSphinx::Connection::MRI < ThinkingSphinx::Connection::Client
-  def initialize(options)
-    @options = options
-  end
+# frozen_string_literal: true
+class ThinkingSphinx::Connection::MRI < ThinkingSphinx::Connection::Client
   def base_error
     Mysql2::Error
   end

data/lib/thinking_sphinx/core.rb CHANGED

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

data/lib/thinking_sphinx/core/field.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Core::Field
   def infixing?
     options[:infixes]

data/lib/thinking_sphinx/core/index.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Core::Index
   extend ActiveSupport::Concern
   include ThinkingSphinx::Core::Settings
@@ -9,7 +11,7 @@ module ThinkingSphinx::Core::Index
   def initialize(reference, options = {})
     @reference    = reference.to_sym
-    @docinfo      = :extern
+    @docinfo      = :extern unless config.settings["skip_docinfo"]
     @options      = options
     @offset       = config.next_offset(options[:offset_as] || reference)
     @type         = 'plain'
@@ -36,6 +38,7 @@ module ThinkingSphinx::Core::Index
   end
   def interpret_definition!
+    return unless model.table_exists?
     return if @interpreted_definition
     apply_defaults!

data/lib/thinking_sphinx/core/interpreter.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Core::Interpreter < BasicObject
   def self.translate!(index, block)
     new(index, block).translate!

data/lib/thinking_sphinx/core/property.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Core::Property
   def facet?
     options[:facet]

data/lib/thinking_sphinx/core/settings.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Core::Settings
   private
   def apply_defaults!(defaults = self.class.settings)

data/lib/thinking_sphinx/deletion.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Deletion
   delegate :name, :to => :index

data/lib/thinking_sphinx/deltas.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Deltas
   def self.config
     ThinkingSphinx::Configuration.instance

data/lib/thinking_sphinx/deltas/default_delta.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Deltas::DefaultDelta
   attr_reader :adapter, :options

data/lib/thinking_sphinx/deltas/delete_job.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Deltas::DeleteJob
   def initialize(index_name, document_id)
     @index_name, @document_id = index_name, document_id

data/lib/thinking_sphinx/deltas/index_job.rb CHANGED

@@ -1,14 +1,22 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Deltas::IndexJob
   def initialize(index_name)
     @index_name = index_name
   end
   def perform
-    configuration.controller.index @index_name, :verbose => !quiet_deltas?
+    ThinkingSphinx::Commander.call(
+      :index_sql, configuration,
+      :indices => [index_name],
+      :verbose => !quiet_deltas?
+    )
   end
   private
+  attr_reader :index_name
   def configuration
     @configuration ||= ThinkingSphinx::Configuration.instance
   end

data/lib/thinking_sphinx/distributed.rb CHANGED

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

data/lib/thinking_sphinx/distributed/index.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Distributed::Index <
   Riddle::Configuration::DistributedIndex

data/lib/thinking_sphinx/errors.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::SphinxError < StandardError
   attr_accessor :statement
@@ -85,3 +87,10 @@ end
 class ThinkingSphinx::UnknownAttributeType < StandardError
 end
+class ThinkingSphinx::TranscriptionError < StandardError
+  attr_accessor :inner_exception, :instance, :property
+end
+class ThinkingSphinx::UnknownCommand < StandardError
+end

data/lib/thinking_sphinx/excerpter.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Excerpter
   DefaultOptions = {
     :before_match    => '<span class="match">',

data/lib/thinking_sphinx/facet.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Facet
   attr_reader :name
@@ -11,7 +13,7 @@ class ThinkingSphinx::Facet
   def results_from(raw)
     raw.inject({}) { |hash, row|
-      hash[row[group_column]] = row[ThinkingSphinx::SphinxQL.count[:column]]
+      hash[row[group_column]] = row["sphinx_internal_count"]
       hash
     }
   end
@@ -19,8 +21,7 @@ class ThinkingSphinx::Facet
   private
   def group_column
-    @properties.any?(&:multi?) ?
-      ThinkingSphinx::SphinxQL.group_by[:column] : name
+    @properties.any?(&:multi?) ? "sphinx_internal_group" : name
   end
   def use_field?

data/lib/thinking_sphinx/facet_search.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::FacetSearch
   include Enumerable
@@ -112,8 +114,8 @@ class ThinkingSphinx::FacetSearch
   def options_for(facet)
     options.merge(
       :select      => [(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(', '),
       :group_by    => facet.name,
       :indices     => index_names_for(facet),

data/lib/thinking_sphinx/float_formatter.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::FloatFormatter
   PATTERN = /(\d+)e\-(\d+)$/

data/lib/thinking_sphinx/frameworks.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Frameworks
   def self.current
     defined?(::Rails) ? ThinkingSphinx::Frameworks::Rails.new :

data/lib/thinking_sphinx/frameworks/plain.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Frameworks::Plain
   attr_accessor :environment, :root

data/lib/thinking_sphinx/frameworks/rails.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Frameworks::Rails
   def environment
     Rails.env

data/lib/thinking_sphinx/guard.rb CHANGED

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
 module ThinkingSphinx::Guard
   #
 end
 require 'thinking_sphinx/guard/file'
 require 'thinking_sphinx/guard/files'
+require 'thinking_sphinx/guard/none'

data/lib/thinking_sphinx/guard/file.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Guard::File
   attr_reader :name

data/lib/thinking_sphinx/guard/files.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Guard::Files
   def self.call(names, &block)
     new(names).call(&block)

data/lib/thinking_sphinx/guard/none.rb ADDED

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+class ThinkingSphinx::Guard::None
+  def self.call(names, &block)
+    block.call names
+  end
+end

data/lib/thinking_sphinx/hooks/guard_presence.rb ADDED

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+class ThinkingSphinx::Hooks::GuardPresence
+  def self.call(configuration = nil, stream = STDERR)
+    new(configuration, stream).call
+  end
+  def initialize(configuration = nil, stream = STDERR)
+    @configuration = configuration || ThinkingSphinx::Configuration.instance
+    @stream        = stream
+  end
+  def call
+    return if files.empty?
+    stream.puts "WARNING: The following indexing guard files exist:"
+    files.each do |file|
+      stream.puts " * #{file}"
+    end
+    stream.puts <<-TXT
+These files indicate indexing is already happening. If that is not the case,
+these files should be deleted to ensure all indices can be processed.
+    TXT
+  end
+  private
+  attr_reader :configuration, :stream
+  def files
+    @files ||= Dir["#{configuration.indices_location}/ts-*.tmp"]
+  end
+end

data/lib/thinking_sphinx/index.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::Index
   attr_reader :reference, :options, :block

data/lib/thinking_sphinx/index_set.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::IndexSet
   include Enumerable

data/lib/thinking_sphinx/indexing_strategies/all_at_once.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::IndexingStrategies::AllAtOnce
   def self.call(indices = [], &block)
     indices << '--all' if indices.empty?

data/lib/thinking_sphinx/indexing_strategies/one_at_a_time.rb CHANGED

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
 class ThinkingSphinx::IndexingStrategies::OneAtATime
   def self.call(indices = [], &block)
     if indices.empty?

data/lib/thinking_sphinx/interfaces.rb ADDED

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+module ThinkingSphinx::Interfaces
+  #
+end
+require 'thinking_sphinx/interfaces/base'
+require 'thinking_sphinx/interfaces/daemon'
+require 'thinking_sphinx/interfaces/real_time'
+require 'thinking_sphinx/interfaces/sql'

data/lib/thinking_sphinx/interfaces/base.rb ADDED

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+class ThinkingSphinx::Interfaces::Base
+  include ThinkingSphinx::WithOutput
+  private
+  def command(command, extra_options = {})
+    ThinkingSphinx::Commander.call(
+      command, configuration, options.merge(extra_options), stream
+    )
+  end
+end