thinking-sphinx 3.1.4 → 6.0.0

data/spec/acceptance/grouping_by_attributes_spec.rb

@@ -1,77 +1,79 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Grouping search results by attributes', :live => true do
   it "groups by the provided attribute" do
-    snuff  = Book.create! :title => 'Snuff',          :year => 2011
-    earth  = Book.create! :title => 'The Long Earth', :year => 2012
-    dodger = Book.create! :title => 'Dodger',         :year => 2012
+    snuff  = Book.create! :title => 'Snuff',          :publishing_year => 2011
+    earth  = Book.create! :title => 'The Long Earth', :publishing_year => 2012
+    dodger = Book.create! :title => 'Dodger',         :publishing_year => 2012
 
     index
 
-    Book.search(:group_by => :year).to_a.should == [snuff, earth]
+    expect(Book.search(:group_by => :publishing_year).to_a).to eq([snuff, earth])
   end
 
   it "allows sorting within the group" do
-    snuff  = Book.create! :title => 'Snuff',          :year => 2011
-    earth  = Book.create! :title => 'The Long Earth', :year => 2012
-    dodger = Book.create! :title => 'Dodger',         :year => 2012
+    snuff  = Book.create! :title => 'Snuff',          :publishing_year => 2011
+    earth  = Book.create! :title => 'The Long Earth', :publishing_year => 2012
+    dodger = Book.create! :title => 'Dodger',         :publishing_year => 2012
 
     index
 
-    Book.search(:group_by => :year, :order_group_by => 'title ASC').to_a.
-      should == [snuff, dodger]
+    expect(Book.search(:group_by => :publishing_year, :order_group_by => 'title ASC').to_a).
+      to eq([snuff, dodger])
   end
 
   it "allows enumerating by count" do
-    snuff  = Book.create! :title => 'Snuff',          :year => 2011
-    earth  = Book.create! :title => 'The Long Earth', :year => 2012
-    dodger = Book.create! :title => 'Dodger',         :year => 2012
+    snuff  = Book.create! :title => 'Snuff',          :publishing_year => 2011
+    earth  = Book.create! :title => 'The Long Earth', :publishing_year => 2012
+    dodger = Book.create! :title => 'Dodger',         :publishing_year => 2012
 
     index
 
     expectations = [[snuff, 1], [earth, 2]]
 
-    Book.search(:group_by => :year).each_with_count do |book, count|
+    Book.search(:group_by => :publishing_year).each_with_count do |book, count|
       expectation = expectations.shift
 
-      book.should  == expectation.first
-      count.should == expectation.last
+      expect(book).to  eq(expectation.first)
+      expect(count).to eq(expectation.last)
     end
   end
 
   it "allows enumerating by group" do
-    snuff  = Book.create! :title => 'Snuff',          :year => 2011
-    earth  = Book.create! :title => 'The Long Earth', :year => 2012
-    dodger = Book.create! :title => 'Dodger',         :year => 2012
+    snuff  = Book.create! :title => 'Snuff',          :publishing_year => 2011
+    earth  = Book.create! :title => 'The Long Earth', :publishing_year => 2012
+    dodger = Book.create! :title => 'Dodger',         :publishing_year => 2012
 
     index
 
     expectations = [[snuff, 2011], [earth, 2012]]
 
-    Book.search(:group_by => :year).each_with_group do |book, group|
+    Book.search(:group_by => :publishing_year).each_with_group do |book, group|
       expectation = expectations.shift
 
-      book.should  == expectation.first
-      group.should == expectation.last
+      expect(book).to  eq(expectation.first)
+      expect(group).to eq(expectation.last)
     end
   end
 
   it "allows enumerating by group and count" do
-    snuff  = Book.create! :title => 'Snuff',          :year => 2011
-    earth  = Book.create! :title => 'The Long Earth', :year => 2012
-    dodger = Book.create! :title => 'Dodger',         :year => 2012
+    snuff  = Book.create! :title => 'Snuff',          :publishing_year => 2011
+    earth  = Book.create! :title => 'The Long Earth', :publishing_year => 2012
+    dodger = Book.create! :title => 'Dodger',         :publishing_year => 2012
 
     index
 
     expectations = [[snuff, 2011, 1], [earth, 2012, 2]]
-    search       = Book.search(:group_by => :year)
+    search       = Book.search(:group_by => :publishing_year)
 
     search.each_with_group_and_count do |book, group, count|
       expectation = expectations.shift
 
-      book.should  == expectation[0]
-      group.should == expectation[1]
-      count.should == expectation[2]
+      expect(book).to  eq(expectation[0])
+      expect(group).to eq(expectation[1])
+      expect(count).to eq(expectation[2])
     end
   end
 end

data/spec/acceptance/index_options_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Index options' do
@@ -14,11 +16,11 @@ describe 'Index options' do
       end
 
       it "keeps #{type}_fields blank" do
-        index.send("#{type}_fields").should be_nil
+        expect(index.send("#{type}_fields")).to be_nil
       end
 
       it "sets min_#{type}_len" do
-        index.send("min_#{type}_len").should == 3
+        expect(index.send("min_#{type}_len")).to eq(3)
       end
     end
 
@@ -33,11 +35,11 @@ describe 'Index options' do
       end
 
       it "#{type}_fields should contain the field" do
-        index.send("#{type}_fields").should == 'title'
+        expect(index.send("#{type}_fields")).to eq('title')
       end
 
       it "sets min_#{type}_len" do
-        index.send("min_#{type}_len").should == 3
+        expect(index.send("min_#{type}_len")).to eq(3)
       end
     end
   end
@@ -57,12 +59,12 @@ describe 'Index options' do
     end
 
     it "stores each source definition" do
-      index.sources.length.should == 2
+      expect(index.sources.length).to eq(2)
     end
 
     it "treats each source as separate" do
-      index.sources.first.fields.length.should == 2
-      index.sources.last.fields.length.should  == 3
+      expect(index.sources.first.fields.length).to eq(2)
+      expect(index.sources.last.fields.length).to  eq(3)
     end
   end
 
@@ -77,11 +79,11 @@ describe 'Index options' do
     end
 
     it "declares wordcount fields" do
-      index.sources.first.sql_field_str2wordcount.should == ['title']
+      expect(index.sources.first.sql_field_str2wordcount).to eq(['title'])
     end
 
     it "declares wordcount attributes" do
-      index.sources.first.sql_attr_str2wordcount.should == ['content']
+      expect(index.sources.first.sql_attr_str2wordcount).to eq(['content'])
     end
   end
 
@@ -98,15 +100,15 @@ describe 'Index options' do
     end
 
     it "allows for core source settings" do
-      index.sources.first.sql_range_step.should == 5
+      expect(index.sources.first.sql_range_step).to eq(5)
     end
 
     it "allows for source options" do
-      index.sources.first.disable_range?.should be_true
+      expect(index.sources.first.disable_range?).to be_truthy
     end
 
     it "respects sql_query_pre values" do
-      index.sources.first.sql_query_pre.should include("DO STUFF")
+      expect(index.sources.first.sql_query_pre).to include("DO STUFF")
     end
   end
 
@@ -130,23 +132,23 @@ describe 'Index options' do
     end
 
     it "prioritises index-level options over YAML options" do
-      index.min_infix_len.should == 1
+      expect(index.min_infix_len).to eq(1)
     end
 
     it "prioritises index-level source options" do
-      index.sources.first.sql_range_step.should == 20
+      expect(index.sources.first.sql_range_step).to eq(20)
     end
 
     it "keeps index-level options prioritised when rendered again" do
       index.render
 
-      index.min_infix_len.should == 1
+      expect(index.min_infix_len).to eq(1)
     end
 
     it "keeps index-level options prioritised when rendered again" do
       index.render
 
-      index.sources.first.sql_range_step.should == 20
+      expect(index.sources.first.sql_range_step).to eq(20)
     end
   end
 end

data/spec/acceptance/indexing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Indexing', :live => true do
@@ -8,7 +10,7 @@ describe 'Indexing', :live => true do
 
     article = Article.create! :title => 'Pancakes'
     index 'article_core'
-    Article.search.should be_empty
+    expect(Article.search).to be_empty
 
     FileUtils.rm path
   end
@@ -20,7 +22,7 @@ describe 'Indexing', :live => true do
 
     article = Article.create! :title => 'Pancakes'
     index 'article_core'
-    Article.search.should_not be_empty
+    expect(Article.search).not_to be_empty
 
     FileUtils.rm path
   end
@@ -31,6 +33,6 @@ describe 'Indexing', :live => true do
     index 'article_core'
 
     file = Rails.root.join('db/sphinx/test/ts-article_core.tmp')
-    File.exist?(file).should be_false
+    expect(File.exist?(file)).to be_falsey
   end
 end

data/spec/acceptance/merging_spec.rb

@@ -0,0 +1,90 @@
+# frozen_string_literal: true
+
+require "acceptance/spec_helper"
+
+describe "Merging deltas", :live => true do
+  it "merges in new records" do
+    guards = Book.create(
+      :title => "Guards! Guards!", :author => "Terry Pratchett"
+    )
+    sleep 0.25
+
+    expect(
+      Book.search("Terry Pratchett", :indices => ["book_delta"]).to_a
+    ).to eq([guards])
+    expect(
+      Book.search("Terry Pratchett", :indices => ["book_core"]).to_a
+    ).to be_empty
+
+    merge
+    guards.reload
+
+    expect(
+      Book.search("Terry Pratchett", :indices => ["book_core"]).to_a
+    ).to eq([guards])
+    expect(guards.delta).to eq(false)
+  end
+
+  it "merges in changed records" do
+    race = Book.create(
+      :title => "The Hate Space", :author => "Maxine Beneba Clarke"
+    )
+    index
+    expect(
+      Book.search("Space", :indices => ["book_core"]).to_a
+    ).to eq([race])
+
+    race.reload.update :title => "The Hate Race"
+    sleep 0.25
+    expect(
+      Book.search("Race", :indices => ["book_delta"]).to_a
+    ).to eq([race])
+    expect(
+      Book.search("Race", :indices => ["book_core"]).to_a
+    ).to be_empty
+
+    merge
+    race.reload
+
+    expect(
+      Book.search("Race", :indices => ["book_core"]).to_a
+    ).to eq([race])
+    expect(
+      Book.search("Race", :indices => ["book_delta"]).to_a
+    ).to eq([race])
+    expect(
+      Book.search("Space", :indices => ["book_core"]).to_a
+    ).to be_empty
+    expect(race.delta).to eq(false)
+  end
+
+  it "maintains existing records" do
+    race = Book.create(
+      :title => "The Hate Race", :author => "Maxine Beneba Clarke"
+    )
+    index
+
+    soil = Book.create(
+      :title => "Foreign Soil", :author => "Maxine Beneba Clarke"
+    )
+    sleep 0.25
+    expect(
+      Book.search("Soil", :indices => ["book_delta"]).to_a
+    ).to eq([soil])
+    expect(
+      Book.search("Soil", :indices => ["book_core"]).to_a
+    ).to be_empty
+    expect(
+      Book.search("Race", :indices => ["book_core"]).to_a
+    ).to eq([race])
+
+    merge
+
+    expect(
+      Book.search("Soil", :indices => ["book_core"]).to_a
+    ).to eq([soil])
+    expect(
+      Book.search("Race", :indices => ["book_core"]).to_a
+    ).to eq([race])
+  end
+end

data/spec/acceptance/paginating_search_results_spec.rb

@@ -1,24 +1,42 @@
+# frozen_string_literal: true
+
 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
 
-    Article.search.total_entries.should == 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
 
-    Article.search.length.should == 20
+    expect(Article.search.length).to eq(20)
   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
 
-    Article.search.total_pages.should == 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

@@ -1,17 +1,115 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Updates to records in real-time indices', :live => true do
   it "handles fields with unicode nulls" do
     product = Product.create! :name => "Widget \u0000"
 
-    Product.search.first.should == product
-  end
+    expect(Product.search.first).to eq(product)
+  end unless ENV['DATABASE'] == 'postgresql'
 
   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])
+  end
+
+  it "handles inserts and updates for namespaced models" do
+    person = Admin::Person.create :name => 'Death'
+
+    expect(Admin::Person.search('Death').to_a).to eq([person])
+
+    person.update :name => 'Mort'
+
+    expect(Admin::Person.search('Death').to_a).to be_empty
+    expect(Admin::Person.search('Mort').to_a).to eq([person])
+  end
+
+  it "can use direct interface for upserting records" do
+    Admin::Person.connection.execute <<~SQL
+      INSERT INTO admin_people (name, created_at, updated_at)
+      VALUES ('Pat', now(), now());
+    SQL
+
+    expect(Admin::Person.search('Pat').to_a).to be_empty
+
+    instance = Admin::Person.find_by(:name => 'Pat')
+    ThinkingSphinx::Processor.new(instance: instance).upsert
+
+    expect(Admin::Person.search('Pat').to_a).to eq([instance])
+
+    Admin::Person.connection.execute <<~SQL
+      UPDATE admin_people SET name = 'Patrick' WHERE name = 'Pat';
+    SQL
+
+    expect(Admin::Person.search('Patrick').to_a).to be_empty
+
+    instance.reload
+    ThinkingSphinx::Processor.new(model: Admin::Person, id: instance.id).upsert
+
+    expect(Admin::Person.search('Patrick').to_a).to eq([instance])
+  end
+
+  it "can use direct interface for processing records outside scope" do
+    Article.connection.execute <<~SQL
+      INSERT INTO articles (title, published, created_at, updated_at)
+      VALUES ('Nice Title', TRUE, now(), now());
+    SQL
+
+    article  = Article.last
+
+    ThinkingSphinx::Processor.new(model: article.class, id: article.id).sync
+
+    expect(ThinkingSphinx.search('Nice', :indices => ["published_articles_core"])).to include(article)
+
+    Article.connection.execute <<~SQL
+      UPDATE articles SET published = FALSE WHERE title = 'Nice Title';
+    SQL
+    ThinkingSphinx::Processor.new(model: article.class, id: article.id).sync
+
+    expect(ThinkingSphinx.search('Nice', :indices => ["published_articles_core"])).to be_empty
+  end
+
+  it "can use direct interface for processing deleted records" do
+    Article.connection.execute <<~SQL
+      INSERT INTO articles (title, published, created_at, updated_at)
+      VALUES ('Nice Title', TRUE, now(), now());
+    SQL
+
+    article  = Article.last
+    ThinkingSphinx::Processor.new(:instance => article).sync
+
+    expect(ThinkingSphinx.search('Nice', :indices => ["published_articles_core"])).to include(article)
+
+    Article.connection.execute <<~SQL
+      DELETE FROM articles where title = 'Nice Title';
+    SQL
+
+    ThinkingSphinx::Processor.new(:instance => article).sync
+
+    expect(ThinkingSphinx.search('Nice', :indices => ["published_articles_core"])).to be_empty
+  end
+
+  it "syncs records in real-time index with alternate ids" do
+    Album.connection.execute <<~SQL
+      INSERT INTO albums (id, name, artist, integer_id)
+      VALUES ('#{("a".."z").to_a.sample}', 'Sing to the Moon', 'Laura Mvula', #{rand(10000)});
+    SQL
+
+    album  = Album.last
+    ThinkingSphinx::Processor.new(:model => Album, id: album.integer_id).sync
+
+    expect(ThinkingSphinx.search('Laura', :indices => ["album_real_core"])).to include(album)
+
+    Article.connection.execute <<~SQL
+      DELETE FROM albums where id = '#{album.id}';
+    SQL
+
+    ThinkingSphinx::Processor.new(:instance => album).sync
 
-    Product.search('blue fish', :indices => ['product_core']).to_a.
-      should == [product]
+    expect(ThinkingSphinx.search('Laura', :indices => ["album_real_core"])).to be_empty
   end
 end

data/spec/acceptance/remove_deleted_records_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Hiding deleted records from search results', :live => true do
@@ -5,32 +7,62 @@ describe 'Hiding deleted records from search results', :live => true do
     pancakes = Article.create! :title => 'Pancakes'
     index
 
-    Article.search('pancakes').should_not be_empty
+    expect(Article.search('pancakes')).not_to be_empty
     pancakes.destroy
 
-    Article.search('pancakes').should be_empty
+    expect(Article.search('pancakes')).to be_empty
   end
 
   it "will catch stale records deleted without callbacks being fired" do
     pancakes = Article.create! :title => 'Pancakes'
     index
 
-    Article.search('pancakes').should_not be_empty
+    expect(Article.search('pancakes')).not_to be_empty
     Article.connection.execute "DELETE FROM articles WHERE id = #{pancakes.id}"
 
-    Article.search('pancakes').should be_empty
+    expect(Article.search('pancakes')).to be_empty
   end
 
   it "removes records from real-time index results" do
     product = Product.create! :name => 'Shiny'
 
-    Product.search('Shiny', :indices => ['product_core']).to_a.
-      should == [product]
+    expect(Product.search('Shiny', :indices => ['product_core']).to_a).
+      to eq([product])
+
+    product.destroy
+
+    expect(Product.search_for_ids('Shiny', :indices => ['product_core'])).
+      to be_empty
+  end
+
+  it "removes records from real-time index results with alternate ids" do
+    album = Album.create! :name => 'Sing to the Moon', :artist => 'Laura Mvula'
+
+    expect(Album.search('Sing', :indices => ['album_real_core']).to_a).
+      to eq([album])
+
+    album.destroy
+
+    expect(Album.search_for_ids('Sing', :indices => ['album_real_core'])).
+      to be_empty
+  end
+
+  it "does not remove real-time results when callbacks are disabled" do
+    original = ThinkingSphinx::Configuration.instance.
+      settings['real_time_callbacks']
+    product = Product.create! :name => 'Shiny'
+    expect(Product.search('Shiny', :indices => ['product_core']).to_a).
+      to eq([product])
+
+    ThinkingSphinx::Configuration.instance.
+      settings['real_time_callbacks'] = false
 
     product.destroy
+    expect(Product.search_for_ids('Shiny', :indices => ['product_core'])).
+      not_to be_empty
 
-    Product.search_for_ids('Shiny', :indices => ['product_core']).
-      should be_empty
+    ThinkingSphinx::Configuration.instance.
+      settings['real_time_callbacks'] = original
   end
 
   it "deletes STI child classes from parent indices" do
@@ -40,4 +72,28 @@ describe 'Hiding deleted records from search results', :live => true do
 
     expect(Bird.search_for_ids('duck')).to be_empty
   end
+
+  it "can use a direct interface for processing records" do
+    pancakes = Article.create! :title => 'Pancakes'
+    index
+    expect(Article.search('pancakes')).not_to be_empty
+
+    Article.connection.execute "DELETE FROM articles WHERE id = #{pancakes.id}"
+    expect(Article.search_for_ids('pancakes')).not_to be_empty
+
+    ThinkingSphinx::Processor.new(instance: pancakes).delete
+    expect(Article.search_for_ids('pancakes')).to be_empty
+  end
+
+  it "can use a direct interface for processing records without an instance" do
+    pancakes = Article.create! :title => 'Pancakes'
+    index
+    expect(Article.search('pancakes')).not_to be_empty
+
+    Article.connection.execute "DELETE FROM articles WHERE id = #{pancakes.id}"
+    expect(Article.search_for_ids('pancakes')).not_to be_empty
+
+    ThinkingSphinx::Processor.new(model: Article, id: pancakes.id).delete
+    expect(Article.search_for_ids('pancakes')).to be_empty
+  end
 end

data/spec/acceptance/search_counts_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Get search result counts', :live => true do
@@ -5,7 +7,7 @@ describe 'Get search result counts', :live => true do
     4.times { |i| Article.create :title => "Article #{i}" }
     index
 
-    Article.search_count.should == 4
+    expect(Article.search_count).to eq(4)
   end
 
   it "returns counts across all models" do
@@ -13,6 +15,6 @@ describe 'Get search result counts', :live => true do
     2.times { |i| Book.create :title => "Book #{i}" }
     index
 
-    ThinkingSphinx.count.should == 5
+    expect(ThinkingSphinx.count).to eq(5)
   end
 end

data/spec/acceptance/search_for_just_ids_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Searching for just instance Ids', :live => true do
@@ -6,7 +8,7 @@ describe 'Searching for just instance Ids', :live => true do
     waffles  = Article.create! :title => 'Waffles'
     index
 
-    Article.search_for_ids('pancakes').to_a.should == [pancakes.id]
+    expect(Article.search_for_ids('pancakes').to_a).to eq([pancakes.id])
   end
 
   it "works across the global context" do
@@ -14,6 +16,6 @@ describe 'Searching for just instance Ids', :live => true do
     book    = Book.create! :title => 'American Gods'
     index
 
-    ThinkingSphinx.search_for_ids.to_a.should =~ [article.id, book.id]
+    expect(ThinkingSphinx.search_for_ids.to_a).to match_array([article.id, book.id])
   end
 end