flying-sphinx 2.1.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 727f92b2356f83883fab5b51f106d39c43b8e89c57811a33fb5ea8541f21c09b
-  data.tar.gz: 81451cc912cf38baad334a63f5e996bcb561da3bc94a6422da19c3b074f02ca0
+  metadata.gz: 32b8175efa0d0846873f557091c82fc88f3618840a176b4e04af8e913c52b2b3
+  data.tar.gz: d0e1bc6ba2684eb8785ded846e92e2946ce3fe2dd8e42386a54551d8433810e9
 SHA512:
-  metadata.gz: 2add3250b48d68914f9bdaddbcb0f502f3b1f6a503a7ada15989df33788fde8e8eeecdef9d16bc9acdb4ae501cb8b5df4118ed45121d913bc4733d60678fff4b
-  data.tar.gz: 315fec177d81494362eecfcb4bb368fc9ab6ae096b9027fdb1f26b75528b8300bfe6b1c74bfeb844f6cc8184310fa69a62aa17ca56dbf515f6cbc007728c6daf
+  metadata.gz: dac4e7aec527cda3258d06ac3fb8cb3eb959ccf3f87af9f0c1b6241dd5f3c8293932163dba66740eee54e748d7842622d49742352d706d8405fec4f269251d2e
+  data.tar.gz: 99c512ceac2d85230f6d144c1154d77ade553ca3de54de354e899d441c50706cce981bde3cc1e4ca4b398f237276f1f139ff4a71e1ab3f544393cce585357b3c

data/.github/workflows/ci.yml

@@ -0,0 +1,52 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.6', '2.7', '3.0', '3.1' ]
+        rails: [ '5.0', '5.1', '5.2', '6.0', '6.1', '7.0' ]
+        exclude:
+          - ruby: '2.6'
+            rails: '7.0'
+          - ruby: '2.7'
+            rails: '7.0'
+          - ruby: '3.0'
+            rails: '5.0'
+          - ruby: '3.0'
+            rails: '5.1'
+          - ruby: '3.0'
+            rails: '5.2'
+          - ruby: '3.1'
+            rails: '5.0'
+          - ruby: '3.1'
+            rails: '5.1'
+          - ruby: '3.1'
+            rails: '5.2'
+          - ruby: '3.1'
+            rails: '6.0'
+
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+      - name: Set up Appraisal
+        run: bundle exec appraisal generate
+      - name: Install gems
+        env:
+          BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile"
+        run: bundle update
+      - name: Test
+        env:
+          CI: "true"
+          BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/rails_${{ matrix.rails }}.gemfile"
+        run: bundle exec rspec

data/Appraisals

@@ -1,29 +1,23 @@
-appraise 'rails-3.2' do
-  gem 'rails',   '~> 3.2.18'
-  gem 'faraday', '~> 0.8.0'
-end if RUBY_VERSION.to_f <= 2.3
-
-appraise 'rails-4.0' do
-  gem 'rails',   '~> 4.0.5'
-  gem 'faraday', '~> 0.9.0'
-end if RUBY_VERSION.to_f <= 2.3
-
-appraise 'rails-4.1' do
-  gem 'rails', '~> 4.1.16'
-end if RUBY_VERSION.to_f <= 2.3
-
-appraise 'rails-4.2' do
-  gem 'rails', '~> 4.2.10'
-end if RUBY_VERSION.to_f <= 2.3
-
-appraise 'rails-5.0' do
+appraise 'rails_5.0' do
   gem 'rails', '~> 5.0.6'
-end
+end if RUBY_VERSION.to_f <= 2.7
 
-appraise 'rails-5.1' do
+appraise 'rails_5.1' do
   gem 'rails', '~> 5.1.4'
-end
+end if RUBY_VERSION.to_f <= 2.7
 
-appraise 'rails-5.2' do
+appraise 'rails_5.2' do
   gem 'rails', '~> 5.2.0'
+end if RUBY_VERSION.to_f <= 2.7
+
+appraise 'rails_6.0' do
+  gem 'rails',  '~> 6.0.0'
+end if RUBY_VERSION.to_f <= 3.0
+
+appraise 'rails_6.1' do
+  gem 'rails',  '~> 6.1.0'
 end
+
+appraise 'rails_7.0' do
+  gem 'rails',  '~> 7.0.0'
+end if RUBY_VERSION.to_f >= 2.7

data/CHANGELOG.markdown

@@ -2,6 +2,32 @@
 
 All notable changes to this project (at least, from v0.4.0 onwards) are documented in this file.
 
+## 3.0.0 - 2022-04-12
+
+### Changed
+
+* Supports (and requires) Faraday v2+.
+* Dropped support for Ruby 2.5 and older.
+* Dropped support for Rails 4.2 and older.
+
+No functional changes to the gem beyond the Faraday changes, though the tests and CI have had some improvements.
+
+## 2.2.0 - 2020-04-04
+
+### Added
+
+* The `lemmatizer_base` option is now respected and files in that specified directory are copied to the Flying Sphinx servers as part of the configure command.
+
+### Changed
+
+* Official support for Ruby 2.2 has ended. The gem may continue to work, but there is no guarantee of ongoing compatibility.
+
+## 2.1.4 - 2019-03-10
+
+### Fixed
+
+* Fixed the overriding of Flying Sphinx connection details by Thinking Sphinx's new prepare hook (added in Thinking Sphinx v4.2.0).
+
 ## 2.1.3 - 2018-12-12
 
 ### Fixed

data/README.textile

@@ -12,7 +12,7 @@ This is all covered pretty well on "the Flying Sphinx site":http://flying-sphinx
 
 h2. Compatibility and Limitations
 
-The current (2.x) releases support Thinking Sphinx v4+, ActiveRecord/Rails 3.2+, and Ruby 2.2+.
+The current (2.x) releases support Thinking Sphinx v4+, ActiveRecord/Rails 3.2+, and Ruby 2.3+. Ruby 2.2.x will probably work well too, but is not tested against, and thus not officially supported.
 
 If you are using older versions of any of these, please use v1.3.1 (which supports Thinking Sphinx v1.5+, ActiveRecord/Rails 2.3.6+, and Ruby 1.9.3+).
 
@@ -39,4 +39,4 @@ h2. Contributors
 
 h2. Licence
 
-Copyright © 2011-2018 Pat Allan, released under an MIT licence.
+Copyright © 2011-2019 Pat Allan, released under an MIT licence.

data/flying-sphinx.gemspec

@@ -17,19 +17,20 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
   s.executables   = ['flying-sphinx']
 
-  s.add_runtime_dependency 'ey-hmac',            '~> 2.2'
-  s.add_runtime_dependency 'faraday',            '>= 0.7'
-  s.add_runtime_dependency 'gzipped_tar',        '~> 0.1.1'
+  s.add_runtime_dependency 'ey-hmac',            '~> 2.4'
+  s.add_runtime_dependency 'faraday',            '>= 2'
+  s.add_runtime_dependency 'faraday-multipart'
+  s.add_runtime_dependency 'gzipped_tar',        '>= 0.1.2'
   s.add_runtime_dependency 'multi_json',         '>= 1.3.0'
-  s.add_runtime_dependency 'pusher-client',      '~> 0.3'
+  s.add_runtime_dependency 'pusher-client',      '~> 0.6'
   s.add_runtime_dependency 'thinking-sphinx',    '>= 4.0.0'
 
-  s.add_development_dependency 'appraisal',    '~> 2.2'
-  s.add_development_dependency 'dotenv',       '~> 0.11.1'
-  s.add_development_dependency 'em-websocket', '~> 0.5.1'
-  s.add_development_dependency 'mysql2',       '~> 0.3.15'
+  s.add_development_dependency 'appraisal',    '~> 2.4'
+  s.add_development_dependency 'dotenv',       '~> 2.7'
+  s.add_development_dependency 'mysql2',       '>= 0.3.15'
   s.add_development_dependency 'rack'
   s.add_development_dependency 'rspec',        '~> 2.14'
   s.add_development_dependency 'rspec-retry',  '~> 0.4'
-  s.add_development_dependency 'webmock',      '~> 1.17.4'
+  s.add_development_dependency 'webmock',      '~> 3.14'
+  s.add_development_dependency 'websocket-driver'
 end

data/lib/flying_sphinx/configuration_options.rb

@@ -8,7 +8,10 @@ class FlyingSphinx::ConfigurationOptions
   end
 
   def settings
-    @settings ||= FlyingSphinx::SettingFiles.new(indices).to_hash
+    @settings ||= begin
+      configuration.render
+      FlyingSphinx::SettingFiles.new(configuration).to_hash
+    end
   end
 
   def version
@@ -21,11 +24,6 @@ class FlyingSphinx::ConfigurationOptions
     @configuration ||= ThinkingSphinx::Configuration.instance
   end
 
-  def indices
-    configuration.render
-    configuration.indices
-  end
-
   def version_defined?
     configuration.version.present?
   end

data/lib/flying_sphinx/configurer.rb

@@ -1,3 +1,5 @@
+require "faraday/multipart"
+
 class FlyingSphinx::Configurer
   InvalidVersionError = Class.new FlyingSphinx::Error
   PresignatureError   = Class.new FlyingSphinx::Error

data/lib/flying_sphinx/railtie.rb

@@ -1,13 +1,29 @@
 class FlyingSphinx::Railtie < Rails::Railtie
   rake_tasks do
+    next unless FlyingSphinx::Railtie.remote_sphinx?
+
     require 'flying_sphinx/commands'
 
     ThinkingSphinx.rake_interface = FlyingSphinx::RakeInterface
 
     load File.expand_path('../tasks.rb', __FILE__)
-  end if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
+  end
 
   initializer "flying_sphinx.set_sphinx_host_and_port" do |app|
+    FlyingSphinx::Railtie.set_up_remote_connection
+  end
+
+  config.to_prepare do
+    FlyingSphinx::Railtie.set_up_remote_connection
+  end
+
+  def self.remote_sphinx?
+    ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
+  end
+
+  def self.set_up_remote_connection
+    return unless remote_sphinx?
+
     configuration = FlyingSphinx::Configuration.new
 
     ThinkingSphinx::Configuration.instance.settings['connection_options'] = {
@@ -15,5 +31,5 @@ class FlyingSphinx::Railtie < Rails::Railtie
       :port     => 9306,
       :username => configuration.username
     }
-  end if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
+  end
 end

data/lib/flying_sphinx/response/invalid.rb

@@ -1,4 +1,4 @@
-class FlyingSphinx::Response::Invalid < Faraday::Response::Middleware
+class FlyingSphinx::Response::Invalid < Faraday::Middleware
   def on_complete(environment)
     return unless environment[:status] == 403
 

data/lib/flying_sphinx/response/json.rb

@@ -1,4 +1,4 @@
-class FlyingSphinx::Response::JSON < Faraday::Response::Middleware
+class FlyingSphinx::Response::JSON < Faraday::Middleware
   def on_complete(environment)
     return if environment[:request_headers]['Authorization'].nil?
 

data/lib/flying_sphinx/response/logger.rb

@@ -1,4 +1,4 @@
-class FlyingSphinx::Response::Logger < Faraday::Response::Middleware
+class FlyingSphinx::Response::Logger < Faraday::Middleware
   extend Forwardable
 
   def call(environment)

data/lib/flying_sphinx/setting_files.rb

@@ -1,9 +1,10 @@
 class FlyingSphinx::SettingFiles
   INDEX_SETTINGS  = [:stopwords, :wordforms, :exceptions]
   SOURCE_SETTINGS = [:mysql_ssl_cert, :mysql_ssl_key, :mysql_ssl_ca]
+  COMMON_SETTINGS = [:lemmatizer_base]
 
-  def initialize(indices)
-    @indices = indices
+  def initialize(configuration)
+    @configuration = configuration
   end
 
   def to_hash
@@ -19,11 +20,27 @@ class FlyingSphinx::SettingFiles
 
   private
 
-  attr_reader :indices
+  attr_reader :configuration
+
+  delegate :indices, :to => :configuration
+
+  def common_settings(&block)
+    return unless configuration.respond_to?(:common)
+
+    COMMON_SETTINGS.each do |setting|
+      path = configuration.common.public_send(setting)
+      next if path.nil?
+
+      Dir["#{path}/**/*"].each do |file|
+        block.call setting, file
+      end
+    end
+  end
 
   def each_file_for_setting(&block)
     index_settings  &block
     source_settings &block
+    common_settings &block
   end
 
   def index_settings(&block)

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '2.1.3'
+  Version = '3.0.0'
 end

data/spec/acceptance/configuring_spec.rb

@@ -4,7 +4,7 @@ require 'cgi'
 describe 'Configuring Sphinx' do
   let(:interface)     { ThinkingSphinx.rake_interface.new }
   let(:configuration) { configuration_double :indices => [double('Index')],
-    :render => 'searchd { }', :version => '2.2.11' }
+    :render => 'searchd { }', :version => '2.2.11', :common => double('common', lemmatizer_base: nil) }
 
   before :each do
     allow(ThinkingSphinx::Configuration).to receive(:instance).

data/spec/flying_sphinx/action_spec.rb

@@ -17,6 +17,7 @@ describe FlyingSphinx::Action do
   end
 
   def perform_and_complete(action)
+    Thread.report_on_exception = false
     thread = Thread.new { action.perform }
     sleep 0.01
     action.send :completion, '{"id":748}'
@@ -83,6 +84,7 @@ describe FlyingSphinx::Action do
     it "logs a warning when the action fails" do
       logger.should_receive(:warn).with("Action failed.")
 
+      Thread.report_on_exception = false
       thread = Thread.new { action.perform }
       sleep 0.01
       action.send :failure, '{"id":748}'

data/spec/flying_sphinx/setting_files_spec.rb

@@ -1,8 +1,12 @@
 require 'spec_helper'
 
 describe FlyingSphinx::SettingFiles do
-  let(:files)   { FlyingSphinx::SettingFiles.new indices }
+  let(:files)   { FlyingSphinx::SettingFiles.new configuration }
+  let(:configuration) do
+    double(:configuration, :indices => indices, :common => common)
+  end
   let(:indices) { [] }
+  let(:common)  { double(:common, :lemmatizer_base => nil) }
 
   def index_double(methods)
     double 'Riddle::Configuration::Index', methods
@@ -14,38 +18,38 @@ describe FlyingSphinx::SettingFiles do
 
   describe '#to_hash' do
     before :each do
-      File.stub :read => 'blah'
+      allow(File).to receive(:read).and_return('blah')
     end
 
     [:stopwords, :wordforms, :exceptions].each do |setting|
       it "collects #{setting} files from indices" do
         indices << index_double(setting => '/my/file/foo.txt')
 
-        files.to_hash.should == {
+        expect(files.to_hash).to eq(
           "#{setting}/foo.txt" => 'blah',
           'extra'              => "#{setting}/foo.txt"
-        }
+        )
       end
 
       it "does not repeat same files for #{setting}" do
         indices << index_double(setting => '/my/file/foo.txt')
         indices << index_double(setting => '/my/file/foo.txt')
 
-        files.to_hash.should == {
+        expect(files.to_hash).to eq(
           "#{setting}/foo.txt" => 'blah',
           'extra'              => "#{setting}/foo.txt"
-        }
+        )
       end
 
       it "accepts multiples files for #{setting}" do
         indices << index_double(
           setting => '/my/file/foo.txt /my/file/bar.txt')
 
-        files.to_hash["#{setting}/foo.txt"].should == 'blah'
-        files.to_hash["#{setting}/bar.txt"].should == 'blah'
-        files.to_hash['extra'].split(';').should =~ [
+        expect(files.to_hash["#{setting}/foo.txt"]).to eq('blah')
+        expect(files.to_hash["#{setting}/bar.txt"]).to eq('blah')
+        expect(files.to_hash['extra'].split(';')).to match_array([
           "#{setting}/foo.txt", "#{setting}/bar.txt"
-        ]
+        ])
       end
     end
 
@@ -54,10 +58,10 @@ describe FlyingSphinx::SettingFiles do
         indices << index_double(:sources => [
           source_double(setting => '/my/file/foo.txt')])
 
-        files.to_hash.should == {
+        expect(files.to_hash).to eq(
           "#{setting}/foo.txt" => 'blah',
           'extra'              => "#{setting}/foo.txt"
-        }
+        )
       end
 
       it "does not repeat same files for #{setting}" do
@@ -66,21 +70,35 @@ describe FlyingSphinx::SettingFiles do
         indices << index_double(:sources => [
           source_double(setting => '/my/file/foo.txt')])
 
-        files.to_hash.should == {
+        expect(files.to_hash).to eq(
           "#{setting}/foo.txt" => 'blah',
           'extra'              => "#{setting}/foo.txt"
-        }
+        )
       end
 
       it "accepts multiples files for #{setting}" do
         indices << index_double(:sources => [
           source_double(setting => '/my/file/foo.txt /my/file/bar.txt')])
 
-        files.to_hash["#{setting}/foo.txt"].should == 'blah'
-        files.to_hash["#{setting}/bar.txt"].should == 'blah'
-        files.to_hash['extra'].split(';').should =~ [
+        expect(files.to_hash["#{setting}/foo.txt"]).to eq('blah')
+        expect(files.to_hash["#{setting}/bar.txt"]).to eq('blah')
+        expect(files.to_hash['extra'].split(';')).to match_array([
           "#{setting}/foo.txt", "#{setting}/bar.txt"
-        ]
+        ])
+      end
+    end
+
+    [:lemmatizer_base].each do |setting|
+      it "collects #{setting} files from sources" do
+        allow(common).to receive(setting).and_return("/my/path")
+
+        allow(Dir).to receive(:[]).with("/my/path/**/*").
+          and_return(["/my/path/foo.txt"])
+
+        expect(files.to_hash).to eq(
+          "#{setting}/foo.txt" => 'blah',
+          'extra'              => "#{setting}/foo.txt"
+        )
       end
     end
   end

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ require 'bundler'
 
 require 'dotenv'
 require 'webmock/rspec'
-require 'em-websocket'
 require 'rack'
 
 Dotenv.load '.env.test'

data/spec/support/local_pusher.rb

@@ -1,48 +1,75 @@
+require "socket"
+
 class LocalPusher
   attr_reader :connections
 
   def initialize
-    @connections = []
+    mutex.synchronize do
+      @connections = []
+      @alive = true
+    end
   end
 
   def start
+    Thread.report_on_exception = false
     @server_thread ||= Thread.new do
-      EM.run { socket_server }
+      socket_server
     end
   end
 
   def stop
-    server_thread.kill
+    mutex.synchronize do
+      connections.each(&:close)
+      @alive = false
+    end
+
+    server_thread.join(5)
   end
 
   def send(event, data)
-    connections.each do |connection|
-      connection.send({
-        'event'   => event,
-        'data'    => data.to_json,
-        'channel' => ENV['FLYING_SPHINX_IDENTIFIER']
-      }.to_json)
+    mutex.synchronize do
+      connections.each do |connection|
+        connection.write_json(
+          'event'   => event,
+          'data'    => data.to_json,
+          'channel' => ENV['FLYING_SPHINX_IDENTIFIER']
+        )
+      end
     end
   end
 
   private
 
-  attr_reader :server_thread
+  attr_reader :server_thread, :alive
+
+  def mutex
+    @mutex ||= Mutex.new
+  end
 
   def socket_server
-    EM::WebSocket.run(
-      :host => ENV['FLYING_SPHINX_SOCKETS_HOST'],
-      :port => ENV['FLYING_SPHINX_SOCKETS_PORT']
-    ) do |connection|
-      connection.onopen do |handshake|
-        connections << connection
-        connection.send({
-          'event' => 'pusher:connection_established',
-          'data'  => {'socket_id' => 101}.to_json
-        }.to_json)
-      end
+    server = TCPServer.new(
+      ENV['FLYING_SPHINX_SOCKETS_HOST'],
+      ENV['FLYING_SPHINX_SOCKETS_PORT'].to_i
+    )
 
-      connection.onclose { connections.delete connection }
+    loop do
+      break unless mutex.synchronize { alive }
+      connection = LocalPusherConnection.new(server.accept_nonblock)
+      mutex.synchronize { connections << connection }
+
+      loop do
+        break unless mutex.synchronize { alive }
+        connection.parse
+      end
+    rescue IO::WaitReadable, Errno::EINTR
+      IO.select([server])
+      retry
     end
+  rescue Errno::EADDRINUSE
+    puts "Socket failure, retrying..."
+    sleep 1
+    retry
+  ensure
+    server.close
   end
 end

data/spec/support/local_pusher_connection.rb

@@ -0,0 +1,40 @@
+require "websocket/driver"
+
+class LocalPusherConnection
+  def initialize(socket)
+    @socket = socket
+
+    driver.on :connect, -> (event) do
+      driver.start
+      write_json(
+        'event' => 'pusher:connection_established',
+        'data'  => {'socket_id' => 101}.to_json
+      )
+    end
+  end
+
+  def close
+    socket.close
+  end
+
+  def parse
+    driver.parse(socket.gets)
+  rescue IOError
+  end
+
+  def write(string)
+    socket.write(string)
+  end
+
+  def write_json(object)
+    driver.text(object.to_json)
+  end
+
+  private
+
+  attr_reader :socket
+
+  def driver
+    @driver ||= WebSocket::Driver.server(self)
+  end
+end

data/spec/support/successful_action.rb

@@ -8,6 +8,7 @@ class SuccessfulAction
 
   def matches?(block)
     pusher.start
+    Thread.report_on_exception = false
     thread = Thread.new { call block }
     sleep 1.5
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flying-sphinx
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Pat Allan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-12-12 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ey-hmac
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: faraday-multipart
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gzipped_tar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
   requirement: !ruby/object:Gem::Requirement
@@ -100,54 +114,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
-- !ruby/object:Gem::Dependency
-  name: em-websocket
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.15
 - !ruby/object:Gem::Dependency
@@ -198,14 +198,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.4
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.17.4
+        version: '3.14'
+- !ruby/object:Gem::Dependency
+  name: websocket-driver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
 executables:
@@ -215,8 +229,8 @@ extra_rdoc_files:
 - README.textile
 files:
 - ".env.test"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Appraisals
 - CHANGELOG.markdown
 - Gemfile
@@ -285,12 +299,13 @@ files:
 - spec/support/command_helpers.rb
 - spec/support/hmac.rb
 - spec/support/local_pusher.rb
+- spec/support/local_pusher_connection.rb
 - spec/support/multipart.rb
 - spec/support/successful_action.rb
 homepage: https://flying-sphinx.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -305,9 +320,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Sphinx in the Cloud
 test_files:
@@ -335,5 +349,6 @@ test_files:
 - spec/support/command_helpers.rb
 - spec/support/hmac.rb
 - spec/support/local_pusher.rb
+- spec/support/local_pusher_connection.rb
 - spec/support/multipart.rb
 - spec/support/successful_action.rb

data/.travis.yml

@@ -1,13 +0,0 @@
-language: ruby
-rvm:
-- 2.2.10
-- 2.3.7
-- 2.4.4
-- 2.5.1
-before_install:
-- gem install bundler
-- gem update --system
-before_script:
-- bundle exec appraisal install
-cache: bundler
-script: bundle exec appraisal rspec