thinking-sphinx 4.4.1 → 5.4.0

data/lib/thinking_sphinx/settings.rb

@@ -11,14 +11,16 @@ class ThinkingSphinx::Settings
     lemmatizer_base mysql_ssl_cert mysql_ssl_key mysql_ssl_ca
   ].freeze
   DEFAULTS = {
-    "configuration_file" => "config/ENVIRONMENT.sphinx.conf",
-    "indices_location"   => "db/sphinx/ENVIRONMENT",
-    "pid_file"           => "log/ENVIRONMENT.sphinx.pid",
-    "log"                => "log/ENVIRONMENT.searchd.log",
-    "query_log"          => "log/ENVIRONMENT.searchd.query.log",
-    "binlog_path"        => "tmp/binlog/ENVIRONMENT",
-    "workers"            => "threads",
-    "mysql_encoding"     => "utf8"
+    "configuration_file"       => "config/ENVIRONMENT.sphinx.conf",
+    "indices_location"         => "db/sphinx/ENVIRONMENT",
+    "pid_file"                 => "log/ENVIRONMENT.sphinx.pid",
+    "log"                      => "log/ENVIRONMENT.searchd.log",
+    "query_log"                => "log/ENVIRONMENT.searchd.query.log",
+    "binlog_path"              => "tmp/binlog/ENVIRONMENT",
+    "workers"                  => "threads",
+    "mysql_encoding"           => "utf8",
+    "maximum_statement_length" => (2 ** 23) - 5,
+    "real_time_tidy"           => false
   }.freeze
 
   def self.call(configuration)
@@ -62,7 +64,9 @@ class ThinkingSphinx::Settings
 
   def defaults
     DEFAULTS.inject({}) do |hash, (key, value)|
-      value = value.gsub("ENVIRONMENT", framework.environment)
+      if value.is_a?(String)
+        value = value.gsub("ENVIRONMENT", framework.environment)
+      end
 
       if FILE_KEYS.include?(key)
         hash[key] = absolute value

data/lib/thinking_sphinx/sinatra.rb

@@ -3,5 +3,5 @@
 require 'thinking_sphinx'
 
 ActiveSupport.on_load :active_record do
-  include ThinkingSphinx::ActiveRecord::Base
+  require 'thinking_sphinx/active_record'
 end

data/lib/thinking_sphinx/test.rb

@@ -42,7 +42,7 @@ class ThinkingSphinx::Test
       config.indices_location,
       config.searchd.binlog_path
     ].each do |path|
-      FileUtils.rm_r(path) if File.exists?(path)
+      FileUtils.rm_r(path) if File.exist?(path)
     end
   end
 

data/lib/thinking_sphinx.rb

@@ -17,8 +17,6 @@ require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/module/attribute_accessors'
 
 module ThinkingSphinx
-  MAXIMUM_STATEMENT_LENGTH = (2 ** 23) - 5
-
   def self.count(query = '', options = {})
     search_for_ids(query, options).total_entries
   end
@@ -98,7 +96,6 @@ require 'thinking_sphinx/test'
 require 'thinking_sphinx/utf8'
 require 'thinking_sphinx/wildcard'
 # Extended
-require 'thinking_sphinx/active_record'
 require 'thinking_sphinx/deltas'
 require 'thinking_sphinx/distributed'
 require 'thinking_sphinx/logger'

data/spec/acceptance/attribute_access_spec.rb

@@ -20,7 +20,11 @@ describe 'Accessing attributes directly via search results', :live => true do
     search = Book.search 'gods', :select => "*, weight()"
     search.context[:panes] << ThinkingSphinx::Panes::WeightPane
 
-    expect(search.first.weight).to eq(2500)
+    if ENV["SPHINX_ENGINE"] == "sphinx" && ENV["SPHINX_VERSION"].to_f > 3.3
+      expect(search.first.weight).to eq(20_000.0)
+    else
+      expect(search.first.weight).to eq(2500)
+    end
   end
 
   it "provides direct access to the weight with alternative primary keys" do
@@ -39,7 +43,11 @@ describe 'Accessing attributes directly via search results', :live => true do
     search = Book.search 'gods', :select => "*, weight()"
     search.masks << ThinkingSphinx::Masks::WeightEnumeratorMask
 
-    expectations = [[gods, 2500]]
+    if ENV["SPHINX_ENGINE"] == "sphinx" && ENV["SPHINX_VERSION"].to_f > 3.3
+      expectations = [[gods, 20_000.0]]
+    else
+      expectations = [[gods, 2500]]
+    end
     search.each_with_weight do |result, weight|
       expectation = expectations.shift
 

data/spec/acceptance/big_integers_spec.rb

@@ -52,7 +52,7 @@ describe '64 bit document ids', :live => true do
   context 'with Real-Time' do
     it 'handles large 32 bit integers with an offset multiplier' do
       product = Product.create! :name => "Widget"
-      product.update_attributes :id => 980190962
+      product.update :id => 980190962
       expect(
         Product.search('widget', :indices => ['product_core']).to_a
       ).to eq([product])

data/spec/acceptance/geosearching_spec.rb

@@ -38,10 +38,20 @@ describe 'Searching by latitude and longitude', :live => true do
       expected = {:mysql => 250326.906250, :postgresql => 250331.234375}
     end
 
-    if ActiveRecord::Base.configurations['test']['adapter'][/postgres/]
-      expect(cities.first.geodist).to eq(expected[:postgresql])
+    adapter = nil
+
+    if ActiveRecord::VERSION::STRING.to_f > 6.0
+      adapter = ActiveRecord::Base.configurations.configs_for.first.adapter
+    elsif ActiveRecord::VERSION::STRING.to_f > 5.2
+      adapter = ActiveRecord::Base.configurations.configs_for.first.config["adapter"]
+    else
+      adapter = ActiveRecord::Base.configurations['test']['adapter']
+    end
+
+    if adapter[/postgres/]
+      expect(cities.first.geodist).to be_within(0.01).of(expected[:postgresql])
     else # mysql
-      expect(cities.first.geodist).to eq(expected[:mysql])
+      expect(cities.first.geodist).to be_within(0.01).of(expected[:mysql])
     end
   end
 

data/spec/acceptance/merging_spec.rb

@@ -34,7 +34,7 @@ describe "Merging deltas", :live => true do
       Book.search("Space", :indices => ["book_core"]).to_a
     ).to eq([race])
 
-    race.reload.update_attributes :title => "The Hate Race"
+    race.reload.update :title => "The Hate Race"
     sleep 0.25
     expect(
       Book.search("Race", :indices => ["book_delta"]).to_a

data/spec/acceptance/paginating_search_results_spec.rb

@@ -4,13 +4,22 @@ require 'acceptance/spec_helper'
 
 describe 'Paginating search results', :live => true do
   it "tracks how many results there are in total" do
+    expect(Article.search.total_entries).to be_zero
+
     21.times { |number| Article.create :title => "Article #{number}" }
     index
 
-    expect(Article.search.total_entries).to eq(21)
+    if ENV["SPHINX_ENGINE"] == "manticore" && ENV["SPHINX_VERSION"].to_f >= 4.0
+      # I suspect this is a bug in Manticore?
+      expect(Article.search.total_entries).to eq(22)
+    else
+      expect(Article.search.total_entries).to eq(21)
+    end
   end
 
   it "paginates the result set by default" do
+    expect(Article.search.total_entries).to be_zero
+
     21.times { |number| Article.create :title => "Article #{number}" }
     index
 
@@ -18,9 +27,16 @@ describe 'Paginating search results', :live => true do
   end
 
   it "tracks the number of pages" do
+    expect(Article.search.total_entries).to be_zero
+
     21.times { |number| Article.create :title => "Article #{number}" }
     index
 
-    expect(Article.search.total_pages).to eq(2)
+    if ENV["SPHINX_ENGINE"] == "manticore" && ENV["SPHINX_VERSION"].to_f >= 4.0
+      # I suspect this is a bug in Manticore?
+      expect(Article.search.total_pages).to eq(1)
+    else
+      expect(Article.search.total_pages).to eq(2)
+    end
   end
 end

data/spec/acceptance/real_time_updates_spec.rb

@@ -11,7 +11,7 @@ describe 'Updates to records in real-time indices', :live => true do
 
   it "handles attributes for sortable fields accordingly" do
     product = Product.create! :name => 'Red Fish'
-    product.update_attributes :name => 'Blue Fish'
+    product.update :name => 'Blue Fish'
 
     expect(Product.search('blue fish', :indices => ['product_core']).to_a).
       to eq([product])
@@ -22,7 +22,7 @@ describe 'Updates to records in real-time indices', :live => true do
 
     expect(Admin::Person.search('Death').to_a).to eq([person])
 
-    person.update_attributes :name => 'Mort'
+    person.update :name => 'Mort'
 
     expect(Admin::Person.search('Death').to_a).to be_empty
     expect(Admin::Person.search('Mort').to_a).to eq([person])

data/spec/acceptance/searching_with_filters_spec.rb

@@ -17,7 +17,7 @@ describe 'Searching with filters', :live => true do
     grave = Book.create! :title => 'The Graveyard Book', :year => 2009
     index
 
-    expect(Book.search(:with => {:year => [2001, 2005]}).to_a).to eq([gods, boys])
+    expect(Book.search(:with => {:year => [2001, 2005]}).to_a).to match_array([gods, boys])
   end
 
   it "limits results by a ranged filter" do
@@ -31,7 +31,7 @@ describe 'Searching with filters', :live => true do
     index
 
     expect(Book.search(:with => {:created_at => 6.days.ago..2.days.ago}).to_a).
-      to eq([gods, boys])
+      to match_array([gods, boys])
   end
 
   it "limits results by exclusive filters on single values" do
@@ -154,6 +154,6 @@ describe 'Searching with filters', :live => true do
     expect(products.to_a).to eq([pancakes])
 
     products = Product.search :with => {"options.sugar" => 1}
-    expect(products.to_a).to eq([pancakes, waffles])
+    expect(products.to_a).to match_array([pancakes, waffles])
   end if JSONColumn.call
 end

data/spec/acceptance/sql_deltas_spec.rb

@@ -16,7 +16,7 @@ describe 'SQL delta indexing', :live => true do
     )
     sleep 0.25
 
-    expect(Book.search('Terry Pratchett').to_a).to eq([guards, men])
+    expect(Book.search('Terry Pratchett').to_a).to match_array([guards, men])
   end
 
   it "automatically indexes updated records" do
@@ -25,7 +25,7 @@ describe 'SQL delta indexing', :live => true do
 
     expect(Book.search('Harry').to_a).to eq([book])
 
-    book.reload.update_attributes(:author => 'Terry Pratchett')
+    book.reload.update(:author => 'Terry Pratchett')
     sleep 0.25
 
     expect(Book.search('Terry').to_a).to eq([book])
@@ -37,7 +37,7 @@ describe 'SQL delta indexing', :live => true do
 
     expect(Book.search('Harry').to_a).to eq([book])
 
-    book.reload.update_attributes(:author => 'Terry Pratchett')
+    book.reload.update(:author => 'Terry Pratchett')
     sleep 0.25
 
     expect(Book.search('Harry')).to be_empty
@@ -49,7 +49,7 @@ describe 'SQL delta indexing', :live => true do
 
     expect(Album.search('Whitloms').to_a).to eq([album])
 
-    album.reload.update_attributes(:artist => 'The Whitlams')
+    album.reload.update(:artist => 'The Whitlams')
     sleep 0.25
 
     expect(Book.search('Whitloms')).to be_empty
@@ -63,4 +63,16 @@ describe 'SQL delta indexing', :live => true do
 
     expect(Book.search('Gaiman').to_a).to eq([book])
   end
+
+  it "updates associated models" do
+    colour = Colour.create(:name => 'green')
+    sleep 0.25
+
+    expect(Colour.search('green').to_a).to eq([colour])
+
+    tee = colour.tees.create
+    sleep 0.25
+
+    expect(Colour.search(:with => {:tee_ids => tee.id}).to_a).to eq([colour])
+  end
 end

data/spec/acceptance/support/sphinx_controller.rb

@@ -12,11 +12,13 @@ class SphinxController
 
     ThinkingSphinx::Configuration.reset
 
-    ActiveSupport::Dependencies.loaded.each do |path|
-      $LOADED_FEATURES.delete "#{path}.rb"
-    end
+    if Rails::VERSION::MAJOR < 7
+      ActiveSupport::Dependencies.loaded.each do |path|
+        $LOADED_FEATURES.delete "#{path}.rb"
+      end
 
-    ActiveSupport::Dependencies.clear
+      ActiveSupport::Dependencies.clear
+    end
 
     config.searchd.mysql41 = 9307
     config.settings['quiet_deltas']      = true

data/spec/acceptance/support/sphinx_helpers.rb

@@ -6,22 +6,22 @@ module SphinxHelpers
   end
 
   def index(*indices)
-    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5 if ENV['CI']
 
     yield if block_given?
 
     sphinx.index *indices
     sleep 0.25
-    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5 if ENV['CI']
   end
 
   def merge
-    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5 if ENV['CI']
     sleep 0.5
 
     sphinx.merge
     sleep 1.5
-    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5 if ENV['CI']
   end
 end
 

data/spec/acceptance/suspended_deltas_spec.rb

@@ -10,7 +10,7 @@ describe 'Suspend deltas for a given action', :live => true do
     expect(Book.search('Harry').to_a).to eq([book])
 
     ThinkingSphinx::Deltas.suspend :book do
-      book.reload.update_attributes(:author => 'Terry Pratchett')
+      book.reload.update(:author => 'Terry Pratchett')
       sleep 0.25
 
       expect(Book.search('Terry').to_a).to eq([])
@@ -27,7 +27,7 @@ describe 'Suspend deltas for a given action', :live => true do
     expect(Book.search('Harry').to_a).to eq([book])
 
     ThinkingSphinx::Deltas.suspend :book do
-      book.reload.update_attributes(:author => 'Terry Pratchett')
+      book.reload.update(:author => 'Terry Pratchett')
       sleep 0.25
 
       expect(Book.search('Terry').to_a).to eq([])
@@ -44,7 +44,7 @@ describe 'Suspend deltas for a given action', :live => true do
     expect(Book.search('Harry').to_a).to eq([book])
 
     ThinkingSphinx::Deltas.suspend_and_update :book do
-      book.reload.update_attributes(:author => 'Terry Pratchett')
+      book.reload.update(:author => 'Terry Pratchett')
       sleep 0.25
 
       expect(Book.search('Terry').to_a).to eq([])

data/spec/internal/app/indices/article_index.rb

@@ -10,7 +10,6 @@ ThinkingSphinx::Index.define :article, :with => :active_record do
   has taggings.created_at, :as => :taggings_at, :type => :timestamp
 
   set_property :min_infix_len => 4
-  set_property :enable_star   => true
 end
 
 ThinkingSphinx::Index.define :article, :with => :active_record,

data/spec/internal/app/indices/colour_index.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+ThinkingSphinx::Index.define :colour, :with => :active_record, :delta => true do
+  indexes name
+
+  has tees.id, :as => :tee_ids
+end

data/spec/internal/app/models/admin/person.rb

@@ -3,5 +3,7 @@
 class Admin::Person < ActiveRecord::Base
   self.table_name = 'admin_people'
 
-  after_save ThinkingSphinx::RealTime.callback_for('admin/person')
+  ThinkingSphinx::Callbacks.append(
+    self, 'admin/person', :behaviours => [:sql, :real_time]
+  )
 end

data/spec/internal/app/models/album.rb

@@ -6,7 +6,9 @@ class Album < ActiveRecord::Base
   before_validation :set_id, :on => :create
   before_validation :set_integer_id, :on => :create
 
-  after_save ThinkingSphinx::RealTime.callback_for(:album)
+  ThinkingSphinx::Callbacks.append(
+    self, :behaviours => [:sql, :real_time, :deltas]
+  )
 
   validates :id,         :presence => true, :uniqueness => true
   validates :integer_id, :presence => true, :uniqueness => true

data/spec/internal/app/models/animal.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 class Animal < ActiveRecord::Base
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
 end

data/spec/internal/app/models/article.rb

@@ -4,4 +4,6 @@ class Article < ActiveRecord::Base
   belongs_to :user
   has_many :taggings
   has_many :tags, :through => :taggings
+
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql, :updates])
 end

data/spec/internal/app/models/bird.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 class Bird < Animal
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
 end

data/spec/internal/app/models/book.rb

@@ -5,6 +5,8 @@ class Book < ActiveRecord::Base
 
   has_and_belongs_to_many :genres
 
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql, :deltas])
+
   sphinx_scope(:by_query) { |query| query }
   sphinx_scope(:by_year) do |year|
     {:with => {:year => year}}

data/spec/internal/app/models/car.rb

@@ -3,5 +3,5 @@
 class Car < ActiveRecord::Base
   belongs_to :manufacturer
 
-  after_save ThinkingSphinx::RealTime.callback_for(:car)
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:real_time])
 end

data/spec/internal/app/models/city.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 class City < ActiveRecord::Base
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
+
   scope :ordered, lambda { order(:name) }
 end

data/spec/internal/app/models/colour.rb

@@ -2,4 +2,6 @@
 
 class Colour < ActiveRecord::Base
   has_many :tees
+
+  ThinkingSphinx::Callbacks.append(self, behaviours: [:sql, :deltas])
 end

data/spec/internal/app/models/product.rb

@@ -4,5 +4,5 @@ class Product < ActiveRecord::Base
   has_many :categorisations
   has_many :categories, :through => :categorisations
 
-  after_save ThinkingSphinx::RealTime.callback_for(:product)
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:real_time])
 end

data/spec/internal/app/models/tee.rb

@@ -2,4 +2,9 @@
 
 class Tee < ActiveRecord::Base
   belongs_to :colour
+
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
+  ThinkingSphinx::Callbacks.append(
+    self, behaviours: [:sql, :deltas], :path => [:colour]
+  )
 end

data/spec/internal/app/models/user.rb

@@ -3,6 +3,8 @@
 class User < ActiveRecord::Base
   has_many :articles
 
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
+
   default_scope { order(:id) }
   scope :recent, lambda { where('created_at > ?', 1.week.ago) }
 end

data/spec/internal/config/database.yml

@@ -1,6 +1,11 @@
 test:
   adapter:      <%= ENV['DATABASE'] || 'mysql2' %>
   database:     thinking_sphinx
-  username:     <%= ENV['DATABASE'] == 'postgresql' ? ENV['USER'] : 'root' %>
+  username:     <%= ENV['DATABASE'] == 'postgresql' ? 'postgres' : 'root' %>
+<% if ENV["CI"] %>
+  password:     thinking_sphinx
+  host:         127.0.0.1
+  port:         <%= ENV['DATABASE'] == 'postgresql' ? 5432 : 3306 %>
+<% end %>
   min_messages: warning
   encoding:     utf8

data/spec/internal/db/schema.rb

@@ -68,6 +68,7 @@ ActiveRecord::Schema.define do
 
   create_table(:colours, :force => true) do |t|
     t.string :name
+    t.boolean :delta, :null => false, :default => true
     t.timestamps null: false
   end
 

data/spec/thinking_sphinx/active_record/callbacks/update_callbacks_spec.rb

@@ -19,12 +19,13 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks do
     let(:klass)         { double(:name => 'Article') }
     let(:configuration) { double('configuration',
       :settings => {'attribute_updates' => true},
-      :indices_for_references => [index]) }
+      :indices_for_references => [index], :index_set_class => set_class) }
     let(:connection)    { double('connection', :execute => '') }
     let(:index)         { double 'index', :name => 'article_core',
       :sources => [source], :document_id_for_key => 3, :distributed? => false,
       :type => 'plain', :primary_key => :id}
     let(:source)        { double('source', :attributes => []) }
+    let(:set_class)     { double(:reference_name => :article) }
 
     before :each do
       stub_const 'ThinkingSphinx::Configuration',

data/spec/thinking_sphinx/active_record/index_spec.rb

@@ -5,7 +5,9 @@ require 'spec_helper'
 describe ThinkingSphinx::ActiveRecord::Index do
   let(:index)        { ThinkingSphinx::ActiveRecord::Index.new :user }
   let(:config)       { double('config', :settings => {},
-    :indices_location => 'location', :next_offset => 8) }
+    :indices_location => 'location', :next_offset => 8,
+    :index_set_class => index_set_class) }
+  let(:index_set_class) { double :reference_name => :user }
 
   before :each do
     allow(ThinkingSphinx::Configuration).to receive_messages :instance => config
@@ -94,18 +96,6 @@ describe ThinkingSphinx::ActiveRecord::Index do
     end
   end
 
-  describe '#docinfo' do
-    it "defaults to extern" do
-      expect(index.docinfo).to eq(:extern)
-    end
-
-    it "can be disabled" do
-      config.settings["skip_docinfo"] = true
-
-      expect(index.docinfo).to be_nil
-    end
-  end
-
   describe '#document_id_for_key' do
     it "calculates the document id based on offset and number of indices" do
       allow(config).to receive_message_chain(:indices, :count).and_return(5)

data/spec/thinking_sphinx/active_record/interpreter_spec.rb

@@ -15,8 +15,13 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
   let(:block)   { Proc.new { } }
 
   before :each do
-    allow(ThinkingSphinx::ActiveRecord::SQLSource).to receive_messages :new => source
-    allow(source).to receive_messages :model => model
+    allow(ThinkingSphinx::ActiveRecord::SQLSource).to receive_messages(
+      :new => source
+    )
+
+    allow(source).to receive_messages(
+      :model => model, :add_attribute => nil, :add_field => nil
+    )
   end
 
   describe '.translate!' do
@@ -94,17 +99,15 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
     end
 
     it "adds an attribute to the source" do
-      instance.has column
+      expect(source).to receive(:add_attribute).with(attribute)
 
-      expect(source.attributes).to include(attribute)
+      instance.has column
     end
 
     it "adds multiple attributes when passed multiple columns" do
-      instance.has column, column
+      expect(source).to receive(:add_attribute).with(attribute).twice
 
-      expect(source.attributes.select { |saved_attribute|
-        saved_attribute == attribute
-      }.length).to eq(2)
+      instance.has column, column
     end
   end
 
@@ -144,17 +147,15 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
     end
 
     it "adds a field to the source" do
-      instance.indexes column
+      expect(source).to receive(:add_field).with(field)
 
-      expect(source.fields).to include(field)
+      instance.indexes column
     end
 
     it "adds multiple fields when passed multiple columns" do
-      instance.indexes column, column
+      expect(source).to receive(:add_field).with(field).twice
 
-      expect(source.fields.select { |saved_field|
-        saved_field == field
-      }.length).to eq(2)
+      instance.indexes column, column
     end
   end