flying-sphinx 1.2.0 → 1.2.1

data/.env.test

@@ -0,0 +1,5 @@
+FLYING_SPHINX_IDENTIFIER=abc
+FLYING_SPHINX_API_KEY=def
+FLYING_SPHINX_SOCKETS_INSECURE=true
+FLYING_SPHINX_SOCKETS_HOST=127.0.0.1
+FLYING_SPHINX_SOCKETS_PORT=8080

data/.gitignore

@@ -2,4 +2,5 @@
 Gemfile.lock
 *.tmproj
 *.sublime-*
+gemfiles/*.lock
 pkg

data/.travis.yml

@@ -1,4 +1,39 @@
+language: ruby
 rvm:
   - 1.8.7
-  - 1.9.2
   - ree
+  - 1.9.3
+  - 2.0
+  - 2.1.2
+gemfile:
+  - gemfiles/rails_2.3.gemfile
+  - gemfiles/rails_3.0.gemfile
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0.gemfile
+before_install:
+  - gem update --system
+  - gem install bundler
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: ree
+      gemfile: gemfiles/rails_4.0.gemfile
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: ree
+      gemfile: gemfiles/rails_3.2.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_2.3.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_2.3.gemfile
+    - rvm: 2.1.2
+      gemfile: gemfiles/rails_2.3.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/rails_3.0.gemfile
+    - rvm: 2.0
+      gemfile: gemfiles/rails_3.0.gemfile
+    - rvm: 2.1.2
+      gemfile: gemfiles/rails_3.0.gemfile
+cache: bundler
+script: bundle exec rspec

data/Appraisals

@@ -0,0 +1,23 @@
+if RUBY_VERSION.to_f <= 1.8
+  appraise 'rails-2.3' do
+    gem 'rails',   '~> 2.3.18'
+    gem 'faraday', '0.7.0'
+    gem 'riddle',  '< 2.0.0'
+  end
+
+  appraise 'rails-3.0' do
+    gem 'rails',   '~> 3.0.20'
+    gem 'faraday', '~> 0.8.0'
+    gem 'riddle',  '< 2.0.0'
+  end
+else
+  appraise 'rails-3.2' do
+    gem 'rails',   '~> 3.2.18'
+    gem 'faraday', '~> 0.8.0'
+  end
+
+  appraise 'rails-4.0' do
+    gem 'rails',   '~> 4.0.5'
+    gem 'faraday', '~> 0.9.0'
+  end
+end

data/Gemfile

@@ -1,3 +1,21 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem 'activesupport', '< 4.0.0' if RUBY_VERSION.to_f <= 1.8
+gem 'riddle',        '< 2.0.0' if RUBY_VERSION.to_f <= 1.8
+
+if RUBY_VERSION.to_f <= 1.8
+  gem "public_suffix", "< 1.4.0"
+elsif RUBY_VERSION.to_f <= 1.9
+  gem "public_suffix", "< 1.5.0"
+elsif RUBY_VERSION.to_f <= 2.0
+  gem "public_suffix", "< 1.5.0"
+else
+  gem "public_suffix"
+end
+
+gem 'appraisal',     '~> 1.0.0',
+  :git    => 'git://github.com/thoughtbot/appraisal',
+  :branch => 'master',
+  :ref    => 'bd6eef4b6a'

data/Rakefile

@@ -1,27 +1 @@
-require 'rubygems'
-begin
-  require 'bundler'
-  Bundler::GemHelper.install_tasks
-rescue LoadError
-  puts "Although not required, it's recommended you use bundler during development"
-end
-
-require 'rake'
-
-task :default => :test
-task :test    => :spec
-
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-end
-
-RSpec::Core::RakeTask.new(:rspec) do |t|
-  t.pattern = 'spec/**/*_spec.rb'
-  t.rcov = true
-  t.rcov_opts = [
-    '--exclude', 'spec',   '--exclude', 'gems',
-    '--exclude', 'riddle', '--exclude', 'ruby'
-  ]
-end
+require 'bundler/gem_tasks'

data/flying-sphinx.gemspec

@@ -18,21 +18,15 @@ Gem::Specification.new do |s|
   s.executables   = ['flying-sphinx']
 
   s.add_runtime_dependency 'thinking-sphinx'
-  s.add_runtime_dependency 'riddle',        ['>= 1.5.6']
-  s.add_runtime_dependency 'multi_json',    ['>= 1.3.0']
-  s.add_runtime_dependency 'faraday',       ['>= 0.9']
-  s.add_runtime_dependency 'pusher-client', ['~> 0.3']
+  s.add_runtime_dependency 'riddle',             '>= 1.5.6'
+  s.add_runtime_dependency 'multi_json',         '>= 1.3.0'
+  s.add_runtime_dependency 'faraday',            '>= 0.7'
+  s.add_runtime_dependency 'pusher-client',      '~> 0.3'
 
-  s.add_development_dependency 'rake',            ['~> 0.9.2']
-  s.add_development_dependency 'rspec',           ['~> 2.11']
-  s.add_development_dependency 'rspec-fire',      ['~> 1.1.0']
-  s.add_development_dependency 'yajl-ruby',       ['~> 0.8.2']
-  s.add_development_dependency 'fakeweb',         ['~> 1.3.0']
-  s.add_development_dependency 'fakeweb-matcher', ['~> 1.2.2']
-
-  s.post_install_message = <<-MESSAGE
-If you're upgrading, you should rebuild your Sphinx setup when deploying:
-
-  $ heroku rake fs:rebuild
-MESSAGE
+  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 'rspec',        '~> 2.14'
+  s.add_development_dependency 'rspec-retry',  '~> 0.4'
+  s.add_development_dependency 'webmock',      '~> 1.17.4'
 end

data/gemfiles/rails_2.3.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "< 4.0.0"
+gem "appraisal", "~> 1.0.0", :ref => "bd6eef4b6a", :git => "git://github.com/thoughtbot/appraisal", :branch => "master"
+gem "rails", "~> 2.3.18"
+gem "faraday", "0.7.0"
+gem "websocket", "< 1.2.0"
+gem "riddle", "< 2.0.0"
+if RUBY_VERSION.to_f <= 1.8
+  gem "public_suffix", "< 1.4.0"
+elsif RUBY_VERSION.to_f <= 1.9
+  gem "public_suffix", "< 1.5.0"
+elsif RUBY_VERSION.to_f <= 2.0
+  gem "public_suffix", "< 1.5.0"
+else
+  gem "public_suffix"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_3.0.gemfile

@@ -0,0 +1,21 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "< 4.0.0"
+gem "appraisal", "~> 1.0.0", :ref => "bd6eef4b6a", :git => "git://github.com/thoughtbot/appraisal", :branch => "master"
+gem "rails", "~> 3.0.20"
+gem "faraday", "~> 0.8.0"
+gem "websocket", "< 1.2.0"
+gem "riddle", "< 2.0.0"
+if RUBY_VERSION.to_f <= 1.8
+  gem "public_suffix", "< 1.4.0"
+elsif RUBY_VERSION.to_f <= 1.9
+  gem "public_suffix", "< 1.5.0"
+elsif RUBY_VERSION.to_f <= 2.0
+  gem "public_suffix", "< 1.5.0"
+else
+  gem "public_suffix"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_3.2.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 1.0.0", :git => "git://github.com/thoughtbot/appraisal", :branch => "master", :ref => "bd6eef4b6a"
+gem "rails", "~> 3.2.18"
+gem "faraday", "~> 0.8.0"
+if RUBY_VERSION.to_f <= 1.8
+  gem "public_suffix", "< 1.4.0"
+elsif RUBY_VERSION.to_f <= 1.9
+  gem "public_suffix", "< 1.5.0"
+elsif RUBY_VERSION.to_f <= 2.0
+  gem "public_suffix", "< 1.5.0"
+else
+  gem "public_suffix"
+end
+
+gemspec :path => "../"

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal", "~> 1.0.0", :git => "git://github.com/thoughtbot/appraisal", :branch => "master", :ref => "bd6eef4b6a"
+gem "rails", "~> 4.0.5"
+gem "faraday", "~> 0.9.0"
+if RUBY_VERSION.to_f <= 1.8
+  gem "public_suffix", "< 1.4.0"
+elsif RUBY_VERSION.to_f <= 1.9
+  gem "public_suffix", "< 1.5.0"
+elsif RUBY_VERSION.to_f <= 2.0
+  gem "public_suffix", "< 1.5.0"
+else
+  gem "public_suffix"
+end
+
+gemspec :path => "../"

data/lib/flying_sphinx.rb

@@ -1,9 +1,8 @@
 require 'logger'
 
 module FlyingSphinx
-  module Translators
-    #
-  end
+  module Response; end
+  module Translators; end
 
   @logger       = Logger.new(STDOUT)
   @logger.level = Logger::INFO
@@ -48,6 +47,10 @@ require 'flying_sphinx/setting_files'
 require 'flying_sphinx/sphinxql'
 require 'flying_sphinx/version'
 
+require 'flying_sphinx/response/invalid'
+require 'flying_sphinx/response/json'
+require 'flying_sphinx/response/logger'
+
 if defined?(Rails) && defined?(Rails::Railtie)
   require 'flying_sphinx/railtie'
 elsif defined?(Rails) && defined?(Rails::Plugin)

data/lib/flying_sphinx/action.rb

@@ -62,7 +62,7 @@ class FlyingSphinx::Action
   def response
     attempts = 0
     @response ||= begin
-      block.call
+      block.call.body
     rescue
       attempts += 1
       retry if attempts <= 3
@@ -72,7 +72,10 @@ class FlyingSphinx::Action
 
   def socket
     @socket ||= PusherClient::Socket.new FlyingSphinx::API::PUSHER_KEY,
-      :encrypted => true
+      :encrypted => ENV['FLYING_SPHINX_SOCKETS_INSECURE'].nil?,
+      :ws_host   => ENV['FLYING_SPHINX_SOCKETS_HOST'],
+      :wss_port  => ENV['FLYING_SPHINX_SOCKETS_PORT'],
+      :ws_port   => ENV['FLYING_SPHINX_SOCKETS_PORT']
   end
 
   def start

data/lib/flying_sphinx/api.rb

@@ -19,23 +19,17 @@ class FlyingSphinx::API
   end
 
   def get(path, data = {})
-    log('GET', path, data) do
-      connection.get do |request|
-        request.url normalize_path(path), data
-      end
+    connection.get do |request|
+      request.url normalize_path(path), data
     end
   end
 
   def post(path, data = {})
-    log('POST', path, data) do
-      connection.post normalize_path(path), data
-    end
+    connection.post normalize_path(path), data
   end
 
   def put(path, data = {})
-    log('PUT', path, data) do
-      connection.put normalize_path(path), data
-    end
+    connection.put normalize_path(path), data
   end
 
   private
@@ -63,18 +57,16 @@ class FlyingSphinx::API
     }
 
     Faraday.new(options) do |builder|
+      # Built-in middleware
       builder.request :multipart
       builder.request :url_encoded
-      builder.adapter adapter
-    end
-  end
 
-  def log(method, path, data = {}, option = {}, &block)
-    FlyingSphinx.logger.debug "API Request: #{method} '#{path}'; params: #{data.inspect}"
-    response = block.call
-    FlyingSphinx.logger.debug "API Response: #{response.body.inspect}"
-    raise 'Invalid Flying Sphinx credentials' if response.status == 403
+      # Local middleware
+      builder.use FlyingSphinx::Response::Logger
+      builder.use FlyingSphinx::Response::Invalid
+      builder.use FlyingSphinx::Response::JSON
 
-    MultiJson.load response.body
+      builder.adapter adapter
+    end
   end
 end

data/lib/flying_sphinx/configuration.rb

@@ -28,20 +28,8 @@ class FlyingSphinx::Configuration
 
   attr_reader :identifier, :api_key
 
-  def change(initial, expected)
-    api.post(initial)
-
-    response = api.get('daemon')
-    while response['status'] == initial
-      sleep 0.5
-      response = api.get('daemon')
-    end
-
-    response['status'] == expected
-  end
-
   def response_body
-    @response_body ||= api.get '/'
+    @response_body ||= api.get('/').body
   end
 
   def identifier_from_env

data/lib/flying_sphinx/controller.rb

@@ -78,6 +78,10 @@ class FlyingSphinx::Controller
     end
   end
 
+  def running?
+    true
+  end
+
   def sphinx_version
     '2.0.4'
   end

data/lib/flying_sphinx/gzipped_hash.rb

@@ -8,7 +8,7 @@ class FlyingSphinx::GzippedHash
   def to_gzipped_hash
     hash['gzip'] = 'true'
 
-    keys.each { |key| hash[key] = gzip hash[key] }
+    keys.each { |key| hash[key] = gzip hash[key], key }
 
     hash
   end
@@ -23,11 +23,14 @@ class FlyingSphinx::GzippedHash
     keys
   end
 
-  def gzip(string)
+  def gzip(string, key)
     io     = StringIO.new 'w'
     writer = Zlib::GzipWriter.new io
     writer.write string
     writer.close
-    Faraday::UploadIO.new StringIO.new(io.string, 'rb'), 'application/gzip'
+
+    Faraday::UploadIO.new(
+      StringIO.new(io.string, 'rb'), 'application/gzip', key
+    )
   end
 end

data/lib/flying_sphinx/response/invalid.rb

@@ -0,0 +1,7 @@
+class FlyingSphinx::Response::Invalid < Faraday::Response::Middleware
+  def on_complete(environment)
+    return unless environment[:status] == 403
+
+    raise 'Invalid Flying Sphinx credentials'
+  end
+end

data/lib/flying_sphinx/response/json.rb

@@ -0,0 +1,5 @@
+class FlyingSphinx::Response::JSON < Faraday::Response::Middleware
+  def on_complete(environment)
+    environment[:body] = MultiJson.load environment[:body]
+  end
+end

data/lib/flying_sphinx/response/logger.rb

@@ -0,0 +1,23 @@
+class FlyingSphinx::Response::Logger < Faraday::Response::Middleware
+  extend Forwardable
+
+  def call(environment)
+    debug "API Request: #{environment[:method]} #{environment[:url]}"
+    debug "API Body:    #{environment[:body].inspect}"
+
+    super
+  end
+
+  def on_complete(environment)
+    debug "API Status:   #{environment[:status]}"
+    debug "API Response: #{environment[:body].inspect}"
+  end
+
+  private
+
+  def_delegators :logger, :debug
+
+  def logger
+    FlyingSphinx.logger
+  end
+end

data/lib/flying_sphinx/tasks.rb

@@ -26,6 +26,6 @@ namespace :fs do
 
   desc "Stop, clear, configure, start then populate Sphinx"
   task :regenerate => :environment do
-    FlyingSphinx::CLI.new('rebuild').regenerate
+    FlyingSphinx::CLI.new('regenerate').run
   end
 end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '1.2.0'
+  Version = '1.2.1'
 end

data/spec/acceptance/get_info_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe 'Requesting customer information' do
+  let(:configuration) { FlyingSphinx::Configuration.new 'foo', 'bar' }
+
+  before :each do
+    stub_request(:get, 'https://flying-sphinx.com/api/my/app').to_return(
+      :status => 200,
+      :body   => '{"server":"my.sphinx.server","port":9307}'
+    )
+  end
+
+  it { expect(configuration.host).to eq('my.sphinx.server') }
+  it { expect(configuration.port).to eq(9307) }
+end

data/spec/acceptance/start_or_stop_sphinx_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+
+describe 'Starting Sphinx' do
+  let(:cli) { FlyingSphinx::CLI.new 'start' }
+
+  before :each do
+    stub_request(:post, 'https://flying-sphinx.com/api/my/app/start').
+      to_return(:status => 200, :body => '{"id":429, "status":"OK"}')
+  end
+
+  it 'makes the request to the server', :retry => 3 do
+    expect { cli.run }.to be_successful_with 429
+  end
+end
+
+describe 'Stopping Sphinx', :retry => 3 do
+  let(:cli) { FlyingSphinx::CLI.new 'stop' }
+
+  before :each do
+    stub_request(:post, 'https://flying-sphinx.com/api/my/app/stop').
+      to_return(:status => 200, :body => '{"id":537, "status":"OK"}')
+  end
+
+  it 'makes the request to the server', :retry => 3 do
+    expect { cli.run }.to be_successful_with 537
+  end
+end

data/spec/{specs → flying_sphinx}/action_spec.rb

@@ -1,6 +1,4 @@
-require 'light_spec_helper'
-require 'multi_json'
-require 'flying_sphinx/action'
+require 'spec_helper'
 
 describe FlyingSphinx::Action do
   let(:action)   { FlyingSphinx::Action.new 'abc123', 1, &block }
@@ -8,7 +6,7 @@ describe FlyingSphinx::Action do
   let(:socket)   { double 'socket', :connect => true, :disconnect => true,
     :subscribe => true, :[] => channel, :connected => true }
   let(:channel)  { double 'channel', :bind => true }
-  let(:response) { {'status' => 'OK', 'id' => 748} }
+  let(:response) { double :body => {'status' => 'OK', 'id' => 748} }
   let(:logger)   { double 'logger', :debug => true }
 
   before :each do
@@ -50,7 +48,7 @@ describe FlyingSphinx::Action do
       block.should_receive(:call).and_return(response)
 
       perform_and_complete action
-    end
+    end if RUBY_VERSION.to_f > 1.8
 
     it "raises an error if the response's status is BLOCKED" do
       response.stub :status => 'BLOCKED'

data/spec/{specs → flying_sphinx}/api_spec.rb

@@ -1,19 +1,16 @@
-require 'light_spec_helper'
-require 'flying_sphinx/api'
-require 'flying_sphinx/version'
+require 'spec_helper'
 
 describe FlyingSphinx::API do
   let(:api)        { FlyingSphinx::API.new 'foo', 'bar', adapter }
-  let(:faraday)    { fire_class_double('Faraday', :new => connection) }
+  let(:faraday)    { double('Faraday', :new => connection) }
   let(:adapter)    { double('adapter') }
   let(:connection) { double('connection') }
   let(:logger)     { double :debug => true }
   let(:response)   { double :body => '', :status => 200 }
 
   before :each do
-    faraday.as_replaced_constant
-
     stub_const 'MultiJson', double(:load => {})
+    stub_const 'Faraday',   faraday
     FlyingSphinx.stub :logger => logger
   end
 

data/spec/{specs → flying_sphinx}/configuration_spec.rb

@@ -1,15 +1,14 @@
-require 'light_spec_helper'
-require 'flying_sphinx/configuration'
+require 'spec_helper'
 
 describe FlyingSphinx::Configuration do
-  let(:api)        { fire_double('FlyingSphinx::API', :get => body) }
+  let(:api)        { double 'FlyingSphinx::API', :get => double(:body => body) }
   let(:body)       { {'server' => 'foo.bar.com', 'port' => 9319} }
   let(:api_key)    { 'foo-bar-baz' }
   let(:identifier) { 'my-identifier' }
   let(:config)     { FlyingSphinx::Configuration.new identifier, api_key }
 
   before :each do
-    fire_class_double('FlyingSphinx::API', :new => api).as_replaced_constant
+    stub_const 'FlyingSphinx::API', double(:new => api)
   end
 
   describe '#host' do

data/spec/{specs → flying_sphinx}/controller_spec.rb

@@ -1,8 +1,4 @@
-require 'light_spec_helper'
-require 'faraday'
-require 'flying_sphinx/controller'
-require 'flying_sphinx/configuration_options'
-require 'flying_sphinx/gzipped_hash'
+require 'spec_helper'
 
 describe FlyingSphinx::Controller do
   let(:controller)    { FlyingSphinx::Controller.new api }

data/spec/{specs → flying_sphinx}/setting_files_spec.rb

@@ -1,16 +1,15 @@
-require 'light_spec_helper'
-require 'flying_sphinx/setting_files'
+require 'spec_helper'
 
 describe FlyingSphinx::SettingFiles do
   let(:files)   { FlyingSphinx::SettingFiles.new indices }
   let(:indices) { [] }
 
   def index_double(methods)
-    fire_double 'Riddle::Configuration::Index', methods
+    double 'Riddle::Configuration::Index', methods
   end
 
   def source_double(methods)
-    fire_double 'Riddle::Configuration::SQLSource', methods
+    double 'Riddle::Configuration::SQLSource', methods
   end
 
   describe '#to_hash' do
@@ -42,11 +41,11 @@ describe FlyingSphinx::SettingFiles do
         indices << index_double(
           setting => '/my/file/foo.txt /my/file/bar.txt')
 
-        files.to_hash.should == {
-          "#{setting}:foo.txt" => 'blah',
-          "#{setting}:bar.txt" => 'blah',
-          'extra'              => "#{setting}:foo.txt;#{setting}:bar.txt"
-        }
+        files.to_hash["#{setting}:foo.txt"].should == 'blah'
+        files.to_hash["#{setting}:bar.txt"].should == 'blah'
+        files.to_hash['extra'].split(';').should =~ [
+          "#{setting}:foo.txt", "#{setting}:bar.txt"
+        ]
       end
     end
 
@@ -77,11 +76,11 @@ describe FlyingSphinx::SettingFiles do
         indices << index_double(:sources => [
           source_double(setting => '/my/file/foo.txt /my/file/bar.txt')])
 
-        files.to_hash.should == {
-          "#{setting}:foo.txt" => 'blah',
-          "#{setting}:bar.txt" => 'blah',
-          'extra'              => "#{setting}:foo.txt;#{setting}:bar.txt"
-        }
+        files.to_hash["#{setting}:foo.txt"].should == 'blah'
+        files.to_hash["#{setting}:bar.txt"].should == 'blah'
+        files.to_hash['extra'].split(';').should =~ [
+          "#{setting}:foo.txt", "#{setting}:bar.txt"
+        ]
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,13 +1,18 @@
 require 'rubygems'
 require 'bundler'
 
-require 'timeout'
-require 'thinking-sphinx'
+require 'dotenv'
+require 'webmock/rspec'
+require 'em-websocket'
+
+Dotenv.load '.env.test'
+WebMock.disable_net_connect!
+
+require 'thinking_sphinx'
 require 'flying_sphinx'
-require 'delayed_job'
 
-require 'fakeweb'
-require 'fakeweb_matcher'
+unless FlyingSphinx.logger.level == Logger::DEBUG
+  FlyingSphinx.logger.level = Logger::WARN
+end
 
-FakeWeb.allow_net_connect = false
-Delayed::Worker.backend   = :active_record
+Dir["spec/support/**/*.rb"].each { |file| require File.expand_path(file) }

data/spec/support/local_pusher.rb

@@ -0,0 +1,48 @@
+class LocalPusher
+  attr_reader :connections
+
+  def initialize
+    @connections = []
+  end
+
+  def start
+    @server_thread ||= Thread.new do
+      EM.run { socket_server }
+    end
+  end
+
+  def stop
+    server_thread.kill
+  end
+
+  def send(event, data)
+    connections.each do |connection|
+      connection.send({
+        'event'   => event,
+        'data'    => data.to_json,
+        'channel' => ENV['FLYING_SPHINX_IDENTIFIER']
+      }.to_json)
+    end
+  end
+
+  private
+
+  attr_reader :server_thread
+
+  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
+
+      connection.onclose { connections.delete connection }
+    end
+  end
+end

data/spec/support/successful_action.rb

@@ -0,0 +1,46 @@
+class SuccessfulAction
+  attr_writer :result
+
+  def initialize(action_id)
+    @action_id = action_id
+    @result    = nil
+  end
+
+  def matches?(block)
+    pusher.start
+    thread = Thread.new { call block }
+    sleep 1.0
+
+    pusher.send 'completion', 'id' => action_id
+    thread.join
+    pusher.stop
+
+    result
+  end
+
+  def failure_message_for_should
+    "Action failed"
+  end
+
+  private
+
+  attr_reader :action_id, :result
+
+  def call(block)
+    self.result = block.call
+  end
+
+  def pusher
+    @pusher ||= LocalPusher.new
+  end
+end
+
+module SuccessfulActionHelper
+  def be_successful_with(action_id)
+    SuccessfulAction.new action_id
+  end
+end
+
+RSpec.configure do |config|
+  config.include SuccessfulActionHelper
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: flying-sphinx
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-30 00:00:00.000000000 Z
+date: 2017-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thinking-sphinx
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: riddle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,20 +62,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: pusher-client
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,94 +86,107 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: em-websocket
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 0.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: 0.5.1
 - !ruby/object:Gem::Dependency
-  name: rspec-fire
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.3.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 0.3.15
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '2.14'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: rspec-retry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: fakeweb-matcher
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.17.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.17.4
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
 executables:
@@ -172,8 +195,10 @@ extensions: []
 extra_rdoc_files:
 - README.textile
 files:
+- .env.test
 - .gitignore
 - .travis.yml
+- Appraisals
 - Gemfile
 - HISTORY
 - LICENCE
@@ -181,6 +206,10 @@ files:
 - Rakefile
 - bin/flying-sphinx
 - flying-sphinx.gemspec
+- gemfiles/rails_2.3.gemfile
+- gemfiles/rails_3.0.gemfile
+- gemfiles/rails_3.2.gemfile
+- gemfiles/rails_4.0.gemfile
 - keys/key
 - lib/flying-sphinx.rb
 - lib/flying_sphinx.rb
@@ -195,48 +224,57 @@ files:
 - lib/flying_sphinx/gzipped_hash.rb
 - lib/flying_sphinx/rails.rb
 - lib/flying_sphinx/railtie.rb
+- lib/flying_sphinx/response/invalid.rb
+- lib/flying_sphinx/response/json.rb
+- lib/flying_sphinx/response/logger.rb
 - lib/flying_sphinx/setting_files.rb
 - lib/flying_sphinx/sinatra.rb
 - lib/flying_sphinx/sphinxql.rb
 - lib/flying_sphinx/sphinxql/translator.rb
 - lib/flying_sphinx/tasks.rb
 - lib/flying_sphinx/version.rb
-- spec/light_spec_helper.rb
+- spec/acceptance/get_info_spec.rb
+- spec/acceptance/start_or_stop_sphinx_spec.rb
+- spec/flying_sphinx/action_spec.rb
+- spec/flying_sphinx/api_spec.rb
+- spec/flying_sphinx/configuration_spec.rb
+- spec/flying_sphinx/controller_spec.rb
+- spec/flying_sphinx/setting_files_spec.rb
 - spec/spec_helper.rb
-- spec/specs/action_spec.rb
-- spec/specs/api_spec.rb
-- spec/specs/configuration_spec.rb
-- spec/specs/controller_spec.rb
-- spec/specs/setting_files_spec.rb
+- spec/support/local_pusher.rb
+- spec/support/successful_action.rb
 homepage: https://flying-sphinx.com
 licenses: []
-metadata: {}
-post_install_message: ! "If you're upgrading, you should rebuild your Sphinx setup
-  when deploying:\n\n  $ heroku rake fs:rebuild\n"
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 1.8.30
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Sphinx in the Cloud
 test_files:
-- spec/light_spec_helper.rb
+- spec/acceptance/get_info_spec.rb
+- spec/acceptance/start_or_stop_sphinx_spec.rb
+- spec/flying_sphinx/action_spec.rb
+- spec/flying_sphinx/api_spec.rb
+- spec/flying_sphinx/configuration_spec.rb
+- spec/flying_sphinx/controller_spec.rb
+- spec/flying_sphinx/setting_files_spec.rb
 - spec/spec_helper.rb
-- spec/specs/action_spec.rb
-- spec/specs/api_spec.rb
-- spec/specs/configuration_spec.rb
-- spec/specs/controller_spec.rb
-- spec/specs/setting_files_spec.rb
+- spec/support/local_pusher.rb
+- spec/support/successful_action.rb

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MmFjZTkzNjBhNTJjNTBlYzI1ZmE4ODNlNDZmNTViMTk5MWM4ZmExNw==
-  data.tar.gz: !binary |-
-    Zjg1ZTkzYTM0MDE0ODcyYTg0ODBlMDZlMjQwNmI0ZGIyM2E2ODg3ZA==
-SHA512:
-  metadata.gz: !binary |-
-    M2MxZWNkYzYzOTE4ZDVhNDc1YTIyMDcwNzA3M2Q4OTIwMjlmMTViMTU1M2Vj
-    OWQ5MjdlNWQ1M2MxNTM4YzUyYWJlNDNhOWE3MzE4ZTJhMGFhM2QyOTU3ZGJm
-    YjFkZjg2MzkxYjBkZTY2YWM4YTAxOGQ3ODVjMzkyZTE5OTRiOTE=
-  data.tar.gz: !binary |-
-    ZDUzYTA3ZjVmZTQwZmNiMDk4NjVhNTE5ZTExMjE4NmE5ZGRiYjA5ODUyNWRi
-    MGEyOGM1ZjUzYmYxYjY2YzJlMTdhMWI5ZDIzMjc0MzUwNDBlZjlkOGIxYzUw
-    Mzk0N2Q2YzY2MGJmZTA3OGNlYzMwMDk0NzZmOTQwNTNlYWJhNzk=

data/spec/light_spec_helper.rb

@@ -1,9 +0,0 @@
-require 'bundler/setup'
-require 'rspec/fire'
-
-module FlyingSphinx; end
-
-RSpec.configure do |config|
-  config.mock_with :rspec
-  config.include(RSpec::Fire)
-end