yoomee-mongosphinx 0.1.5 → 0.1.8

data/{mongosphinx.rb → lib/mongo_sphinx.rb}

@@ -11,17 +11,43 @@ require 'mongo_mapper'
 require 'riddle'
 
 module MongoSphinx
-  if (match = __FILE__.match(/mongosphinx-([0-9.-]*)/))
+  if (match = __FILE__.match(/.*mongo_sphinx-([0-9.-]*)/))
     VERSION = match[1]
   else
     VERSION = 'unknown'
   end
+  
+  # Check if Sphinx is running.
+  
+  def self.sphinx_running?
+    !!sphinx_pid && pid_active?(sphinx_pid)
+  end
+
+  # Get the Sphinx pid if the pid file exists.
+  
+  def self.sphinx_pid
+    if File.exists?(MongoSphinx::Configuration.instance.pid_file)
+      File.read(MongoSphinx::Configuration.instance.pid_file)[/\d+/]
+    else
+      nil
+    end
+  end
+  
+  def self.pid_active?(pid)
+    !!Process.kill(0, pid.to_i)
+  rescue Errno::EPERM => e
+    true
+  rescue Exception => e
+    false
+  end
+  
 end
 
-require 'lib/multi_attribute'
-require 'lib/indexer'
-require 'lib/mixins/indexer'
-require 'lib/mixins/properties'
+require 'mongo_sphinx/multi_attribute'
+require 'mongo_sphinx/configuration'
+require 'mongo_sphinx/indexer'
+require 'mongo_sphinx/mixins/indexer'
+require 'mongo_sphinx/mixins/properties'
 
 
 # Include the Indexer mixin from the original Document class of

data/lib/mongo_sphinx/configuration.rb

@@ -0,0 +1,197 @@
+require 'erb'
+require 'singleton'
+
+module MongoSphinx
+  # This class both keeps track of the configuration settings for Sphinx and
+  # also generates the resulting file for Sphinx to use.
+  # 
+  # Here are the default settings, relative to RAILS_ROOT where relevant:
+  #
+  # config file::           config/#{environment}.sphinx.conf
+  # searchd log file::      log/searchd.log
+  # query log file::        log/searchd.query.log
+  # pid file::              log/searchd.#{environment}.pid
+  # searchd files::         db/sphinx/#{environment}/
+  # address::               127.0.0.1
+  # port::                  9312
+  # allow star::            false
+  # min prefix length::     1
+  # min infix length::      1
+  # mem limit::             64M
+  # max matches::           1000
+  # morphology::            nil
+  # charset type::          utf-8
+  # charset table::         nil
+  # ignore chars::          nil
+  # html strip::            false
+  # html remove elements::  ''
+  # searchd_binary_name::   searchd
+  # indexer_binary_name::   indexer
+  #
+  # If you want to change these settings, create a YAML file at
+  # config/sphinx.yml with settings for each environment, in a similar
+  # fashion to database.yml - using the following keys: config_file,
+  # searchd_log_file, query_log_file, pid_file, searchd_file_path, port,
+  # allow_star, enable_star, min_prefix_len, min_infix_len, mem_limit,
+  # max_matches, morphology, charset_type, charset_table, ignore_chars,
+  # html_strip, html_remove_elements, delayed_job_priority,
+  # searchd_binary_name, indexer_binary_name.
+  #
+  # I think you've got the idea.
+  # 
+  # Each setting in the YAML file is optional - so only put in the ones you
+  # want to change.
+  #
+  # Keep in mind, if for some particular reason you're using a version of
+  # Sphinx older than 0.9.8 r871 (that's prior to the proper 0.9.8 release),
+  # don't set allow_star to true.
+  # 
+  class Configuration
+    include Singleton
+
+    attr_accessor :searchd_file_path, :allow_star,:app_root, :delayed_job_priority
+    attr_accessor :version
+    
+    attr_accessor :source_options, :index_options
+    
+    attr_reader :environment, :configuration, :controller
+
+    def initialize(app_root = Dir.pwd)
+      self.reset
+    end
+
+    def self.configure(&block)
+      yield instance
+      instance.reset(instance.app_root)
+    end
+
+    def reset(custom_app_root=nil)
+      if custom_app_root
+        self.app_root = custom_app_root
+      else
+        self.app_root          = RAILS_ROOT if defined?(RAILS_ROOT)
+        self.app_root          = Merb.root  if defined?(Merb)
+        self.app_root        ||= app_root
+      end
+
+      @configuration = Riddle::Configuration.new
+      @configuration.searchd.pid_file   = "#{self.app_root}/log/mongo_sphinx.searchd.#{environment}.pid"
+      @configuration.searchd.log        = "#{self.app_root}/log/mongo_sphinx.searchd.log"
+      @configuration.searchd.query_log  = "#{self.app_root}/log/mongo_sphinx.query.log"
+
+      @controller = Riddle::Controller.new @configuration,
+      "#{self.app_root}/config/#{environment}.mongo_sphinx.conf"
+
+      self.address              = "127.0.0.1"
+      self.port                 = 9312
+      self.searchd_file_path    = "#{self.app_root}/db/mongo_sphinx/#{environment}"
+      self.allow_star           = false
+      self.delayed_job_priority = 0
+      self.source_options  = {}
+      self.index_options   = {
+        :charset_type => "utf-8"
+      }
+
+      self.version = nil
+      self.version ||= @controller.sphinx_version
+
+      self
+    end
+
+    def self.environment
+      Thread.current[:mongo_sphinx_environment] ||= begin
+        if defined?(Merb)
+          Merb.environment
+        elsif defined?(RAILS_ENV)
+          RAILS_ENV
+        else
+          ENV['RAILS_ENV'] || 'development'
+        end
+      end
+    end
+
+    def environment
+      self.class.environment
+    end
+
+    def address
+      @address
+    end
+
+    def address=(address)
+      @address = address
+      @configuration.searchd.address = address
+    end
+
+    def port
+      @port
+    end
+
+    def port=(port)
+      @port = port
+      @configuration.searchd.port = port
+    end
+
+    def pid_file
+      @configuration.searchd.pid_file
+    end
+
+    def pid_file=(pid_file)
+      @configuration.searchd.pid_file = pid_file
+    end
+
+    def searchd_log_file
+      @configuration.searchd.log
+    end
+
+    def searchd_log_file=(file)
+      @configuration.searchd.log = file
+    end
+
+    def query_log_file
+      @configuration.searchd.query_log
+    end
+
+    def query_log_file=(file)
+      @configuration.searchd.query_log = file
+    end
+
+    def config_file
+      @controller.path
+    end
+
+    def config_file=(file)
+      @controller.path = file
+    end
+
+    def bin_path
+      @controller.bin_path
+    end
+
+    def bin_path=(path)
+      @controller.bin_path = path
+    end
+
+    def searchd_binary_name
+      @controller.searchd_binary_name
+    end
+
+    def searchd_binary_name=(name)
+      @controller.searchd_binary_name = name
+    end
+
+    def indexer_binary_name
+      @controller.indexer_binary_name
+    end
+
+    def indexer_binary_name=(name)
+      @controller.indexer_binary_name = name
+    end
+
+    def client
+      client = Riddle::Client.new address, port
+      client.max_matches = configuration.searchd.max_matches || 1000
+      client
+    end
+  end
+end

data/lib/{mixins → mongo_sphinx/mixins}/indexer.rb

@@ -107,6 +107,9 @@ module MongoMapper # :nodoc:
           attr_accessor :skip_delta_index
           alias_method :skip_delta_index?, :skip_delta_index
           
+          attr_accessor :skip_set_delta
+          alias_method :skip_set_delta?, :skip_set_delta
+          
           self.has_delta_index = opts[:delta] || false
 
           self.fulltext_keys = keys
@@ -130,7 +133,7 @@ module MongoMapper # :nodoc:
               self.class::reindex_delta unless self.skip_delta_index?
             end
             define_method(:set_delta) do
-              self.delta = true
+              self.delta = true unless self.skip_set_delta?
             end
           end
 
@@ -140,7 +143,7 @@ module MongoMapper # :nodoc:
             end
             define_method :reindex_core do
               Rails.logger.info("reindexing #{self.to_s.underscore}_core")
-              Process.fork {`rake mongosphinx:rebuild index=#{self.to_s.underscore}_core`}
+              Process.fork {`rake mongo_sphinx:rebuild index=#{self.to_s.underscore}_core`}
             end
             if opts[:delta]
               define_method :xml_for_sphinx_delta do
@@ -148,7 +151,7 @@ module MongoMapper # :nodoc:
               end
               define_method :reindex_delta do
                 Rails.logger.info("reindexing #{self.to_s.underscore}_delta")
-                Process.fork {`rake mongosphinx:rebuild index=#{self.to_s.underscore}_delta`}
+                Process.fork {`rake mongo_sphinx:rebuild index=#{self.to_s.underscore}_delta`}
               end
             end
           end
@@ -209,6 +212,7 @@ module MongoMapper # :nodoc:
             index_names += "#{class_name.underscore}_core "
             index_names += "#{class_name.underscore}_delta " if class_name.camelize.constantize.has_delta_index
           end
+          debugger
           index_names = "*" if index_names.blank?
           result = client.query(query, index_names)
 

data/lib/mongo_sphinx/tasks.rb

@@ -0,0 +1,126 @@
+require 'fileutils'
+
+namespace :mongo_sphinx do
+  task :app_env do
+    if defined?(RAILS_ROOT)
+      Rake::Task[:environment].invoke
+      
+      if defined?(Rails.configuration)
+        Rails.configuration.cache_classes = false
+      else
+        Rails::Initializer.run { |config| config.cache_classes = false }
+      end
+    end
+    
+    Rake::Task[:merb_env].invoke    if defined?(Merb)
+  end
+  
+  desc "Output the current Mongo Sphinx version"
+  task :version => :app_env do
+    puts "Mongo Sphinx v" + MongoSphinx.version
+  end
+  
+  desc "Stop if running, then start a Sphinx searchd daemon using Mongo Sphinx's settings"
+  task :running_start => :app_env do
+    Rake::Task["mongo_sphinx:stop"].invoke if sphinx_running?
+    Rake::Task["mongo_sphinx:start"].invoke
+  end
+  
+  desc "Start a Sphinx searchd daemon using Mongo Sphinx's settings"
+  task :start => :app_env do
+    config = MongoSphinx::Configuration.instance
+    
+    FileUtils.mkdir_p config.searchd_file_path
+    raise RuntimeError, "searchd is already running." if sphinx_running?
+    
+    Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
+    
+    config.controller.start
+    
+    if sphinx_running?
+      puts "Started successfully (pid #{sphinx_pid})."
+    else
+      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
+    end
+  end
+  
+  desc "Stop Sphinx using Mongo Sphinx's settings"
+  task :stop => :app_env do
+    unless sphinx_running?
+      puts "searchd is not running"
+    else
+      config = MongoSphinx::Configuration.instance
+      pid    = sphinx_pid
+      config.controller.stop
+      puts "Stopped search daemon (pid #{pid})."
+    end
+  end
+  
+  desc "Restart Sphinx"
+  task :restart => [:app_env, :stop, :start]
+  
+  desc "Generate the Sphinx configuration file using Mongo Sphinx's settings"
+  task :configure => :app_env do
+    config = MongoSphinx::Configuration.instance
+    puts "Generating Configuration to #{config.config_file}"
+    config.build
+  end
+  
+  desc "Index data for Sphinx using Mongo Sphinx's settings"
+  task :index => :app_env do
+    config = MongoSphinx::Configuration.instance
+    # unless ENV["INDEX_ONLY"] == "true"
+    #   puts "Generating Configuration to #{config.config_file}"
+    #   config.build
+    # end
+    
+    FileUtils.mkdir_p config.searchd_file_path
+    config.controller.index :verbose => true
+  end
+  
+  desc "Reindex Sphinx without regenerating the configuration file"
+  task :reindex => :app_env do
+    config = MongoSphinx::Configuration.instance
+    FileUtils.mkdir_p config.searchd_file_path
+    puts config.controller.index
+  end
+  
+  desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
+  task :rebuild => :app_env do
+    Rake::Task["mongo_sphinx:stop"].invoke if sphinx_running?
+    Rake::Task["mongo_sphinx:index"].invoke
+    Rake::Task["mongo_sphinx:start"].invoke
+  end
+end
+
+namespace :ms do
+  desc "Output the current Mongo Sphinx version"
+  task :version => "mongo_sphinx:version"
+  desc "Stop if running, then start a Sphinx searchd daemon using Mongo Sphinx's settings"
+  task :run     => "mongo_sphinx:running_start"
+  desc "Start a Sphinx searchd daemon using Mongo Sphinx's settings"
+  task :start   => "mongo_sphinx:start"
+  desc "Stop Sphinx using Mongo Sphinx's settings"
+  task :stop    => "mongo_sphinx:stop"
+  desc "Index data for Sphinx using Mongo Sphinx's settings"
+  task :in      => "mongo_sphinx:index"
+  task :index   => "mongo_sphinx:index"
+  desc "Reindex Sphinx without regenerating the configuration file"
+  task :reindex => "mongo_sphinx:reindex"
+  desc "Restart Sphinx"
+  task :restart => "mongo_sphinx:restart"
+  desc "Generate the Sphinx configuration file using Mongo Sphinx's settings"
+  task :conf    => "mongo_sphinx:configure"
+  desc "Generate the Sphinx configuration file using Mongo Sphinx's settings"
+  task :config  => "mongo_sphinx:configure"
+  desc "Stop Sphinx (if it's running), rebuild the indexes, and start Sphinx"
+  task :rebuild => "mongo_sphinx:rebuild"
+end
+
+def sphinx_pid
+  MongoSphinx.sphinx_pid
+end
+
+def sphinx_running?
+  MongoSphinx.sphinx_running?
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yoomee-mongosphinx
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Matt Atkins
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-20 00:00:00 +01:00
+date: 2010-08-24 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -29,11 +29,16 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - README.rdoc
-- mongosphinx.rb
-- lib/multi_attribute.rb
-- lib/mixins/properties.rb
-- lib/mixins/indexer.rb
-- lib/indexer.rb
+- lib/mongo_sphinx.rb
+- lib/mongo_sphinx/tasks.rb
+- lib/mongo_sphinx/multi_attribute.rb
+- lib/mongo_sphinx/mixins/properties.rb
+- lib/mongo_sphinx/mixins/indexer.rb
+- lib/mongo_sphinx/mixins/.DS_Store
+- lib/mongo_sphinx/indexer.rb
+- lib/mongo_sphinx/configuration.rb
+- lib/mongo_sphinx/.DS_Store
+- lib/.DS_Store
 has_rdoc: true
 homepage: http://github.com/yoomee/mongosphinx
 licenses: []