flying-sphinx 0.8.4 → 0.8.5

data/HISTORY

@@ -1,3 +1,8 @@
+0.8.5 - 10th December 2012
+* Daemon actions (start/stop) are now asynchronous.
+* More forgiving when environment variables aren't around. Particularly helpful for Padrino and Sinatra.
+* Make delta indexing jobs asynchronous - no need to wait for the result. Also, with the different URL, flying-sphinx.com will not queue up duplicate delta jobs within the last 20 minutes if there's a indexing job still pending.
+
 0.8.4 - 22nd September 2012
 * Load the Delta class when loading Rails.
 

data/lib/flying_sphinx/configuration.rb

@@ -13,11 +13,11 @@ class FlyingSphinx::Configuration
   end
 
   def start_sphinx
-    api.post('start').success?
+    change 'starting', 'started'
   end
 
   def stop_sphinx
-    api.post('stop').success?
+    change 'stopping', 'stopped'
   end
 
   def client_key
@@ -33,6 +33,18 @@ class FlyingSphinx::Configuration
   private
 
   attr_reader :identifier, :api_key
+  
+  def change(initial, expected)
+    api.post(initial)
+
+    response = api.get('daemon')
+    while response.body.status == initial
+      sleep 0.5
+      response = api.get('daemon')
+    end
+
+    response.body.status == expected
+  end
 
   def set_from_server
     response = api.get '/'
@@ -58,10 +70,10 @@ class FlyingSphinx::Configuration
   end
 
   def host_from_env
-    (ENV['STAGED_SPHINX_HOST'] || ENV['FLYING_SPHINX_HOST']).dup
+    (ENV['STAGED_SPHINX_HOST'] || ENV['FLYING_SPHINX_HOST'] || '').dup
   end
 
   def port_from_env
-    (ENV['STAGED_SPHINX_PORT'] || ENV['FLYING_SPHINX_PORT']).dup
+    (ENV['STAGED_SPHINX_PORT'] || ENV['FLYING_SPHINX_PORT'] || 9306).dup
   end
 end

data/lib/flying_sphinx/delayed_delta.rb

@@ -55,7 +55,7 @@ class FlyingSphinx::DelayedDelta < ThinkingSphinx::Deltas::DefaultDelta
     return true if skip? instance
 
     self.class.enqueue(
-      FlyingSphinx::IndexRequest.new(model.delta_index_names),
+      FlyingSphinx::IndexRequest.new(model.delta_index_names, true),
       delayed_job_priority
     )
 

data/lib/flying_sphinx/index_request.rb

@@ -1,5 +1,5 @@
 class FlyingSphinx::IndexRequest
-  attr_reader :index_id, :indices
+  attr_reader :index_id, :indices, :async
 
   INDEX_COMPLETE_CHECKING_INTERVAL = 3
 
@@ -18,8 +18,8 @@ class FlyingSphinx::IndexRequest
     puts "Index Log:\n#{index.log}"
   end
 
-  def initialize(indices = [])
-    @indices = indices
+  def initialize(indices = [], async = false)
+    @indices, @async = indices, async
   end
 
   # Shows index name in Delayed::Job#name.
@@ -30,6 +30,8 @@ class FlyingSphinx::IndexRequest
 
   def index
     begin_request
+    return if async
+
     while !request_complete?
       sleep 3
     end
@@ -68,7 +70,9 @@ class FlyingSphinx::IndexRequest
   end
 
   def begin_request
-    response = api.post 'indices', :indices => indices.join(',')
+    path = 'indices'
+    path << '/unique' if async
+    response = api.post path, :indices => indices.join(',')
 
     @index_id = response.body.id
     @request_begun = true

data/lib/flying_sphinx/sinatra.rb

@@ -1,12 +1,14 @@
 require 'flying_sphinx'
 
-config = FlyingSphinx::Configuration.new
+if ENV['FLYING_SPHINX_IDENTIFIER'] || ENV['STAGED_SPHINX_IDENTIFIER']
+  config = FlyingSphinx::Configuration.new
 
-ThinkingSphinx::Configuration.instance.address = config.host
-ThinkingSphinx::Configuration.instance.port    = config.port
-ThinkingSphinx::Configuration.instance.configuration.searchd.client_key =
-  config.client_key
+  ThinkingSphinx::Configuration.instance.address = config.host
+  ThinkingSphinx::Configuration.instance.port    = config.port
+  ThinkingSphinx::Configuration.instance.configuration.searchd.client_key =
+    config.client_key
 
-if ENV['DATABASE_URL'][/^mysql/].nil?
-  ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
+  if ENV['DATABASE_URL'][/^mysql/].nil?
+    ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
+  end
 end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.8.4'
+  Version = '0.8.5'
 end

data/spec/specs/delayed_delta_spec.rb

@@ -5,21 +5,21 @@ describe FlyingSphinx::DelayedDelta do
     before :each do
       Delayed::Job.stub!(:count => 0)
     end
-    
+
     it "should enqueue if there's no existing jobs for the same index" do
       Delayed::Job.should_receive(:enqueue)
-      
+
       FlyingSphinx::DelayedDelta.enqueue(stub('object'))
     end
-    
+
     it "should not enqueue the job if there's an existing job already" do
       Delayed::Job.stub!(:count => 1)
       Delayed::Job.should_not_receive(:enqueue)
-      
+
       FlyingSphinx::DelayedDelta.enqueue(stub('object'))
     end
   end
-  
+
   describe '#index' do
     let(:config)        { ThinkingSphinx::Configuration.instance }
     let(:delayed_delta) { FlyingSphinx::DelayedDelta.new stub('instance'), {} }
@@ -30,116 +30,117 @@ describe FlyingSphinx::DelayedDelta do
         :delta_index_names => ['foo_delta']
     }
     let(:instance) { stub('instance', :sphinx_document_id => 42) }
-    
+
     before :each do
       ThinkingSphinx.updates_enabled = true
       ThinkingSphinx.deltas_enabled  = true
-      
+
       config.delayed_job_priority = 2
-      
+
       FlyingSphinx::DelayedDelta.stub!(:enqueue => true)
       Delayed::Job.stub!(:enqueue => true, :inspect => 'Delayed::Job')
-      
+
       delayed_delta.stub!(:toggled => true)
     end
-    
+
     context 'updates disabled' do
       before :each do
         ThinkingSphinx.updates_enabled = false
       end
-      
+
       it "should not enqueue a delta job" do
         FlyingSphinx::DelayedDelta.should_not_receive(:enqueue)
-        
+
         delayed_delta.index model
       end
-      
+
       it "should not enqueue a flag as deleted job" do
         Delayed::Job.should_not_receive(:enqueue)
-        
+
         delayed_delta.index model
       end
     end
-    
+
     context 'deltas disabled' do
       before :each do
         ThinkingSphinx.deltas_enabled = false
       end
-      
+
       it "should not enqueue a delta job" do
         FlyingSphinx::DelayedDelta.should_not_receive(:enqueue)
-        
+
         delayed_delta.index model
       end
-      
+
       it "should not enqueue a flag as deleted job" do
         Delayed::Job.should_not_receive(:enqueue)
-        
+
         delayed_delta.index model
       end
     end
-    
+
     context "instance isn't toggled" do
       before :each do
         delayed_delta.stub!(:toggled => false)
       end
-      
+
       it "should not enqueue a delta job" do
         FlyingSphinx::DelayedDelta.should_not_receive(:enqueue)
-        
+
         delayed_delta.index model, instance
       end
-      
+
       it "should not enqueue a flag as deleted job" do
         Delayed::Job.should_not_receive(:enqueue)
-        
+
         delayed_delta.index model, instance
       end
     end
-    
+
     it "should enqueue a delta job for the appropriate indexes" do
       FlyingSphinx::DelayedDelta.should_receive(:enqueue) do |job, priority|
         job.indices.should == ['foo_delta']
+        job.async.should be_true
       end
-      
+
       delayed_delta.index model
     end
-    
+
     it "should use the defined priority for the delta job" do
       FlyingSphinx::DelayedDelta.should_receive(:enqueue) do |job, priority|
         priority.should == 2
       end
-      
+
       delayed_delta.index model
     end
-    
+
     it "should enqueue a flag-as-deleted job for the appropriate indexes" do
       Delayed::Job.should_receive(:enqueue) do |job, options|
         job.indices.should == ['foo_core']
       end
-      
+
       delayed_delta.index model, instance
     end
-    
+
     it "should enqueue a flag-as-deleted job for the appropriate id" do
       Delayed::Job.should_receive(:enqueue) do |job, options|
         job.document_id.should == 42
       end
-      
+
       delayed_delta.index model, instance
     end
-    
+
     it "should use the defined priority for the flag-as-deleted job" do
       Delayed::Job.should_receive(:enqueue) do |job, options|
         options[:priority].should == 2
       end
-      
+
       delayed_delta.index model, instance
     end
-    
+
     it "should not enqueue a flag-as-deleted job if no instance is provided" do
       Delayed::Job.should_not_receive(:enqueue)
-      
+
       delayed_delta.index model
     end
   end

data/spec/specs/index_request_spec.rb

@@ -86,6 +86,23 @@ describe FlyingSphinx::IndexRequest do
         }.should raise_error(RuntimeError, 'Your account does not support delta indexing. Upgrading plans is probably the best way around this.')
       end
     end
+
+    context 'asynchronous' do
+      let(:index_request) { FlyingSphinx::IndexRequest.new [], true }
+
+      it "makes a new request" do
+        api.should_receive(:post).
+          with('indices/unique', index_params).and_return(index_response)
+
+        index_request.index
+      end
+
+      it "does not check the status" do
+        api.should_not_receive(:get)
+
+        index_request.index
+      end
+    end
   end
 
   describe '#status_message' do

metadata

@@ -1,219 +1,216 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flying-sphinx
-version: !ruby/object:Gem::Version 
-  hash: 55
+version: !ruby/object:Gem::Version
+  version: 0.8.5
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 4
-  version: 0.8.4
 platform: ruby
-authors: 
+authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: thinking-sphinx
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: riddle
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: riddle
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.5.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: multi_json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 0
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.1
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: faraday_middleware
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 0
-        - 7
-        version: "0.7"
+      - !ruby/object:Gem::Version
+        version: '0.7'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rash
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: rash
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: '2.11'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rspec-fire
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
+        version: '2.11'
+- !ruby/object:Gem::Dependency
+  name: rspec-fire
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.8.2
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+      - !ruby/object:Gem::Version
+        version: 0.8.2
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: fakeweb-matcher
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 2
-        - 2
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: fakeweb-matcher
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 1.2.2
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: delayed_job
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 1
-        - 4
+      - !ruby/object:Gem::Version
+        version: 1.2.2
+- !ruby/object:Gem::Dependency
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
         version: 2.1.4
   type: :development
-  version_requirements: *id012
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.4
 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
@@ -251,42 +248,30 @@ files:
 - spec/specs/sphinx_configuration_spec.rb
 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
-
+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 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sphinx in the Cloud
-test_files: 
+test_files:
 - spec/light_spec_helper.rb
 - spec/spec_helper.rb
 - spec/specs/api_spec.rb
@@ -296,4 +281,3 @@ test_files:
 - spec/specs/index_request_spec.rb
 - spec/specs/setting_files_spec.rb
 - spec/specs/sphinx_configuration_spec.rb
-has_rdoc: