flying-sphinx 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YWNhMDhjYWNhNjY1MWExY2UyZjQxYjE4YjQ2MTQ3NTljNWY2ODUzZA==
+  data.tar.gz: !binary |-
+    MDE3OTE1NTcyZjhlMzRkMmRlMGNmMzYxNjk5NmYyNzdmMGU5Mjk2ZA==
+SHA512:
+  metadata.gz: !binary |-
+    ZTJhMjJjODU2YTI5MTdiZWYyYjc1MDAxNjBhNGY0NTExY2Q5YWFhMmExZjdk
+    NTQ0Zjk1Nzg5MmU3MWY2NWViOWMyMzYyMzljODYwODFjMmI0MzdiNDdjYTEz
+    MThkZWUwOGIxODhiNTNiMDAxOGVkZDUyM2ExMTMzNmFmYTdjMDA=
+  data.tar.gz: !binary |-
+    OTE3NDdjNDNkMTVkMTg1YjkzMTI3NTU2YTIxNTUxYjA4ZmYxYWU1OWEzMjA2
+    YzlhOGE1NjVkNzE1ZjllNGMzNjQ1YjFhODM3ZDJmNmI2MDZjNzU3MjQ0MmIy
+    ODgxNzBlMGM0NjVjNWY5NmY4MzJjOGZiY2E2NDY4MzZhMGE0NTc=

data/HISTORY

@@ -1,4 +1,10 @@
-1.0.0 - 7th May 2012
+1.1.0 - 15th March 2014
+* Updated Faraday dependency to require 0.9 or newer (and removed faraday_middleware dependency).
+* Added remote rotate support via custom controller.
+* Added regenerate command (for when real-time indices are being used).
+* Removed the requirement of Rashie.
+
+1.0.0 - 7th May 2013
 * Updating Riddle dependency to >= 1.5.6.
 * Support for Thinking Sphinx v1/2/3.
 * Delayed Job support pushed back to ts-delayed-delta.

data/README.textile

@@ -7,13 +7,15 @@ h2. Installation and Usage
 This is all covered pretty well on "the Flying Sphinx site":http://flying-sphinx.com/docs, but if you're reading this on Github, you're probably keen on using this repository as the source instead of the gem. Here's the code snippet for your @Gemfile@:
 
 <pre><code>gem 'flying-sphinx',
-  :git => 'git://github.com/flying-sphinx/flying-sphinx.git'</code></pre>
+  :git    => 'git://github.com/flying-sphinx/flying-sphinx.git',
+  :branch => 'master',
+  :ref    => '216f589d1f'</code></pre>
 
 h2. Compatibility and Limitations
 
 Flying Sphinx is built with support for Rails 2.3.6 and beyond. Sadly, earlier versions of Rails aren't supported due to a requirement of a recent version of Rack deep in the dependency tree.
 
-It works with Rails 1.8.7 and 1.9.2, and on both Heroku's Bamboo and Cedar stacks. You _do_ need to use it with Heroku at this point - allowing others hosting elsewhere to use Flying Sphinx is something I'm considering, but it's not possible right now.
+It works from Ruby 1.8.7 onwards, and on both Heroku's Bamboo and Cedar stacks. You _do_ need to use it with Heroku at this point - allowing others hosting elsewhere to use Flying Sphinx is something I'm considering, but it's not possible right now.
 
 There are limitations with Heroku's setup and Sphinx/Thinking Sphinx functionality - again, the official documentation "covers this":http://flying-sphinx.com/docs#limitations, so have a read there.
 

data/flying-sphinx.gemspec

@@ -18,11 +18,10 @@ 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_middleware', ['~> 0.7']
-  s.add_runtime_dependency 'rash',               ['~> 0.3.0']
-  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.9']
+  s.add_runtime_dependency 'pusher-client', ['~> 0.3']
 
   s.add_development_dependency 'rake',            ['~> 0.9.2']
   s.add_development_dependency 'rspec',           ['~> 2.11']

data/lib/flying_sphinx.rb

@@ -30,7 +30,6 @@ end
 
 require 'multi_json'
 require 'faraday'
-require 'faraday_middleware'
 require 'riddle'
 require 'riddle/0.9.9'
 require 'pusher-client'

data/lib/flying_sphinx/action.rb

@@ -76,9 +76,9 @@ class FlyingSphinx::Action
   end
 
   def start
-    raise "Action blocked" if response.body.status == 'BLOCKED'
+    raise "Action blocked" if response['status'] == 'BLOCKED'
 
-    @action_id = response.body.id
+    @action_id = response['id']
   end
 
   def subscribe_to_events

data/lib/flying_sphinx/api.rb

@@ -64,8 +64,6 @@ class FlyingSphinx::API
 
     Faraday.new(options) do |builder|
       builder.use Faraday::Request::UrlEncoded
-      builder.use Faraday::Response::Rashify
-      builder.use Faraday::Response::ParseJson
       builder.adapter(adapter)
     end
   end
@@ -74,6 +72,8 @@ class FlyingSphinx::API
     FlyingSphinx.logger.debug "API Request: #{method} '#{path}'; params: #{data.inspect}"
     response = block.call
     FlyingSphinx.logger.debug "API Response: #{response.body.inspect}"
-    return response
+    raise 'Invalid Flying Sphinx credentials' if response.status == 403
+
+    MultiJson.load response.body
   end
 end

data/lib/flying_sphinx/cli.rb

@@ -4,13 +4,14 @@ class FlyingSphinx::CLI
   extend Forwardable
 
   COMMANDS = {
-    'configure' => [:configure],
-    'index'     => [:index],
-    'setup'     => [:configure, :index],
-    'start'     => [:start],
-    'stop'      => [:stop],
-    'restart'   => [:restart],
-    'rebuild'   => [:rebuild]
+    'configure'  => [:configure],
+    'index'      => [:index],
+    'setup'      => [:configure, :index],
+    'start'      => [:start],
+    'stop'       => [:stop],
+    'restart'    => [:restart],
+    'rebuild'    => [:rebuild],
+    'regenerate' => [:regenerate]
   }
 
   def_delegators :controller, :start, :stop, :restart
@@ -82,4 +83,10 @@ class FlyingSphinx::CLI
 
     controller.rebuild
   end
+
+  def regenerate
+    load_rails
+
+    controller.regenerate
+  end
 end

data/lib/flying_sphinx/configuration.rb

@@ -13,11 +13,11 @@ class FlyingSphinx::Configuration
   end
 
   def host
-    @host ||= response_body.server rescue host_from_env
+    @host ||= response_body['server'] rescue host_from_env
   end
 
   def port
-    @port ||= response_body.port rescue port_from_env
+    @port ||= response_body['port'] rescue port_from_env
   end
 
   def username
@@ -32,20 +32,16 @@ class FlyingSphinx::Configuration
     api.post(initial)
 
     response = api.get('daemon')
-    while response.body.status == initial
+    while response['status'] == initial
       sleep 0.5
       response = api.get('daemon')
     end
 
-    response.body.status == expected
+    response['status'] == expected
   end
 
   def response_body
-    @response_body ||= begin
-      response = api.get '/'
-      raise 'Invalid Flying Sphinx credentials' if response.status == 403
-      response.body
-    end
+    @response_body ||= api.get '/'
   end
 
   def identifier_from_env

data/lib/flying_sphinx/controller.rb

@@ -51,12 +51,33 @@ class FlyingSphinx::Controller
     end
   end
 
+  def regenerate(file = nil)
+    reset file
+
+    ThinkingSphinx::RakeInterface.new.generate
+  end
+
+  def reset(file = nil)
+    options = file.nil? ? configuration_options :
+      {:configuration => {'sphinx' => file}, :sphinx_version => '2.0.6'}
+
+    FlyingSphinx::Action.perform api.identifier do
+      api.put 'reset', options
+    end
+  end
+
   def restart
     FlyingSphinx::Action.perform api.identifier do
       api.post 'restart'
     end
   end
 
+  def rotate
+    FlyingSphinx::Action.perform api.identifier do
+      api.post 'rotate'
+    end
+  end
+
   def sphinx_version
     '2.0.4'
   end

data/lib/flying_sphinx/tasks.rb

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

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '1.0.0'
+  Version = '1.1.0'
 end

data/spec/specs/action_spec.rb

@@ -8,8 +8,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) { double 'response', :body => body }
-  let(:body)     { double 'body', :status => 'OK', :id => 748 }
+  let(:response) { {'status' => 'OK', 'id' => 748} }
   let(:logger)   { double 'logger', :debug => true }
 
   before :each do

data/spec/specs/api_spec.rb

@@ -8,11 +8,12 @@ describe FlyingSphinx::API do
   let(:adapter)    { double('adapter') }
   let(:connection) { double('connection') }
   let(:logger)     { double :debug => true }
-  let(:response)   { double :body => '' }
+  let(:response)   { double :body => '', :status => 200 }
 
   before :each do
     faraday.as_replaced_constant
 
+    stub_const 'MultiJson', double(:load => {})
     FlyingSphinx.stub :logger => logger
   end
 

data/spec/specs/configuration_spec.rb

@@ -2,9 +2,8 @@ require 'light_spec_helper'
 require 'flying_sphinx/configuration'
 
 describe FlyingSphinx::Configuration do
-  let(:api)        { fire_double('FlyingSphinx::API',
-    :get => double(:body => body, :status => 200)) }
-  let(:body)       { double(:server => 'foo.bar.com', :port => 9319) }
+  let(:api)        { fire_double('FlyingSphinx::API', :get => 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 }

metadata

@@ -1,219 +1,177 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flying-sphinx
-version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
-  segments: 
-  - 1
-  - 0
-  - 0
-  version: 1.0.0
+version: !ruby/object:Gem::Version
+  version: 1.1.0
 platform: ruby
-authors: 
+authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-07 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id001
+date: 2014-03-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 5
-        - 6
-        version: 1.5.6
-  version_requirements: *id002
-  name: riddle
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: riddle
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  version_requirements: *id003
-  name: multi_json
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.6
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
-  version_requirements: *id004
-  name: faraday_middleware
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: faraday
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
-        version: 0.3.0
-  version_requirements: *id005
-  name: rash
   prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
-  version_requirements: *id006
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
   name: pusher-client
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  version_requirements: *id007
+      - !ruby/object:Gem::Version
+        version: '0.3'
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
-  version_requirements: *id008
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  version_requirements: *id009
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
   name: rspec-fire
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
-        version: 0.8.2
-  version_requirements: *id010
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  version_requirements: *id011
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
   name: fakeweb
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
-        version: 1.2.2
-  version_requirements: *id012
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
   name: fakeweb-matcher
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.2
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
-executables: 
+executables:
 - flying-sphinx
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.textile
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -247,45 +205,31 @@ files:
 - spec/specs/api_spec.rb
 - spec/specs/configuration_spec.rb
 - spec/specs/setting_files_spec.rb
-has_rdoc: true
 homepage: https://flying-sphinx.com
 licenses: []
-
-post_install_message: |
-  If you're upgrading, you should rebuild your Sphinx setup when deploying:
-  
-    $ heroku rake fs:rebuild
-
+metadata: {}
+post_install_message: ! "If you're upgrading, you should rebuild your Sphinx setup
+  when deploying:\n\n  $ heroku rake fs:rebuild\n"
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Sphinx in the Cloud
-test_files: 
+test_files:
 - spec/light_spec_helper.rb
 - spec/spec_helper.rb
 - spec/specs/action_spec.rb