flying-sphinx 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/flying_sphinx/index_request.rb

@@ -4,19 +4,51 @@ class FlyingSphinx::IndexRequest
   def initialize(configuration)
     @configuration = configuration
     
+    update_sphinx_configuration
+    
     FlyingSphinx::Tunnel.connect(configuration) do
-      begin_request
+      begin_request unless request_begun?
       
-      while !request_complete?
-        sleep(0.25)
-      end
+      !request_complete?
     end
   end
   
   private
   
+  def update_sphinx_configuration
+    api.put '/app/update', :configuration => sphinx_configuration
+  end
+  
+  def sphinx_configuration
+    ts_config = ThinkingSphinx::Configuration.instance
+    ts_config.port    = configuration.port
+    ts_config.address = configuration.host
+    
+    riddle_config = ts_config.configuration
+    
+    ThinkingSphinx.context.indexed_models.each do |model|
+      model = model.constantize
+      model.define_indexes
+      riddle_config.indexes.concat model.to_riddle
+    end
+    
+    riddle_config.indexes.each do |index|
+      index.sources.each do |source|
+        source.sql_host = '127.0.0.1'
+        source.sql_port = configuration.database_port
+      end
+    end
+    
+    riddle_config.render
+  end
+  
   def begin_request
-    @index_id = api.post('/app/indices')
+    @index_id      = api.post('/app/indices')
+    @request_begun = true
+  end
+  
+  def request_begun?
+    @request_begun
   end
   
   def request_complete?

data/lib/flying_sphinx/tunnel.rb

@@ -1,32 +1,25 @@
 class FlyingSphinx::Tunnel
-  def self.connect(configuration)
+  def self.connect(configuration, &block)
     tunnel = new configuration
-    tunnel.open
-    tunnel.forward
-    
-    yield
-    
-    tunnel.close
+    tunnel.open do |session|
+      session.loop &block
+    end
   end
   
   def initialize(configuration)
     @configuration = configuration
   end
   
-  def open
-    @session = Net::SSH.start(@configuration.host, 'sphinx', ssh_options)
-  end
-  
-  def forward
-    @session.forward.remote(
-      db_port, db_host, @configuration.database_port, '0.0.0.0'
-    )
+  def open(&block)
+    Net::SSH.start(@configuration.host, 'sphinx', ssh_options) do |session|
+      session.forward.remote(
+        db_port, db_host, @configuration.database_port, '0.0.0.0'
+      )
+      
+      yield session
+    end
   end
-  
-  def close
-    @session.close
-  end
-  
+    
   private
   
   def db_host

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Pat Allan