freelancing-god-riddle 0.9.8.1533.1 → 0.9.8.1533.2

data/lib/riddle/client.rb

@@ -1,3 +1,7 @@
+require 'riddle/client/filter'
+require 'riddle/client/message'
+require 'riddle/client/response'
+
 module Riddle
   class VersionError < StandardError;  end
   class ResponseError < StandardError; end

data/lib/riddle/configuration/distributed_index.rb

@@ -0,0 +1,48 @@
+module Riddle
+  class Configuration
+    class DistributedIndex < Riddle::Configuration::Section
+      self.settings = [:type, :local, :agent, :agent_connect_timeout,
+        :agent_query_timeout]
+      
+      attr_accessor :name, :local_indexes, :remote_indexes,
+        :agent_connect_timeout, :agent_query_timeout
+      
+      def initialize(name)
+        @name           = name
+        @local_indexes  = []
+        @remote_indexes = []
+      end
+      
+      def type
+        "distributed"
+      end
+      
+      def local
+        self.local_indexes
+      end
+      
+      def agent
+        agents = remote_indexes.collect { |index| index.remote }.uniq
+        agents.collect { |agent|
+          agent + ":" + remote_indexes.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
+      end
+    end
+  end
+end

data/lib/riddle/configuration/index.rb

@@ -0,0 +1,134 @@
+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
+        @morphologies.join(", ")
+      end
+      
+      def morphology=(morphology)
+        @morphologies = nil_split morphology, /,\s?/
+      end
+      
+      def stopwords
+        @stopword_files.join(" ")
+      end
+      
+      def stopwords=(stopwords)
+        @stopword_files = nil_split stopwords, ' '
+      end
+      
+      def wordforms
+        @wordform_files.join(" ")
+      end
+      
+      def wordforms=(wordforms)
+        @wordform_files = nil_split wordforms, ' '
+      end
+      
+      def exceptions
+        @exception_files.join(" ")
+      end
+      
+      def exceptions=(exceptions)
+        @exception_files = nil_split exceptions, ' '
+      end
+      
+      def ignore_chars
+        @ignore_characters.join(", ")
+      end
+      
+      def ignore_chars=(ignore_chars)
+        @ignore_characters = nil_split ignore_chars, /,\s?/
+      end
+      
+      def prefix_fields
+        @prefix_field_names.join(", ")
+      end
+      
+      def infix_fields
+        @infix_field_names.join(", ")
+      end
+      
+      def ngram_chars
+        @ngram_characters.join(", ")
+      end
+      
+      def ngram_chars=(ngram_chars)
+        @ngram_characters = nil_split ngram_chars, /,\s?/
+      end
+      
+      def phrase_boundary
+        @phrase_boundaries.join(", ")
+      end
+      
+      def phrase_boundary=(phrase_boundary)
+        @phrase_boundaries = nil_split phrase_boundary, /,\s?/
+      end
+      
+      def html_remove_elements
+        @html_remove_element_tags.join(", ")
+      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
+    end
+  end
+end

data/lib/riddle/configuration/indexer.rb

@@ -0,0 +1,19 @@
+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/lib/riddle/configuration/remote_index.rb

@@ -0,0 +1,17 @@
+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/lib/riddle/configuration/searchd.rb

@@ -0,0 +1,25 @@
+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/lib/riddle/configuration/section.rb

@@ -0,0 +1,32 @@
+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 = Array(send(setting)).collect { |set|
+              "  #{setting} = #{set}"  
+            }
+          end
+          conf.length == 0 ? nil : conf
+        }.flatten.compact
+      end
+    end
+  end
+end

data/lib/riddle/configuration/source.rb

@@ -0,0 +1,23 @@
+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/lib/riddle/configuration/sql_source.rb

@@ -0,0 +1,34 @@
+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/lib/riddle/configuration/xml_source.rb

@@ -0,0 +1,28 @@
+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/lib/riddle/configuration.rb

@@ -0,0 +1,33 @@
+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/lib/riddle/controller.rb

@@ -0,0 +1,44 @@
+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 --config #{@path}"
+      `#{cmd}`    
+
+      sleep(1)
+
+      unless running?
+        puts "Failed to start searchd daemon. Check #{@configuration.searchd.log}."
+      end
+    end
+
+    def stop
+      return unless running?
+      `kill #{pid}`
+    end
+
+    def pid
+      if File.exists?("#{@configuration.searchd.pid_file}")
+        `cat #{@configuration.searchd.pid_file}`[/\d+/]
+      else
+        nil
+      end
+    end
+
+    def running?
+      pid && `ps #{pid} | wc -l`.to_i > 1
+    end
+  end
+end

data/lib/riddle.rb

@@ -1,9 +1,9 @@
 require 'socket'
 require 'timeout'
+
 require 'riddle/client'
-require 'riddle/client/filter'
-require 'riddle/client/message'
-require 'riddle/client/response'
+require 'riddle/configuration'
+require 'riddle/controller'
 
 module Riddle #:nodoc:
   class ConnectionError < StandardError #:nodoc:
@@ -18,7 +18,7 @@ module Riddle #:nodoc:
     Rev     = 1533
     # Release number to mark my own fixes, beyond feature parity with
     # Sphinx itself.
-    Release = 1
+    Release = 2
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')

data/spec/unit/configuration/distributed_index_spec.rb

@@ -0,0 +1,56 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration::DistributedIndex do
+  it "should not be valid without any indexes" do
+    index = Riddle::Configuration::DistributedIndex.new("dist1")
+    index.should_not be_valid
+  end
+  
+  it "should be valid with just local indexes" do
+    index = Riddle::Configuration::DistributedIndex.new("dist1")
+    index.local_indexes << "local_one"
+    index.should be_valid
+  end
+  
+  it "should be valid with just remote indexes" do
+    index = Riddle::Configuration::DistributedIndex.new("dist1")
+    index.remote_indexes << Riddle::Configuration::RemoteIndex.new("local", 3312, "remote_one")
+    index.should be_valid
+  end
+  
+  it "should be of type 'distributed'" do
+    index = Riddle::Configuration::DistributedIndex.new("dist1")
+    index.type.should == 'distributed'
+  end
+  
+  it "should raise a ConfigurationError if rendering when not valid" do
+    index = Riddle::Configuration::DistributedIndex.new("dist1")
+    lambda { index.render }.should raise_error(Riddle::Configuration::ConfigurationError)
+  end
+  
+  it "should render correctly if supplied settings are valid" do
+    index = Riddle::Configuration::DistributedIndex.new("dist1")
+    
+    index.local_indexes << "test1" << "test1stemmed"
+    index.remote_indexes <<
+      Riddle::Configuration::RemoteIndex.new("localhost", 3313, "remote1") <<
+      Riddle::Configuration::RemoteIndex.new("localhost", 3314, "remote2") <<
+      Riddle::Configuration::RemoteIndex.new("localhost", 3314, "remote3")
+    
+    index.agent_connect_timeout = 1000
+    index.agent_query_timeout   = 3000
+    
+    index.render.should == <<-DISTINDEX
+index dist1
+{
+  type = distributed
+  local = test1
+  local = test1stemmed
+  agent = localhost:3313:remote1
+  agent = localhost:3314:remote2,remote3
+  agent_connect_timeout = 1000
+  agent_query_timeout = 3000
+}
+    DISTINDEX
+  end
+end

data/spec/unit/configuration/index_spec.rb

@@ -0,0 +1,108 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration::DistributedIndex do
+  it "should be invalid without a name, sources or path if there's no parent" do
+    index = Riddle::Configuration::Index.new(nil)
+    index.should_not be_valid
+    
+    index.name = "test1"
+    index.should_not be_valid
+    
+    index.sources << Riddle::Configuration::SQLSource.new("source", "mysql")
+    index.should_not be_valid
+    
+    index.path = "a/path"
+    index.should be_valid
+    
+    index.name = nil
+    index.should_not be_valid
+    
+    index.name = "test1"
+    index.sources.clear
+    index.should_not be_valid
+  end
+  
+  it "should be invalid without a name but not sources or path if it has a parent" do
+    index = Riddle::Configuration::Index.new(nil)
+    index.should_not be_valid
+    
+    index.name = "test1stemmed"
+    index.should_not be_valid
+    
+    index.parent = "test1"
+    index.should be_valid
+  end
+  
+  it "should raise a ConfigurationError if rendering when not valid" do
+    index = Riddle::Configuration::Index.new("test1")
+    lambda { index.render }.should raise_error(Riddle::Configuration::ConfigurationError)
+  end
+  
+  it "should render correctly if supplied settings are valid" do
+    source = Riddle::Configuration::XMLSource.new("src1", "xmlpipe")
+    source.xmlpipe_command = "ls /dev/null"
+    
+    index = Riddle::Configuration::Index.new("test1", source)
+    index.path                      = "/var/data/test1"
+    index.docinfo                   = "extern"
+    index.mlock                     = 0
+    index.morphologies             << "stem_en" << "stem_ru" << "soundex"
+    index.stopword_files           << "/var/data/stopwords.txt" << "/var/data/stopwords2.txt"
+    index.wordform_files           << "/var/data/wordforms.txt"
+    index.exception_files          << "/var/data/exceptions.txt"
+    index.min_word_len              = 1
+    index.charset_type              = "utf-8"
+    index.charset_table             = "0..9, A..Z->a..z, _, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F"
+    index.ignore_characters        << "U+00AD"
+    index.min_prefix_len            = 0
+    index.min_infix_len             = 0
+    index.prefix_field_names       << "filename"
+    index.infix_field_names        << "url" << "domain"
+    index.enable_star               = 1
+    index.ngram_len                 = 1
+    index.ngram_characters         << "U+3000..U+2FA1F"
+    index.phrase_boundaries        << "." << "?" << "!" << "U+2026"
+    index.phrase_boundary_step      = 100
+    index.html_strip                = 0
+    index.html_index_attrs          = "img=alt,title; a=title"
+    index.html_remove_element_tags << "style" << "script"
+    index.preopen                   = 1
+    
+    index.render.should == <<-INDEX
+source src1
+{
+  type = xmlpipe
+  xmlpipe_command = ls /dev/null
+}
+
+index test1
+{
+  source = src1
+  path = /var/data/test1
+  docinfo = extern
+  mlock = 0
+  morphology = stem_en, stem_ru, soundex
+  stopwords = /var/data/stopwords.txt /var/data/stopwords2.txt
+  wordforms = /var/data/wordforms.txt
+  exceptions = /var/data/exceptions.txt
+  min_word_len = 1
+  charset_type = utf-8
+  charset_table = 0..9, A..Z->a..z, _, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F
+  ignore_chars = U+00AD
+  min_prefix_len = 0
+  min_infix_len = 0
+  prefix_fields = filename
+  infix_fields = url, domain
+  enable_star = 1
+  ngram_len = 1
+  ngram_chars = U+3000..U+2FA1F
+  phrase_boundary = ., ?, !, U+2026
+  phrase_boundary_step = 100
+  html_strip = 0
+  html_index_attrs = img=alt,title; a=title
+  html_remove_elements = style, script
+  preopen = 1
+}
+    INDEX
+  end
+end

data/spec/unit/configuration/indexer_spec.rb

@@ -0,0 +1,36 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration::Indexer do
+  it "should always be valid" do
+    indexer = Riddle::Configuration::Indexer.new
+    indexer.should be_valid
+  end
+  
+  it "should support Sphinx's indexer settings" do
+    settings = %w( mem_limit max_iops max_iosize )
+    indexer = Riddle::Configuration::Indexer.new
+    
+    settings.each do |setting|
+      indexer.should respond_to(setting.to_sym)
+      indexer.should respond_to("#{setting}=".to_sym)
+    end
+  end
+  
+  it "should render a correct configuration" do
+    indexer = Riddle::Configuration::Indexer.new
+    
+    indexer.render.should == <<-INDEXER
+indexer
+{
+}
+    INDEXER
+    
+    indexer.mem_limit = "32M"
+    indexer.render.should == <<-INDEXER
+indexer
+{
+  mem_limit = 32M
+}
+    INDEXER
+  end
+end

data/spec/unit/configuration/searchd_spec.rb

@@ -0,0 +1,48 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration::Searchd do
+  it "should be invalid without a port or pid_file" do
+    searchd = Riddle::Configuration::Searchd.new
+    searchd.should_not be_valid
+    
+    searchd.port = 3312
+    searchd.should_not be_valid
+    
+    searchd.pid_file = "file.pid"
+    searchd.should be_valid
+    
+    searchd.port = nil
+    searchd.should_not be_valid
+  end
+  
+  it "should raise a ConfigurationError if rendering but not valid" do
+    searchd = Riddle::Configuration::Searchd.new
+    searchd.should_not be_valid
+    lambda { searchd.render }.should raise_error(Riddle::Configuration::ConfigurationError)
+  end
+  
+  it "should support Sphinx's searchd settings" do
+    settings = %w( address port log query_log read_timeout max_children
+      pid_file max_matches seamless_rotate preopen_indexes unlink_old )
+    searchd = Riddle::Configuration::Searchd.new
+    
+    settings.each do |setting|
+      searchd.should respond_to(setting.to_sym)
+      searchd.should respond_to("#{setting}=".to_sym)
+    end
+  end
+  
+  it "should render a correct configuration with valid settings" do
+    searchd = Riddle::Configuration::Searchd.new
+    searchd.port      = 3312
+    searchd.pid_file  = "file.pid"
+    
+    searchd.render.should == <<-SEARCHD
+searchd
+{
+  port = 3312
+  pid_file = file.pid
+}
+    SEARCHD
+  end
+end

data/spec/unit/configuration/source_spec.rb

@@ -0,0 +1,5 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration::Source do
+  #
+end

data/spec/unit/configuration/sql_source_spec.rb

@@ -0,0 +1,100 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration::SQLSource do
+  it "should be invalid without a host, user, database, and query if there's no parent" do
+    source = Riddle::Configuration::SQLSource.new("src1", "mysql")
+    source.should_not be_valid
+    
+    source.sql_host   = "localhost"
+    source.sql_user   = "test"
+    source.sql_db     = "test"
+    source.sql_query  = "SELECT * FROM tables"
+    source.should be_valid
+    
+    [:name, :type, :sql_host, :sql_user, :sql_db, :sql_query].each do |setting|
+      value = source.send(setting)
+      source.send("#{setting}=".to_sym, nil)
+      source.should_not be_nil
+      source.send("#{setting}=".to_sym, value)
+    end
+  end
+  
+  it "should be invalid without only a name and type if there is a parent" do
+    source = Riddle::Configuration::SQLSource.new("src1", "mysql")
+    source.should_not be_valid
+
+    source.parent = "sqlparent"
+    source.should be_valid
+
+    source.name = nil
+    source.should_not be_valid
+
+    source.name = "src1"
+    source.type = nil
+    source.should_not be_valid
+  end
+
+  it "should raise a ConfigurationError if rendering when not valid" do
+    source = Riddle::Configuration::SQLSource.new("src1", "mysql")
+    lambda { source.render }.should raise_error(Riddle::Configuration::ConfigurationError)
+  end
+
+  it "should render correctly when valid" do
+    source = Riddle::Configuration::SQLSource.new("src1", "mysql")
+    source.sql_host = "localhost"
+    source.sql_user = "test"
+    source.sql_pass = ""
+    source.sql_db = "test"
+    source.sql_port = 3306
+    source.sql_sock = "/tmp/mysql.sock"
+    source.mysql_connect_flags = 32
+    source.sql_query_pre << "SET NAMES utf8" << "SET SESSION query_cache_type=OFF"
+    source.sql_query = "SELECT id, group_id, UNIX_TIMESTAMP(date_added) AS date_added, title, content FROM documents WHERE id >= $start AND id <= $end"
+    source.sql_query_range = "SELECT MIN(id), MAX(id) FROM documents"
+    source.sql_range_step = 1000
+    source.sql_attr_uint << "author_id" << "forum_id:9" << "group_id"
+    source.sql_attr_bool << "is_deleted"
+    source.sql_attr_timestamp << "posted_ts" << "last_edited_ts" << "date_added"
+    source.sql_attr_str2ordinal << "author_name"
+    source.sql_attr_float << "lat_radians" << "long_radians"
+    source.sql_attr_multi << "uint tag from query; select id, tag FROM tags"
+    source.sql_query_post = ""
+    source.sql_query_post_index = "REPLACE INTO counters (id, val) VALUES ('max_indexed_id', $maxid)"
+    source.sql_ranged_throttle = 0
+    source.sql_query_info = "SELECT * FROM documents WHERE id = $id"
+
+    source.render.should == <<-SQLSOURCE
+source src1
+{
+  type = mysql
+  sql_host = localhost
+  sql_user = test
+  sql_pass = 
+  sql_db = test
+  sql_port = 3306
+  sql_sock = /tmp/mysql.sock
+  mysql_connect_flags = 32
+  sql_query_pre = SET NAMES utf8
+  sql_query_pre = SET SESSION query_cache_type=OFF
+  sql_query = SELECT id, group_id, UNIX_TIMESTAMP(date_added) AS date_added, title, content FROM documents WHERE id >= $start AND id <= $end
+  sql_query_range = SELECT MIN(id), MAX(id) FROM documents
+  sql_range_step = 1000
+  sql_attr_uint = author_id
+  sql_attr_uint = forum_id:9
+  sql_attr_uint = group_id
+  sql_attr_bool = is_deleted
+  sql_attr_timestamp = posted_ts
+  sql_attr_timestamp = last_edited_ts
+  sql_attr_timestamp = date_added
+  sql_attr_str2ordinal = author_name
+  sql_attr_float = lat_radians
+  sql_attr_float = long_radians
+  sql_attr_multi = uint tag from query; select id, tag FROM tags
+  sql_query_post = 
+  sql_query_post_index = REPLACE INTO counters (id, val) VALUES ('max_indexed_id', $maxid)
+  sql_ranged_throttle = 0
+  sql_query_info = SELECT * FROM documents WHERE id = $id
+}
+    SQLSOURCE
+  end
+end

data/spec/unit/configuration/xml_source_spec.rb

@@ -0,0 +1,51 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration::XMLSource do
+  it "should be invalid without an xmlpipe command, name and type if there's no parent" do
+    source = Riddle::Configuration::XMLSource.new("xml1", "xmlpipe")
+    source.should_not be_valid
+    
+    source.xmlpipe_command = "ls /var/null"
+    source.should be_valid
+    
+    source.name = nil
+    source.should_not be_valid
+    
+    source.name = "xml1"
+    source.type = nil
+    source.should_not be_valid
+  end
+  
+  it "should be invalid without only a name and type if there is a parent" do
+    source = Riddle::Configuration::XMLSource.new("xml1", "xmlpipe")
+    source.should_not be_valid
+    
+    source.parent = "xmlparent"
+    source.should be_valid
+    
+    source.name = nil
+    source.should_not be_valid
+    
+    source.name = "xml1"
+    source.type = nil
+    source.should_not be_valid
+  end
+  
+  it "should raise a ConfigurationError if rendering when not valid" do
+    source = Riddle::Configuration::XMLSource.new("xml1", "xmlpipe")
+    lambda { source.render }.should raise_error(Riddle::Configuration::ConfigurationError)
+  end
+  
+  it "should render correctly when valid" do
+    source = Riddle::Configuration::XMLSource.new("xml1", "xmlpipe")
+    source.xmlpipe_command = "ls /var/null"
+    
+    source.render.should == <<-XMLSOURCE
+source xml1
+{
+  type = xmlpipe
+  xmlpipe_command = ls /var/null
+}
+    XMLSOURCE
+  end
+end

data/spec/unit/configuration_spec.rb

@@ -0,0 +1,25 @@
+require 'spec/spec_helper'
+
+describe Riddle::Configuration do
+  it "should render all given indexes and sources, plus the indexer and search sections" do
+    config = Riddle::Configuration.new
+    
+    config.searchd.port = 3312
+    config.searchd.pid_file = "file.pid"
+    
+    source = Riddle::Configuration::XMLSource.new("src1", "xmlpipe")
+    source.xmlpipe_command = "ls /dev/null"
+    
+    index = Riddle::Configuration::Index.new("index1")
+    index.path = "/path/to/index1"
+    index.sources << source
+    
+    config.indexes << index
+    generated_conf = config.render
+    
+    generated_conf.should match(/index index1/)
+    generated_conf.should match(/source src1/)
+    generated_conf.should match(/indexer/)
+    generated_conf.should match(/searchd/)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-riddle
 version: !ruby/object:Gem::Version 
-  version: 0.9.8.1533.1
+  version: 0.9.8.1533.2
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-23 00:00:00 -08:00
+date: 2008-11-26 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -26,6 +26,17 @@ files:
 - lib/riddle/client/message.rb
 - lib/riddle/client/response.rb
 - lib/riddle/client.rb
+- lib/riddle/configuration/distributed_index.rb
+- lib/riddle/configuration/index.rb
+- lib/riddle/configuration/indexer.rb
+- lib/riddle/configuration/remote_index.rb
+- lib/riddle/configuration/searchd.rb
+- lib/riddle/configuration/section.rb
+- lib/riddle/configuration/source.rb
+- lib/riddle/configuration/sql_source.rb
+- lib/riddle/configuration/xml_source.rb
+- lib/riddle/configuration.rb
+- lib/riddle/controller.rb
 - lib/riddle.rb
 - lib/tabtab_definitions.rb
 - MIT-LICENCE
@@ -35,6 +46,14 @@ files:
 - spec/functional/search_spec.rb
 - spec/functional/update_spec.rb
 - spec/unit/client_spec.rb
+- spec/unit/configuration/distributed_index_spec.rb
+- spec/unit/configuration/index_spec.rb
+- spec/unit/configuration/indexer_spec.rb
+- spec/unit/configuration/searchd_spec.rb
+- spec/unit/configuration/source_spec.rb
+- spec/unit/configuration/sql_source_spec.rb
+- spec/unit/configuration/xml_source_spec.rb
+- spec/unit/configuration_spec.rb
 - spec/unit/filter_spec.rb
 - spec/unit/message_spec.rb
 - spec/unit/response_spec.rb
@@ -75,6 +94,14 @@ test_files:
 - spec/functional/search_spec.rb
 - spec/functional/update_spec.rb
 - spec/unit/client_spec.rb
+- spec/unit/configuration/distributed_index_spec.rb
+- spec/unit/configuration/index_spec.rb
+- spec/unit/configuration/indexer_spec.rb
+- spec/unit/configuration/searchd_spec.rb
+- spec/unit/configuration/source_spec.rb
+- spec/unit/configuration/sql_source_spec.rb
+- spec/unit/configuration/xml_source_spec.rb
+- spec/unit/configuration_spec.rb
 - spec/unit/filter_spec.rb
 - spec/unit/message_spec.rb
 - spec/unit/response_spec.rb