riddle 0.9.8.1533.10 → 1.0.0

data/spec/fixtures/sql/structure.sql

@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS `people`;
+
+CREATE TABLE `people` (
+  `id` int(11) NOT NULL auto_increment,
+  `first_name` varchar(50) NOT NULL,
+  `middle_initial` varchar(10) NOT NULL,
+  `last_name` varchar(50) NOT NULL,
+  `gender` varchar(10) NOT NULL,
+  `street_address` varchar(200) NOT NULL,
+  `city` varchar(100) NOT NULL,
+  `state` varchar(100) NOT NULL,
+  `postcode` varchar(10) NOT NULL,
+  `email` varchar(100) NOT NULL,
+  `birthday` datetime NOT NULL,
+  PRIMARY KEY  (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;

data/spec/functional/excerpt_spec.rb

@@ -28,7 +28,7 @@ describe "Sphinx Excepts" do
   end
   
   it "should separate matches that are far apart by an ellipsis by default" do
-    @client.excerpts(
+    excerpts = @client.excerpts(
       :index        => "people",
       :words        => "Pat",
       :docs         => [
@@ -45,18 +45,32 @@ not. It's just my name: Pat.
         ],
       :before_match => "<em>",
       :after_match  => "</em>"
-    ).should == [
-      <<-SENTENCE
+    )
+    
+    
+    if SphinxVersion == '0.9.9'
+      excerpts.should == [
+        <<-SENTENCE
+This is a really long sentence written by <em>Pat</em>. It has to be over 256
+characters long, between keywords. But what is the  &#8230; 're really interested in finding out,
+yeah? Excerpts are particularly riveting. This keyword, however, is
+not. It's just my name: <em>Pat</em>.
+        SENTENCE
+      ]
+    else
+      excerpts.should == [
+        <<-SENTENCE
 This is a really long sentence written by <em>Pat</em>. It has to be over 256
 characters long, between keywords. But what is the keyword?  &#8230;  interested in finding out,
 yeah? Excerpts are particularly riveting. This keyword, however, is
 not. It's just my name: <em>Pat</em>.
-      SENTENCE
-    ]
+        SENTENCE
+      ]
+    end
   end
   
   it "should use the provided separator" do
-    @client.excerpts(
+    excerpts = @client.excerpts(
       :index           => "people",
       :words           => "Pat",
       :docs            => [
@@ -74,14 +88,27 @@ not. It's just my name: Pat.
       :before_match    => "<em>",
       :after_match     => "</em>",
       :chunk_separator => " --- "
-    ).should == [
-      <<-SENTENCE
+    )
+    
+    if SphinxVersion == '0.9.9'
+      excerpts.should == [
+        <<-SENTENCE
+This is a really long sentence written by <em>Pat</em>. It has to be over 256
+characters long, between keywords. But what is the  --- 're really interested in finding out,
+yeah? Excerpts are particularly riveting. This keyword, however, is
+not. It's just my name: <em>Pat</em>.
+        SENTENCE
+      ]
+    else
+      excerpts.should == [
+        <<-SENTENCE
 This is a really long sentence written by <em>Pat</em>. It has to be over 256
 characters long, between keywords. But what is the keyword?  ---  interested in finding out,
 yeah? Excerpts are particularly riveting. This keyword, however, is
 not. It's just my name: <em>Pat</em>.
-      SENTENCE
-    ]
+        SENTENCE
+      ]
+    end
   end
   
   it "should return multiple results for multiple documents" do

data/spec/functional/persistance_spec.rb

@@ -0,0 +1,17 @@
+require 'spec/spec_helper'
+
+describe "Sphinx Persistance Connection" do
+  before :each do
+    @client = Riddle::Client.new("localhost", 3313)
+  end
+  
+  it "should raise errors once already opened" do
+    @client.open
+    lambda { @client.open }.should raise_error
+    @client.close
+  end
+  
+  it "should raise errors if closing when already closed" do
+    lambda { @client.close }.should raise_error
+  end
+end

data/spec/functional/status_spec.rb

@@ -0,0 +1,21 @@
+require 'spec/spec_helper'
+
+if SphinxVersion == '0.9.9'
+  describe "Sphinx Status" do
+    before :each do
+      @client = Riddle::Client.new("localhost", 3313)
+      @status = @client.status
+    end
+  
+    it "should return a hash" do
+      @status.should be_a(Hash)
+    end
+  
+    it "should include the uptime, connections, and command_search keys" do
+      # Not checking all values, but ensuring keys are being set correctly
+      @status[:uptime].should_not be_nil
+      @status[:connections].should_not be_nil
+      @status[:command_search].should_not be_nil
+    end
+  end
+end

data/spec/functional/update_spec.rb

@@ -11,17 +11,17 @@ describe "Sphinx Updates" do
     result[:matches].should_not be_empty
     result[:matches].length.should == 1
     ellie = result[:matches].first
-    ellie[:attributes]["birthday"].should == Time.local(1970, 1, 23).to_i
+    ellie[:attributes]["birthday"].should == Time.utc(1970, 1, 23).to_i
     
     # make Ellie younger by 6 years
-    @client.update("people", ["birthday"], {ellie[:doc] => [Time.local(1976, 1, 23).to_i]})
+    @client.update("people", ["birthday"], {ellie[:doc] => [Time.utc(1976, 1, 23).to_i]})
     
     # check attribute's value
     result = @client.query("Ellie K Ford")
     result[:matches].should_not be_empty
     result[:matches].length.should == 1
     ellie = result[:matches].first
-    ellie[:attributes]["birthday"].should == Time.local(1976, 1, 23).to_i
+    ellie[:attributes]["birthday"].should == Time.utc(1976, 1, 23).to_i
   end
   
   it "should update multiple records appropriately" do

data/spec/spec_helper.rb

@@ -0,0 +1,30 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+
+SphinxVersion = ENV['VERSION'] || '0.9.8'
+
+require 'riddle'
+require "riddle/#{SphinxVersion}"
+require 'spec'
+require 'spec/sphinx_helper'
+
+Spec::Runner.configure do |config|
+  sphinx = SphinxHelper.new
+  sphinx.setup_mysql
+  sphinx.generate_configuration
+  sphinx.index
+  
+  config.before :all do
+    `php -f spec/fixtures/data_generator.#{SphinxVersion}.php`
+    sphinx.start
+  end
+  
+  config.after :all do
+    sphinx.stop
+  end
+end
+
+def query_contents(key)
+  contents = open("spec/fixtures/data/#{key.to_s}.bin") { |f| f.read }
+  contents.respond_to?(:encoding) ?
+    contents.force_encoding('ASCII-8BIT') : contents
+end

data/spec/sphinx_helper.rb

@@ -0,0 +1,93 @@
+require 'mysql'
+require 'erb'
+require 'yaml'
+
+class SphinxHelper
+  attr_accessor :host, :username, :password
+  attr_reader   :path
+  
+  def initialize
+    @host     = "localhost"
+    @username = "anonymous"
+    @password = ""
+
+    if File.exist?("spec/fixtures/sql/conf.yml")
+      config    = YAML.load(File.open("spec/fixtures/sql/conf.yml"))
+      @host     = config["host"]
+      @username = config["username"]
+      @password = config["password"]
+    end
+    
+    @path = File.expand_path(File.dirname(__FILE__))
+  end
+  
+  def setup_mysql
+    server = Mysql.new @host, @username, @password
+    server.set_server_option(Mysql::OPTION_MULTI_STATEMENTS_ON)
+
+    unless server.list_dbs.include?("riddle")
+      server.create_db "riddle"
+    end
+
+    server.query "USE riddle;"
+    
+    structure = File.open("spec/fixtures/sql/structure.sql") { |f| f.read }
+    # Block ensures multiple statement transaction is closed.
+    server.query(structure) { |response| }
+    data = File.open("spec/fixtures/sql/data.sql") { |f|
+      while line = f.gets
+        server.query line
+      end
+    }
+
+    server.close
+  end
+  
+  def reset
+    setup_mysql
+    index
+  end
+  
+  def generate_configuration
+    template = File.open("spec/fixtures/sphinx/configuration.erb") { |f| f.read }
+    File.open("spec/fixtures/sphinx/spec.conf", "w") { |f|
+      f.puts ERB.new(template).result(binding)
+    }
+  end
+  
+  def index
+    cmd = "indexer --config #{@path}/fixtures/sphinx/spec.conf --all"
+    cmd << " --rotate" if running?
+    `#{cmd}`
+  end
+  
+  def start
+    return if running?
+
+    cmd = "searchd --config #{@path}/fixtures/sphinx/spec.conf"
+    `#{cmd}`
+
+    sleep(1)
+
+    unless running?
+      puts "Failed to start searchd daemon. Check fixtures/sphinx/searchd.log."
+    end
+  end
+  
+  def stop
+    return unless running?
+    `kill #{pid}`
+  end
+  
+  def pid
+    if File.exists?("#{@path}/fixtures/sphinx/searchd.pid")
+      `cat #{@path}/fixtures/sphinx/searchd.pid`[/\d+/]
+    else
+      nil
+    end
+  end
+
+  def running?
+    pid && `ps #{pid} | wc -l`.to_i > 1
+  end
+end

data/spec/unit/client_spec.rb

@@ -1,8 +1,9 @@
 require 'spec/spec_helper'
 
 describe Riddle::Client do
-  it "should have the same keys for both commands and versions" do
-    Riddle::Client::Commands.keys.should == Riddle::Client::Versions.keys
+  it "should have the same keys for both commands and versions, except persist" do
+    
+    (Riddle::Client::Commands.keys - [:persist]).should == Riddle::Client::Versions.keys
   end
   
   it "should default to localhost as the server" do
@@ -123,12 +124,28 @@ describe Riddle::Client do
     client.queue.first.should == query_contents(:field_weights)
   end
   
-  it "should build a message with acomment correctly" do
+  it "should build a message with a comment correctly" do
     client = Riddle::Client.new
     client.append_query "test ", "*", "commenting"
     client.queue.first.should == query_contents(:comment)
   end
   
+  if SphinxVersion == '0.9.9'
+    it "should build a message with overrides correctly" do
+      client = Riddle::Client.new
+      client.add_override("rating", :float, {1 => 10.0})
+      client.append_query "test "
+      client.queue.first.should == query_contents(:overrides)
+    end
+  
+    it "should build a message with selects correctly" do
+      client = Riddle::Client.new
+      client.select = "selecting"
+      client.append_query "test "
+      client.queue.first.should == query_contents(:select)
+    end
+  end
+  
   it "should keep multiple messages in the queue" do
     client = Riddle::Client.new
     client.weights = [100, 1]

data/spec/unit/configuration/distributed_index_spec.rb

@@ -36,6 +36,7 @@ describe Riddle::Configuration::DistributedIndex do
       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
@@ -48,6 +49,7 @@ index dist1
   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
 }

data/spec/unit/configuration/index_spec.rb

@@ -47,6 +47,7 @@ describe Riddle::Configuration::DistributedIndex do
     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"
@@ -67,6 +68,13 @@ describe Riddle::Configuration::DistributedIndex do
     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
@@ -82,6 +90,7 @@ index 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
@@ -102,6 +111,13 @@ index test1
   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
 }
     INDEX
   end

data/spec/unit/configuration/searchd_spec.rb

@@ -1,18 +1,38 @@
 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
+  if SphinxVersion == '0.9.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.port = 3312
+      searchd.should_not be_valid
     
-    searchd.pid_file = "file.pid"
-    searchd.should be_valid
+      searchd.pid_file = "file.pid"
+      searchd.should be_valid
     
-    searchd.port = nil
-    searchd.should_not 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
@@ -22,8 +42,11 @@ describe Riddle::Configuration::Searchd do
   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 )
+    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|
@@ -37,12 +60,22 @@ describe Riddle::Configuration::Searchd do
     searchd.port      = 3312
     searchd.pid_file  = "file.pid"
     
-    searchd.render.should == <<-SEARCHD
+    if SphinxVersion == '0.9.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
+      SEARCHD
+    end
   end
 end