riddle 1.5.4 → 1.5.5

data/.travis.yml

@@ -1,14 +1,19 @@
 language: ruby
+before_install:
+  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-1.10_i386_12.04.deb
+  - sudo dpkg -i fs-sphinx-1.10_i386_12.04.deb
+  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.0.4_i386_12.04.deb
+  - sudo dpkg -i fs-sphinx-2.0.4_i386_12.04.deb
+  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.0.6_i386_12.04.deb
+  - sudo dpkg -i fs-sphinx-2.0.6_i386_12.04.deb
 rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - ree
   - jruby-18mode
-  - ruby-head
 env:
-  - SPHINX_BIN=/usr/local/sphinx-0.9.9/bin SPHINX_VERSION=0.9.9
   - SPHINX_BIN=/usr/local/sphinx-1.10/bin SPHINX_VERSION=1.10
-  - SPHINX_BIN=/usr/local/sphinx-2.0.1/bin SPHINX_VERSION=2.0.1
+  - SPHINX_BIN=/usr/local/sphinx-2.0.4/bin SPHINX_VERSION=2.0.4
+  - SPHINX_BIN=/usr/local/sphinx-2.0.6/bin SPHINX_VERSION=2.0.6
 before_script: killall searchd; echo ''
 after_script:  killall searchd; echo ''

data/Gemfile

@@ -2,5 +2,5 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'mysql2',     '0.3.2',    :platform => :ruby
-gem 'jdbc-mysql', '>= 5.1.13', :platform => :jruby
+gem 'mysql2',     '0.3.2',  :platform => :ruby
+gem 'jdbc-mysql', '5.1.13', :platform => :jruby

data/HISTORY

@@ -1,3 +1,12 @@
+1.5.5 - February 23rd 2013
+- Added Riddle::Query.escape for SphinxQL queries.
+- Fixed failover handling (Ngan Pham).
+- Improved encoding default check (Darcy Brown).
+- Removing REE support (as it is no longer supported either).
+- Client key is used for binary protocol persistent connections (if set).
+- Escaping single quotes in SphinxQL snippets calls.
+- Regex fix for matching {'s (Rob Golkosky).
+
 1.5.4 - January 2nd 2013
 - RT indices get most of the same settings as SQL indices.
 - Escape single quotes in SphinxQL match queries, given we're wrapping them in single quotes.

data/README.textile

@@ -89,3 +89,5 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Ilia Lobsanov
 * Aleksey Morozov
 * S. Christoffer Eliesen
+* Rob Golkosky
+* Darcy Brown

data/lib/riddle.rb

@@ -12,7 +12,7 @@ module Riddle #:nodoc:
     #
   end
 
-  def self.encode(data, encoding = defined?(::Encoding) && ::Encoding.default_external)
+  def self.encode(data, encoding = @@use_encoding && ::Encoding.default_external)
     if @@use_encoding
       data.force_encoding(encoding)
     else

data/lib/riddle/0.9.9/client.rb

@@ -4,8 +4,8 @@ Riddle::Client::Versions[:update] = 0x102
 class Riddle::Client
   private
 
-  def initialise_connection
-    socket = initialise_socket
+  def initialise_connection(available_server)
+    socket = initialise_socket(available_server)
 
     # Send version
     socket.send [1].pack('N'), 0

data/lib/riddle/client.rb

@@ -481,9 +481,7 @@ module Riddle
 
       return if Versions[:search] < 0x116
 
-      @socket.send [
-        Commands[:persist], 0, 4, 1
-      ].pack("nnNN"), 0
+      @socket.send request_header(:persist) + [1].pack('N'), 0
     end
 
     def close
@@ -498,10 +496,10 @@ module Riddle
       available_servers = servers.dup
 
       if @timeout == 0
-        @socket = initialise_connection
+        @socket = initialise_connection(available_servers.first)
       else
         begin
-          Timeout.timeout(@timeout) { @socket = initialise_connection }
+          Timeout.timeout(@timeout) { @socket = initialise_connection(available_servers.first) }
         rescue Timeout::Error, Riddle::ConnectionError => e
           failed_servers ||= []
           failed_servers << available_servers.shift
@@ -546,8 +544,8 @@ module Riddle
       end
     end
 
-    def initialise_connection
-      socket = initialise_socket
+    def initialise_connection(available_server)
+      socket = initialise_socket(available_server)
 
       # Checking version
       version = socket.recv(4).unpack('N*').first
@@ -562,24 +560,24 @@ module Riddle
       socket
     end
 
-    def initialise_socket
+    def initialise_socket(available_server)
       tries = 0
       begin
         socket = if self.connection
           self.connection.call(self)
         elsif self.class.connection
           self.class.connection.call(self)
-        elsif server && server.index('/') == 0
-          UNIXSocket.new server
-        elsif server
-          TCPSocket.new server, @port
+        elsif available_server && available_server.index('/') == 0
+          UNIXSocket.new available_server
+        elsif available_server
+          TCPSocket.new available_server, @port
         else
           raise "Server not set."
         end
       rescue Errno::ETIMEDOUT, Errno::ECONNRESET, Errno::ECONNREFUSED => e
         retry if (tries += 1) < 5
         raise Riddle::ConnectionError,
-          "Connection to #{server} on #{@port} failed. #{e.message}"
+          "Connection to #{available_server} on #{@port} failed. #{e.message}"
       end
 
       socket
@@ -598,6 +596,8 @@ module Riddle
         end
       when :status
         [Commands[command], Versions[command], 4, 1].pack("nnNN")
+      when :persist
+        [Commands[command], 0, 4 + length].pack("nnN")
       else
         [Commands[command], Versions[command], length].pack("nnN")
       end

data/lib/riddle/configuration/parser.rb

@@ -59,7 +59,7 @@ class Riddle::Configuration::Parser
 
   def each_with_prefix(prefix)
     inner.keys.select { |key| key[/^#{prefix}\s+/] }.each do |key|
-      yield key.gsub(/^#{prefix}\s+/, '').gsub(/\s*{$/, ''), inner[key]
+      yield key.gsub(/^#{prefix}\s+/, '').gsub(/\s*\{$/, ''), inner[key]
     end
   end
 

data/lib/riddle/controller.rb

@@ -36,9 +36,9 @@ module Riddle
       if options[:nodetach]
         exec(cmd)
       elsif RUBY_PLATFORM =~ /mswin|mingw/
-        system("start /B #{cmd} 1> NUL 2>&1")
+        output = system("start /B #{cmd} 1> NUL 2>&1")
       else
-        `#{cmd}`
+        output = `#{cmd}`
       end
 
       sleep(1)
@@ -46,6 +46,8 @@ module Riddle
       unless running?
         puts "Failed to start searchd daemon. Check #{@configuration.searchd.log}."
       end
+      
+      output
     end
 
     def stop

data/lib/riddle/query.rb

@@ -58,6 +58,9 @@ module Riddle::Query
   end
 
   def self.snippets(data, index, query, options = nil)
+    data.gsub!("'")  { |x| "\\'" }
+    query.gsub!("'") { |x| "\\'" }
+
     options = ', ' + options.keys.collect { |key|
       value = options[key]
       value = "'#{value}'" if value.is_a?(String)
@@ -95,6 +98,14 @@ module Riddle::Query
       value
     end
   end
+
+  def self.escape(string)
+    string.gsub("\\") { |match|
+      "\\\\"
+    }.gsub(/[\(\)\|\-!@~"\/\^\$]/) { |match|
+      "\\\\#{match}"
+    }
+  end
 end
 
 require 'riddle/query/delete'

data/lib/riddle/version.rb

@@ -1,3 +1,3 @@
 module Riddle
-  Version = '1.5.4'
+  Version = '1.5.5'
 end

data/spec/riddle/query_spec.rb

@@ -46,6 +46,16 @@ describe Riddle::Query do
       Riddle::Query.snippets('foo bar baz', 'foo_core', 'foo',
         :before_match => '<strong>').should == "CALL SNIPPETS('foo bar baz', 'foo_core', 'foo', '<strong>' AS before_match)"
     end
+
+    it "escapes quotes in the text data" do
+      Riddle::Query.snippets("foo bar 'baz", 'foo_core', 'foo').
+        should == "CALL SNIPPETS('foo bar \\'baz', 'foo_core', 'foo')"
+    end
+
+    it "escapes quotes in the query data" do
+      Riddle::Query.snippets("foo bar baz", 'foo_core', "foo'").
+        should == "CALL SNIPPETS('foo bar baz', 'foo_core', 'foo\\'')"
+    end
   end
 
   describe '.create_function' do
@@ -61,4 +71,16 @@ describe Riddle::Query do
         should == 'UPDATE foo_core SET deleted = 1 WHERE id = 5'
     end
   end
+
+  describe '.escape' do
+    %w(( ) | - ! @ ~ " / ^ $).each do |reserved|
+      it "escapes #{reserved}" do
+        Riddle::Query.escape(reserved).should == "\\\\#{reserved}"
+      end
+    end
+
+    it "escapes \\" do
+      Riddle::Query.escape("\\").should == "\\\\"
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.4
+  - 5
+  version: 1.5.5
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-02 00:00:00 +11:00
+date: 2013-02-23 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency