thinking-sphinx 3.1.4 → 6.0.0

data/spec/acceptance/searching_across_models_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Searching across models', :live => true do
@@ -5,7 +7,7 @@ describe 'Searching across models', :live => true do
     article = Article.create! :title => 'Pancakes'
     index
 
-    ThinkingSphinx.search.first.should == article
+    expect(ThinkingSphinx.search.first).to eq(article)
   end
 
   it "returns results matching the given query" do
@@ -14,8 +16,8 @@ describe 'Searching across models', :live => true do
     index
 
     articles = ThinkingSphinx.search 'pancakes'
-    articles.should include(pancakes)
-    articles.should_not include(waffles)
+    expect(articles).to include(pancakes)
+    expect(articles).not_to include(waffles)
   end
 
   it "handles results from different models" do
@@ -23,7 +25,7 @@ describe 'Searching across models', :live => true do
     book    = Book.create! :title => 'American Gods'
     index
 
-    ThinkingSphinx.search.to_a.should =~ [article, book]
+    expect(ThinkingSphinx.search.to_a).to match_array([article, book])
   end
 
   it "filters by multiple classes" do
@@ -32,7 +34,14 @@ describe 'Searching across models', :live => true do
     user    = User.create! :name => 'Pat'
     index
 
-    ThinkingSphinx.search(:classes => [User, Article]).to_a.
-      should =~ [article, user]
+    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_across_schemas_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 multi_schema = MultiSchema.new
@@ -16,23 +18,23 @@ describe 'Searching across PostgreSQL schemas', :live => true do
   it 'can distinguish between objects with the same primary key' do
     multi_schema.switch :public
     jekyll = Product.create name: 'Doctor Jekyll'
-    Product.search('Jekyll', :retry_stale => false).to_a.should == [jekyll]
-    Product.search(:retry_stale => false).to_a.should == [jekyll]
+    expect(Product.search('Jekyll', :retry_stale => false).to_a).to eq([jekyll])
+    expect(Product.search(:retry_stale => false).to_a).to eq([jekyll])
 
     multi_schema.switch :thinking_sphinx
     hyde = Product.create name: 'Mister Hyde'
-    Product.search('Jekyll', :retry_stale => false).to_a.should == []
-    Product.search('Hyde', :retry_stale => false).to_a.should == [hyde]
-    Product.search(:retry_stale => false).to_a.should == [hyde]
+    expect(Product.search('Jekyll', :retry_stale => false).to_a).to eq([])
+    expect(Product.search('Hyde', :retry_stale => false).to_a).to eq([hyde])
+    expect(Product.search(:retry_stale => false).to_a).to eq([hyde])
 
     multi_schema.switch :public
-    Product.search('Jekyll', :retry_stale => false).to_a.should == [jekyll]
-    Product.search(:retry_stale => false).to_a.should == [jekyll]
-    Product.search('Hyde', :retry_stale => false).to_a.should == []
+    expect(Product.search('Jekyll', :retry_stale => false).to_a).to eq([jekyll])
+    expect(Product.search(:retry_stale => false).to_a).to eq([jekyll])
+    expect(Product.search('Hyde', :retry_stale => false).to_a).to eq([])
 
-    Product.search(
+    expect(Product.search(
       :middleware => ThinkingSphinx::Middlewares::RAW_ONLY,
       :indices    => ['product_core', 'product_two_core']
-    ).to_a.length.should == 2
+    ).to_a.length).to eq(2)
   end
 end if multi_schema.active?

data/spec/acceptance/searching_on_fields_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Searching on fields', :live => true do
@@ -8,8 +10,8 @@ describe 'Searching on fields', :live => true do
     index
 
     articles = Article.search :conditions => {:title => 'pancakes'}
-    articles.should include(pancakes)
-    articles.should_not include(waffles)
+    expect(articles).to include(pancakes)
+    expect(articles).not_to include(waffles)
   end
 
   it "limits results for a field from an association" do
@@ -17,7 +19,7 @@ describe 'Searching on fields', :live => true do
     pancakes = Article.create! :title => 'Pancakes', :user => user
     index
 
-    Article.search(:conditions => {:user => 'pat'}).first.should == pancakes
+    expect(Article.search(:conditions => {:user => 'pat'}).first).to eq(pancakes)
   end
 
   it "returns results with matches from grouped fields" do
@@ -26,23 +28,23 @@ describe 'Searching on fields', :live => true do
     waffles  = Article.create! :title => 'Waffles',  :user => user
     index
 
-    Article.search('waffles', :conditions => {:title => 'pancakes'}).to_a.
-      should == [pancakes]
+    expect(Article.search('waffles', :conditions => {:title => 'pancakes'}).to_a).
+      to eq([pancakes])
   end
 
   it "returns results with matches from concatenated columns in a field" do
     book = Book.create! :title => 'Night Watch', :author => 'Terry Pratchett'
     index
 
-    Book.search(:conditions => {:info => 'Night Pratchett'}).to_a.
-      should == [book]
+    expect(Book.search(:conditions => {:info => 'Night Pratchett'}).to_a).
+      to eq([book])
   end
 
   it "handles NULLs in concatenated fields" do
     book = Book.create! :title => 'Night Watch'
     index
 
-    Book.search(:conditions => {:info => 'Night Watch'}).to_a.should == [book]
+    expect(Book.search(:conditions => {:info => 'Night Watch'}).to_a).to eq([book])
   end
 
   it "returns results with matches from file fields" do
@@ -52,6 +54,6 @@ describe 'Searching on fields', :live => true do
     book = Book.create! :title => 'Accelerando', :blurb_file => file_path.to_s
     index
 
-    Book.search('cyberpunk').to_a.should == [book]
+    expect(Book.search('cyberpunk').to_a).to eq([book])
   end
 end

data/spec/acceptance/searching_with_filters_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Searching with filters', :live => true do
@@ -6,16 +8,16 @@ describe 'Searching with filters', :live => true do
     waffles  = Article.create! :title => 'Waffles',  :published => false
     index
 
-    Article.search(:with => {:published => true}).to_a.should == [pancakes]
+    expect(Article.search(:with => {:published => true}).to_a).to eq([pancakes])
   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
 
-    Book.search(:with => {:year => [2001, 2005]}).to_a.should == [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
@@ -28,8 +30,8 @@ describe 'Searching with filters', :live => true do
     grave.update_column :created_at, 1.day.ago
     index
 
-    Book.search(:with => {:created_at => 6.days.ago..2.days.ago}).to_a.
-      should == [gods, boys]
+    expect(Book.search(:with => {:created_at => 6.days.ago..2.days.ago}).to_a).
+      to match_array([gods, boys])
   end
 
   it "limits results by exclusive filters on single values" do
@@ -37,16 +39,16 @@ describe 'Searching with filters', :live => true do
     waffles  = Article.create! :title => 'Waffles',  :published => false
     index
 
-    Article.search(:without => {:published => true}).to_a.should == [waffles]
+    expect(Article.search(:without => {:published => true}).to_a).to eq([waffles])
   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
 
-    Book.search(:without => {:year => [2001, 2005]}).to_a.should == [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
@@ -64,9 +66,9 @@ describe 'Searching with filters', :live => true do
 
     index
 
-    Article.search(
+    expect(Article.search(
       :with => {:taggings_at => 1.days.ago..1.day.from_now}
-    ).to_a.should == [pancakes]
+    ).to_a).to eq([pancakes])
   end
 
   it "takes into account local timezones for timestamps" do
@@ -84,9 +86,9 @@ describe 'Searching with filters', :live => true do
 
     index
 
-    Article.search(
+    expect(Article.search(
       :with => {:taggings_at => 2.minutes.ago..Time.zone.now}
-    ).to_a.should == [pancakes]
+    ).to_a).to eq([pancakes])
   end
 
   it "limits results with MVAs having all of the given values" do
@@ -103,13 +105,13 @@ describe 'Searching with filters', :live => true do
     index
 
     articles = Article.search :with_all => {:tag_ids => [food.id, flat.id]}
-    articles.to_a.should == [pancakes]
+    expect(articles.to_a).to eq([pancakes])
   end
 
   it "limits results with MVAs that don't contain all the given values" do
     # Matching results may have some of the given values, but cannot have all
     # of them. Certainly an edge case.
-    pending "SphinxQL doesn't yet support OR in its WHERE clause"
+    skip "SphinxQL doesn't yet support OR in its WHERE clause"
 
     pancakes = Article.create :title => 'Pancakes'
     waffles  = Article.create :title => 'Waffles'
@@ -124,7 +126,7 @@ describe 'Searching with filters', :live => true do
     index
 
     articles = Article.search :without_all => {:tag_ids => [food.id, flat.id]}
-    articles.to_a.should == [waffles]
+    expect(articles.to_a).to eq([waffles])
   end
 
   it "limits results on real-time indices with multi-value integer attributes" do
@@ -139,6 +141,19 @@ describe 'Searching with filters', :live => true do
     waffles.categories  << food
 
     products = Product.search :with => {:category_ids => [flat.id]}
-    products.to_a.should == [pancakes]
+    expect(products.to_a).to eq([pancakes])
   end
+
+  it 'searches with real-time JSON attributes' do
+    pancakes = Product.create :name => 'Pancakes',
+      :options => {'lemon' => 1, 'sugar' => 1, :number => 3}
+    waffles  = Product.create :name => 'Waffles',
+      :options => {'chocolate' => 1, 'sugar' => 1, :number => 1}
+
+    products = Product.search :with => {"options.lemon" => 1}
+    expect(products.to_a).to eq([pancakes])
+
+    products = Product.search :with => {"options.sugar" => 1}
+    expect(products.to_a).to match_array([pancakes, waffles])
+  end if JSONColumn.call
 end

data/spec/acceptance/searching_with_sti_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Searching across STI models', :live => true do
@@ -6,7 +8,7 @@ describe 'Searching across STI models', :live => true do
     duck     = Bird.create :name => 'Duck'
     index
 
-    Animal.search(:indices  => ['animal_core']).to_a.should == [platypus, duck]
+    expect(Animal.search(:indices  => ['animal_core']).to_a).to eq([platypus, duck])
   end
 
   it "limits results based on subclasses" do
@@ -14,7 +16,7 @@ describe 'Searching across STI models', :live => true do
     duck     = Bird.create :name => 'Duck'
     index
 
-    Bird.search(:indices  => ['animal_core']).to_a.should == [duck]
+    expect(Bird.search(:indices  => ['animal_core']).to_a).to eq([duck])
   end
 
   it "returns results for deeper subclasses when searching on their parents" do
@@ -23,7 +25,7 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    Bird.search(:indices  => ['animal_core']).to_a.should == [duck, emu]
+    expect(Bird.search(:indices  => ['animal_core']).to_a).to eq([duck, emu])
   end
 
   it "returns results for deeper subclasses" do
@@ -32,7 +34,7 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    FlightlessBird.search(:indices  => ['animal_core']).to_a.should == [emu]
+    expect(FlightlessBird.search(:indices  => ['animal_core']).to_a).to eq([emu])
   end
 
   it "filters out sibling subclasses" do
@@ -41,7 +43,7 @@ describe 'Searching across STI models', :live => true do
     otter    = Mammal.create :name => 'Otter'
     index
 
-    Bird.search(:indices  => ['animal_core']).to_a.should == [duck]
+    expect(Bird.search(:indices  => ['animal_core']).to_a).to eq([duck])
   end
 
   it "obeys :classes if supplied" do
@@ -50,18 +52,18 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    Bird.search(
+    expect(Bird.search(
       :indices  => ['animal_core'],
       :skip_sti => true,
       :classes  => [Bird, FlightlessBird]
-    ).to_a.should == [duck, emu]
+    ).to_a).to eq([duck, emu])
   end
 
   it 'finds root objects when type is blank' do
     animal = Animal.create :name => 'Animal', type: ''
     index
 
-    Animal.search(:indices => ['animal_core']).to_a.should == [animal]
+    expect(Animal.search(:indices => ['animal_core']).to_a).to eq([animal])
   end
 
   it 'allows for indices on mid-hierarchy classes' do
@@ -69,6 +71,6 @@ describe 'Searching across STI models', :live => true do
     emu      = FlightlessBird.create :name => 'Emu'
     index
 
-    Bird.search(:indices => ['bird_core']).to_a.should == [duck, emu]
+    expect(Bird.search(:indices => ['bird_core']).to_a).to eq([duck, emu])
   end
 end

data/spec/acceptance/searching_within_a_model_spec.rb

@@ -1,4 +1,6 @@
 # encoding: UTF-8
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Searching within a model', :live => true do
@@ -6,7 +8,7 @@ describe 'Searching within a model', :live => true do
     article = Article.create! :title => 'Pancakes'
     index
 
-    Article.search.first.should == article
+    expect(Article.search.first).to eq(article)
   end
 
   it "returns results matching the given query" do
@@ -15,22 +17,22 @@ describe 'Searching within a model', :live => true do
     index
 
     articles = Article.search 'pancakes'
-    articles.should include(pancakes)
-    articles.should_not include(waffles)
+    expect(articles).to include(pancakes)
+    expect(articles).not_to include(waffles)
   end
 
   it "handles unicode characters" do
     istanbul = City.create! :name => 'İstanbul'
     index
 
-    City.search('İstanbul').to_a.should == [istanbul]
+    expect(City.search('İstanbul').to_a).to eq([istanbul])
   end
 
   it "will star provided queries on request" do
     article = Article.create! :title => 'Pancakes'
     index
 
-    Article.search('cake', :star => true).first.should == article
+    expect(Article.search('cake', :star => true).first).to eq(article)
   end
 
   it "allows for searching on specific indices" do
@@ -38,7 +40,7 @@ describe 'Searching within a model', :live => true do
     index
 
     articles = Article.search('pancake', :indices => ['stemmed_article_core'])
-    articles.to_a.should == [article]
+    expect(articles.to_a).to eq([article])
   end
 
   it "allows for searching on distributed indices" do
@@ -46,38 +48,63 @@ describe 'Searching within a model', :live => true do
     index
 
     articles = Article.search('pancake', :indices => ['article'])
-    articles.to_a.should == [article]
+    expect(articles.to_a).to eq([article])
   end
 
   it "can search on namespaced models" do
     person = Admin::Person.create :name => 'James Bond'
     index
 
-    Admin::Person.search('Bond').to_a.should == [person]
+    expect(Admin::Person.search('Bond').to_a).to eq([person])
   end
 
   it "raises an error if searching through an ActiveRecord scope" do
-    lambda {
+    expect {
       City.ordered.search
-    }.should raise_error(ThinkingSphinx::MixedScopesError)
+    }.to raise_error(ThinkingSphinx::MixedScopesError)
   end
 
   it "does not raise an error when searching with a default ActiveRecord scope" do
-    lambda {
+    expect {
       User.search
-    }.should_not raise_error(ThinkingSphinx::MixedScopesError)
+    }.not_to raise_error
   end
 
   it "raises an error when searching with default and applied AR scopes" do
-    lambda {
+    expect {
       User.recent.search
-    }.should raise_error(ThinkingSphinx::MixedScopesError)
+    }.to raise_error(ThinkingSphinx::MixedScopesError)
   end
 
   it "raises an error if the model has no indices defined" do
-    lambda {
+    expect {
       Category.search.to_a
-    }.should raise_error(ThinkingSphinx::NoIndicesError)
+    }.to raise_error(ThinkingSphinx::NoIndicesError)
+  end
+
+  it "handles models with alternative id columns" do
+    album = Album.create! :name => 'The Seldom Seen Kid', :artist => 'Elbow'
+    index
+
+    expect(Album.search(:indices => ['album_core', 'album_delta']).first).
+      to eq(album)
+
+    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
 
@@ -85,6 +112,6 @@ describe 'Searching within a model with a realtime index', :live => true do
   it "returns results" do
     product = Product.create! :name => 'Widget'
 
-    Product.search.first.should == product
+    expect(Product.search.first).to eq(product)
   end
 end

data/spec/acceptance/sorting_search_results_spec.rb

@@ -1,48 +1,50 @@
+# frozen_string_literal: true
+
 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
 
-    Book.search(:order => 'year ASC').to_a.should == [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
 
-    Book.search(:order => :year).to_a.should == [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
 
-    Book.search(:order => :title).to_a.should == [gods, boys, grave]
+    expect(Book.search(:order => :title).to_a).to eq([gods, boys, grave])
   end
 
   it "sorts by a given sortable field with real-time indices" do
     widgets = Product.create! :name => 'Widgets'
     gadgets = Product.create! :name => 'Gadgets'
 
-    Product.search(:order => "name_sort ASC").to_a.should == [gadgets, widgets]
+    expect(Product.search(:order => "name_sort ASC").to_a).to eq([gadgets, widgets])
   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
 
-    Book.search(
-      :select => '*, year MOD 2004 as mod_year', :order => 'mod_year ASC'
-    ).to_a.should == [boys, grave, gods]
+    expect(Book.search(
+      :select => '*, publishing_year MOD 2004 as mod_year', :order => 'mod_year ASC'
+    ).to_a).to eq([boys, grave, gods])
   end
 end

data/spec/acceptance/spec_helper.rb

@@ -1,17 +1,6 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 root = File.expand_path File.dirname(__FILE__)
 Dir["#{root}/support/**/*.rb"].each { |file| require file }
-
-if ENV['SPHINX_VERSION'].try :[], /2.0.\d/
-  ThinkingSphinx::SphinxQL.variables!
-
-  ThinkingSphinx::Middlewares::DEFAULT.insert_after(
-    ThinkingSphinx::Middlewares::Inquirer,
-    ThinkingSphinx::Middlewares::UTF8
-  )
-  ThinkingSphinx::Middlewares::RAW_ONLY.insert_after(
-    ThinkingSphinx::Middlewares::Inquirer,
-    ThinkingSphinx::Middlewares::UTF8
-  )
-end