thinking-sphinx 5.5.1 → 6.0.0

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.exist?(path)
+      FileUtils.rm_rf(path) if File.exist?(path)
     end
   end
 

data/lib/thinking_sphinx.rb

@@ -34,6 +34,10 @@ module ThinkingSphinx
     ThinkingSphinx::Search::Merger.new(search).merge! nil, :ids_only => true
   end
 
+  def self.none
+    ThinkingSphinx::Search.new nil, :none => true
+  end
+
   def self.before_index_hooks
     @before_index_hooks
   end

data/spec/acceptance/attribute_access_spec.rb

@@ -4,17 +4,17 @@ require 'acceptance/spec_helper'
 
 describe 'Accessing attributes directly via search results', :live => true do
   it "allows access to attribute values" do
-    Book.create! :title => 'American Gods', :year => 2001
+    Book.create! :title => 'American Gods', :publishing_year => 2001
     index
 
     search = Book.search('gods')
     search.context[:panes] << ThinkingSphinx::Panes::AttributesPane
 
-    expect(search.first.sphinx_attributes['year']).to eq(2001)
+    expect(search.first.sphinx_attributes['publishing_year']).to eq(2001)
   end
 
   it "provides direct access to the search weight/relevance scores" do
-    Book.create! :title => 'American Gods', :year => 2001
+    Book.create! :title => 'American Gods', :publishing_year => 2001
     index
 
     search = Book.search 'gods', :select => "*, weight()"
@@ -37,7 +37,7 @@ describe 'Accessing attributes directly via search results', :live => true do
   end
 
   it "can enumerate with the weight" do
-    gods = Book.create! :title => 'American Gods', :year => 2001
+    gods = Book.create! :title => 'American Gods', :publishing_year => 2001
     index
 
     search = Book.search 'gods', :select => "*, weight()"

data/spec/acceptance/excerpts_spec.rb

@@ -5,7 +5,7 @@ require 'acceptance/spec_helper'
 
 describe 'Accessing excerpts for methods on a search result', :live => true do
   it "returns excerpts for a given method" do
-    Book.create! :title => 'American Gods', :year => 2001
+    Book.create! :title => 'American Gods', :publishing_year => 2001
     index
 
     search = Book.search('gods')
@@ -16,7 +16,7 @@ describe 'Accessing excerpts for methods on a search result', :live => true do
   end
 
   it "handles UTF-8 text for excerpts" do
-    Book.create! :title => 'Война и миръ', :year => 1869
+    Book.create! :title => 'Война и миръ', :publishing_year => 1869
     index
 
     search = Book.search 'миръ'

data/spec/acceptance/grouping_by_attributes_spec.rb

@@ -4,36 +4,36 @@ 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
 
-    expect(Book.search(:group_by => :year).to_a).to eq([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
 
-    expect(Book.search(:group_by => :year, :order_group_by => 'title ASC').to_a).
+    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
 
       expect(book).to  eq(expectation.first)
@@ -42,15 +42,15 @@ describe 'Grouping search results by attributes', :live => true do
   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
 
       expect(book).to  eq(expectation.first)
@@ -59,14 +59,14 @@ describe 'Grouping search results by attributes', :live => true do
   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

data/spec/acceptance/real_time_updates_spec.rb

@@ -28,7 +28,7 @@ describe 'Updates to records in real-time indices', :live => true do
     expect(Admin::Person.search('Mort').to_a).to eq([person])
   end
 
-  it "can use a direct interface for processing records" do
+  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());
@@ -52,4 +52,64 @@ describe 'Updates to records in real-time indices', :live => true do
 
     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
+
+    expect(ThinkingSphinx.search('Laura', :indices => ["album_real_core"])).to be_empty
+  end
 end

data/spec/acceptance/searching_across_models_spec.rb

@@ -37,4 +37,11 @@ describe 'Searching across models', :live => true do
     expect(ThinkingSphinx.search(:classes => [User, Article]).to_a).
       to match_array([article, user])
   end
+
+  it "has a 'none' default scope" do
+    article = Article.create! :title => 'Pancakes'
+    index
+
+    expect(ThinkingSphinx.none).to be_empty
+  end
 end

data/spec/acceptance/searching_with_filters_spec.rb

@@ -12,12 +12,12 @@ describe 'Searching with filters', :live => true do
   end
 
   it "limits results by an array of values" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
     index
 
-    expect(Book.search(:with => {:year => [2001, 2005]}).to_a).to match_array([gods, boys])
+    expect(Book.search(:with => {:publishing_year => [2001, 2005]}).to_a).to match_array([gods, boys])
   end
 
   it "limits results by a ranged filter" do
@@ -43,12 +43,12 @@ describe 'Searching with filters', :live => true do
   end
 
   it "limits results by exclusive filters on arrays of values" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
     index
 
-    expect(Book.search(:without => {:year => [2001, 2005]}).to_a).to eq([grave])
+    expect(Book.search(:without => {:publishing_year => [2001, 2005]}).to_a).to eq([grave])
   end
 
   it "limits results by ranged filters on timestamp MVAs" do

data/spec/acceptance/searching_within_a_model_spec.rb

@@ -92,6 +92,20 @@ describe 'Searching within a model', :live => true do
     expect(Album.search(:indices => ['album_real_core']).first).
       to eq(album)
   end
+
+  it "is available via a sphinx-prefixed method" do
+    article = Article.create! :title => 'Pancakes'
+    index
+
+    expect(Article.sphinx_search.first).to eq(article)
+  end
+
+  it "has a 'none' default scope" do
+    article = Article.create! :title => 'Pancakes'
+    index
+
+    expect(Article.search_none).to be_empty
+  end
 end
 
 describe 'Searching within a model with a realtime index', :live => true do

data/spec/acceptance/sorting_search_results_spec.rb

@@ -4,27 +4,27 @@ require 'acceptance/spec_helper'
 
 describe 'Sorting search results', :live => true do
   it "sorts by a given clause" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
     index
 
-    expect(Book.search(:order => 'year ASC').to_a).to eq([gods, boys, grave])
+    expect(Book.search(:order => 'publishing_year ASC').to_a).to eq([gods, boys, grave])
   end
 
   it "sorts by a given attribute in ascending order" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
     index
 
-    expect(Book.search(:order => :year).to_a).to eq([gods, boys, grave])
+    expect(Book.search(:order => :publishing_year).to_a).to eq([gods, boys, grave])
   end
 
   it "sorts by a given sortable field" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
     index
 
     expect(Book.search(:order => :title).to_a).to eq([gods, boys, grave])
@@ -38,13 +38,13 @@ describe 'Sorting search results', :live => true do
   end
 
   it "can sort with a provided expression" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
     index
 
     expect(Book.search(
-      :select => '*, year MOD 2004 as mod_year', :order => 'mod_year ASC'
+      :select => '*, publishing_year MOD 2004 as mod_year', :order => 'mod_year ASC'
     ).to_a).to eq([boys, grave, gods])
   end
 end

data/spec/acceptance/sphinx_scopes_spec.rb

@@ -4,39 +4,39 @@ require 'acceptance/spec_helper'
 
 describe 'Sphinx scopes', :live => true do
   it "allows calling sphinx scopes from models" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
     index
 
-    expect(Book.by_year(2009).to_a).to eq([grave])
+    expect(Book.by_publishing_year(2009).to_a).to eq([grave])
   end
 
   it "allows scopes to return both query and options" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
     index
 
-    expect(Book.by_query_and_year('Graveyard', 2009).to_a).to eq([grave])
+    expect(Book.by_query_and_publishing_year('Graveyard', 2009).to_a).to eq([grave])
   end
 
   it "allows chaining of scopes" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
     index
 
-    expect(Book.by_year(2001..2005).ordered.to_a).to eq([boys, gods])
+    expect(Book.by_publishing_year(2001..2005).ordered.to_a).to eq([boys, gods])
   end
 
   it "allows chaining of scopes that include queries" do
-    gods  = Book.create! :title => 'American Gods',      :year => 2001
-    boys  = Book.create! :title => 'Anansi Boys',        :year => 2005
-    grave = Book.create! :title => 'The Graveyard Book', :year => 2009
+    gods  = Book.create! :title => 'American Gods',      :publishing_year => 2001
+    boys  = Book.create! :title => 'Anansi Boys',        :publishing_year => 2005
+    grave = Book.create! :title => 'The Graveyard Book', :publishing_year => 2009
     index
 
-    expect(Book.by_year(2001).by_query_and_year('Graveyard', 2009).to_a).
+    expect(Book.by_publishing_year(2001).by_query_and_publishing_year('Graveyard', 2009).to_a).
       to eq([grave])
   end
 
@@ -77,4 +77,11 @@ describe 'Sphinx scopes', :live => true do
       ThinkingSphinx::PopulatedResultsError
     )
   end
+
+  it "handles a chainable 'none' scope and returns nothing" do
+    Book.create! :title => 'Small Gods'
+    index
+
+    expect(Book.by_query('gods').none).to be_empty
+  end
 end

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

@@ -23,3 +23,9 @@ ThinkingSphinx::Index.define :article, :with => :active_record,
 
   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/book_index.rb

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

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

@@ -8,11 +8,11 @@ class Book < ActiveRecord::Base
   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/db/schema.rb

@@ -39,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

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'bundler'
+require 'logger'
 
 Bundler.require :default, :development
 

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

@@ -60,7 +60,7 @@ describe ThinkingSphinx::ActiveRecord::Callbacks::UpdateCallbacks do
 
     it "builds an update query with only updateable attributes that have changed" do
       expect(Riddle::Query).to receive(:update).
-        with('article_core', 3, 'bar' => 7).and_return('SphinxQL')
+        with('article_core', 3, { 'bar' => 7 }).and_return('SphinxQL')
 
       callbacks.after_update
     end

data/spec/thinking_sphinx/active_record/interpreter_spec.rb

@@ -93,7 +93,7 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
 
     it "passes through options to the attribute" do
       expect(ThinkingSphinx::ActiveRecord::Attribute).to receive(:new).
-        with(model, column, :as => :other_name).and_return(attribute)
+        with(model, column, { :as => :other_name }).and_return(attribute)
 
       instance.has column, :as => :other_name
     end
@@ -141,7 +141,7 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
 
     it "passes through options to the field" do
       expect(ThinkingSphinx::ActiveRecord::Field).to receive(:new).
-        with(model, column, :as => :other_name).and_return(field)
+        with(model, column, { :as => :other_name }).and_return(field)
 
       instance.indexes column, :as => :other_name
     end
@@ -230,19 +230,19 @@ describe ThinkingSphinx::ActiveRecord::Interpreter do
     end
 
     it "sends through a hash if provided" do
-      expect(source).to receive(:set_database_settings).with(:foo => :bar)
+      expect(source).to receive(:set_database_settings).with({ :foo => :bar })
 
       instance.set_database :foo => :bar
     end
 
     it "finds the environment settings if given a string key" do
-      expect(source).to receive(:set_database_settings).with(:baz => 'qux')
+      expect(source).to receive(:set_database_settings).with({ :baz => 'qux' })
 
       instance.set_database 'other'
     end
 
     it "finds the environment settings if given a symbol key" do
-      expect(source).to receive(:set_database_settings).with(:baz => 'qux')
+      expect(source).to receive(:set_database_settings).with({ :baz => 'qux' })
 
       instance.set_database :other
     end

data/spec/thinking_sphinx/commands/clear_real_time_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe ThinkingSphinx::Commands::ClearRealTime do
     allow(Dir).to receive(:[]).with('/path/to/my/index/parts.*').
       and_return(['parts.a', 'parts.b'])
 
-    allow(FileUtils).to receive_messages :rm_r => true,
+    allow(FileUtils).to receive_messages :rm_rf => true,
       :rm => true
     allow(File).to receive_messages :exist? => true
   end
@@ -30,7 +30,7 @@ RSpec.describe ThinkingSphinx::Commands::ClearRealTime do
   end
 
   it "removes the directory for the binlog files" do
-    expect(FileUtils).to receive(:rm_r).with('/path/to/binlog')
+    expect(FileUtils).to receive(:rm_rf).with('/path/to/binlog')
 
     command.call
   end

data/spec/thinking_sphinx/commands/clear_sql_spec.rb

@@ -24,7 +24,7 @@ RSpec.describe ThinkingSphinx::Commands::ClearSQL do
     allow(Dir).to receive(:[]).with('/path/to/indices/ts-*.tmp').
       and_return(['/path/to/indices/ts-foo.tmp'])
 
-    allow(FileUtils).to receive_messages :rm_r => true, :rm => true
+    allow(FileUtils).to receive_messages :rm_rf => true, :rm => true
     allow(File).to receive_messages :exist? => true
   end
 
@@ -45,7 +45,7 @@ RSpec.describe ThinkingSphinx::Commands::ClearSQL do
   end
 
   it "removes any indexing guard files" do
-    expect(FileUtils).to receive(:rm_r).with(["/path/to/indices/ts-foo.tmp"])
+    expect(FileUtils).to receive(:rm_rf).with(["/path/to/indices/ts-foo.tmp"])
 
     command.call
   end

data/spec/thinking_sphinx/configuration/minimum_fields_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe ThinkingSphinx::Configuration::MinimumFields do
   let(:indices) { [index_a, index_b] }
   let(:index_a) { double 'Index A', :model => model_a, :type => 'plain',
     :sources => [double(:fields => [field_a1, field_a2])] }
-  let(:index_b) { double 'Index B', :model => model_a, :type => 'rt',
+  let(:index_b) { double 'Index B', :model => model_b, :type => 'rt',
     :fields => [field_b1, field_b2] }
   let(:field_a1) { double :name => 'sphinx_internal_class_name' }
   let(:field_a2) { double :name => 'name' }
@@ -38,7 +38,7 @@ RSpec.describe ThinkingSphinx::Configuration::MinimumFields do
     expect(index_b.fields).to eq([field_b2])
   end
 
-  it 'removes the class name fields only for the indices without type column' do
+  it 'removes the class name fields only for the rt indices without type column' do
     allow(model_a).to receive(:column_names).and_return(['id', 'name', 'type'])
     allow(model_b).to receive(:column_names).and_return(['id', 'name'])
 
@@ -47,4 +47,14 @@ RSpec.describe ThinkingSphinx::Configuration::MinimumFields do
     expect(index_a.sources.first.fields).to eq([field_a1, field_a2])
     expect(index_b.fields).to eq([field_b2])
   end
+
+  it 'removes the class name fields only for the plain indices without type column' do
+    allow(model_a).to receive(:column_names).and_return(['id', 'name'])
+    allow(model_b).to receive(:column_names).and_return(['id', 'name', 'type'])
+
+    subject.reconcile
+
+    expect(index_a.sources.first.fields).to eq([field_a2])
+    expect(index_b.fields).to eq([field_b1, field_b2])
+  end
 end

data/spec/thinking_sphinx/excerpter_spec.rb

@@ -28,9 +28,10 @@ describe ThinkingSphinx::Excerpter do
         :before_match => '<b>', :chunk_separator => ' -- ')
 
       expect(Riddle::Query).to receive(:snippets).
-        with('all of the words', 'index', 'all words',
+        with('all of the words', 'index', 'all words', {
           :before_match => '<b>', :after_match => '</span>',
-          :chunk_separator => ' -- ').
+          :chunk_separator => ' -- '
+        }).
         and_return('CALL SNIPPETS')
 
       excerpter.excerpt!('all of the words')

data/spec/thinking_sphinx/index_spec.rb

@@ -19,7 +19,7 @@ describe ThinkingSphinx::Index do
 
       it "creates an ActiveRecord index" do
         expect(ThinkingSphinx::ActiveRecord::Index).to receive(:new).
-          with(:user, :with => :active_record).and_return index
+          with(:user, { :with => :active_record }).and_return index
 
         ThinkingSphinx::Index.define(:user, :with => :active_record)
       end
@@ -100,7 +100,7 @@ describe ThinkingSphinx::Index do
 
       it "creates a real-time index" do
         expect(ThinkingSphinx::RealTime::Index).to receive(:new).
-          with(:user, :with => :real_time).and_return index
+          with(:user, { :with => :real_time }).and_return index
 
         ThinkingSphinx::Index.define(:user, :with => :real_time)
       end