flying-sphinx 2.2.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f6ae3a86fa09f28adfe144f1e33ebc0cbd16e612146f77dd14634616a9de420
-  data.tar.gz: b7945e84452327eac48a975da634cb196d619c602a16233d7fe9f58f0aeb31a6
+  metadata.gz: 32b8175efa0d0846873f557091c82fc88f3618840a176b4e04af8e913c52b2b3
+  data.tar.gz: d0e1bc6ba2684eb8785ded846e92e2946ce3fe2dd8e42386a54551d8433810e9
 SHA512:
-  metadata.gz: 4aa2d490c2d47ba961ad9c8cc5eb6b98c88df1ebbe12f20fcec691cfa02ebb2b87bdccfdee1121c2956b19c97239c3e1f228b1d90e6480db8d7ccdc5b09af18b
-  data.tar.gz: 91e86268a161e4d3fb1505132f982b09fa5114e567bfdfabed01f2a3f2b25b6364e975a601e8eb588e772ead7cdc3b9b29e398964a3f0ab211e446020121e995
+  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,33 +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_6_0' do
-  gem 'rails',  '~> 6.0.0.beta2'
-end if RUBY_VERSION.to_f >= 2.5
+appraise 'rails_7.0' do
+  gem 'rails',  '~> 7.0.0'
+end if RUBY_VERSION.to_f >= 2.7

data/CHANGELOG.markdown

@@ -2,6 +2,16 @@
 
 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

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 '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',      '~> 3.8'
+  s.add_development_dependency 'webmock',      '~> 3.14'
+  s.add_development_dependency 'websocket-driver'
 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/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/version.rb

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

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/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.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Pat Allan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-04 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,42 +114,28 @@ 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
@@ -198,14 +198,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        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,8 +320,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Sphinx in the Cloud
 test_files:
@@ -334,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,14 +0,0 @@
-language: ruby
-rvm:
-- 2.3.8
-- 2.4.5
-- 2.5.3
-- 2.6.1
-before_install:
-- gem update --system
-- gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
-- gem install bundler -v '< 2'
-before_script:
-- bundle exec appraisal install
-cache: bundler
-script: bundle exec appraisal rspec