riddle 1.4.0 → 1.5.0

data/lib/riddle/configuration.rb

@@ -14,20 +14,20 @@ module Riddle
   class Configuration
     class ConfigurationError < StandardError #:nodoc:
     end
-    
-    attr_reader :indexes, :searchd
+
+    attr_reader :indices, :searchd
     attr_accessor :indexer
-    
+
     def initialize
       @indexer = Riddle::Configuration::Indexer.new
       @searchd = Riddle::Configuration::Searchd.new
-      @indexes = []
+      @indices = []
     end
-    
+
     def render
       (
         [@indexer.render, @searchd.render] +
-        @indexes.collect { |index| index.render }
+        @indices.collect { |index| index.render }
       ).join("\n")
     end
   end

data/lib/riddle/configuration/distributed_index.rb

@@ -2,51 +2,51 @@ module Riddle
   class Configuration
     class DistributedIndex < Riddle::Configuration::Section
       def self.settings
-        [ 
+        [
           :type, :local, :agent, :agent_blackhole,
           :agent_connect_timeout, :agent_query_timeout
         ]
       end
-      
-      attr_accessor :name, :local_indexes, :remote_indexes, :agent_blackhole,
+
+      attr_accessor :name, :local_indices, :remote_indices, :agent_blackhole,
         :agent_connect_timeout, :agent_query_timeout
-      
+
       def initialize(name)
         @name             = name
-        @local_indexes    = []
-        @remote_indexes   = []
+        @local_indices    = []
+        @remote_indices   = []
         @agent_blackhole  = []
       end
-      
+
       def type
         "distributed"
       end
-      
+
       def local
-        self.local_indexes
+        self.local_indices
       end
-      
+
       def agent
-        agents = remote_indexes.collect { |index| index.remote }.uniq
+        agents = remote_indices.collect { |index| index.remote }.uniq
         agents.collect { |agent|
-          agent + ":" + remote_indexes.select { |index|
+          agent + ":" + remote_indices.select { |index|
             index.remote == agent
           }.collect { |index| index.name }.join(",")
         }
       end
-            
+
       def render
         raise ConfigurationError unless valid?
-        
+
         (
           ["index #{name}", "{"] +
           settings_body +
           ["}", ""]
         ).join("\n")
       end
-      
+
       def valid?
-        @local_indexes.length > 0 || @remote_indexes.length > 0
+        @local_indices.length > 0 || @remote_indices.length > 0
       end
     end
   end

data/lib/riddle/configuration/sql_source.rb

@@ -13,16 +13,16 @@ module Riddle
           :sql_column_buffers, :sql_field_string, :sql_field_str2wordcount,
           :sql_query_post, :sql_query_post_index, :sql_ranged_throttle,
           :sql_query_info, :mssql_winauth, :mssql_unicode, :unpack_zlib,
-        :unpack_mysqlcompress, :unpack_mysqlcompress_maxsize
+          :unpack_mysqlcompress, :unpack_mysqlcompress_maxsize
         ]
       end
-      
+
       attr_accessor *self.settings
-      
+
       def initialize(name, type)
         @name = name
         @type = type
-        
+
         @sql_query_pre            = []
         @sql_joined_field         = []
         @sql_file_field           = []
@@ -42,7 +42,7 @@ module Riddle
         @unpack_zlib              = []
         @unpack_mysqlcompress     = []
       end
-      
+
       def valid?
         super && (!( @sql_host.nil? || @sql_user.nil? || @sql_db.nil? ||
           @sql_query.nil? ) || !@parent.nil?)

data/lib/riddle/controller.rb

@@ -1,58 +1,61 @@
 module Riddle
   class Controller
     attr_accessor :path, :bin_path, :searchd_binary_name, :indexer_binary_name
-    
+
     def initialize(configuration, path)
       @configuration  = configuration
       @path           = path
-      
+
       @bin_path            = ''
       @searchd_binary_name = 'searchd'
       @indexer_binary_name = 'indexer'
     end
-    
+
     def sphinx_version
       `#{indexer} 2>&1`[/Sphinx (\d+\.\d+(\.\d+|(?:-dev|(\-id64)?\-beta)))/, 1]
     rescue
       nil
     end
-    
-    def index(*indexes)
-      options = indexes.last.is_a?(Hash) ? indexes.pop : {}
-      indexes << '--all' if indexes.empty?
-      
-      cmd = "#{indexer} --config \"#{@path}\" #{indexes.join(' ')}"
+
+    def index(*indices)
+      options = indices.last.is_a?(Hash) ? indices.pop : {}
+      indices << '--all' if indices.empty?
+
+      cmd = "#{indexer} --config \"#{@path}\" #{indices.join(' ')}"
       cmd << " --rotate" if running?
       options[:verbose] ? system(cmd) : `#{cmd}`
     end
-    
-    def start
+
+    def start(options={})
       return if running?
       check_for_configuration_file
-      
+
       cmd = "#{searchd} --pidfile --config \"#{@path}\""
-      
-      if RUBY_PLATFORM =~ /mswin|mingw/
+      cmd << " --nodetach" if options[:nodetach]
+
+      if options[:nodetach]
+        exec(cmd)
+      elsif RUBY_PLATFORM =~ /mswin|mingw/
         system("start /B #{cmd} 1> NUL 2>&1")
       else
         `#{cmd}`
       end
-      
+
       sleep(1)
-      
+
       unless running?
         puts "Failed to start searchd daemon. Check #{@configuration.searchd.log}."
       end
     end
-    
+
     def stop
       return true unless running?
       check_for_configuration_file
-      
+
       stop_flag = 'stopwait'
       stop_flag = 'stop' if Riddle.loaded_version.split('.').first == '0'
       cmd = %(#{searchd} --pidfile --config "#{@path}" --#{stop_flag})
-      
+
       if RUBY_PLATFORM =~ /mswin|mingw/
         system("start /B #{cmd} 1> NUL 2>&1")
       else
@@ -61,7 +64,7 @@ module Riddle
     ensure
       return !running?
     end
-    
+
     def pid
       if File.exists?(@configuration.searchd.pid_file)
         File.read(@configuration.searchd.pid_file)[/\d+/]
@@ -69,23 +72,23 @@ module Riddle
         nil
       end
     end
-    
+
     def running?
       !!pid && !!Process.kill(0, pid.to_i)
     rescue
       false
     end
-    
+
     private
-    
+
     def indexer
       "#{bin_path}#{indexer_binary_name}"
     end
-    
+
     def searchd
       "#{bin_path}#{searchd_binary_name}"
     end
-    
+
     def check_for_configuration_file
       return if File.exist?(@path)
       raise "Configuration file '#{@path}' does not exist"

data/lib/riddle/query.rb

@@ -1,86 +1,97 @@
 module Riddle::Query
   def self.connection(address = '127.0.0.1', port = 9312)
     require 'mysql2'
-    
+
     # If you use localhost, MySQL insists on a socket connection, but Sphinx
     # requires a TCP connection. Using 127.0.0.1 fixes that.
     address = '127.0.0.1' if address == 'localhost'
-    
+
     Mysql2::Client.new(
       :host => address,
       :port => port
     )
   end
-  
+
   def self.meta
     'SHOW META'
   end
-  
+
   def self.warnings
     'SHOW WARNINGS'
   end
-  
+
   def self.status
     'SHOW STATUS'
   end
-  
+
   def self.tables
     'SHOW TABLES'
   end
-  
+
   def self.variables
     'SHOW VARIABLES'
   end
-  
+
   def self.collation
     'SHOW COLLATION'
   end
-  
+
   def self.describe(index)
     "DESCRIBE #{index}"
   end
-  
+
   def self.begin
     'BEGIN'
   end
-  
+
   def self.commit
     'COMMIT'
   end
-  
+
   def self.rollback
     'ROLLBACK'
   end
-  
+
   def self.set(variable, values, global = true)
     values = "(#{values.join(', ')})" if values.is_a?(Array)
     "SET#{ ' GLOBAL' if global } #{variable} = #{values}"
   end
-  
+
   def self.snippets(data, index, query, options = nil)
     options = ', ' + options.keys.collect { |key|
       "#{options[key]} AS #{key}"
     }.join(', ') unless options.nil?
-    
+
     "CALL SNIPPETS('#{data}', '#{index}', '#{query}'#{options})"
   end
-  
+
   def self.create_function(name, type, file)
     type = type.to_s.upcase
     "CREATE FUNCTION #{name} RETURNS #{type} SONAME '#{file}'"
   end
-  
+
   def self.drop_function(name)
     "DROP FUNCTION #{name}"
   end
-  
+
   def self.update(index, id, values = {})
     values = values.keys.collect { |key|
-      "#{key} = #{values[key]}"
+      "#{key} = #{translate_value values[key]}"
     }.join(', ')
-    
+
     "UPDATE #{index} SET #{values} WHERE id = #{id}"
   end
+
+  def self.translate_value(value)
+    case value
+    when TrueClass
+      1
+    when FalseClass
+      0
+    else
+      value
+    end
+  end
 end
 
 require 'riddle/query/delete'

data/lib/riddle/query/select.rb

@@ -1,8 +1,10 @@
 class Riddle::Query::Select
   def initialize
+    @values                = ['*']
     @indices               = []
     @matching              = nil
     @wheres                = {}
+    @where_nots            = {}
     @group_by              = nil
     @order_by              = nil
     @order_within_group_by = nil
@@ -11,6 +13,11 @@ class Riddle::Query::Select
     @options               = {}
   end
 
+  def values(*values)
+    @values += values
+    self
+  end
+
   def from(*indices)
     @indices += indices
     self
@@ -26,6 +33,11 @@ class Riddle::Query::Select
     self
   end
 
+  def where_not(filters = {})
+    @where_nots.merge!(filters)
+    self
+  end
+
   def group_by(attribute)
     @group_by = attribute
     self
@@ -57,7 +69,7 @@ class Riddle::Query::Select
   end
 
   def to_sql
-    sql = "SELECT * FROM #{ @indices.join(', ') }"
+    sql = "SELECT #{ @values.join(', ') } FROM #{ @indices.join(', ') }"
     sql << " WHERE #{ combined_wheres }" if wheres?
     sql << " GROUP BY #{@group_by}"      if !@group_by.nil?
     sql << " ORDER BY #{@order_by}"      if !@order_by.nil?
@@ -66,20 +78,20 @@ class Riddle::Query::Select
     end
     sql << " #{limit_clause}"   unless @limit.nil? && @offset.nil?
     sql << " #{options_clause}" unless @options.empty?
-  
+
     sql
   end
 
   private
 
   def wheres?
-    !(@wheres.empty? && @matching.nil?)
+    !(@wheres.empty? && @where_nots.empty? && @matching.nil?)
   end
 
   def combined_wheres
     if @matching.nil?
       wheres_to_s
-    elsif @wheres.empty?
+    elsif @wheres.empty? && @where_nots.empty?
       "MATCH('#{@matching}')"
     else
       "MATCH('#{@matching}') AND #{wheres_to_s}"
@@ -87,9 +99,49 @@ class Riddle::Query::Select
   end
 
   def wheres_to_s
-    @wheres.keys.collect { |key|
-      "#{key} = #{@wheres[key]}"
-    }.join(' AND ')
+    (
+      @wheres.keys.collect { |key|
+        filter_comparison_and_value key, @wheres[key]
+      } +
+      @where_nots.keys.collect { |key|
+        exclusive_filter_comparison_and_value key, @where_nots[key]
+      }
+    ).join(' AND ')
+  end
+
+  def filter_comparison_and_value(attribute, value)
+    case value
+    when Array
+      "#{attribute} IN (#{value.collect { |val| filter_value(val) }.join(', ')})"
+    when Range
+      "#{attribute} BETWEEN #{filter_value(value.first)} AND #{filter_value(value.last)}"
+    else
+      "#{attribute} = #{filter_value(value)}"
+    end
+  end
+
+  def exclusive_filter_comparison_and_value(attribute, value)
+    case value
+    when Array
+      "#{attribute} NOT IN (#{value.collect { |val| filter_value(val) }.join(', ')})"
+    when Range
+      "#{attribute} < #{filter_value(value.first)} OR #{attribute} > #{filter_value(value.last)}"
+    else
+      "#{attribute} <> #{filter_value(value)}"
+    end
+  end
+
+  def filter_value(value)
+    case value
+    when TrueClass
+      1
+    when FalseClass
+      0
+    when Time
+      value.to_i
+    else
+      value
+    end
   end
 
   def limit_clause
@@ -102,7 +154,16 @@ class Riddle::Query::Select
 
   def options_clause
     'OPTION ' + @options.keys.collect { |key|
-      "#{key}=#{@options[key]}"
+      "#{key}=#{option_value @options[key]}"
     }.join(', ')
   end
+
+  def option_value(value)
+    case value
+    when Hash
+      '(' + value.collect { |key, value| "#{key}=#{value}" }.join(', ') + ')'
+    else
+      value
+    end
+  end
 end