flying-sphinx 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/flying_sphinx.rb

@@ -4,10 +4,11 @@ end
 
 require 'httparty'
 require 'net/ssh'
+require 'riddle/0.9.9'
 
 require 'flying_sphinx/api'
 require 'flying_sphinx/configuration'
 require 'flying_sphinx/index_request'
 require 'flying_sphinx/tunnel'
 
-require 'flying_sphinx/railtie' if defined?(Rails)
+require 'flying_sphinx/railtie' if defined?(Rails) && defined?(Rails::Railtie)

data/lib/flying_sphinx/configuration.rb

@@ -1,17 +1,37 @@
 class FlyingSphinx::Configuration
   attr_reader :heroku_id, :api_key, :host, :port, :database_port
   
-  def initialize(heroku_id, api_key)
-    @heroku_id = heroku_id
-    @api_key   = api_key
+  def initialize(heroku_id = nil, api_key = nil)
+    @heroku_id = heroku_id || heroku_id_from_env
+    @api_key   = api_key   || api_key_from_env
     
     set_from_server
+    setup_environment_settings
   end
   
   def api
     @api ||= FlyingSphinx::API.new(heroku_id, api_key)
   end
   
+  def app_name
+    @app_name = heroku_id.split('@').first
+  end
+  
+  def sphinx_configuration
+    thinking_sphinx.generate
+    set_database_settings
+    
+    riddle.render
+  end
+  
+  def start_sphinx
+    api.post('/app/start')
+  end
+  
+  def stop_sphinx
+    api.post('/app/stop')
+  end
+  
   private
   
   def set_from_server
@@ -21,4 +41,59 @@ class FlyingSphinx::Configuration
     @port          = json['port']
     @database_port = json['database_port']
   end
+  
+  def base_path
+    "/mnt/sphinx/flying-sphinx/#{app_name}"
+  end
+  
+  def log_path
+    "#{base_path}/log"
+  end
+  
+  def thinking_sphinx
+    ThinkingSphinx::Configuration.instance
+  end
+  
+  def riddle
+    thinking_sphinx.configuration
+  end
+  
+  def setup_environment_settings
+    ThinkingSphinx.remote_sphinx = true
+    
+    set_searchd_settings
+    set_path_settings
+  end
+  
+  def set_path_settings
+    thinking_sphinx.searchd_file_path = "#{base_path}/indexes"
+    
+    riddle.searchd.pid_file  = "#{base_path}/searchd.pid"
+    riddle.searchd.log       = "#{log_path}/searchd.log"
+    riddle.searchd.query_log = "#{log_path}/searchd.query.log"
+  end
+  
+  def set_searchd_settings
+    thinking_sphinx_configuration.port    = port
+    thinking_sphinx_configuration.address = host
+  end
+  
+  def set_database_settings
+    riddle.indexes.each do |index|
+      next unless index.respond_to?(:sources)
+      
+      index.sources.each do |source|
+        source.sql_host = '127.0.0.1'
+        source.sql_port = configuration.database_port
+      end
+    end
+  end
+  
+  def heroku_id_from_env
+    ENV['APP_NAME'] + '@heroku.com'
+  end
+  
+  def api_key_from_env
+    ENV['FLYING_SPHINX_API_KEY']
+  end
 end

data/lib/flying_sphinx/index_request.rb

@@ -16,41 +16,7 @@ class FlyingSphinx::IndexRequest
   private
   
   def update_sphinx_configuration
-    api.put '/app', :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
-    
-    app_name = configuration.heroku_id.split('@').first
-    base_path = "/mnt/sphinx/flying-sphinx/#{app_name}"
-    ts_config.searchd_file_path = "#{base_path}/indexes"
-    riddle_config.searchd.pid_file = "#{base_path}/searchd.pid"
-    riddle_config.searchd.log = "#{base_path}/log/searchd.log"
-    riddle_config.searchd.query_log = "#{base_path}/log/searchd.query.log"
-    
-    riddle_config.indexes.clear
-    
-    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|
-      next unless index.respond_to?(:sources)
-      
-      index.sources.each do |source|
-        source.sql_host = '127.0.0.1'
-        source.sql_port = configuration.database_port
-      end
-    end
-    
-    riddle_config.render
+    api.put '/app', :configuration => configuration.sphinx_configuration
   end
   
   def begin_request

data/lib/flying_sphinx/tasks.rb

@@ -1,9 +1,16 @@
 namespace :fs do
-  task :index => :environment
+  task :index => :environment do
+    FlyingSphinx::IndexRequest.new FlyingSphinx::Configuration.new
+  end
   
-  task :start => :environment
+  task :start => :environment do
+    FlyingSphinx::Configuration.new.start_sphinx
+  end
   
-  task :stop  => :environment
+  task :stop  => :environment do
+    FlyingSphinx::Configuration.new.stop_sphinx
+  end
   
   task :restart => [:environment, :stop, :start]
+  task :rebuild => [:environment, :stop, :index, :start]
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flying-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-12 00:00:00 +11:00
+date: 2010-12-16 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency