riddle 2.1.0 → 2.2.0

data/spec/unit/configuration/common_spec.rb

@@ -1,60 +0,0 @@
-require 'spec_helper'
-
-describe Riddle::Configuration::Common do
-  it "should always be valid" do
-    common = Riddle::Configuration::Common.new
-    common.should be_valid
-  end
-  
-  it "should support Sphinx's common settings" do
-    settings = %w( lemmatizer_base on_json_attr_error json_autoconv_numbers
-      json_autoconv_keynames rlp_root rlp_environment rlp_max_batch_size
-      rlp_max_batch_docs )
-    common = Riddle::Configuration::Common.new
-    
-    settings.each do |setting|
-      common.should respond_to(setting.to_sym)
-      common.should respond_to("#{setting}=".to_sym)
-    end
-  end
-
-  it "should render a correct configuration" do
-    common = Riddle::Configuration::Common.new
-    common.common_sphinx_configuration = true
-
-    common.render.should == <<-COMMON
-common
-{
-}
-    COMMON
-  
-    common.lemmatizer_base = "/tmp"
-    common.render.should == <<-COMMON
-common
-{
-  lemmatizer_base = /tmp
-}
-    COMMON
-  end
-
-  it "should not be present when common_sphinx_configuration is not set" do
-    common = Riddle::Configuration::Common.new
-    common.render.should be_nil
-  end
-
-  it "should not be present when common_sphinx_configuration is false" do
-    common = Riddle::Configuration::Common.new
-    common.common_sphinx_configuration = false
-    common.render.should be_nil
-  end
-  
-  it "should render when common_sphinx_configuration is true" do
-    common = Riddle::Configuration::Common.new
-    common.common_sphinx_configuration = true
-    common.render.should == <<-COMMON
-common
-{
-}
-    COMMON
-  end
-end

data/spec/unit/configuration/distributed_index_spec.rb

@@ -1,58 +0,0 @@
-require 'spec_helper'
-
-describe Riddle::Configuration::DistributedIndex do
-  it "should not be valid without any indices" do
-    index = Riddle::Configuration::DistributedIndex.new("dist1")
-    index.should_not be_valid
-  end
-
-  it "should be valid with just local indices" do
-    index = Riddle::Configuration::DistributedIndex.new("dist1")
-    index.local_indices << "local_one"
-    index.should be_valid
-  end
-
-  it "should be valid with just remote indices" do
-    index = Riddle::Configuration::DistributedIndex.new("dist1")
-    index.remote_indices << 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_indices << "test1" << "test1stemmed"
-    index.remote_indices <<
-      Riddle::Configuration::RemoteIndex.new("localhost", 3313, "remote1") <<
-      Riddle::Configuration::RemoteIndex.new("localhost", 3314, "remote2") <<
-      Riddle::Configuration::RemoteIndex.new("localhost", 3314, "remote3")
-    index.agent_blackhole << "testbox:3312:testindex1,testindex2"
-
-    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_blackhole = testbox:3312:testindex1,testindex2
-  agent_connect_timeout = 1000
-  agent_query_timeout = 3000
-}
-    DISTINDEX
-  end
-end

data/spec/unit/configuration/index_spec.rb

@@ -1,124 +0,0 @@
-require '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.min_stemming_len          = 1
-    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               = true
-    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.ondisk_dict               = 1
-    index.inplace_enable            = 1
-    index.inplace_hit_gap           = 0
-    index.inplace_docinfo_gap       = 0
-    index.inplace_reloc_factor      = 0.1
-    index.inplace_write_factor      = 0.1
-    index.index_exact_words         = 1
-
-    index.render.should == <<-INDEX
-source src1
-{
-  type = xmlpipe
-  xmlpipe_command = ls /dev/null
-}
-
-index test1
-{
-  path = /var/data/test1
-  docinfo = extern
-  mlock = 0
-  morphology = stem_en, stem_ru, soundex
-  min_stemming_len = 1
-  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
-  ondisk_dict = 1
-  inplace_enable = 1
-  inplace_hit_gap = 0
-  inplace_docinfo_gap = 0
-  inplace_reloc_factor = 0.1
-  inplace_write_factor = 0.1
-  index_exact_words = 1
-  source = src1
-}
-    INDEX
-  end
-end

data/spec/unit/configuration/indexer_spec.rb

@@ -1,73 +0,0 @@
-require '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
-
-  it "should render shared settings when common_sphinx_configuration is not set" do
-    indexer = Riddle::Configuration::Indexer.new
-    indexer.rlp_root = '/tmp'
-    
-    indexer.render.should == <<-INDEXER
-indexer
-{
-  rlp_root = /tmp
-}
-    INDEXER
-  end
-
-  it "should render shared settings when common_sphinx_configuration is false" do
-    indexer = Riddle::Configuration::Indexer.new
-    indexer.common_sphinx_configuration = false
-    indexer.rlp_root = '/tmp'
-
-    indexer.render.should == <<-INDEXER
-indexer
-{
-  rlp_root = /tmp
-}
-    INDEXER
-  end
-
-  it "should not render shared settings when common_sphinx_configuration is true" do
-    indexer = Riddle::Configuration::Indexer.new
-    indexer.common_sphinx_configuration = true
-    indexer.rlp_root = '/tmp'
-
-    indexer.render.should == <<-INDEXER
-indexer
-{
-}
-      INDEXER
-  end
-end

data/spec/unit/configuration/realtime_index_spec.rb

@@ -1,65 +0,0 @@
-require 'spec_helper'
-
-describe Riddle::Configuration::RealtimeIndex do
-  let(:index) { Riddle::Configuration::RealtimeIndex.new('rt1') }
-
-  describe '#valid?' do
-    it "should not be valid without a name" do
-      index.name = nil
-      index.path = 'foo'
-      index.should_not be_valid
-    end
-
-    it "should not be valid without a path" do
-      index.path = nil
-      index.should_not be_valid
-    end
-
-    it "should be valid with a name and path" do
-      index.path = 'foo'
-      index.should be_valid
-    end
-  end
-
-  describe '#type' do
-    it "should be 'rt'" do
-      index.type.should == 'rt'
-    end
-  end
-
-  describe '#render' do
-    it "should raise a ConfigurationError if rendering when not valid" do
-      lambda {
-        index.render
-      }.should raise_error(Riddle::Configuration::ConfigurationError)
-    end
-
-    it "should render correctly if supplied settings are valid" do
-      index.path = '/var/data/rt'
-      index.rt_mem_limit = '512M'
-      index.rt_field << 'title' << 'content'
-
-      index.rt_attr_uint      << 'gid'
-      index.rt_attr_bigint    << 'guid'
-      index.rt_attr_float     << 'gpa'
-      index.rt_attr_timestamp << 'ts_added'
-      index.rt_attr_string    << 'author'
-
-      index.render.should == <<-RTINDEX
-index rt1
-{
-  type = rt
-  path = /var/data/rt
-  rt_mem_limit = 512M
-  rt_field = title
-  rt_field = content
-  rt_attr_uint = gid
-  rt_attr_bigint = guid
-  rt_attr_float = gpa
-  rt_attr_timestamp = ts_added
-  rt_attr_string = author
-}
-      RTINDEX
-    end
-  end
-end

data/spec/unit/configuration/searchd_spec.rb

@@ -1,228 +0,0 @@
-require 'spec_helper'
-
-describe Riddle::Configuration::Searchd do
-  if Riddle.loaded_version.to_f >= 0.9
-    it "should be invalid without a listen 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.listen  = nil
-      searchd.should_not be_valid
-
-      searchd.listen = "localhost:3312"
-      searchd.should be_valid
-    end
-  else
-    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
-  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( listen address port log query_log read_timeout
-      client_timeout max_children pid_file max_matches seamless_rotate
-      preopen_indexes unlink_old attr_flush_period ondisk_dict_default
-      max_packet_size mva_updates_pool crash_log_path max_filters
-      max_filter_values )
-    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 support setting listen to a port number" do
-    searchd = Riddle::Configuration::Searchd.new
-    searchd.port = 3312
-    searchd.pid_file = "file.pid"
-    searchd.listen = 3312
-
-    if Riddle.loaded_version.to_f >= 0.9
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = 3312
-  pid_file = file.pid
-}
-      SEARCHD
-    else
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  port = 3312
-  pid_file = file.pid
-}
-      SEARCHD
-    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"
-
-    if Riddle.loaded_version.to_f >= 0.9
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = 3312
-  pid_file = file.pid
-}
-      SEARCHD
-    else
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  port = 3312
-  pid_file = file.pid
-}
-      SEARCHD
-    end
-  end
-
-  it "should render with a client key if one is provided" do
-    searchd = Riddle::Configuration::Searchd.new
-    searchd.port       = 3312
-    searchd.pid_file   = 'file.pid'
-    searchd.client_key = 'secret'
-
-    if Riddle.loaded_version.to_f >= 0.9
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = 3312
-  pid_file = file.pid
-  client_key = secret
-}
-      SEARCHD
-    else
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  port = 3312
-  pid_file = file.pid
-  client_key = secret
-}
-      SEARCHD
-    end
-  end
-
-  if Riddle.loaded_version.to_f >= 0.9
-    it "should render with mysql41 on the default port if true" do
-      searchd = Riddle::Configuration::Searchd.new
-      searchd.mysql41  = true
-      searchd.pid_file = 'file.pid'
-
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = 9306:mysql41
-  pid_file = file.pid
-}
-      SEARCHD
-    end
-
-    it "should render with mysql41 on a given port" do
-      searchd = Riddle::Configuration::Searchd.new
-      searchd.mysql41  = 9307
-      searchd.pid_file = 'file.pid'
-
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = 9307:mysql41
-  pid_file = file.pid
-}
-      SEARCHD
-    end
-
-    it "allows for both normal and mysql41 connections" do
-      searchd = Riddle::Configuration::Searchd.new
-      searchd.mysql41  = true
-      searchd.port     = 9312
-      searchd.pid_file = 'file.pid'
-
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = 9312
-  listen = 9306:mysql41
-  pid_file = file.pid
-}
-      SEARCHD
-    end
-
-    it "uses given address for mysql41 connections" do
-      searchd = Riddle::Configuration::Searchd.new
-      searchd.mysql41  = true
-      searchd.address  = '127.0.0.1'
-      searchd.pid_file = 'file.pid'
-
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = 127.0.0.1:9306:mysql41
-  pid_file = file.pid
-}
-      SEARCHD
-    end
-
-    it "applies the given address to both normal and mysql41 connections" do
-      searchd = Riddle::Configuration::Searchd.new
-      searchd.mysql41  = true
-      searchd.port     = 9312
-      searchd.address  = 'sphinx.server.local'
-      searchd.pid_file = 'file.pid'
-
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = sphinx.server.local:9312
-  listen = sphinx.server.local:9306:mysql41
-  pid_file = file.pid
-}
-      SEARCHD
-    end
-
-    it 'maintains the address and port settings without rendering them' do
-      searchd          = Riddle::Configuration::Searchd.new
-      searchd.port     = 9312
-      searchd.address  = 'sphinx.server.local'
-      searchd.pid_file = 'file.pid'
-
-      searchd.render.should == <<-SEARCHD
-searchd
-{
-  listen = sphinx.server.local:9312
-  pid_file = file.pid
-}
-      SEARCHD
-      searchd.address.should == 'sphinx.server.local'
-      searchd.port.should == 9312
-    end
-  end
-end