thinking-sphinx 3.1.4 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c37a8158a4baca6cab0f26af120eeb5465ee53fc
-  data.tar.gz: 875569737b2a9456c28302c2bfd5a06b9571f3ea
+SHA256:
+  metadata.gz: 5cba08942e61d8ca739c20ac29a9ee471b229c200c4b78a2047ddf82e4dca686
+  data.tar.gz: d933fa8e4d057d7bab8609fce6430a80d79dca0c2ba0ea03b06060b9fc27ddb4
 SHA512:
-  metadata.gz: 8409e713da894877707dfd5d0bad3fc6454b1c1b21edce294778fedad926d04e6947db05d938fb9473af59f4636c57d65b9ffc682e9afdfde467ab86a552bf6c
-  data.tar.gz: 486a6e944456d0d007e44759259d915e32c09bbd8e263699762d56be1a5ad736de8576f41a2ceb6b035552bb6cf0baf44c7d8c440a54d0c1dff470d159bfba64
+  metadata.gz: 280fea099e92acd152f776562879739712b739d8c73f620d923f215c6d83d3472fb7d029569274562881a8e1eafa1ce122ac44ddae709bd02be9b55502d90c87
+  data.tar.gz: 073533d77fd5073e17c6fc48a1463d7eeaa491071ab0fd54414ae152894e3eeff3601f9dea07234e8a0bc2570286b4c2a26dd6ae08572436250af5ce2acf1320

data/.circleci/config.yml

@@ -0,0 +1,99 @@
+version: 2.1
+
+orbs:
+  ruby: circleci/ruby@1.0
+
+workflows:
+  test:
+    jobs:
+      - test:
+          name: "Sphinx 2.2"
+          sphinx_version: 2.2.11
+          sphinx_engine: sphinx
+          debian: jessie
+          ruby: '2.4.6'
+          matrix:
+            parameters:
+              database: [ 'mysql2', 'postgresql' ]
+              rails: [ '4_2', '5_0', '5_1', '5_2' ]
+
+jobs:
+  test:
+    parameters:
+      ruby:
+        type: string
+      rails:
+        type: string
+      database:
+        type: string
+      sphinx_version:
+        type: string
+      sphinx_engine:
+        type: string
+      debian:
+        type: string
+
+    docker:
+      - image: circleci/ruby:<< parameters.ruby >>-<< parameters.debian >>
+
+      - image: circleci/postgres:10
+        environment:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: thinking_sphinx
+          POSTGRES_DB: thinking_sphinx
+
+      - image: circleci/mysql:5.7
+        environment:
+          MYSQL_ROOT_PASSWORD: thinking_sphinx
+          MYSQL_DATABASE: thinking_sphinx
+
+    working_directory: ~/app
+
+    steps:
+      - checkout
+
+      - restore_cache:
+          keys:
+            - v1-dependencies-<< parameters.ruby >>-<< parameters.rails >>
+
+      - run:
+          name: install bundler
+          command: |
+            export BUNDLER_VERSION=1.17.3
+            export BUNDLE_PATH=vendor/bundle
+            gem install bundler:$BUNDLER_VERSION
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+            bundle update
+
+      - run:
+          name: set up appraisal
+          command: bundle exec appraisal generate
+
+      - run:
+          name: update gems
+          environment:
+            BUNDLE_GEMFILE: "./gemfiles/rails_<< parameters.rails >>.gemfile"
+          command: bundle update
+
+      - save_cache:
+          paths:
+            - ./vendor/bundle
+          key: v1-dependencies-<< parameters.ruby >>-<< parameters.rails >>
+
+      - run:
+          name: set up sphinx
+          command: "./bin/loadsphinx << parameters.sphinx_version >> << parameters.sphinx_engine >>"
+
+      - run:
+          name: tests
+          environment:
+            CI: "true"
+            DATABASE: << parameters.database >>
+            SPHINX_VERSION: << parameters.sphinx_version >>
+            SPHINX_ENGINE: << parameters.sphinx_engine >>
+            BUNDLE_GEMFILE: "./gemfiles/rails_<< parameters.rails >>.gemfile"
+          command: bundle exec rspec

data/.github/actions/test/action.yml

@@ -0,0 +1,46 @@
+name: "Test"
+description: "Run RSpec in given environment"
+inputs:
+  ruby-version:
+    description: "Ruby version"
+    required: true
+  rails-version:
+    description: "Rails version"
+    required: true
+  sphinx-version:
+    description: "Sphinx version"
+    required: true
+  sphinx-engine:
+    description: "Sphinx engine"
+    required: true
+  database:
+    description: "Database engine"
+    required: true
+runs:
+  using: "composite"
+  steps:
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ inputs.ruby-version }}
+        bundler-cache: true
+    - name: Set up Sphinx
+      shell: bash
+      run: |
+        ./bin/loadsphinx ${{ inputs.sphinx-version }} ${{ inputs.sphinx-engine }}
+    - name: Set up Appraisal
+      shell: bash
+      run: "bundle exec appraisal generate"
+    - name: Install Appraisal's gems
+      shell: bash
+      env:
+        BUNDLE_GEMFILE: "gemfiles/rails_${{ inputs.rails-version }}.gemfile"
+      run: bundle install
+    - name: Test
+      shell: bash
+      env:
+        CI: "true"
+        DATABASE: ${{ inputs.database }}
+        SPHINX_VERSION: ${{ inputs.sphinx-version }}
+        SPHINX_ENGINE: ${{ inputs.sphinx-engine }}
+        BUNDLE_GEMFILE: "gemfiles/rails_${{ inputs.rails-version }}.gemfile"
+      run: "bundle exec rspec"

data/.github/workflows/ci.yml

@@ -0,0 +1,75 @@
+name: test
+
+on:
+  push:
+    branches:
+      - main
+      - develop
+  pull_request:
+    branches:
+      - main
+      - develop
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  test-matrix:
+    runs-on: ubuntu-latest
+
+    outputs:
+      matrix: ${{ steps.matrix.outputs.matrix }}
+
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 4.0
+          bundler-cache: true
+
+      - id: matrix
+        run: echo "matrix=$(./bin/testmatrix)" | tee -a "$GITHUB_OUTPUT"
+
+      - run: echo "$MATRIX" | yq -P
+        env:
+          MATRIX: ${{ steps.matrix.outputs.matrix }}
+
+  test:
+    runs-on: ubuntu-22.04
+    needs: [test-matrix]
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include: ${{ fromJSON(needs.test-matrix.outputs.matrix) }}
+
+    services:
+      postgres:
+        image: postgres:10
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: thinking_sphinx
+          POSTGRES_DB: thinking_sphinx
+        ports: ['5432:5432']
+        # needed because the postgres container does not provide a healthcheck
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+      mysql:
+        image: mysql:5.7
+        env:
+          MYSQL_ROOT_PASSWORD: thinking_sphinx
+          MYSQL_DATABASE: thinking_sphinx
+        ports: ['3306:3306']
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+      - uses: actions/checkout@v6
+      - uses: ./.github/actions/test
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          rails-version: ${{ matrix.rails }}
+          sphinx-version: ${{ matrix.sphinx_version }}
+          sphinx-engine: ${{ matrix.sphinx_engine }}
+          database: ${{ matrix.database }}
+        timeout-minutes: 12

data/.gitignore

@@ -1,12 +1,17 @@
 *.gem
+*.sublime-*
 .bundle
+.overmind.env
 .rbx
+.rspec
+.tool-versions
+data/*
+gemfiles
 Gemfile.lock
-*.sublime-*
 pkg/*
 spec/internal/config/test.sphinx.conf
 spec/internal/db/sphinx
-spec/internal/log/*.log
+spec/internal/log
 !spec/internal/tmp/.gitkeep
 spec/internal/tmp/*
 tmp

data/.travis.yml

@@ -1,21 +1,36 @@
 language: ruby
+dist: xenial
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1.0
-  - jruby-19mode
+- 2.4.10
+- 2.5.8
+- 2.6.6
+- 2.7.1
 before_install:
-  - gem update --system
-  - gem install bundler
+- gem update --system
+- gem install bundler -v '1.17.3'
+install: bundle _1.17.3_ install --jobs=3 --retry=3
 before_script:
-  - "mysql -e 'create database thinking_sphinx;' > /dev/null"
-  - "psql -c 'create database thinking_sphinx;' -U postgres >/dev/null"
-  - bundle exec appraisal install
-script: bundle exec appraisal rspec
+- mysql -e 'create database thinking_sphinx;' > /dev/null
+- psql -c 'create database thinking_sphinx;' -U postgres >/dev/null
+- "./bin/loadsphinx $SPHINX_VERSION $SPHINX_ENGINE"
+- bundle _1.17.3_ exec appraisal install
+script: bundle _1.17.3_ exec appraisal rspec
 env:
-  - DATABASE=mysql2 SPHINX_BIN=/usr/local/sphinx-2.0.10/bin/ SPHINX_VERSION=2.0.10
-  - DATABASE=postgresql SPHINX_BIN=/usr/local/sphinx-2.0.10/bin/ SPHINX_VERSION=2.0.10
-  - DATABASE=mysql2 SPHINX_BIN=/usr/local/sphinx-2.1.9/bin/ SPHINX_VERSION=2.1.9
-  - DATABASE=postgresql SPHINX_BIN=/usr/local/sphinx-2.1.9/bin/ SPHINX_VERSION=2.1.9
-  - DATABASE=mysql2 SPHINX_BIN=/usr/local/sphinx-2.2.6/bin/ SPHINX_VERSION=2.2.6
-  - DATABASE=postgresql SPHINX_BIN=/usr/local/sphinx-2.2.6/bin/ SPHINX_VERSION=2.2.6
+  matrix:
+  - DATABASE=mysql2 SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
+  - DATABASE=postgresql SPHINX_VERSION=2.2.11 SPHINX_ENGINE=sphinx
+  - DATABASE=mysql2 SPHINX_VERSION=3.3.1 SPHINX_ENGINE=sphinx
+  - DATABASE=mysql2 SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
+  - DATABASE=postgresql SPHINX_VERSION=2.8.2 SPHINX_ENGINE=manticore
+  - DATABASE=mysql2 SPHINX_VERSION=3.5.0 SPHINX_ENGINE=manticore
+  - DATABASE=postgresql SPHINX_VERSION=3.5.0 SPHINX_ENGINE=manticore
+  # - DATABASE=postgresql SPHINX_VERSION=3.3.1 SPHINX_ENGINE=sphinx
+sudo: false
+addons:
+  postgresql: '9.4'
+  apt:
+    packages:
+    - libodbc1
+services:
+- mysql
+- postgresql

data/Appraisals

@@ -1,15 +1,71 @@
-appraise 'rails_3_2' do
-  gem 'rails',  '~> 3.2.21'
-end
+appraise 'rails_4_2' do
+  gem 'rails',  '~> 4.2.6'
+  gem 'mysql2', '~> 0.4.0', :platform => :ruby
+end if RUBY_VERSION.to_f <= 2.4
 
-appraise 'rails_4_0' do
-  gem 'rails', '~> 4.0.12'
-end
+appraise 'rails_5_0' do
+  if RUBY_PLATFORM == "java"
+    gem 'rails', '5.0.6'
+  else
+    gem 'rails', '~> 5.0.7'
+  end
 
-appraise 'rails_4_1' do
-  gem 'rails', '~> 4.1.8'
-end
+  gem 'mysql2', '~> 0.4.0', :platform => :ruby
 
-appraise 'rails_4_2' do
-  gem 'rails', '~> 4.2.0'
-end
+  gem 'jdbc-mysql',                          '~> 5.1.36', :platform => :jruby
+  gem 'activerecord-jdbcmysql-adapter',      '~> 50.0',   :platform => :jruby
+  gem 'activerecord-jdbcpostgresql-adapter', '~> 50.0',   :platform => :jruby
+end if (RUBY_PLATFORM != "java" || ENV["SPHINX_VERSION"].to_f > 2.1) && RUBY_VERSION.to_f < 3.0
+
+appraise 'rails_5_1' do
+  gem 'rails',  '~> 5.1.0'
+  gem 'mysql2', '~> 0.4.0', :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f < 3.0
+
+appraise 'rails_5_2' do
+  gem 'rails',  '~> 5.2.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f < 3.0
+
+appraise 'rails_6_0' do
+  gem 'rails',  '~> 6.0.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5
+
+appraise 'rails_6_1' do
+  gem 'rails',  '~> 6.1.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.5
+
+appraise 'rails_7_0' do
+  gem 'rails',  '~> 7.0.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.7
+
+appraise 'rails_7_1' do
+  gem 'rails',  '~> 7.1.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 2.7
+
+appraise 'rails_7_2' do
+  gem 'rails',  '~> 7.2.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 3.1
+
+appraise 'rails_8_0' do
+  gem 'rails',  '~> 8.0.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 3.2
+
+appraise 'rails_8_1' do
+  gem 'rails',  '~> 8.1.0'
+  gem 'mysql2', '~> 0.5.0', :platform => :ruby
+  gem 'pg',     '~> 1.0',   :platform => :ruby
+end if RUBY_PLATFORM != 'java' && RUBY_VERSION.to_f >= 3.2