thinking-sphinx 3.1.4 → 6.0.0

data/spec/acceptance/support/sphinx_helpers.rb

@@ -1,16 +1,27 @@
+# frozen_string_literal: true
+
 module SphinxHelpers
   def sphinx
     @sphinx ||= SphinxController.new
   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['CI']
+    sleep 0.5
+
+    sphinx.merge
+    sleep 1.5
+    sleep 0.5 if ENV['CI']
   end
 end
 
@@ -27,4 +38,8 @@ RSpec.configure do |config|
   config.after :all do |group|
     sphinx.stop if group.class.metadata[:live]
   end
+
+  config.after :suite do
+    SphinxController.new.stop
+  end
 end

data/spec/acceptance/suspended_deltas_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Suspend deltas for a given action', :live => true do
@@ -5,50 +7,50 @@ describe 'Suspend deltas for a given action', :live => true do
     book = Book.create :title => 'Night Watch', :author => 'Harry Pritchett'
     index
 
-    Book.search('Harry').to_a.should == [book]
+    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
 
-      Book.search('Terry').to_a.should == []
+      expect(Book.search('Terry').to_a).to eq([])
     end
 
     sleep 0.25
-    Book.search('Terry').to_a.should == [book]
+    expect(Book.search('Terry').to_a).to eq([book])
   end
 
   it "returns core records even though they are no longer valid" do
     book = Book.create :title => 'Night Watch', :author => 'Harry Pritchett'
     index
 
-    Book.search('Harry').to_a.should == [book]
+    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
 
-      Book.search('Terry').to_a.should == []
+      expect(Book.search('Terry').to_a).to eq([])
     end
 
     sleep 0.25
-    Book.search('Harry').to_a.should == [book]
+    expect(Book.search('Harry').to_a).to eq([book])
   end
 
   it "marks core records as deleted" do
     book = Book.create :title => 'Night Watch', :author => 'Harry Pritchett'
     index
 
-    Book.search('Harry').to_a.should == [book]
+    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
 
-      Book.search('Terry').to_a.should == []
+      expect(Book.search('Terry').to_a).to eq([])
     end
 
     sleep 0.25
-    Book.search('Harry').to_a.should be_empty
+    expect(Book.search('Harry').to_a).to be_empty
   end
 end

data/spec/fixtures/database.yml

@@ -1,4 +1,4 @@
 username: root
-password:
+password: thinking_sphinx
 host: localhost
 database: thinking_sphinx

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

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define 'admin/person', :with => :active_record do
   indexes name
 end
+
+ThinkingSphinx::Index.define 'admin/person', :with => :real_time, :name => 'admin_person_rt' do
+  indexes name
+end

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

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+ThinkingSphinx::Index.define :album, :with => :active_record, :primary_key => :integer_id, :delta => true do
+  indexes name, artist
+end
+
+ThinkingSphinx::Index.define :album, :with => :real_time, :primary_key => :integer_id, :name => :album_real do
+  indexes name, artist
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :animal, :with => :active_record do
   indexes name
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :article, :with => :active_record do
   indexes title, content
   indexes user.name, :as => :user
@@ -5,10 +7,9 @@ ThinkingSphinx::Index.define :article, :with => :active_record do
 
   has published, user_id
   has taggings.tag_id, :as => :tag_ids, :source => :query
-  has taggings.created_at, :as => :taggings_at
+  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,
@@ -18,7 +19,13 @@ ThinkingSphinx::Index.define :article, :with => :active_record,
 
   has published, user_id
   has taggings.tag_id, :as => :tag_ids
-  has taggings.created_at, :as => :taggings_at
+  has taggings.created_at, :as => :taggings_at, :type => :timestamp
 
   set_property :morphology => 'stem_en'
 end
+
+ThinkingSphinx::Index.define :article, :name => :published_articles, :with => :real_time do
+  indexes title, content
+
+  scope { Article.where :published => true }
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FlightlessBird
 ThinkingSphinx::Index.define :bird, :with => :active_record do
   indexes name

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

@@ -1,8 +1,11 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :book, :with => :active_record, :delta => true do
   indexes title, :sortable => true
   indexes author, :facet => true
   indexes [title, author], :as => :info
   indexes blurb_file, :file => true
 
-  has year, created_at
+  has publishing_year
+  has created_at, :type => :timestamp
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :car, :with => :real_time do
   indexes name, :sortable => true
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :city, :with => :active_record do
   indexes name
   has lat, lng

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/indices/product_index.rb

@@ -1,14 +1,15 @@
+# frozen_string_literal: true
+
 multi_schema = MultiSchema.new
 
 ThinkingSphinx::Index.define :product, :with => :real_time do
   indexes name, :sortable => true
 
   has category_ids, :type => :integer, :multi => true
+  has options, :type => :json if JSONColumn.call
 end
 
 if multi_schema.active?
-  multi_schema.create 'thinking_sphinx'
-
   ThinkingSphinx::Index.define(:product,
     :name => :product_two, :offset_as => :product_two, :with => :real_time
   ) do

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

@@ -1,4 +1,6 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :tee, :with => :active_record do
-  index colour.name
+  indexes colour.name
   has colour_id, :facet => true
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :user, :with => :active_record do
   indexes name
 

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

@@ -1,3 +1,9 @@
+# frozen_string_literal: true
+
 class Admin::Person < ActiveRecord::Base
   self.table_name = 'admin_people'
+
+  ThinkingSphinx::Callbacks.append(
+    self, 'admin/person', :behaviours => [:sql, :real_time]
+  )
 end

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Album < ActiveRecord::Base
+  self.primary_key = :id
+
+  before_validation :set_id, :on => :create
+  before_validation :set_integer_id, :on => :create
+
+  ThinkingSphinx::Callbacks.append(
+    self, :behaviours => [:sql, :real_time, :deltas]
+  )
+
+  validates :id,         :presence => true, :uniqueness => true
+  validates :integer_id, :presence => true, :uniqueness => true
+
+  private
+
+  def set_id
+    self.id = (Album.maximum(:id) || "a").next
+  end
+
+  def set_integer_id
+    self.integer_id = (Album.maximum(:integer_id) || 0) + 1
+  end
+end

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

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

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

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 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,2 +1,5 @@
+# frozen_string_literal: true
+
 class Bird < Animal
+  ThinkingSphinx::Callbacks.append(self, :behaviours => [:sql])
 end

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

@@ -1,14 +1,18 @@
+# frozen_string_literal: true
+
 class Book < ActiveRecord::Base
   include ThinkingSphinx::Scopes
 
   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}}
+  sphinx_scope(:by_publishing_year) do |year|
+    {:with => {:publishing_year => year}}
   end
-  sphinx_scope(:by_query_and_year) do |query, year|
-    [query, {:with => {:year =>year}}]
+  sphinx_scope(:by_query_and_publishing_year) do |query, year|
+    [query, {:with => {:publishing_year =>year}}]
   end
-  sphinx_scope(:ordered) { {:order => 'year DESC'} }
+  sphinx_scope(:ordered) { {:order => 'publishing_year DESC'} }
 end

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

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 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/categorisation.rb

@@ -1,6 +1,15 @@
+# frozen_string_literal: true
+
 class Categorisation < ActiveRecord::Base
   belongs_to :category
   belongs_to :product
 
-  after_save ThinkingSphinx::RealTime.callback_for(:product, [:product])
+  after_commit :update_product
+
+  private
+
+  def update_product
+    product.reload
+    ThinkingSphinx::RealTime.callback_for(:product, [:product]).after_save self
+  end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Category < ActiveRecord::Base
   has_many :categorisations
   has_many :products, :through => :categorisations

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

@@ -1,3 +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

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
 class Colour < ActiveRecord::Base
   has_many :tees
+
+  ThinkingSphinx::Callbacks.append(self, behaviours: [:sql, :deltas])
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Event < ActiveRecord::Base
   belongs_to :eventable, :polymorphic => true
 end

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class FlightlessBird < Bird
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Genre < ActiveRecord::Base
   #
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hardcover < Book
   #
 end

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Mammal < Animal
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Manufacturer < ActiveRecord::Base
   has_many :cars
 end

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

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 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/tag.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tag < ActiveRecord::Base
   has_many :taggings
   has_many :articles, :through => :taggings

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tagging < ActiveRecord::Base
   belongs_to :tag
   belongs_to :article

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

@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
 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/tweet.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tweet < ActiveRecord::Base
   self.primary_key = :id
 end

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

@@ -1,6 +1,10 @@
+# frozen_string_literal: true
+
 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,17 @@
 test:
   adapter:      <%= ENV['DATABASE'] || 'mysql2' %>
   database:     thinking_sphinx
-  username:     <%= ENV['DATABASE'] == 'postgresql' ? ENV['USER'] : 'root' %>
+  username:     <%= ENV['DATABASE'] == 'postgresql' ? 'postgres' : 'root' %>
+<% if ENV["DATABASE_PASSWORD"] %>
+  password:     <%= ENV["DATABASE_PASSWORD"] %>
+<% end %>
+<% if ENV["DATABASE_PORT"] %>
+  host:         127.0.0.1
+  port:         <%= ENV["DATABASE_PORT"] %>
+<% elsif 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

@@ -1,9 +1,19 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   create_table(:admin_people, :force => true) do |t|
     t.string :name
     t.timestamps null: false
   end
 
+  create_table(:albums, :force => true, :id => false) do |t|
+    t.string :id
+    t.integer :integer_id
+    t.string :name
+    t.string :artist
+    t.boolean :delta, :default => true, :null => false
+  end
+
   create_table(:animals, :force => true) do |t|
     t.string :name
     t.string :type
@@ -29,7 +39,7 @@ ActiveRecord::Schema.define do
   create_table(:books, :force => true) do |t|
     t.string  :title
     t.string  :author
-    t.integer :year
+    t.integer :publishing_year
     t.string  :blurb_file
     t.boolean :delta, :default => true,   :null => false
     t.string  :type,  :default => 'Book', :null => false
@@ -58,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
 
@@ -72,6 +83,7 @@ ActiveRecord::Schema.define do
 
   create_table(:products, :force => true) do |t|
     t.string :name
+    t.json :options if ::JSONColumn.call
   end
 
   create_table(:taggings, :force => true) do |t|

data/spec/spec_helper.rb

@@ -1,18 +1,29 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
+require 'logger'
 
 Bundler.require :default, :development
 
 root = File.expand_path File.dirname(__FILE__)
 require "#{root}/support/multi_schema"
+require "#{root}/support/json_column"
+require "#{root}/support/mysql"
 require 'thinking_sphinx/railtie'
 
 Combustion.initialize! :active_record
 
-Dir["#{root}/support/**/*.rb"].each { |file| require file }
+MultiSchema.new.create 'thinking_sphinx'
+
+require "#{root}/support/sphinx_yaml_helpers"
 
 RSpec.configure do |config|
   # enable filtering for examples
   config.filter_run :wip => nil
   config.run_all_when_everything_filtered = true
+
+  config.around :each, :live do |example|
+    example.run_with_retry :retry => 3
+  end
 end

data/spec/support/json_column.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+class JSONColumn
+  include ActiveRecord::ConnectionAdapters
+
+  def self.call
+    new.call
+  end
+
+  def call
+    ruby? && postgresql? && column?
+  end
+
+  private
+
+  def column?
+    (
+      ActiveRecord::ConnectionAdapters.constants.include?(:PostgreSQLAdapter) &&
+      PostgreSQLAdapter.constants.include?(:TableDefinition) &&
+      PostgreSQLAdapter::TableDefinition.instance_methods.include?(:json)
+    ) || (
+      ActiveRecord::ConnectionAdapters.constants.include?(:PostgreSQL) &&
+      PostgreSQL.constants.include?(:ColumnMethods) &&
+      PostgreSQL::ColumnMethods.instance_methods.include?(:json)
+    )
+  end
+
+  def postgresql?
+    ENV['DATABASE'] == 'postgresql'
+  end
+
+  def ruby?
+    RUBY_PLATFORM != 'java'
+  end
+end

data/spec/support/multi_schema.rb

@@ -1,15 +1,19 @@
+# frozen_string_literal: true
+
 class MultiSchema
   def active?
     ENV['DATABASE'] == 'postgresql'
   end
 
   def create(schema_name)
+    return unless active?
+
     unless connection.schema_exists? schema_name
       connection.execute %Q{CREATE SCHEMA "#{schema_name}"}
     end
 
     switch schema_name
-    silence_stream(STDOUT) { load Rails.root.join('db', 'schema.rb') }
+    load Rails.root.join('db', 'schema.rb')
   end
 
   def current