riddle 1.5.5 → 1.5.6

data/.travis.yml

@@ -1,11 +1,11 @@
 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
+  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-1.10_x86_64_12.04.deb
+  - sudo dpkg -i fs-sphinx-1.10_x86_64_12.04.deb
+  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.0.4_x86_64_12.04.deb
+  - sudo dpkg -i fs-sphinx-2.0.4_x86_64_12.04.deb
+  - curl -O http://fs-packages.s3.amazonaws.com/fs-sphinx-2.0.6_x86_64_12.04.deb
+  - sudo dpkg -i fs-sphinx-2.0.6_x86_64_12.04.deb
 rvm:
   - 1.8.7
   - 1.9.2

data/HISTORY

@@ -1,3 +1,9 @@
+1.5.6 - May 7th 2013
+- Wrap underlying parse errors within Riddle::ResponseError instances when parsing responses.
+- Add lemmatization options (Kirill Lazarev).
+- Ignore configuration lines that are only comments when parsing configurations.
+- Construct GROUP ORDER and ORDER in SphinxQL in the correct order (Grzegorz Derebecki).
+
 1.5.5 - February 23rd 2013
 - Added Riddle::Query.escape for SphinxQL queries.
 - Fixed failover handling (Ngan Pham).

data/lib/riddle.rb

@@ -7,7 +7,7 @@ module Riddle #:nodoc:
   @@escape_pattern = /[\(\)\|\-!@~"&\/]/
   @@use_encoding   = defined?(::Encoding) &&
                      ::Encoding.respond_to?(:default_external)
-  
+
   class ConnectionError < StandardError #:nodoc:
     #
   end
@@ -19,36 +19,36 @@ module Riddle #:nodoc:
       data
     end
   end
-  
+
   def self.mutex
     @@mutex
   end
-  
+
   def self.escape_pattern
     @@escape_pattern
   end
-  
+
   def self.escape_pattern=(pattern)
     mutex.synchronize do
       @@escape_pattern = pattern
     end
   end
-  
+
   def self.escape(string)
     string.gsub(escape_pattern) { |char| "\\#{char}" }
   end
-  
+
   def self.loaded_version
     @@sphinx_version
   end
-  
+
   def self.loaded_version=(version)
     @@sphinx_version = version
   end
-  
+
   def self.version_warning
     return if loaded_version
-    
+
     STDERR.puts %Q{
 Riddle cannot detect Sphinx on your machine, and so can't determine which
 version of Sphinx you are planning on using. Please use one of the following
@@ -70,7 +70,6 @@ require 'riddle/client'
 require 'riddle/configuration'
 require 'riddle/controller'
 require 'riddle/query'
-require 'riddle/version'
 
 Riddle.loaded_version = nil
 Riddle::AutoVersion.configure

data/lib/riddle/client.rb

@@ -4,7 +4,9 @@ require 'riddle/client/response'
 
 module Riddle
   class VersionError < StandardError;  end
-  class ResponseError < StandardError; end
+  class ResponseError < StandardError
+    attr_accessor :original
+  end
   class OutOfBoundsError < StandardError; end
 
   # This class was heavily based on the existing Client API by Dmytro Shteflyuk
@@ -290,6 +292,10 @@ module Riddle
 
       @queue.clear
       results
+    rescue => original
+      error = ResponseError.new original.message
+      error.original = original
+      raise error
     end
 
     # Query the Sphinx daemon - defaulting to all indices, but you can specify

data/lib/riddle/configuration/indexer.rb

@@ -4,7 +4,7 @@ module Riddle
       def self.settings
         [ 
           :mem_limit, :max_iops, :max_iosize, :max_xmlpipe2_field,
-          :write_buffer, :max_file_field_buffer
+          :write_buffer, :max_file_field_buffer, :lemmatizer_base, :lemmatizer_cache
         ]
       end
       

data/lib/riddle/configuration/parser.rb

@@ -144,7 +144,7 @@ class Riddle::Configuration::Parser
       return line if line.nil?
 
       line = line.strip
-      line.empty? ? next_line : line
+      (line.empty? || line[/^#/]) ? next_line : line
     end
 
     def next_settings

data/lib/riddle/query/select.rb

@@ -84,10 +84,10 @@ class Riddle::Query::Select
     sql = "SELECT #{ @values.join(', ') } FROM #{ @indices.join(', ') }"
     sql << " WHERE #{ combined_wheres }" if wheres?
     sql << " GROUP BY #{@group_by}"      if !@group_by.nil?
-    sql << " ORDER BY #{@order_by}"      if !@order_by.nil?
     unless @order_within_group_by.nil?
       sql << " WITHIN GROUP ORDER BY #{@order_within_group_by}"
     end
+    sql << " ORDER BY #{@order_by}"      if !@order_by.nil?
     sql << " #{limit_clause}"   unless @limit.nil? && @offset.nil?
     sql << " #{options_clause}" unless @options.empty?
 

data/riddle.gemspec

@@ -1,10 +1,9 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
-require 'riddle/version'
 
 Gem::Specification.new do |s|
   s.name        = 'riddle'
-  s.version     = Riddle::Version
+  s.version     = '1.5.6'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']

data/spec/functional/connection_spec.rb

@@ -8,7 +8,7 @@ describe 'Sphinx Client', :live => true do
   after :each do
     Riddle::Client.connection = nil
   end
-  
+
   describe '.connection' do
     it "should use the given block" do
       Riddle::Client.connection = lambda { |client|
@@ -16,16 +16,16 @@ describe 'Sphinx Client', :live => true do
       }
       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') }.
-        should raise_error(RiddleSpecConnectionProcError)
+        should raise_error(Riddle::ResponseError)
     end
   end
-  
+
   describe '#connection' do
     it "use the given block" do
       client.connection = lambda { |client|
@@ -39,7 +39,7 @@ describe 'Sphinx Client', :live => true do
         raise RiddleSpecConnectionProcError
       }
       lambda { client.query('smith') }.
-        should raise_error(RiddleSpecConnectionProcError)
+        should raise_error(Riddle::ResponseError)
     end
 
     it "should prioritise instance over class connection" do
@@ -49,7 +49,7 @@ describe 'Sphinx Client', :live => true do
       client.connection = lambda { |client|
         TCPSocket.new(client.server, client.port)
       }
-    
+
       lambda { client.query('smith') }.should_not raise_error
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 1
   - 5
-  - 5
-  version: 1.5.5
+  - 6
+  version: 1.5.6
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-23 00:00:00 +11:00
+date: 2013-05-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,7 +117,6 @@ files:
 - lib/riddle/query/delete.rb
 - lib/riddle/query/insert.rb
 - lib/riddle/query/select.rb
-- lib/riddle/version.rb
 - riddle.gemspec
 - spec/fixtures/.gitignore
 - spec/fixtures/data/0.9.9/anchor.bin

data/lib/riddle/version.rb

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