riddle 1.4.0 → 1.5.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/connection_spec.rb

@@ -2,10 +2,8 @@ require 'spec_helper'
 
 class RiddleSpecConnectionProcError < StandardError; end
 
-describe "Sphinx Client" do
-  before :each do
-    @client = Riddle::Client.new("localhost", 9313)
-  end
+describe 'Sphinx Client', :live => true do
+  let(:client) { Riddle::Client.new 'localhost', 9313 }
 
   after :each do
     Riddle::Client.connection = nil
@@ -16,31 +14,31 @@ describe "Sphinx Client" do
       Riddle::Client.connection = lambda { |client|
         TCPSocket.new(client.server, client.port)
       }
-      @client.query("smith").should be_kind_of(Hash)
+      client.query('smith').should be_kind_of(Hash)
     end
     
     it "should fail with errors from the given block" do
       Riddle::Client.connection = lambda { |client|
         raise RiddleSpecConnectionProcError
       }
-      lambda { @client.query("smith") }.
+      lambda { client.query('smith') }.
         should raise_error(RiddleSpecConnectionProcError)
     end
   end
   
   describe '#connection' do
     it "use the given block" do
-      @client.connection = lambda { |client|
+      client.connection = lambda { |client|
         TCPSocket.new(client.server, client.port)
       }
-      @client.query("smith").should be_kind_of(Hash)
+      client.query('smith').should be_kind_of(Hash)
     end
 
     it "should fail with errors from the given block" do
-      @client.connection = lambda { |client|
+      client.connection = lambda { |client|
         raise RiddleSpecConnectionProcError
       }
-      lambda { @client.query("smith") }.
+      lambda { client.query('smith') }.
         should raise_error(RiddleSpecConnectionProcError)
     end
 
@@ -48,11 +46,11 @@ describe "Sphinx Client" do
       Riddle::Client.connection = lambda { |client|
         raise RiddleSpecConnectionProcError
       }
-      @client.connection = lambda { |client|
+      client.connection = lambda { |client|
         TCPSocket.new(client.server, client.port)
       }
     
-      lambda { @client.query("smith") }.should_not raise_error
+      lambda { client.query('smith') }.should_not raise_error
     end
   end
 end

data/spec/functional/excerpt_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Sphinx Excepts" do
+describe "Sphinx Excepts", :live => true do
   before :each do
     @client = Riddle::Client.new("localhost", 9313)
   end

data/spec/functional/keywords_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Sphinx Keywords" do
+describe "Sphinx Keywords", :live => true do
   before :each do
     @client = Riddle::Client.new("localhost", 9313)
   end

data/spec/functional/persistance_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Sphinx Persistance Connection" do
+describe "Sphinx Persistance Connection", :live => true do
   before :each do
     @client = Riddle::Client.new("localhost", 9313)
   end

data/spec/functional/search_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Sphinx Searches" do
+describe "Sphinx Searches", :live => true do
   let(:client) { Riddle::Client.new 'localhost', 9313 }
   
   it "should return a single hash if a single query" do

data/spec/functional/status_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 if Riddle.loaded_version == '0.9.9' || Riddle.loaded_version == '1.10'
-  describe "Sphinx Status" do
+  describe "Sphinx Status", :live => true do
     before :each do
       @client = Riddle::Client.new("localhost", 9313)
       @status = @client.status

data/spec/functional/update_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Sphinx Updates" do
+describe "Sphinx Updates", :live => true do
   before :each do
     @client = Riddle::Client.new("localhost", 9313)
   end

data/spec/riddle/auto_version_spec.rb

@@ -5,39 +5,47 @@ describe Riddle::AutoVersion do
     before :each do
       @controller = Riddle::Controller.new stub('configuration'), 'sphinx.conf'
       Riddle::Controller.stub!(:new => @controller)
+
+      unless ENV['SPHINX_VERSION'].nil?
+        @env_version, ENV['SPHINX_VERSION'] = ENV['SPHINX_VERSION'].dup, nil
+      end
+    end
+
+    after :each do
+      ENV['SPHINX_VERSION'] = @env_version unless @env_version.nil?
     end
-    
+
     it "should require 0.9.8 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/0.9.8')
-      
+
       @controller.stub!(:sphinx_version => '0.9.8')
       Riddle::AutoVersion.configure
     end
-    
+
     it "should require 0.9.9 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/0.9.9')
-      
+
       @controller.stub!(:sphinx_version => '0.9.9')
       Riddle::AutoVersion.configure
     end
-    
+
     it "should require 1.10 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/1.10')
-      
+
       @controller.stub!(:sphinx_version => '1.10-beta')
       Riddle::AutoVersion.configure
     end
-    
+
     it "should require 1.10 if using 1.10 with 64 bit IDs" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/1.10')
-      
+
       @controller.stub!(:sphinx_version => '1.10-id64-beta')
       Riddle::AutoVersion.configure
     end
-    
+
     it "should require 2.0.1 if that is the known version" do
       Riddle::AutoVersion.should_receive(:require).with('riddle/2.0.1')
-      
+
       @controller.stub!(:sphinx_version => '2.0.1-beta')
       Riddle::AutoVersion.configure
     end

data/spec/riddle/query/select_spec.rb

@@ -2,63 +2,127 @@ require 'spec_helper'
 
 describe Riddle::Query::Select do
   let(:query) { Riddle::Query::Select.new }
-  
+
   it 'handles basic queries on a specific index' do
     query.from('foo_core').to_sql.should == 'SELECT * FROM foo_core'
   end
-  
+
   it 'handles queries on multiple indices' do
     query.from('foo_core').from('foo_delta').to_sql.
       should == 'SELECT * FROM foo_core, foo_delta'
   end
-  
+
   it 'accepts multiple arguments for indices' do
     query.from('foo_core', 'foo_delta').to_sql.
       should == 'SELECT * FROM foo_core, foo_delta'
   end
-  
+
+  it "handles custom select values" do
+    query.values('@weight').from('foo_core').to_sql.
+      should == 'SELECT *, @weight FROM foo_core'
+  end
+
   it 'handles basic queries with a search term' do
     query.from('foo_core').matching('foo').to_sql.
       should == "SELECT * FROM foo_core WHERE MATCH('foo')"
   end
-  
+
   it 'handles filters with integers' do
     query.from('foo_core').matching('foo').where(:bar_id => 10).to_sql.
       should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bar_id = 10"
   end
-  
+
+  it "handles exclusive filters with integers" do
+    query.from('foo_core').matching('foo').where_not(:bar_id => 10).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bar_id <> 10"
+  end
+
+  it "handles filters with true" do
+    query.from('foo_core').matching('foo').where(:bar => true).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bar = 1"
+  end
+
+  it "handles exclusive filters with true" do
+    query.from('foo_core').matching('foo').where_not(:bar => true).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bar <> 1"
+  end
+
+  it "handles filters with false" do
+    query.from('foo_core').matching('foo').where(:bar => false).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bar = 0"
+  end
+
+  it "handles exclusive filters with false" do
+    query.from('foo_core').matching('foo').where_not(:bar => false).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bar <> 0"
+  end
+
+  it "handles filters with arrays" do
+    query.from('foo_core').matching('foo').where(:bars => [1, 2]).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bars IN (1, 2)"
+  end
+
+  it "handles exclusive filters with arrays" do
+    query.from('foo_core').matching('foo').where_not(:bars => [1, 2]).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bars NOT IN (1, 2)"
+  end
+
+  it "handles filters with timestamps" do
+    time = Time.now
+    query.from('foo_core').matching('foo').where(:created_at => time).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND created_at = #{time.to_i}"
+  end
+
+  it "handles exclusive filters with timestamps" do
+    time = Time.now
+    query.from('foo_core').matching('foo').where_not(:created_at => time).
+      to_sql.should == "SELECT * FROM foo_core WHERE MATCH('foo') AND created_at <> #{time.to_i}"
+  end
+
+  it "handles filters with ranges" do
+    query.from('foo_core').matching('foo').where(:bar => 1..5).to_sql.
+      should == "SELECT * FROM foo_core WHERE MATCH('foo') AND bar BETWEEN 1 AND 5"
+  end
+
   it 'handles grouping' do
     query.from('foo_core').group_by('bar_id').to_sql.
       should == "SELECT * FROM foo_core GROUP BY bar_id"
   end
-  
+
   it 'handles ordering' do
     query.from('foo_core').order_by('bar_id ASC').to_sql.
       should == 'SELECT * FROM foo_core ORDER BY bar_id ASC'
   end
-  
+
   it 'handles group ordering' do
     query.from('foo_core').order_within_group_by('bar_id ASC').to_sql.
       should == 'SELECT * FROM foo_core WITHIN GROUP ORDER BY bar_id ASC'
   end
-  
+
   it 'handles a limit' do
     query.from('foo_core').limit(10).to_sql.
       should == 'SELECT * FROM foo_core LIMIT 10'
   end
-  
+
   it 'handles an offset' do
     query.from('foo_core').offset(20).to_sql.
       should == 'SELECT * FROM foo_core LIMIT 20, 20'
   end
-  
+
   it 'handles an option' do
     query.from('foo_core').with_options(:bar => :baz).to_sql.
       should == 'SELECT * FROM foo_core OPTION bar=baz'
   end
-  
+
   it 'handles multiple options' do
-    query.from('foo_core').with_options(:bar => :baz, :qux => :quux).to_sql.
-      should == 'SELECT * FROM foo_core OPTION bar=baz, qux=quux'
+    sql = query.from('foo_core').with_options(:bar => :baz, :qux => :quux).
+      to_sql
+    sql.should match(/OPTION .*bar=baz/)
+    sql.should match(/OPTION .*qux=quux/)
+  end
+
+  it "handles options of hashes" do
+    query.from('foo_core').with_options(:weights => {:foo => 5}).to_sql.
+      should == 'SELECT * FROM foo_core OPTION weights=(foo=5)'
   end
 end

data/spec/riddle/query_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Riddle::Query do
+describe Riddle::Query, :live => true do
   describe '.connection' do
     let(:connection) { Riddle::Query.connection 'localhost', 9306 }
     
@@ -9,12 +9,14 @@ describe Riddle::Query do
     end
     
     it "should handle search requests" do
-      connection.query(Riddle::Query.tables).first.should == {
+      connection.query(Riddle::Query.tables).to_a[0].should == {
         'Index' => 'people', 'Type' => 'local'
       }
     end
   end
-  
+end unless RUBY_PLATFORM == 'java' || Riddle.loaded_version.to_i < 2
+
+describe Riddle::Query do
   describe '.set' do
     it 'handles a single value' do
       Riddle::Query.set('foo', 'bar').should == 'SET GLOBAL foo = bar'

data/spec/spec_helper.rb

@@ -4,33 +4,31 @@ require 'bundler'
 $:.unshift File.dirname(__FILE__) + '/../lib'
 $:.unshift File.dirname(__FILE__) + '/..'
 
+Dir['spec/support/**/*.rb'].each { |f| require f }
+
 Bundler.require :default, :development
 
 require 'riddle'
-require 'sphinx_helper'
 
 RSpec.configure do |config|
-  sphinx = SphinxHelper.new
+  config.include BinaryFixtures
+
+  sphinx = Sphinx.new
   sphinx.setup_mysql
   sphinx.generate_configuration
   sphinx.index
-  
-  config.before :all do
-    `php -f spec/fixtures/data_generator.#{Riddle.loaded_version}.php`
-    sphinx.start
+
+  BinaryFixtures.build_fixtures Riddle.loaded_version
+
+  config.before :all do |group|
+    sphinx.start if group.class.metadata[:live]
   end
-  
-  config.after :all do
-    sphinx.stop
+
+  config.after :all do |group|
+    sphinx.stop if group.class.metadata[:live]
   end
 
   # enable filtering for examples
   config.filter_run :wip => true
   config.run_all_when_everything_filtered = true
 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/support/binary_fixtures.rb

@@ -0,0 +1,18 @@
+module BinaryFixtures
+  def self.build_fixtures(version = nil)
+    return if ENV['TRAVIS']
+    
+    version ||= %w(0.9.9 1.10 2.0.1)
+    Array(version).each do |version|
+      FileUtils.mkdir_p "spec/fixtures/data/#{version}"
+      `php -f spec/fixtures/data_generator.#{version}.php`
+    end
+  end
+  
+  def query_contents(key)
+    path     = "spec/fixtures/data/#{Riddle.loaded_version}/#{key}.bin"
+    contents = open(path) { |f| f.read }
+    contents.respond_to?(:encoding) ?
+      contents.force_encoding('ASCII-8BIT') : contents
+  end
+end

data/spec/support/sphinx.rb

@@ -0,0 +1,135 @@
+require 'erb'
+require 'yaml'
+
+if RUBY_PLATFORM == 'java'
+  require 'java'
+  require 'jdbc/mysql'
+end
+
+class Sphinx
+  attr_accessor :host, :username, :password
+
+  def initialize
+    self.host     = 'localhost'
+    self.username = 'root'
+    self.password = ''
+
+    if File.exist?('spec/fixtures/sql/conf.yml')
+      config    = YAML.load(File.open('spec/fixtures/sql/conf.yml'))
+      self.host     = config['host']
+      self.username = config['username']
+      self.password = config['password']
+    end
+  end
+
+  def setup_mysql
+    return setup_mysql_on_jruby if RUBY_PLATFORM == 'java'
+
+    client = Mysql2::Client.new(
+      :host     => host,
+      :username => username,
+      :password => password
+    )
+
+    databases = client.query('SHOW DATABASES', :as => :array).to_a.flatten
+    unless databases.include?('riddle')
+      client.query 'CREATE DATABASE riddle'
+    end
+
+    client.query 'USE riddle'
+
+    structure = File.open('spec/fixtures/sql/structure.sql') { |f| f.read }
+    structure.split(/;/).each { |sql| client.query sql }
+    client.query <<-SQL
+      LOAD DATA INFILE '#{fixtures_path}/sql/data.tsv' INTO TABLE
+      `riddle`.`people` FIELDS TERMINATED BY ',' ENCLOSED BY "'" (gender,
+      first_name, middle_initial, last_name, street_address, city, state,
+      postcode, email, birthday)
+    SQL
+
+    client.close
+  end
+
+  def setup_mysql_on_jruby
+    address = "jdbc:mysql://#{host}"
+    client = java.sql.DriverManager.getConnection(address, username, password)
+
+    set       = client.createStatement.executeQuery('SHOW DATABASES')
+    databases = []
+    databases << set.getString(1) while set.next
+
+    unless databases.include?('riddle')
+      client.createStatement.execute 'CREATE DATABASE riddle'
+    end
+
+    client.createStatement.execute 'USE riddle'
+
+    structure = File.open('spec/fixtures/sql/structure.sql') { |f| f.read }
+    structure.split(/;/).each { |sql| client.createStatement.execute sql }
+    client.createStatement.execute <<-SQL
+      LOAD DATA INFILE '#{fixtures_path}/sql/data.tsv' INTO TABLE
+      `riddle`.`people` FIELDS TERMINATED BY ',' ENCLOSED BY "'" (gender,
+      first_name, middle_initial, last_name, street_address, city, state,
+      postcode, email, birthday)
+    SQL
+  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 = "#{bin_path}indexer --config #{fixtures_path}/sphinx/spec.conf --all"
+    cmd << ' --rotate' if running?
+    `#{cmd}`
+  end
+
+  def start
+    return if running?
+
+    `#{bin_path}searchd --config #{fixtures_path}/sphinx/spec.conf`
+
+    sleep(1)
+
+    unless running?
+      puts 'Failed to start searchd daemon. Check fixtures/sphinx/searchd.log.'
+    end
+  end
+
+  def stop
+    return unless running?
+
+    stop_flag = '--stopwait'
+    stop_flag = '--stop' if Riddle.loaded_version.to_i < 1
+    `#{bin_path}searchd --config #{fixtures_path}/sphinx/spec.conf #{stop_flag}`
+  end
+
+  private
+
+  def pid
+    if File.exists?("#{fixtures_path}/sphinx/searchd.pid")
+      `cat #{fixtures_path}/sphinx/searchd.pid`[/\d+/]
+    else
+      nil
+    end
+  end
+
+  def running?
+    pid && `ps #{pid} | wc -l`.to_i > 1
+  end
+
+  def fixtures_path
+    File.expand_path File.join(File.dirname(__FILE__), '..', 'fixtures')
+  end
+
+  def bin_path
+    @bin_path ||= begin
+      path = (ENV['SPHINX_BIN'] || '').dup
+      path.insert -1, '/' if path.length > 0 && path[/\/$/].nil?
+      path
+    end
+  end
+end