thinking-sphinx 4.4.1 → 5.4.0

data/spec/thinking_sphinx/active_record/sql_source_spec.rb

@@ -30,6 +30,44 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
     end
   end
 
+  describe '#add_attribute' do
+    let(:attribute) { double('attribute', name: 'my_attribute') }
+
+    it "appends attributes to the collection" do
+      source.add_attribute attribute
+
+      expect(source.attributes.collect(&:name)).to include('my_attribute')
+    end
+
+    it "replaces attributes with the same name" do
+      source.add_attribute double('attribute', name: 'my_attribute')
+      source.add_attribute attribute
+
+      matching = source.attributes.select { |attr| attr.name == attribute.name }
+
+      expect(matching).to eq([attribute])
+    end
+  end
+
+  describe '#add_field' do
+    let(:field) { double('field', name: 'my_field') }
+
+    it "appends fields to the collection" do
+      source.add_field field
+
+      expect(source.fields.collect(&:name)).to include('my_field')
+    end
+
+    it "replaces fields with the same name" do
+      source.add_field double('field', name: 'my_field')
+      source.add_field field
+
+      matching = source.fields.select { |fld| fld.name == field.name }
+
+      expect(matching).to eq([field])
+    end
+  end
+
   describe '#attributes' do
     it "has the internal id attribute by default" do
       expect(source.attributes.collect(&:name)).to include('sphinx_internal_id')
@@ -287,14 +325,14 @@ describe ThinkingSphinx::ActiveRecord::SQLSource do
       expect(source.sql_attr_string).to include('name')
     end
 
-    it "adds timestamp attributes to sql_attr_timestamp" do
+    it "adds timestamp attributes to sql_attr_uint" do
       source.attributes << double('attribute')
       allow(presenter).to receive_messages :declaration => 'created_at',
-        :collection_type => :timestamp
+        :collection_type => :uint
 
       source.render
 
-      expect(source.sql_attr_timestamp).to include('created_at')
+      expect(source.sql_attr_uint).to include('created_at')
     end
 
     it "adds float attributes to sql_attr_float" do

data/spec/thinking_sphinx/connection/mri_spec.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+RSpec.describe ThinkingSphinx::Connection::MRI do
+  subject { described_class.new :host => "127.0.0.1", :port => 9306 }
+
+  let(:client) { double :client, :query => "result", :next_result => false }
+
+  before :each do
+    allow(Mysql2::Client).to receive(:new).and_return(client)
+  end
+
+  after :each do
+    ThinkingSphinx::Configuration.reset
+  end
+
+  describe "#execute" do
+    it "sends the query to the client" do
+      subject.execute "SELECT QUERY"
+
+      expect(client).to have_received(:query).with("SELECT QUERY")
+    end
+
+    it "returns a result" do
+      expect(subject.execute("SELECT QUERY")).to eq("result")
+    end
+
+    context "with long queries" do
+      let(:maximum)    { (2 ** 23) - 5 }
+      let(:query)      { String.new "SELECT * FROM book_core WHERE MATCH('')" }
+      let(:difference) { maximum - query.length }
+
+      it 'does not allow overly long queries' do
+        expect {
+          subject.execute(query.insert(-3, 'a' * (difference + 5)))
+        }.to raise_error(ThinkingSphinx::QueryLengthError)
+      end
+
+      it 'does not allow queries longer than specified in the settings' do
+        ThinkingSphinx::Configuration.reset
+
+        write_configuration('maximum_statement_length' => maximum - 5)
+
+        expect {
+          subject.execute(query.insert(-3, 'a' * (difference)))
+        }.to raise_error(ThinkingSphinx::QueryLengthError)
+      end
+    end
+  end
+end if RUBY_PLATFORM != 'java'

data/spec/thinking_sphinx/deletion_spec.rb

@@ -6,7 +6,7 @@ describe ThinkingSphinx::Deletion do
   describe '.perform' do
     let(:connection) { double('connection', :execute => nil) }
     let(:index)      { double('index', :name => 'foo_core',
-      :document_id_for_key => 14, :type => 'plain', :distributed? => false) }
+      :type => 'plain', :distributed? => false) }
 
     before :each do
       allow(ThinkingSphinx::Connection).to receive(:take).and_yield(connection)
@@ -15,8 +15,9 @@ describe ThinkingSphinx::Deletion do
 
     context 'index is SQL-backed' do
       it "updates the deleted flag to false" do
-        expect(connection).to receive(:execute).
-          with('UPDATE foo_core SET sphinx_deleted = 1 WHERE id IN (14)')
+        expect(connection).to receive(:execute).with(
+          'UPDATE foo_core SET sphinx_deleted = 1 WHERE sphinx_internal_id IN (7)'
+        )
 
         ThinkingSphinx::Deletion.perform index, 7
       end
@@ -38,7 +39,7 @@ describe ThinkingSphinx::Deletion do
 
       it "deletes the record to false" do
         expect(connection).to receive(:execute).
-          with('DELETE FROM foo_core WHERE id = 14')
+          with('DELETE FROM foo_core WHERE sphinx_internal_id IN (7)')
 
         ThinkingSphinx::Deletion.perform index, 7
       end

data/spec/thinking_sphinx/index_set_spec.rb

@@ -30,6 +30,16 @@ describe ThinkingSphinx::IndexSet do
   end
 
   describe '#to_a' do
+    let(:article_index) do
+      double(:reference => :article, :distributed? => false)
+    end
+    let(:opinion_article_index) do
+      double(:reference => :opinion_article, :distributed? => false)
+    end
+    let(:page_index) do
+      double(:reference => :page, :distributed? => false)
+    end
+
     it "ensures the indices are loaded" do
       expect(configuration).to receive(:preload_indices)
 
@@ -50,21 +60,29 @@ describe ThinkingSphinx::IndexSet do
 
     it "uses indices for the given classes" do
       configuration.indices.replace [
-        double(:reference => :article,         :distributed? => false),
-        double(:reference => :opinion_article, :distributed? => false),
-        double(:reference => :page,            :distributed? => false)
+        article_index, opinion_article_index, page_index
       ]
 
       options[:classes] = [class_double('Article', :column_names => [])]
 
-      expect(set.to_a.length).to eq(1)
+      expect(set.to_a).to eq([article_index])
+    end
+
+    it "uses indices for the given instance's class" do
+      configuration.indices.replace [
+        article_index, opinion_article_index, page_index
+      ]
+
+      instance_class = class_double('Article', :column_names => [])
+
+      options[:instances] = [double(:instance, :class => instance_class)]
+
+      expect(set.to_a).to eq([article_index])
     end
 
     it "requests indices for any STI superclasses" do
       configuration.indices.replace [
-        double(:reference => :article,         :distributed? => false),
-        double(:reference => :opinion_article, :distributed? => false),
-        double(:reference => :page,            :distributed? => false)
+        article_index, opinion_article_index, page_index
       ]
 
       article = class_double('Article', :column_names => [:type])
@@ -73,14 +91,12 @@ describe ThinkingSphinx::IndexSet do
 
       options[:classes] = [opinion]
 
-      expect(set.to_a.length).to eq(2)
+      expect(set.to_a).to eq([article_index, opinion_article_index])
     end
 
     it "does not use MTI superclasses" do
       configuration.indices.replace [
-        double(:reference => :article,         :distributed? => false),
-        double(:reference => :opinion_article, :distributed? => false),
-        double(:reference => :page,            :distributed? => false)
+        article_index, opinion_article_index, page_index
       ]
 
       article = class_double('Article', :column_names => [])
@@ -88,7 +104,7 @@ describe ThinkingSphinx::IndexSet do
 
       options[:classes] = [opinion]
 
-      expect(set.to_a.length).to eq(1)
+      expect(set.to_a).to eq([opinion_article_index])
     end
 
     it "uses named indices if names are provided" do

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -31,7 +31,7 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
   let(:query)         { double('query') }
   let(:configuration) { double('configuration', :settings => {},
     index_set_class: set_class) }
-  let(:set_class)     { double(:new => index_set) }
+  let(:set_class)     { double(:new => index_set, :reference_name => :article) }
 
   before :each do
     stub_const 'Riddle::Query::Select', double(:new => sphinx_sql)
@@ -115,6 +115,7 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       model = double('model', :connection => double,
         :ancestors => [ActiveRecord::Base], :name => 'Animal')
       allow(index_set.first).to receive_messages :reference => :animal
+      allow(set_class).to receive_messages(:reference_name => :animal)
 
       search.options[:classes] = [model]
 

data/spec/thinking_sphinx/real_time/index_spec.rb

@@ -5,12 +5,52 @@ require 'spec_helper'
 describe ThinkingSphinx::RealTime::Index do
   let(:index)        { ThinkingSphinx::RealTime::Index.new :user }
   let(:config)       { double('config', :settings => {},
-    :indices_location => 'location', :next_offset => 8) }
+    :indices_location => 'location', :next_offset => 8,
+    :index_set_class => index_set_class) }
+  let(:index_set_class) { double(:index_set_class, :reference_name => :user) }
 
   before :each do
     allow(ThinkingSphinx::Configuration).to receive_messages :instance => config
   end
 
+  describe '#add_attribute' do
+    let(:attribute) { double('attribute', name: 'my_attribute') }
+
+    it "appends attributes to the collection" do
+      index.add_attribute attribute
+
+      expect(index.attributes.collect(&:name)).to include('my_attribute')
+    end
+
+    it "replaces attributes with the same name" do
+      index.add_attribute double('attribute', name: 'my_attribute')
+      index.add_attribute attribute
+
+      matching = index.attributes.select { |attr| attr.name == attribute.name }
+
+      expect(matching).to eq([attribute])
+    end
+  end
+
+  describe '#add_field' do
+    let(:field) { double('field', name: 'my_field') }
+
+    it "appends fields to the collection" do
+      index.add_field field
+
+      expect(index.fields.collect(&:name)).to include('my_field')
+    end
+
+    it "replaces fields with the same name" do
+      index.add_field double('field', name: 'my_field')
+      index.add_field field
+
+      matching = index.fields.select { |fld| fld.name == field.name }
+
+      expect(matching).to eq([field])
+    end
+  end
+
   describe '#attributes' do
     it "has the internal id attribute by default" do
       expect(index.attributes.collect(&:name)).to include('sphinx_internal_id')
@@ -23,23 +63,21 @@ describe ThinkingSphinx::RealTime::Index do
     it "has the internal deleted attribute by default" do
       expect(index.attributes.collect(&:name)).to include('sphinx_deleted')
     end
-  end
 
-  describe '#delta?' do
-    it "always returns false" do
-      expect(index).not_to be_delta
+    it "does not have an internal updated_at attribute by default" do
+      expect(index.attributes.collect(&:name)).to_not include('sphinx_updated_at')
     end
-  end
 
-  describe '#docinfo' do
-    it "defaults to extern" do
-      expect(index.docinfo).to eq(:extern)
-    end
+    it "has an internal updated_at attribute if real_time_tidy is true" do
+      config.settings["real_time_tidy"] = true
 
-    it "can be disabled" do
-      config.settings["skip_docinfo"] = true
+      expect(index.attributes.collect(&:name)).to include('sphinx_updated_at')
+    end
+  end
 
-      expect(index.docinfo).to be_nil
+  describe '#delta?' do
+    it "always returns false" do
+      expect(index).not_to be_delta
     end
   end
 

data/spec/thinking_sphinx/real_time/interpreter_spec.rb

@@ -10,6 +10,10 @@ describe ThinkingSphinx::RealTime::Interpreter do
   let(:index)   { Struct.new(:attributes, :fields, :options).new([], [], {}) }
   let(:block)   { Proc.new { } }
 
+  before :each do
+    allow(index).to receive_messages(:add_attribute => nil, :add_field => nil)
+  end
+
   describe '.translate!' do
     let(:instance) { double('interpreter', :translate! => true) }
 
@@ -51,17 +55,15 @@ describe ThinkingSphinx::RealTime::Interpreter do
     end
 
     it "adds an attribute to the index" do
-      instance.has column
+      expect(index).to receive(:add_attribute).with(attribute)
 
-      expect(index.attributes).to include(attribute)
+      instance.has column
     end
 
     it "adds multiple attributes when passed multiple columns" do
-      instance.has column, column
+      expect(index).to receive(:add_attribute).with(attribute).twice
 
-      expect(index.attributes.select { |saved_attribute|
-        saved_attribute == attribute
-      }.length).to eq(2)
+      instance.has column, column
     end
   end
 
@@ -88,17 +90,15 @@ describe ThinkingSphinx::RealTime::Interpreter do
     end
 
     it "adds a field to the index" do
-      instance.indexes column
+      expect(index).to receive(:add_field).with(field)
 
-      expect(index.fields).to include(field)
+      instance.indexes column
     end
 
     it "adds multiple fields when passed multiple columns" do
-      instance.indexes column, column
+      expect(index).to receive(:add_field).with(field).twice
 
-      expect(index.fields.select { |saved_field|
-        saved_field == field
-      }.length).to eq(2)
+      instance.indexes column, column
     end
 
     context 'sortable' do
@@ -135,9 +135,9 @@ describe ThinkingSphinx::RealTime::Interpreter do
       end
 
       it "adds an attribute to the index" do
-        instance.indexes column, :sortable => true
+        expect(index).to receive(:add_attribute).with(attribute)
 
-        expect(index.attributes).to include(attribute)
+        instance.indexes column, :sortable => true
       end
     end
   end

data/spec/thinking_sphinx/real_time/transcriber_spec.rb

@@ -6,7 +6,8 @@ RSpec.describe ThinkingSphinx::RealTime::Transcriber do
   let(:subject)    { ThinkingSphinx::RealTime::Transcriber.new index }
   let(:index)      { double 'index', :name => 'foo_core', :conditions => [],
     :fields => [double(:name => 'field_a'), double(:name => 'field_b')],
-    :attributes => [double(:name => 'attr_a'), double(:name => 'attr_b')] }
+    :attributes => [double(:name => 'attr_a'), double(:name => 'attr_b')],
+    :primary_key => :id }
   let(:insert)     { double :replace! => replace }
   let(:replace)    { double :to_sql => 'REPLACE QUERY' }
   let(:connection) { double :execute => true }
@@ -40,6 +41,13 @@ RSpec.describe ThinkingSphinx::RealTime::Transcriber do
     subject.copy instance_a, instance_b
   end
 
+  it "deletes previous records" do
+    expect(connection).to receive(:execute).
+      with('DELETE FROM foo_core WHERE sphinx_internal_id IN (48, 49)')
+
+    subject.copy instance_a, instance_b
+  end
+
   it "skips instances that aren't in the database" do
     allow(instance_a).to receive(:persisted?).and_return(false)
 

data/thinking-sphinx.gemspec

@@ -5,7 +5,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '4.4.1'
+  s.version     = '5.4.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'activerecord', '>= 3.1.0'
+  s.add_runtime_dependency 'activerecord', '>= 4.2.0'
   s.add_runtime_dependency 'builder',      '>= 2.1.2'
-  s.add_runtime_dependency 'joiner',       '>= 0.2.0'
+  s.add_runtime_dependency 'joiner',       '>= 0.3.4'
   s.add_runtime_dependency 'middleware',   '>= 0.1.0'
   s.add_runtime_dependency 'innertube',    '>= 1.0.2'
   s.add_runtime_dependency 'riddle',       '~> 2.3'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 4.4.1
+  version: 5.4.0
 platform: ruby
 authors:
 - Pat Allan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2021-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.4
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".travis.yml"
 - Appraisals
@@ -197,6 +198,7 @@ files:
 - lib/thinking_sphinx/active_record/attribute/type.rb
 - lib/thinking_sphinx/active_record/attribute/values.rb
 - lib/thinking_sphinx/active_record/base.rb
+- lib/thinking_sphinx/active_record/callbacks/association_delta_callbacks.rb
 - lib/thinking_sphinx/active_record/callbacks/delete_callbacks.rb
 - lib/thinking_sphinx/active_record/callbacks/delta_callbacks.rb
 - lib/thinking_sphinx/active_record/callbacks/update_callbacks.rb
@@ -232,6 +234,7 @@ files:
 - lib/thinking_sphinx/attribute_types.rb
 - lib/thinking_sphinx/batched_search.rb
 - lib/thinking_sphinx/callbacks.rb
+- lib/thinking_sphinx/callbacks/appender.rb
 - lib/thinking_sphinx/capistrano.rb
 - lib/thinking_sphinx/capistrano/v2.rb
 - lib/thinking_sphinx/capistrano/v3.rb
@@ -355,7 +358,6 @@ files:
 - spec/acceptance/attribute_updates_spec.rb
 - spec/acceptance/batch_searching_spec.rb
 - spec/acceptance/big_integers_spec.rb
-- spec/acceptance/connection_spec.rb
 - spec/acceptance/excerpts_spec.rb
 - spec/acceptance/facets_spec.rb
 - spec/acceptance/geosearching_spec.rb
@@ -392,6 +394,7 @@ files:
 - spec/internal/app/indices/book_index.rb
 - spec/internal/app/indices/car_index.rb
 - spec/internal/app/indices/city_index.rb
+- spec/internal/app/indices/colour_index.rb
 - spec/internal/app/indices/product_index.rb
 - spec/internal/app/indices/tee_index.rb
 - spec/internal/app/indices/user_index.rb
@@ -460,6 +463,7 @@ files:
 - spec/thinking_sphinx/commands/stop_spec.rb
 - spec/thinking_sphinx/configuration/minimum_fields_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/connection/mri_spec.rb
 - spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/deletion_spec.rb
 - spec/thinking_sphinx/deltas/default_delta_spec.rb
@@ -507,7 +511,7 @@ homepage: https://pat.github.io/thinking-sphinx/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -522,8 +526,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: A smart wrapper over Sphinx for ActiveRecord
 test_files:
@@ -532,7 +536,6 @@ test_files:
 - spec/acceptance/attribute_updates_spec.rb
 - spec/acceptance/batch_searching_spec.rb
 - spec/acceptance/big_integers_spec.rb
-- spec/acceptance/connection_spec.rb
 - spec/acceptance/excerpts_spec.rb
 - spec/acceptance/facets_spec.rb
 - spec/acceptance/geosearching_spec.rb
@@ -569,6 +572,7 @@ test_files:
 - spec/internal/app/indices/book_index.rb
 - spec/internal/app/indices/car_index.rb
 - spec/internal/app/indices/city_index.rb
+- spec/internal/app/indices/colour_index.rb
 - spec/internal/app/indices/product_index.rb
 - spec/internal/app/indices/tee_index.rb
 - spec/internal/app/indices/user_index.rb
@@ -637,6 +641,7 @@ test_files:
 - spec/thinking_sphinx/commands/stop_spec.rb
 - spec/thinking_sphinx/configuration/minimum_fields_spec.rb
 - spec/thinking_sphinx/configuration_spec.rb
+- spec/thinking_sphinx/connection/mri_spec.rb
 - spec/thinking_sphinx/connection_spec.rb
 - spec/thinking_sphinx/deletion_spec.rb
 - spec/thinking_sphinx/deltas/default_delta_spec.rb

data/spec/acceptance/connection_spec.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'acceptance/spec_helper'
-
-RSpec.describe 'Connections', :live => true do
-  let(:maximum)    { (2 ** 23) - 5 }
-  let(:query)      { String.new "SELECT * FROM book_core WHERE MATCH('')" }
-  let(:difference) { maximum - query.length }
-
-  it 'allows normal length queries through' do
-    expect {
-      ThinkingSphinx::Connection.take do |connection|
-        connection.execute query.insert(-3, 'a' * difference)
-      end
-    }.to_not raise_error
-  end
-
-  it 'does not allow overly long queries' do
-    expect {
-      ThinkingSphinx::Connection.take do |connection|
-        connection.execute query.insert(-3, 'a' * (difference + 5))
-      end
-    }.to raise_error(ThinkingSphinx::QueryLengthError)
-  end
-end