riddle 1.2.2 → 1.3.0

data/README.textile

@@ -84,3 +84,4 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Sam Goldstein
 * Matt Todd
 * Paco Guzmán
+* Greg Weber

data/lib/riddle/1.10/client.rb

@@ -21,6 +21,10 @@ class Riddle::Client
     message.append_ints options[:start_passage_id]
     message.append_string options[:html_strip_mode]
     
+    if Versions[:excerpt] >= 0x103
+      message.append_string options[:passage_boundary]
+    end
+    
     message.append_array options[:docs]
     
     message.to_s

data/lib/riddle/2.0.1.rb

@@ -0,0 +1,6 @@
+require 'riddle/0.9.9'
+require 'riddle/1.10'
+
+Riddle.loaded_version = '2.0.1'
+
+require 'riddle/2.0.1/client'

data/lib/riddle/2.0.1/client.rb

@@ -0,0 +1,2 @@
+Riddle::Client::Versions[:search]  = 0x118
+Riddle::Client::Versions[:excerpt] = 0x103

data/lib/riddle/auto_version.rb

@@ -6,8 +6,13 @@ class Riddle::AutoVersion
     case version
     when '0.9.8', '0.9.9'
       require "riddle/#{version}"
-    when '1.10-beta', '1.10-id64-beta'
+    when '1.10-beta', '1.10-id64-beta', '1.10-dev'
       require 'riddle/1.10'
+    when /2.0.1/
+      require 'riddle/2.0.1'
+    else
+      puts "found version: #{version}"
+      exit
     end
   end
 end

data/lib/riddle/client.rb

@@ -120,7 +120,7 @@ module Riddle
       :group_by, :group_function, :group_clause, :group_distinct, :cut_off,
       :retry_count, :retry_delay, :anchor, :index_weights, :rank_mode,
       :max_query_time, :field_weights, :timeout, :overrides, :select,
-      :connection
+      :connection, :key
     attr_reader :queue
     
     def self.connection=(value)
@@ -134,13 +134,14 @@ module Riddle
     # Can instantiate with a specific server and port - otherwise it assumes
     # defaults of localhost and 3312 respectively. All other settings can be
     # accessed and changed via the attribute accessors.
-    def initialize(servers=nil, port=nil)
+    def initialize(servers = nil, port = nil, key = nil)
       Riddle.version_warning
 
       servers = Array(servers || "localhost")
       @servers = servers.respond_to?(:shuffle) ? servers.shuffle : servers.sort_by{ rand }
       @port   = port     || 9312
       @socket = nil
+      @key    = key
       
       reset
       
@@ -390,6 +391,8 @@ module Riddle
       options[:load_files]       ||= false
       options[:html_strip_mode]  ||= 'index'
       options[:allow_empty]      ||= false
+      options[:passage_boundary] ||= 'none'
+      options[:emit_zones]       ||= false
       
       response = Response.new request(:excerpt, excerpts_message(options))
       
@@ -514,8 +517,9 @@ module Riddle
       true
     end
     
-    # Connects to the Sphinx daemon, and yields a socket to use. The socket is
-    # closed at the end of the block.
+    # If there's an active connection to the Sphinx daemon, this will yield the
+    # socket. If there's no active connection, then it will connect, yield the
+    # new socket, then close it.
     def connect(&block)
       if @socket.nil? || @socket.closed?
         @socket = nil
@@ -575,19 +579,33 @@ module Riddle
       version  = 0
       length   = 0
       message  = Array(messages).join("")
+      
       if message.respond_to?(:force_encoding)
         message = message.force_encoding('ASCII-8BIT')
       end
       
+      if key
+        prefix = Message.new
+        prefix.append_string key
+        message = prefix.to_s + message
+      end
+      
       connect do |socket|
         case command
         when :search
           # Message length is +4 to account for the following count value for
           # the number of messages (well, that's what I'm assuming).
-          socket.send [
-            Commands[command], Versions[command],
-            4+message.length,  messages.length
-          ].pack("nnNN") + message, 0
+          if Versions[command] >= 0x118
+            socket.send [
+              Commands[command], Versions[command],
+              8+message.length,  messages.length, 0
+            ].pack("nnNNN") + message, 0
+          else
+            socket.send [
+              Commands[command], Versions[command],
+              4+message.length,  messages.length
+            ].pack("nnNN") + message, 0
+          end
         when :status
           socket.send [
             Commands[command], Versions[command], 4, 1
@@ -795,6 +813,7 @@ module Riddle
       flags |= 64  if options[:force_all_words]
       flags |= 128 if options[:load_files]
       flags |= 256 if options[:allow_empty]
+      flags |= 512 if options[:emit_zones]
       flags
     end
   end

data/lib/riddle/configuration/searchd.rb

@@ -8,7 +8,7 @@ module Riddle
         :crash_log_path, :max_filters, :max_filter_values, :listen_backlog,
         :read_buffer, :read_unhinted, :max_batch_queries, :subtree_docs_cache,
         :subtree_hits_cache, :workers, :dist_threads, :binlog_path,
-        :binlog_flush, :binlog_max_log_size]
+        :binlog_flush, :binlog_max_log_size, :client_key]
       
       attr_accessor *self.settings
             

data/lib/riddle/controller.rb

@@ -12,7 +12,7 @@ module Riddle
     end
     
     def sphinx_version
-      `#{indexer} 2>&1`[/^Sphinx (\d+\.\d+(\.\d+|(\-id64)?\-beta))/, 1]
+      `#{indexer} 2>&1`[/^Sphinx (\d+\.\d+(\.\d+|(?:-dev|(\-id64)?\-beta)))/, 1]
     rescue
       nil
     end

data/spec/functional/connection_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 class RiddleSpecConnectionProcError < StandardError; end
 
@@ -14,7 +14,7 @@ describe "Sphinx Client" do
   describe '.connection' do
     it "should use the given block" do
       Riddle::Client.connection = lambda { |client|
-        TCPsocket.new(client.server, client.port)
+        TCPSocket.new(client.server, client.port)
       }
       @client.query("smith").should be_kind_of(Hash)
     end
@@ -31,7 +31,7 @@ describe "Sphinx Client" do
   describe '#connection' do
     it "use the given block" do
       @client.connection = lambda { |client|
-        TCPsocket.new(client.server, client.port)
+        TCPSocket.new(client.server, client.port)
       }
       @client.query("smith").should be_kind_of(Hash)
     end
@@ -49,7 +49,7 @@ describe "Sphinx Client" do
         raise RiddleSpecConnectionProcError
       }
       @client.connection = lambda { |client|
-        TCPsocket.new(client.server, client.port)
+        TCPSocket.new(client.server, client.port)
       }
     
       lambda { @client.query("smith") }.should_not raise_error

data/spec/functional/excerpt_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe "Sphinx Excepts" do
   before :each do

data/spec/functional/keywords_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe "Sphinx Keywords" do
   before :each do

data/spec/functional/persistance_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe "Sphinx Persistance Connection" do
   before :each do

data/spec/functional/search_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe "Sphinx Searches" do
   before :each do

data/spec/functional/status_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 if Riddle.loaded_version == '0.9.9' || Riddle.loaded_version == '1.10'
   describe "Sphinx Status" do

data/spec/functional/update_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe "Sphinx Updates" do
   before :each do

data/spec/riddle/auto_version_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::AutoVersion do
   describe '.configure' do
@@ -34,5 +34,12 @@ describe Riddle::AutoVersion do
       @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
   end
 end

data/spec/riddle/client_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Client do
   describe '#initialize' do

data/spec/riddle/configuration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration do
   #

data/spec/riddle/controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Controller do
   describe '#sphinx_version' do

data/spec/riddle_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle do
   describe '.version_warning' do

data/spec/spec_helper.rb

@@ -1,12 +1,15 @@
 require 'rubygems'
+require 'bundler'
 
 $:.unshift File.dirname(__FILE__) + '/../lib'
+$:.unshift File.dirname(__FILE__) + '/..'
+
+Bundler.require :default, :development
 
 require 'riddle'
-require 'spec'
-require 'spec/sphinx_helper'
+require 'sphinx_helper'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   sphinx = SphinxHelper.new
   sphinx.setup_mysql
   sphinx.generate_configuration

data/spec/sphinx_helper.rb

@@ -1,4 +1,3 @@
-require 'mysql'
 require 'erb'
 require 'yaml'
 
@@ -22,26 +21,29 @@ class SphinxHelper
   end
   
   def setup_mysql
-    server = Mysql.new @host, @username, @password
-    server.set_server_option(Mysql::OPTION_MULTI_STATEMENTS_ON)
+    client = Mysql2::Client.new(
+      :host => @host,
+      :username => @username,
+      :password => @password
+    )
 
-    unless server.list_dbs.include?("riddle")
-      server.query "CREATE DATABASE riddle;"
+    databases = client.query('SHOW DATABASES', :as => :array).to_a.flatten
+    unless databases.include?('riddle')
+      client.query 'CREATE DATABASE riddle'
     end
 
-    server.query "USE riddle;"
+    client.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| }
-    server.query <<-QUERY
+    structure.split(/;/).each { |sql| client.query sql }
+    client.query <<-SQL
       LOAD DATA LOCAL INFILE '#{@path}/fixtures/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)
-    QUERY
+    SQL
 
-    server.close
+    client.close
   end
   
   def reset

data/spec/unit/client_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Client do
   it "should have the same keys for both commands and versions, except persist" do

data/spec/unit/configuration/distributed_index_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration::DistributedIndex do
   it "should not be valid without any indexes" do

data/spec/unit/configuration/index_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration::DistributedIndex do
   it "should be invalid without a name, sources or path if there's no parent" do

data/spec/unit/configuration/indexer_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration::Indexer do
   it "should always be valid" do

data/spec/unit/configuration/realtime_index_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration::RealtimeIndex do
   let(:index) { Riddle::Configuration::RealtimeIndex.new('rt1') }

data/spec/unit/configuration/searchd_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration::Searchd do
   if Riddle.loaded_version == '0.9.9' || Riddle.loaded_version == '1.10'
@@ -78,4 +78,31 @@ searchd
       SEARCHD
     end
   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 == '0.9.9' || Riddle.loaded_version == '1.10'
+      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
+end

data/spec/unit/configuration/source_spec.rb

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

data/spec/unit/configuration/sql_source_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration::SQLSource do
   it "should be invalid without a host, user, database, and query if there's no parent" do

data/spec/unit/configuration/xml_source_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration::XMLSource do
   it "should be invalid without an xmlpipe command, name and type if there's no parent" do

data/spec/unit/configuration_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Configuration do
   it "should render all given indexes and sources, plus the indexer and search sections" do

data/spec/unit/filter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Client::Filter do
   it "should render a filter that uses an array of ints correctly" do

data/spec/unit/message_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Client::Message do
   it "should start with an empty string" do

data/spec/unit/response_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe Riddle::Client::Response do
   it "should interpret an integer correctly" do

data/spec/unit/riddle_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe "Riddle" do
   it "should escape characters correctly" do

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
+  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,39 +10,53 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-22 00:00:00 +11:00
+date: 2011-05-07 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: mysql2
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
-        version: 1.2.9
+        version: 0.3.2
   type: :development
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
+  name: jeweler
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 1.5.1
   type: :development
+  prerelease: false
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.8
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 description: A Ruby API and configuration helper for the Sphinx search service.
 email: pat@freelancing-gods.com
 executables: []
@@ -66,6 +75,8 @@ files:
 - lib/riddle/0.9.9/configuration/searchd.rb
 - lib/riddle/1.10.rb
 - lib/riddle/1.10/client.rb
+- lib/riddle/2.0.1.rb
+- lib/riddle/2.0.1/client.rb
 - lib/riddle/auto_version.rb
 - lib/riddle/client.rb
 - lib/riddle/client/filter.rb
@@ -112,7 +123,7 @@ files:
 - spec/unit/response_spec.rb
 - spec/unit/riddle_spec.rb
 has_rdoc: true
-homepage: http://riddle.freelancing-gods.com
+homepage: http://freelancing-god.github.com/riddle/
 licenses: []
 
 post_install_message: 
@@ -125,7 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 2692990953322091417
       segments: 
       - 0
       version: "0"
@@ -134,14 +145,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: An API for Sphinx, written in and for Ruby.