thinking-sphinx 3.4.2 → 4.0.0

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define 'admin/person', :with => :active_record do
   indexes name
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :album, :with => :active_record, :primary_key => :integer_id, :delta => true do
   indexes name, artist
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :animal, :with => :active_record do
   indexes name
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :article, :with => :active_record do
   indexes title, content
   indexes user.name, :as => :user

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FlightlessBird
 ThinkingSphinx::Index.define :bird, :with => :active_record do
   indexes name

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :book, :with => :active_record, :delta => true do
   indexes title, :sortable => true
   indexes author, :facet => true

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :car, :with => :real_time do
   indexes name, :sortable => true
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :city, :with => :active_record do
   indexes name
   has lat, lng

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 multi_schema = MultiSchema.new
 
 ThinkingSphinx::Index.define :product, :with => :real_time do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :tee, :with => :active_record do
   index colour.name
   has colour_id, :facet => true

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ThinkingSphinx::Index.define :user, :with => :active_record do
   indexes name
 

data/spec/internal/app/models/admin/person.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::Person < ActiveRecord::Base
   self.table_name = 'admin_people'
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Album < ActiveRecord::Base
   self.primary_key = :id
 

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Animal < ActiveRecord::Base
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Article < ActiveRecord::Base
   belongs_to :user
   has_many :taggings

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Bird < Animal
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Book < ActiveRecord::Base
   include ThinkingSphinx::Scopes
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Car < ActiveRecord::Base
   belongs_to :manufacturer
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Categorisation < ActiveRecord::Base
   belongs_to :category
   belongs_to :product

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Category < ActiveRecord::Base
   has_many :categorisations
   has_many :products, :through => :categorisations

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class City < ActiveRecord::Base
   scope :ordered, lambda { order(:name) }
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Colour < ActiveRecord::Base
   has_many :tees
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Event < ActiveRecord::Base
   belongs_to :eventable, :polymorphic => true
 end

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class FlightlessBird < Bird
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Genre < ActiveRecord::Base
   #
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Hardcover < Book
   #
 end

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

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class Mammal < Animal
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Manufacturer < ActiveRecord::Base
   has_many :cars
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Product < ActiveRecord::Base
   has_many :categorisations
   has_many :categories, :through => :categorisations

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tag < ActiveRecord::Base
   has_many :taggings
   has_many :articles, :through => :taggings

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tagging < ActiveRecord::Base
   belongs_to :tag
   belongs_to :article

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tee < ActiveRecord::Base
   belongs_to :colour
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Tweet < ActiveRecord::Base
   self.primary_key = :id
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class User < ActiveRecord::Base
   has_many :articles
 

data/spec/internal/db/schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   create_table(:admin_people, :force => true) do |t|
     t.string :name

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'bundler'
 
@@ -6,13 +8,14 @@ Bundler.require :default, :development
 root = File.expand_path File.dirname(__FILE__)
 require "#{root}/support/multi_schema"
 require "#{root}/support/json_column"
+require "#{root}/support/mysql"
 require 'thinking_sphinx/railtie'
 
 Combustion.initialize! :active_record
 
 MultiSchema.new.create 'thinking_sphinx'
 
-Dir["#{root}/support/**/*.rb"].each { |file| require file }
+require "#{root}/support/sphinx_yaml_helpers"
 
 RSpec.configure do |config|
   # enable filtering for examples

data/spec/support/json_column.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class JSONColumn
   include ActiveRecord::ConnectionAdapters
 
@@ -6,7 +8,7 @@ class JSONColumn
   end
 
   def call
-    ruby? && sphinx? && postgresql? && column?
+    ruby? && postgresql? && column?
   end
 
   private
@@ -30,8 +32,4 @@ class JSONColumn
   def ruby?
     RUBY_PLATFORM != 'java'
   end
-
-  def sphinx?
-    ENV['SPHINX_VERSION'].nil? || ENV['SPHINX_VERSION'].to_f > 2.0
-  end
 end

data/spec/support/multi_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MultiSchema
   def active?
     ENV['DATABASE'] == 'postgresql'

data/spec/support/mysql.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+# New versions of MySQL don't allow NULL values for primary keys, but old
+# versions of Rails do. To use both at the same time, we need to update Rails'
+# default primary key type to no longer have a default NULL value.
+#
+class PatchAdapter
+  def call
+    return unless using_mysql? && using_rails_pre_4_1?
+
+    require 'active_record/connection_adapters/abstract_mysql_adapter'
+    ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter::
+      NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
+  end
+
+  def using_mysql?
+    ENV.fetch('DATABASE', 'mysql2') == 'mysql2'
+  end
+
+  def using_rails_pre_4_1?
+    ActiveRecord::VERSION::STRING.to_f < 4.1
+  end
+end
+
+PatchAdapter.new.call

data/spec/support/sphinx_yaml_helpers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SphinxYamlHelpers
   def write_configuration(hash)
     allow(File).to receive_messages :read => {'test' => hash}.to_yaml, :exists? => true

data/spec/thinking_sphinx/active_record/association_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::Association do

data/spec/thinking_sphinx/active_record/attribute/type_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module ActiveRecord
     class Attribute; end

data/spec/thinking_sphinx/active_record/base_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::Base do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::Callbacks::DeleteCallbacks do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::Callbacks::DeltaCallbacks do

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ThinkingSphinx
   module ActiveRecord
     module Callbacks; end

data/spec/thinking_sphinx/active_record/column_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::Column do

data/spec/thinking_sphinx/active_record/column_sql_presenter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::ColumnSQLPresenter do

data/spec/thinking_sphinx/active_record/database_adapters/abstract_adapter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::DatabaseAdapters::AbstractAdapter do

data/spec/thinking_sphinx/active_record/database_adapters/mysql_adapter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::DatabaseAdapters::MySQLAdapter do

data/spec/thinking_sphinx/active_record/database_adapters/postgresql_adapter_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::DatabaseAdapters::PostgreSQLAdapter do

data/spec/thinking_sphinx/active_record/database_adapters_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::DatabaseAdapters do

data/spec/thinking_sphinx/active_record/field_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::Field do

data/spec/thinking_sphinx/active_record/filter_reflection_spec.rb

@@ -1,37 +1,66 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ThinkingSphinx::ActiveRecord::FilterReflection do
   describe '.call' do
     let(:reflection) { double('Reflection', :macro => :has_some,
       :options => options, :active_record => double, :name => 'baz',
-      :foreign_type => :foo_type, :class => reflection_klass) }
+      :foreign_type => :foo_type, :class => original_klass) }
     let(:options)    { {:polymorphic => true} }
     let(:filtered_reflection) { double 'filtered reflection' }
-    let(:reflection_klass)    { double :new => filtered_reflection,
-      :instance_method => initialize_method }
-    let(:initialize_method)   { double :arity => 4 }
+    let(:original_klass)      { double }
+    let(:subclass)            { double :include => true }
 
     before :each do
       allow(reflection.active_record).to receive_message_chain(:connection, :quote_column_name).
         and_return('"foo_type"')
+
+      if ActiveRecord::VERSION::STRING.to_f < 5.2
+        allow(original_klass).to receive(:new).and_return(filtered_reflection)
+      else
+        allow(Class).to receive(:new).with(original_klass).and_return(subclass)
+        allow(subclass).to receive(:new).and_return(filtered_reflection)
+      end
+    end
+
+    class ArgumentsWrapper
+      attr_reader :macro, :name, :scope, :options, :parent
+
+      def initialize(*arguments)
+        if ActiveRecord::VERSION::STRING.to_f < 4.0
+          @macro, @name, @options, @parent = arguments
+        elsif ActiveRecord::VERSION::STRING.to_f < 4.2
+          @macro, @name, @scope, @options, @parent = arguments
+        else
+          @name, @scope, @options, @parent = arguments
+        end
+      end
+    end
+
+    def reflection_klass
+      ActiveRecord::VERSION::STRING.to_f < 5.2 ? original_klass : subclass
+    end
+
+    def expected_reflection_arguments
+      expect(reflection_klass).to receive(:new) do |*arguments|
+        yield ArgumentsWrapper.new(*arguments)
+      end
     end
 
     it "uses the existing reflection's macro" do
-      expect(reflection_klass).to receive(:new).
-        with(:has_some, anything, anything, anything)
+      expect(reflection_klass).to receive(:new) do |macro, *args|
+        expect(macro).to eq(:has_some)
+      end
 
       ThinkingSphinx::ActiveRecord::FilterReflection.call(
         reflection, 'foo_bar', 'Bar'
       )
-    end unless defined?(ActiveRecord::Reflection::MacroReflection)
+    end if ActiveRecord::VERSION::STRING.to_f < 4.2
 
     it "uses the supplied name" do
-      if defined?(ActiveRecord::Reflection::MacroReflection)
-        expect(reflection_klass).to receive(:new).
-          with('foo_bar', anything, anything, anything)
-      else
-        expect(reflection_klass).to receive(:new).
-          with(anything, 'foo_bar', anything, anything)
+      expected_reflection_arguments do |wrapper|
+        expect(wrapper.name).to eq('foo_bar')
       end
 
       ThinkingSphinx::ActiveRecord::FilterReflection.call(
@@ -40,12 +69,8 @@ describe ThinkingSphinx::ActiveRecord::FilterReflection do
     end
 
     it "uses the existing reflection's parent" do
-      if defined?(ActiveRecord::Reflection::MacroReflection)
-        expect(reflection_klass).to receive(:new).
-          with(anything, anything, anything, reflection.active_record)
-      else
-        expect(reflection_klass).to receive(:new).
-          with(anything, anything, anything, reflection.active_record)
+      expected_reflection_arguments do |wrapper|
+        expect(wrapper.parent).to eq(reflection.active_record)
       end
 
       ThinkingSphinx::ActiveRecord::FilterReflection.call(
@@ -54,14 +79,8 @@ describe ThinkingSphinx::ActiveRecord::FilterReflection do
     end
 
     it "removes the polymorphic setting from the options" do
-      if defined?(ActiveRecord::Reflection::MacroReflection)
-        expect(reflection_klass).to receive(:new) do |name, scope, options, parent|
-          expect(options[:polymorphic]).to be_nil
-        end
-      else
-        expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
-          expect(options[:polymorphic]).to be_nil
-        end
+      expected_reflection_arguments do |wrapper|
+        expect(wrapper.options[:polymorphic]).to be_nil
       end
 
       ThinkingSphinx::ActiveRecord::FilterReflection.call(
@@ -70,14 +89,8 @@ describe ThinkingSphinx::ActiveRecord::FilterReflection do
     end
 
     it "adds the class name option" do
-      if defined?(ActiveRecord::Reflection::MacroReflection)
-        expect(reflection_klass).to receive(:new) do |name, scope, options, parent|
-          expect(options[:class_name]).to eq('Bar')
-        end
-      else
-        expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
-          expect(options[:class_name]).to eq('Bar')
-        end
+      expected_reflection_arguments do |wrapper|
+        expect(wrapper.options[:class_name]).to eq('Bar')
       end
 
       ThinkingSphinx::ActiveRecord::FilterReflection.call(
@@ -86,14 +99,8 @@ describe ThinkingSphinx::ActiveRecord::FilterReflection do
     end
 
     it "sets the foreign key if necessary" do
-      if defined?(ActiveRecord::Reflection::MacroReflection)
-        expect(reflection_klass).to receive(:new) do |name, scope, options, parent|
-          expect(options[:foreign_key]).to eq('baz_id')
-        end
-      else
-        expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
-          expect(options[:foreign_key]).to eq('baz_id')
-        end
+      expected_reflection_arguments do |wrapper|
+        expect(wrapper.options[:foreign_key]).to eq('baz_id')
       end
 
       ThinkingSphinx::ActiveRecord::FilterReflection.call(
@@ -104,14 +111,8 @@ describe ThinkingSphinx::ActiveRecord::FilterReflection do
     it "respects supplied foreign keys" do
       options[:foreign_key] = 'qux_id'
 
-      if defined?(ActiveRecord::Reflection::MacroReflection)
-        expect(reflection_klass).to receive(:new) do |name, scope, options, parent|
-          expect(options[:foreign_key]).to eq('qux_id')
-        end
-      else
-        expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
-          expect(options[:foreign_key]).to eq('qux_id')
-        end
+      expected_reflection_arguments do |wrapper|
+        expect(wrapper.options[:foreign_key]).to eq('qux_id')
       end
 
       ThinkingSphinx::ActiveRecord::FilterReflection.call(
@@ -119,51 +120,71 @@ describe ThinkingSphinx::ActiveRecord::FilterReflection do
       )
     end
 
-    it "sets conditions if there are none" do
-      expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
-        expect(options[:conditions]).to eq("::ts_join_alias::.\"foo_type\" = 'Bar'")
+    if ActiveRecord::VERSION::STRING.to_f < 4.0
+      it "sets conditions if there are none" do
+        expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
+          expect(options[:conditions]).to eq("::ts_join_alias::.\"foo_type\" = 'Bar'")
+        end
+
+        ThinkingSphinx::ActiveRecord::FilterReflection.call(
+          reflection, 'foo_bar', 'Bar'
+        )
       end
 
-      ThinkingSphinx::ActiveRecord::FilterReflection.call(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end unless defined?(ActiveRecord::Reflection::MacroReflection)
+      it "appends to the conditions array" do
+        options[:conditions] = ['existing']
 
-    it "appends to the conditions array" do
-      options[:conditions] = ['existing']
+        expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
+          expect(options[:conditions]).to eq(['existing', "::ts_join_alias::.\"foo_type\" = 'Bar'"])
+        end
 
-      expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
-        expect(options[:conditions]).to eq(['existing', "::ts_join_alias::.\"foo_type\" = 'Bar'"])
+        ThinkingSphinx::ActiveRecord::FilterReflection.call(
+          reflection, 'foo_bar', 'Bar'
+        )
       end
 
-      ThinkingSphinx::ActiveRecord::FilterReflection.call(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end unless defined?(ActiveRecord::Reflection::MacroReflection)
+      it "extends the conditions hash" do
+        options[:conditions] = {:x => :y}
 
-    it "extends the conditions hash" do
-      options[:conditions] = {:x => :y}
+        expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
+          expect(options[:conditions]).to eq({:x => :y, :foo_type => 'Bar'})
+        end
 
-      expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
-        expect(options[:conditions]).to eq({:x => :y, :foo_type => 'Bar'})
+        ThinkingSphinx::ActiveRecord::FilterReflection.call(
+          reflection, 'foo_bar', 'Bar'
+        )
       end
 
-      ThinkingSphinx::ActiveRecord::FilterReflection.call(
-        reflection, 'foo_bar', 'Bar'
-      )
-    end unless defined?(ActiveRecord::Reflection::MacroReflection)
+      it "appends to the conditions string" do
+        options[:conditions] = 'existing'
 
-    it "appends to the conditions string" do
-      options[:conditions] = 'existing'
+        expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
+          expect(options[:conditions]).to eq("existing AND ::ts_join_alias::.\"foo_type\" = 'Bar'")
+        end
 
-      expect(reflection_klass).to receive(:new) do |macro, name, options, parent|
-        expect(options[:conditions]).to eq("existing AND ::ts_join_alias::.\"foo_type\" = 'Bar'")
+        ThinkingSphinx::ActiveRecord::FilterReflection.call(
+          reflection, 'foo_bar', 'Bar'
+        )
       end
+    else
+      it "does not add a conditions option" do
+        expected_reflection_arguments do |wrapper|
+          expect(wrapper.options.keys).not_to include(:conditions)
+        end
+
+        ThinkingSphinx::ActiveRecord::FilterReflection.call(
+          reflection, 'foo_bar', 'Bar'
+        )
+      end
+    end
+
+    it "includes custom behaviour in the subclass" do
+      expect(subclass).to receive(:include).with(ThinkingSphinx::ActiveRecord::Depolymorph::OverriddenReflection::JoinConstraint)
 
       ThinkingSphinx::ActiveRecord::FilterReflection.call(
         reflection, 'foo_bar', 'Bar'
       )
-    end unless defined?(ActiveRecord::Reflection::MacroReflection)
+    end if ActiveRecord::VERSION::STRING.to_f > 5.1
 
     it "returns the new reflection" do
       expect(ThinkingSphinx::ActiveRecord::FilterReflection.call(