thinking-sphinx 1.2.13 → 1.4.0

data/vendor/riddle/lib/riddle/configuration/index.rb

@@ -1,142 +0,0 @@
-module Riddle
-  class Configuration
-    class Index < Riddle::Configuration::Section
-      self.settings = [:source, :path, :docinfo, :mlock, :morphology,
-        :stopwords, :wordforms, :exceptions, :min_word_len, :charset_type,
-        :charset_table, :ignore_chars, :min_prefix_len, :min_infix_len,
-        :prefix_fields, :infix_fields, :enable_star, :ngram_len, :ngram_chars,
-        :phrase_boundary, :phrase_boundary_step, :html_strip,
-        :html_index_attrs, :html_remove_elements, :preopen]
-      
-      attr_accessor :name, :parent, :sources, :path, :docinfo, :mlock,
-        :morphologies, :stopword_files, :wordform_files, :exception_files,
-        :min_word_len, :charset_type, :charset_table, :ignore_characters,
-        :min_prefix_len, :min_infix_len, :prefix_field_names,
-        :infix_field_names, :enable_star, :ngram_len, :ngram_characters,
-        :phrase_boundaries, :phrase_boundary_step, :html_strip,
-        :html_index_attrs, :html_remove_element_tags, :preopen
-      
-      def initialize(name, *sources)
-        @name                     = name
-        @sources                  = sources
-        @morphologies             = []
-        @stopword_files           = []
-        @wordform_files           = []
-        @exception_files          = []
-        @ignore_characters        = []
-        @prefix_field_names       = []
-        @infix_field_names        = []
-        @ngram_characters         = []
-        @phrase_boundaries        = []
-        @html_remove_element_tags = []
-      end
-      
-      def source
-        @sources.collect { |s| s.name }
-      end
-      
-      def morphology
-        nil_join @morphologies, ", "
-      end
-      
-      def morphology=(morphology)
-        @morphologies = nil_split morphology, /,\s?/
-      end
-      
-      def stopwords
-        nil_join @stopword_files, " "
-      end
-      
-      def stopwords=(stopwords)
-        @stopword_files = nil_split stopwords, ' '
-      end
-      
-      def wordforms
-        nil_join @wordform_files, " "
-      end
-      
-      def wordforms=(wordforms)
-        @wordform_files = nil_split wordforms, ' '
-      end
-      
-      def exceptions
-        nil_join @exception_files, " "
-      end
-      
-      def exceptions=(exceptions)
-        @exception_files = nil_split exceptions, ' '
-      end
-      
-      def ignore_chars
-        nil_join @ignore_characters, ", "
-      end
-      
-      def ignore_chars=(ignore_chars)
-        @ignore_characters = nil_split ignore_chars, /,\s?/
-      end
-      
-      def prefix_fields
-        nil_join @prefix_field_names, ", "
-      end
-      
-      def infix_fields
-        nil_join @infix_field_names, ", "
-      end
-      
-      def ngram_chars
-        nil_join @ngram_characters, ", "
-      end
-      
-      def ngram_chars=(ngram_chars)
-        @ngram_characters = nil_split ngram_chars, /,\s?/
-      end
-      
-      def phrase_boundary
-        nil_join @phrase_boundaries, ", "
-      end
-      
-      def phrase_boundary=(phrase_boundary)
-        @phrase_boundaries = nil_split phrase_boundary, /,\s?/
-      end
-      
-      def html_remove_elements
-        nil_join @html_remove_element_tags, ", "
-      end
-      
-      def html_remove_elements=(html_remove_elements)
-        @html_remove_element_tags = nil_split html_remove_elements, /,\s?/
-      end
-      
-      def render
-        raise ConfigurationError, "#{@name} #{@sources.inspect} #{@path} #{@parent}" unless valid?
-        
-        inherited_name = "#{name}"
-        inherited_name << " : #{parent}" if parent
-        (
-          @sources.collect { |s| s.render } +
-          ["index #{inherited_name}", "{"] +
-          settings_body +
-          ["}", ""]
-        ).join("\n")
-      end
-      
-      def valid?
-        (!@name.nil?) && (!( @sources.length == 0 || @path.nil? ) || !@parent.nil?)
-      end
-      
-      private
-      
-      def nil_split(string, pattern)
-        (string || "").split(pattern)
-      end
-      
-      def nil_join(array, delimiter)
-        if array.length == 0
-          nil
-        else
-          array.join(delimiter)
-        end
-      end
-    end
-  end
-end

data/vendor/riddle/lib/riddle/configuration/indexer.rb

@@ -1,19 +0,0 @@
-module Riddle
-  class Configuration
-    class Indexer < Riddle::Configuration::Section
-      self.settings = [:mem_limit, :max_iops, :max_iosize]
-      
-      attr_accessor *self.settings
-            
-      def render
-        raise ConfigurationError unless valid?
-        
-        (
-          ["indexer", "{"] +
-          settings_body +
-          ["}", ""]
-        ).join("\n")
-      end
-    end
-  end
-end

data/vendor/riddle/lib/riddle/configuration/remote_index.rb

@@ -1,17 +0,0 @@
-module Riddle
-  class Configuration
-    class RemoteIndex
-      attr_accessor :address, :port, :name
-      
-      def initialize(address, port, name)
-        @address  = address
-        @port     = port
-        @name     = name
-      end
-      
-      def remote
-        "#{address}:#{port}"
-      end
-    end
-  end
-end

data/vendor/riddle/lib/riddle/configuration/searchd.rb

@@ -1,25 +0,0 @@
-module Riddle
-  class Configuration
-    class Searchd < Riddle::Configuration::Section
-      self.settings = [:address, :port, :log, :query_log, :read_timeout,
-        :max_children, :pid_file, :max_matches, :seamless_rotate,
-        :preopen_indexes, :unlink_old]
-      
-      attr_accessor *self.settings
-            
-      def render
-        raise ConfigurationError unless valid?
-        
-        (
-          ["searchd", "{"] +
-          settings_body +
-          ["}", ""]
-        ).join("\n")
-      end
-      
-      def valid?
-        !( @port.nil? || @pid_file.nil? )
-      end
-    end
-  end
-end

data/vendor/riddle/lib/riddle/configuration/section.rb

@@ -1,43 +0,0 @@
-module Riddle
-  class Configuration
-    class Section
-      class << self
-        attr_accessor :settings
-      end
-      
-      settings = []
-      
-      def valid?
-        true
-      end
-      
-      private
-      
-      def settings_body
-        self.class.settings.select { |setting|
-          !send(setting).nil?
-        }.collect { |setting|
-          if send(setting) == ""
-            conf = "  #{setting} = "
-          else
-            conf = setting_to_array(setting).collect { |set|
-              "  #{setting} = #{set}"
-            }
-          end
-          conf.length == 0 ? nil : conf
-        }.flatten.compact
-      end
-      
-      def setting_to_array(setting)
-        value = send(setting)
-        case value
-        when Array      then value
-        when TrueClass  then [1]
-        when FalseClass then [0]
-        else
-          [value]
-        end
-      end
-    end
-  end
-end

data/vendor/riddle/lib/riddle/configuration/source.rb

@@ -1,23 +0,0 @@
-module Riddle
-  class Configuration
-    class Source < Riddle::Configuration::Section
-      attr_accessor :name, :parent, :type
-            
-      def render
-        raise ConfigurationError unless valid?
-        
-        inherited_name = "#{name}"
-        inherited_name << " : #{parent}" if parent
-        (
-          ["source #{inherited_name}", "{"] +
-          settings_body +
-          ["}", ""]
-        ).join("\n")
-      end
-      
-      def valid?
-        !( @name.nil? || @type.nil? )
-      end
-    end
-  end
-end

data/vendor/riddle/lib/riddle/configuration/sql_source.rb

@@ -1,34 +0,0 @@
-module Riddle
-  class Configuration
-    class SQLSource < Riddle::Configuration::Source
-      self.settings = [:type, :sql_host, :sql_user, :sql_pass, :sql_db,
-        :sql_port, :sql_sock, :mysql_connect_flags, :sql_query_pre, :sql_query,
-        :sql_query_range, :sql_range_step, :sql_attr_uint, :sql_attr_bool,
-        :sql_attr_timestamp, :sql_attr_str2ordinal, :sql_attr_float,
-        :sql_attr_multi, :sql_query_post, :sql_query_post_index,
-        :sql_ranged_throttle, :sql_query_info]
-      
-      attr_accessor *self.settings
-      
-      def initialize(name, type)
-        @name = name
-        @type = type
-        
-        @sql_query_pre        = []
-        @sql_attr_uint        = []
-        @sql_attr_bool        = []
-        @sql_attr_timestamp   = []
-        @sql_attr_str2ordinal = []
-        @sql_attr_float       = []
-        @sql_attr_multi       = []
-        @sql_query_post       = []
-        @sql_query_post_index = []
-      end
-            
-      def valid?
-        super && (!( @sql_host.nil? || @sql_user.nil? || @sql_db.nil? ||
-          @sql_query.nil? ) || !@parent.nil?)
-      end
-    end
-  end
-end

data/vendor/riddle/lib/riddle/configuration/xml_source.rb

@@ -1,28 +0,0 @@
-module Riddle
-  class Configuration
-    class XMLSource < Riddle::Configuration::Source
-      self.settings = [:type, :xmlpipe_command, :xmlpipe_field,
-        :xmlpipe_attr_uint, :xmlpipe_attr_bool, :xmlpipe_attr_timestamp,
-        :xmlpipe_attr_str2ordinal, :xmlpipe_attr_float, :xmlpipe_attr_multi]
-      
-      attr_accessor *self.settings
-      
-      def initialize(name, type)
-        @name = name
-        @type = type
-        
-        @xmlpipe_field            = []
-        @xmlpipe_attr_uint        = []
-        @xmlpipe_attr_bool        = []
-        @xmlpipe_attr_timestamp   = []
-        @xmlpipe_attr_str2ordinal = []
-        @xmlpipe_attr_float       = []
-        @xmlpipe_attr_multi       = []
-      end
-            
-      def valid?
-        super && ( !@xmlpipe_command.nil? || !parent.nil? )
-      end
-    end
-  end
-end

data/vendor/riddle/lib/riddle/configuration.rb

@@ -1,33 +0,0 @@
-require 'riddle/configuration/section'
-
-require 'riddle/configuration/distributed_index'
-require 'riddle/configuration/index'
-require 'riddle/configuration/indexer'
-require 'riddle/configuration/remote_index'
-require 'riddle/configuration/searchd'
-require 'riddle/configuration/source'
-require 'riddle/configuration/sql_source'
-require 'riddle/configuration/xml_source'
-
-module Riddle
-  class Configuration
-    class ConfigurationError < StandardError #:nodoc:
-    end
-    
-    attr_reader :indexes, :searchd
-    attr_accessor :indexer
-    
-    def initialize
-      @indexer = Riddle::Configuration::Indexer.new
-      @searchd = Riddle::Configuration::Searchd.new
-      @indexes = []
-    end
-    
-    def render
-      (
-        [@indexer.render, @searchd.render] +
-        @indexes.collect { |index| index.render }
-      ).join("\n")
-    end
-  end
-end

data/vendor/riddle/lib/riddle/controller.rb

@@ -1,53 +0,0 @@
-module Riddle
-  class Controller
-    def initialize(configuration, path)
-      @configuration  = configuration
-      @path           = path
-    end
-    
-    def index
-      cmd = "indexer --config #{@path} --all"
-      cmd << " --rotate" if running?
-      `#{cmd}`
-    end
-    
-    def start
-      return if running?
-      
-      cmd = "searchd --pidfile --config #{@path}"
-      
-      if RUBY_PLATFORM =~ /mswin/
-        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 unless running?
-      Process.kill('SIGTERM', pid.to_i)
-    rescue Errno::EINVAL
-      Process.kill('SIGKILL', pid.to_i)
-    end
-    
-    def pid
-      if File.exists?(@configuration.searchd.pid_file)
-        File.read(@configuration.searchd.pid_file)[/\d+/]
-      else
-        nil
-      end
-    end
-    
-    def running?
-      !!pid && !!Process.kill(0, pid.to_i)
-    rescue
-      false
-    end
-  end
-end

data/vendor/riddle/lib/riddle.rb

@@ -1,30 +0,0 @@
-require 'socket'
-require 'timeout'
-
-require 'riddle/client'
-require 'riddle/configuration'
-require 'riddle/controller'
-
-module Riddle #:nodoc:
-  class ConnectionError < StandardError #:nodoc:
-  end
-  
-  module Version #:nodoc:
-    Major   = 0
-    Minor   = 9
-    Tiny    = 8
-    # Revision number for RubyForge's sake, taken from what Sphinx
-    # outputs to the command line.
-    Rev     = 1533
-    # Release number to mark my own fixes, beyond feature parity with
-    # Sphinx itself.
-    Release = 10
-    
-    String      = [Major, Minor, Tiny].join('.')
-    GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')
-  end
-  
-  def self.escape(string)
-    string.gsub(/[\(\)\|\-!@~"&\/]/) { |char| "\\#{char}" }
-  end
-end

data/features/{support → thinking_sphinx}/models/comment.rb

@@ -1,10 +1,10 @@
 class Comment < ActiveRecord::Base
-  belongs_to :post
-  belongs_to :category
-  
   define_index do 
     indexes :content
     
     has category.name, :facet => true, :as => :category_name, :type => :string
   end
+  
+  belongs_to :post
+  belongs_to :category
 end