flying-sphinx 0.6.1 → 0.6.2

data/HISTORY

@@ -1,3 +1,6 @@
+0.6.2 - 2nd January 2012
+* Pass Sphinx version through to Flying Sphinx servers.
+
 0.6.1 - 4th November 2011
 * Adding Riddle dependency requirement.
 * Updating indexes (index plural) references to indices.

data/lib/flying_sphinx/index_request.rb

@@ -33,10 +33,10 @@ class FlyingSphinx::IndexRequest
     update_sphinx_reference_files
     index
   end
-  
+
   def status_message
     raise "Index Request failed to start. Something's not right!" if @index_id.nil?
-    
+
     status = request_status
     case status
     when 'FINISHED'
@@ -67,9 +67,11 @@ class FlyingSphinx::IndexRequest
   end
 
   def update_sphinx_configuration
-    api.put('/', :configuration => configuration.sphinx_configuration)
+    api.put '/',
+      :configuration  => configuration.sphinx_configuration,
+      :sphinx_version => ThinkingSphinx::Configuration.instance.version
   end
-  
+
   def update_sphinx_reference_files
     FlyingSphinx::Configuration::FileSettings.each do |setting|
       configuration.file_setting_pairs(setting).each do |local, remote|
@@ -94,22 +96,22 @@ class FlyingSphinx::IndexRequest
   rescue RuntimeError => err
     puts err.message
   end
-  
+
   def tunnelled_index
     FlyingSphinx::Tunnel.connect(configuration) do
       begin_request unless request_begun?
-    
+
       true
     end
   end
-  
+
   def direct_index
     begin_request
     while !request_complete?
       sleep 1
     end
   end
-  
+
   def begin_request
     response = api.post 'indices', :indices => indices.join(',')
 
@@ -118,11 +120,11 @@ class FlyingSphinx::IndexRequest
 
     raise RuntimeError, 'Your account does not support delta indexing. Upgrading plans is probably the best way around this.' if response.body.status == 'BLOCKED'
   end
-  
+
   def request_begun?
     @request_begun
   end
-  
+
   def request_complete?
     case request_status
     when 'FINISHED', 'FAILED'
@@ -133,7 +135,7 @@ class FlyingSphinx::IndexRequest
       raise "Unknown index response: '#{response.body}'"
     end
   end
-  
+
   def request_status
     api.get("indices/#{index_id}").body.status
   end
@@ -150,7 +152,7 @@ class FlyingSphinx::IndexRequest
   def api
     configuration.api
   end
-  
+
   def log?
     ENV['VERBOSE_LOGGING'] && ENV['VERBOSE_LOGGING'].length > 0
   end

data/lib/flying_sphinx/version.rb

@@ -1,3 +1,3 @@
 module FlyingSphinx
-  Version = '0.6.1'
+  Version = '0.6.2'
 end

data/spec/specs/index_request_spec.rb

@@ -6,60 +6,66 @@ describe FlyingSphinx::IndexRequest do
     stub(:configuration, :api => api, :sphinx_configuration => 'foo {}',
       :file_setting_pairs => {})
   }
-  
+
   let(:index_response)    {
     stub(:response, :body => stub(:body, :id => 42, :status => 'OK'))
   }
   let(:blocked_response)  {
     stub(:response, :body => stub(:body, :id => nil, :status => 'BLOCKED'))
   }
-    
+
   before :each do
     ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
-    
+
     FlyingSphinx::Configuration.stub!(:new => configuration)
     FlyingSphinx::Tunnel.stub(:connect) { |config, block| block.call }
   end
-  
+
   describe '.cancel_jobs' do
     before :each do
       Delayed::Job.stub!(:delete_all => true)
     end
-    
+
     it "should not delete any rows if the delayed_jobs table does not exist" do
       Delayed::Job.stub!(:table_exists? => false)
       Delayed::Job.should_not_receive(:delete_all)
-      
+
       FlyingSphinx::IndexRequest.cancel_jobs
     end
-    
+
     it "should delete rows if the delayed_jobs table does exist" do
       Delayed::Job.stub!(:table_exists? => true)
       Delayed::Job.should_receive(:delete_all)
-      
+
       FlyingSphinx::IndexRequest.cancel_jobs
     end
-    
+
     it "should delete only Thinking Sphinx jobs" do
       Delayed::Job.stub!(:table_exists? => true)
       Delayed::Job.should_receive(:delete_all) do |sql|
         sql.should match(/handler LIKE '--- !ruby\/object:FlyingSphinx::\%'/)
       end
-      
+
       FlyingSphinx::IndexRequest.cancel_jobs
     end
   end
-  
+
   describe '#update_and_index' do
     let(:index_request) { FlyingSphinx::IndexRequest.new }
-    let(:conf_params)   { { :configuration => 'foo {}' } }
+    let(:conf_params)   { { :configuration => 'foo {}',
+      :sphinx_version => '2.1.0-dev' } }
     let(:index_params)  { { :indices => '' } }
-        
+    let(:ts_config)     { double('config', :version => '2.1.0-dev') }
+
+    before :each do
+      ThinkingSphinx::Configuration.stub :instance => ts_config
+    end
+
     it "makes a new request" do
       api.should_receive(:put).with('/', conf_params).and_return('ok')
       api.should_receive(:post).
         with('indices', index_params).and_return(index_response)
-      
+
       begin
         Timeout::timeout(0.2) {
           index_request.update_and_index
@@ -67,7 +73,7 @@ describe FlyingSphinx::IndexRequest do
       rescue Timeout::Error
       end
     end
-    
+
     [
       :stopwords, :wordforms, :exceptions, :mysql_ssl_cert, :mysql_ssl_key,
       :mysql_ssl_ca
@@ -76,22 +82,22 @@ describe FlyingSphinx::IndexRequest do
         let(:file_params) {
           {:setting => setting.to_s, :file_name => 'bar.txt', :content => 'baz'}
         }
-        
+
         before :each do
           configuration.stub!(:file_setting_pairs => {})
           index_request.stub!(:open => double('file', :read => 'baz'))
         end
-        
+
         it "sends the #{setting} file" do
           api.should_receive(:put).with('/', conf_params).and_return('ok')
           api.should_receive(:post).with('/add_file', file_params).
             and_return('ok')
           api.should_receive(:post).
             with('indices', index_params).and_return(index_response)
-          
+
           configuration.should_receive(:file_setting_pairs).
             with(setting).and_return({'foo.txt' => 'bar.txt'})
-          
+
           begin
             Timeout::timeout(0.2) {
               index_request.update_and_index
@@ -101,7 +107,7 @@ describe FlyingSphinx::IndexRequest do
         end
       end
     end
-    
+
     context 'delta request without delta support' do
       it "should explain why the request failed" do
         api.should_receive(:put).
@@ -114,38 +120,38 @@ describe FlyingSphinx::IndexRequest do
         index_request.update_and_index
       end
     end
-    
+
     context 'request for a MySQL database' do
       before :each do
         ThinkingSphinx.database_adapter = nil
       end
-      
+
       after :each do
         ThinkingSphinx.database_adapter = FlyingSphinx::HerokuSharedAdapter
       end
-      
+
       it "should not establish an SSH connection" do
         FlyingSphinx::Tunnel.should_not_receive(:connect)
-        
+
         api.should_receive(:put).with('/', conf_params).and_return('ok')
         api.should_receive(:post).
           with('indices', index_params).and_return(index_response)
         api.should_receive(:get).with('indices/42').
           and_return(stub(:response, :body => stub(:body, :status => 'FINISHED')))
-        
+
         index_request.update_and_index
       end
     end
   end
-  
+
   describe '#perform' do
     let(:index_request) { FlyingSphinx::IndexRequest.new ['foo_delta'] }
     let(:index_params)  { { :indices => 'foo_delta' } }
-    
+
     it "makes a new request" do
       api.should_receive(:post).
         with('indices', index_params).and_return(index_response)
-      
+
       begin
         Timeout::timeout(0.2) {
           index_request.perform
@@ -154,7 +160,7 @@ describe FlyingSphinx::IndexRequest do
       end
     end
   end
-  
+
   describe '#status_message' do
     let(:index_request)     { FlyingSphinx::IndexRequest.new }
     let(:finished_response) {
@@ -169,51 +175,51 @@ describe FlyingSphinx::IndexRequest do
     let(:unknown_response)  {
       stub(:response, :body => stub(:body, :status => 'UNKNOWN'))
     }
-    
+
     before :each do
       api.stub(:post => index_response)
-      
+
       index_request.instance_variable_set :@index_id, 42
     end
-    
+
     it "returns with a positive message on success" do
       api.stub(:get => finished_response)
-      
+
       index_request.status_message.should == 'Index Request has completed.'
     end
-    
+
     it "returns with a failure message on failure" do
       api.stub(:get => failure_response)
-      
+
       index_request.status_message.should == 'Index Request failed.'
     end
-    
+
     it "warns the user if the request is still pending" do
       api.stub(:get => pending_response)
-      
+
       index_request.status_message.should == 'Index Request is still pending - something has gone wrong.'
     end
-    
+
     it "treats all other statuses as unknown" do
       api.stub(:get => unknown_response)
-      
+
       index_request.status_message.should == "Unknown index response: 'UNKNOWN'."
     end
-    
+
     it "raises a warning if the index id isn't set" do
       index_request.instance_variable_set :@index_id, nil
-      
+
       lambda {
         index_request.status_message
       }.should raise_error
     end
   end
-  
+
   describe "#display_name" do
     let(:index_request) {
       FlyingSphinx::IndexRequest.new ['foo_core', 'bar_core']
     }
-    
+
     it "should display class name with all indexes" do
       index_request.display_name.should == "FlyingSphinx::IndexRequest for foo_core, bar_core"
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,12 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 +02:00
+date: 2012-01-02 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thinking-sphinx
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,11 +31,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  prerelease: false
-  requirement: *id001
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: riddle
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -46,11 +47,11 @@ dependencies:
         - 0
         version: 1.5.0
   type: :runtime
-  prerelease: false
-  requirement: *id002
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: net-ssh
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,11 +63,11 @@ dependencies:
         - 23
         version: 2.0.23
   type: :runtime
-  prerelease: false
-  requirement: *id003
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: multi_json
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -78,11 +79,11 @@ dependencies:
         - 1
         version: 1.0.1
   type: :runtime
-  prerelease: false
-  requirement: *id004
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: faraday_middleware
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,11 +95,11 @@ dependencies:
         - 0
         version: 0.7.0
   type: :runtime
-  prerelease: false
-  requirement: *id005
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rash
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -110,11 +111,11 @@ dependencies:
         - 0
         version: 0.3.0
   type: :runtime
-  prerelease: false
-  requirement: *id006
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -126,11 +127,11 @@ dependencies:
         - 7
         version: 0.8.7
   type: :development
-  prerelease: false
-  requirement: *id007
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -142,11 +143,11 @@ dependencies:
         - 2
         version: 0.8.2
   type: :development
-  prerelease: false
-  requirement: *id008
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -158,11 +159,11 @@ dependencies:
         - 0
         version: 2.5.0
   type: :development
-  prerelease: false
-  requirement: *id009
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: rcov
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -174,11 +175,11 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  prerelease: false
-  requirement: *id010
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: fakeweb
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -190,11 +191,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  prerelease: false
-  requirement: *id011
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: fakeweb-matcher
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -206,11 +207,11 @@ dependencies:
         - 2
         version: 1.2.2
   type: :development
-  prerelease: false
-  requirement: *id012
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: delayed_job
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -222,8 +223,7 @@ dependencies:
         - 4
         version: 2.1.4
   type: :development
-  prerelease: false
-  requirement: *id013
+  version_requirements: *id013
 description: Hooks Thinking Sphinx into the Flying Sphinx service
 email: pat@freelancing-gods.com
 executables: []