thinking-sphinx 3.4.2 → 4.0.0

data/lib/thinking_sphinx/test.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Test
   def self.init(suppress_delta_output = true)
     FileUtils.mkdir_p config.indices_location

data/lib/thinking_sphinx/utf8.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::UTF8
   attr_reader :string
 

data/lib/thinking_sphinx/wildcard.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ThinkingSphinx::Wildcard
   DEFAULT_TOKEN = /\p{Word}+/
 

data/lib/thinking_sphinx/with_output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx::WithOutput
   def initialize(configuration, options = {}, stream = STDOUT)
     @configuration = configuration

data/spec/acceptance/association_scoping_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Scoping association search calls by foreign keys', :live => true do

data/spec/acceptance/attribute_access_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Accessing attributes directly via search results', :live => true do
@@ -15,8 +17,7 @@ describe 'Accessing attributes directly via search results', :live => true do
     Book.create! :title => 'American Gods', :year => 2001
     index
 
-    search = Book.search 'gods',
-      :select => "*, #{ThinkingSphinx::SphinxQL.weight[:select]}"
+    search = Book.search 'gods', :select => "*, weight()"
     search.context[:panes] << ThinkingSphinx::Panes::WeightPane
 
     expect(search.first.weight).to eq(2500)
@@ -26,8 +27,7 @@ describe 'Accessing attributes directly via search results', :live => true do
     gods = Book.create! :title => 'American Gods', :year => 2001
     index
 
-    search = Book.search 'gods',
-      :select => "*, #{ThinkingSphinx::SphinxQL.weight[:select]}"
+    search = Book.search 'gods', :select => "*, weight()"
     search.masks << ThinkingSphinx::Masks::WeightEnumeratorMask
 
     expectations = [[gods, 2500]]

data/spec/acceptance/attribute_updates_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Update attributes automatically where possible', :live => true do

data/spec/acceptance/batch_searching_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Executing multiple searches in one Sphinx call', :live => true do

data/spec/acceptance/big_integers_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe '64 bit integer support' do

data/spec/acceptance/connection_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 RSpec.describe 'Connections', :live => true do

data/spec/acceptance/excerpts_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'acceptance/spec_helper'
 

data/spec/acceptance/facets_spec.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+# frozen_string_literal: true
 
 require 'acceptance/spec_helper'
 
@@ -28,10 +29,8 @@ describe 'Faceted searching', :live => true do
     Article.create!
     index
 
-    article_count = ENV['SPHINX_VERSION'].try(:[], /2.0.\d/) ? 2 : 1
-
     expect(ThinkingSphinx.facets.to_hash[:class]).to eq({
-      'Tee' => 2, 'City' => 1, 'Article' => article_count
+      'Tee' => 2, 'City' => 1, 'Article' => 1
     })
   end
 

data/spec/acceptance/geosearching_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Searching by latitude and longitude', :live => true do
@@ -30,7 +32,7 @@ describe 'Searching by latitude and longitude', :live => true do
     index
 
     cities = City.search(:geo => [-0.616241, 2.602712], :order => 'geodist ASC')
-    if ENV['SPHINX_VERSION'].try :[], /2.2.\d/
+    if ENV.fetch('SPHINX_VERSION', '2.1.2').to_f > 2.1
       expected = {:mysql => 249907.171875, :postgresql => 249912.03125}
     else
       expected = {:mysql => 250326.906250, :postgresql => 250331.234375}

data/spec/acceptance/grouping_by_attributes_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Grouping search results by attributes', :live => true do

data/spec/acceptance/index_options_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Index options' do

data/spec/acceptance/indexing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Indexing', :live => true do

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_attributes :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,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Paginating search results', :live => true do

data/spec/acceptance/real_time_updates_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Updates to records in real-time indices', :live => true do

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

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

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

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

data/spec/acceptance/searching_across_schemas_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 multi_schema = MultiSchema.new

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

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

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

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

data/spec/acceptance/sorting_search_results_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Sorting search results', :live => true do

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

data/spec/acceptance/specifying_sql_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'specifying SQL for index definitions' do

data/spec/acceptance/sphinx_scopes_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'Sphinx scopes', :live => true do

data/spec/acceptance/sql_deltas_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'acceptance/spec_helper'
 
 describe 'SQL delta indexing', :live => true do

data/spec/acceptance/support/database_cleaner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 RSpec.configure do |config|
   config.before(:suite) do
     DatabaseCleaner.strategy = :truncation

data/spec/acceptance/support/sphinx_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SphinxController
   def initialize
     config.searchd.mysql41 = 9307
@@ -16,10 +18,6 @@ class SphinxController
 
     ActiveSupport::Dependencies.clear
 
-    if ENV['SPHINX_VERSION'].try :[], /2.0.\d/
-      ThinkingSphinx::Configuration.instance.settings['utf8'] = false
-    end
-
     config.searchd.mysql41 = 9307
     config.settings['quiet_deltas']      = true
     config.settings['attribute_updates'] = true
@@ -28,6 +26,15 @@ class SphinxController
 
   def start
     config.controller.start
+  rescue Riddle::CommandFailedError => error
+    puts <<-TXT
+
+The Sphinx start command failed:
+  Command: #{error.command_result.command}
+  Status:  #{error.command_result.status}
+  Output:  #{error.command_result.output}
+    TXT
+    raise error
   end
 
   def stop
@@ -38,7 +45,11 @@ class SphinxController
   end
 
   def index(*indices)
-    config.controller.index *indices
+    ThinkingSphinx::Commander.call :index_sql, config, :indices => indices
+  end
+
+  def merge
+    ThinkingSphinx::Commander.call(:merge_and_update, config, {})
   end
 
   private

data/spec/acceptance/support/sphinx_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SphinxHelpers
   def sphinx
     @sphinx ||= SphinxController.new
@@ -12,6 +14,15 @@ module SphinxHelpers
     sleep 0.25
     sleep 0.5 if ENV['TRAVIS']
   end
+
+  def merge
+    sleep 0.5 if ENV['TRAVIS']
+    sleep 0.5
+
+    sphinx.merge
+    sleep 1.5
+    sleep 0.5 if ENV['TRAVIS']
+  end
 end
 
 RSpec.configure do |config|

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