riddle 1.5.6 → 1.5.7

data/HISTORY

@@ -1,3 +1,11 @@
+1.5.7 - July 9th 2013
+- Respect Riddle::OutOfBoundsError instances, instead of wrapping them in ResponseError.
+- Handle boolean values for snippets options.
+- Don't modify snippets parameters (Demian Ferreiro).
+- rt_attr_multi and rt_attr_multi_64 settings for real-time indices.
+- Arrays in INSERT/REPLACE statements are wrapped in parentheses with values separated by commas. Required for MVA values in real-time indices.
+- Clear out the query queue before running a single query.
+
 1.5.6 - May 7th 2013
 - Wrap underlying parse errors within Riddle::ResponseError instances when parsing responses.
 - Add lemmatization options (Kirill Lazarev).
@@ -89,4 +97,4 @@
 - Using Bundler, MySQL2 and Ruby 1.9.2 in development
 - Allow for Sphinx versions compiled from source and SVN (Greg Weber)
 
-1.2.2 - December 22nd 2011
+1.2.2 - December 22nd 2011

data/lib/riddle/client.rb

@@ -292,6 +292,8 @@ module Riddle
 
       @queue.clear
       results
+    rescue Riddle::OutOfBoundsError => error
+      raise error
     rescue => original
       error = ResponseError.new original.message
       error.original = original
@@ -340,6 +342,7 @@ module Riddle
     # will be described under <tt>:error</tt>.
     #
     def query(search, index = '*', comments = '')
+      @queue.clear
       @queue << query_message(search, index, comments)
       self.run.first
     end

data/lib/riddle/configuration/realtime_index.rb

@@ -6,12 +6,14 @@ module Riddle
       def self.settings
         Riddle::Configuration::IndexSettings.settings + [
           :rt_mem_limit, :rt_field, :rt_attr_uint, :rt_attr_bigint,
-          :rt_attr_float, :rt_attr_timestamp, :rt_attr_string
+          :rt_attr_float, :rt_attr_timestamp, :rt_attr_string, :rt_attr_multi,
+          :rt_attr_multi_64
         ]
       end
 
       attr_accessor :rt_mem_limit, :rt_field, :rt_attr_uint, :rt_attr_bigint,
-        :rt_attr_float, :rt_attr_timestamp, :rt_attr_string
+        :rt_attr_float, :rt_attr_timestamp, :rt_attr_string, :rt_attr_multi,
+        :rt_attr_multi_64
 
       def initialize(name)
         @name               = name
@@ -21,6 +23,8 @@ module Riddle
         @rt_attr_float      = []
         @rt_attr_timestamp  = []
         @rt_attr_string     = []
+        @rt_attr_multi      = []
+        @rt_attr_multi_64   = []
 
         initialize_settings
       end

data/lib/riddle/query.rb

@@ -58,11 +58,11 @@ module Riddle::Query
   end
 
   def self.snippets(data, index, query, options = nil)
-    data.gsub!("'")  { |x| "\\'" }
-    query.gsub!("'") { |x| "\\'" }
+    data = data.gsub("'")  { |x| "\\'" }
+    query = query.gsub("'") { |x| "\\'" }
 
     options = ', ' + options.keys.collect { |key|
-      value = options[key]
+      value = translate_value options[key]
       value = "'#{value}'" if value.is_a?(String)
 
       "#{value} AS #{key}"

data/lib/riddle/query/insert.rb

@@ -1,32 +1,32 @@
 class Riddle::Query::Insert
   attr_reader :columns, :values
-  
+
   def initialize(index, columns = [], values = [])
     @index   = index
     @columns = columns
     @values  = values.first.is_a?(Array) ? values : [values]
     @replace = false
   end
-  
+
   def replace!
     @replace = true
     self
   end
-  
+
   def to_sql
     "#{command} INTO #{@index} (#{columns_to_s}) VALUES (#{values_to_s})"
   end
-  
+
   private
-  
+
   def command
     @replace ? 'REPLACE' : 'INSERT'
   end
-  
+
   def columns_to_s
     columns.join(', ')
   end
-        
+
   def values_to_s
     values.collect { |value_set|
       value_set.collect { |value|
@@ -34,7 +34,7 @@ class Riddle::Query::Insert
       }.join(', ')
     }.join('), (')
   end
-  
+
   def translated_value(value)
     case value
     when String
@@ -43,6 +43,8 @@ class Riddle::Query::Insert
       value ? 1 : 0
     when Time
       value.to_i
+    when Array
+      "(#{value.join(',')})"
     else
       value
     end

data/riddle.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'riddle'
-  s.version     = '1.5.6'
+  s.version     = '1.5.7'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Pat Allan']
   s.email       = ['pat@freelancing-gods.com']

data/spec/functional/connection_spec.rb

@@ -42,6 +42,14 @@ describe 'Sphinx Client', :live => true do
         should raise_error(Riddle::ResponseError)
     end
 
+    it "should not override OutOfBoundsError instances" do
+      client.connection = lambda { |client|
+        raise Riddle::OutOfBoundsError
+      }
+      lambda { client.query('smith') }.
+        should raise_error(Riddle::OutOfBoundsError)
+    end
+
     it "should prioritise instance over class connection" do
       Riddle::Client.connection = lambda { |client|
         raise RiddleSpecConnectionProcError

data/spec/riddle/query_spec.rb

@@ -47,6 +47,11 @@ describe Riddle::Query do
         :before_match => '<strong>').should == "CALL SNIPPETS('foo bar baz', 'foo_core', 'foo', '<strong>' AS before_match)"
     end
 
+    it "handles boolean options" do
+      Riddle::Query.snippets('foo bar baz', 'foo_core', 'foo',
+        :exact_phrase => true).should == "CALL SNIPPETS('foo bar baz', 'foo_core', 'foo', 1 AS exact_phrase)"
+    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')"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 1
   - 5
-  - 6
-  version: 1.5.6
+  - 7
+  version: 1.5.7
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-07 00:00:00 -07:00
+date: 2013-07-09 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency