riddle 1.3.3 → 1.4.0

data/README.textile

@@ -86,3 +86,8 @@ Thanks to the following people who have contributed to Riddle in some shape or f
 * Paco Guzmán
 * Greg Weber
 * Enrico Thierbach
+* Jason Lambert
+* Saberma
+* James Cook
+* Alexey Artamonov
+* Paul Gibler

data/lib/riddle.rb

@@ -1,13 +1,24 @@
+require 'thread'
 require 'socket'
 require 'timeout'
 
 module Riddle #:nodoc:
   @@mutex          = Mutex.new
   @@escape_pattern = /[\(\)\|\-!@~"&\/]/
+  @@use_encoding   = defined?(::Encoding) &&
+                     ::Encoding.respond_to?(:default_external)
   
   class ConnectionError < StandardError #:nodoc:
     #
   end
+
+  def self.encode(data, encoding = defined?(::Encoding) && ::Encoding.default_external)
+    if @@use_encoding
+      data.force_encoding(encoding)
+    else
+      data
+    end
+  end
   
   def self.mutex
     @@mutex
@@ -51,6 +62,7 @@ lines after "require 'riddle'" to avoid this warning.
 
     }
   end
+
 end
 
 require 'riddle/auto_version'

data/lib/riddle/0.9.9/configuration/searchd.rb

@@ -5,16 +5,20 @@ module Riddle
         set_listen
         clear_deprecated
         
-        !( @listen.nil? || @pid_file.nil? )
+        !( @listen.nil? || @listen.empty? || @pid_file.nil? )
       end
       
       private
       
       def set_listen
-        return unless @listen.nil?
+        return unless @listen.nil? || @listen.empty?
         
-        @listen = @port.to_s if @port && @address.nil?
-        @listen = "#{@address}:#{@port}" if @address && @port
+        @listen = []
+        @listen << @port.to_s if @port
+        @listen << "9306:mysql41" if @mysql41.is_a?(TrueClass)
+        @listen << "#{@mysql41}:mysql41" if @mysql41.is_a?(Fixnum)
+        
+        @listen.each { |l| l.insert(0, "#{@address}:") } if @address
       end
       
       def clear_deprecated

data/lib/riddle/client.rb

@@ -246,7 +246,7 @@ module Riddle
         result[:fields] = response.next_array
 
         attributes = response.next_int
-        for i in 0...attributes
+        attributes.times do
           attribute_name = response.next
           type           = response.next_int
 
@@ -278,7 +278,7 @@ module Riddle
         result[:time] = ('%.3f' % (response.next_int / 1000.0)).to_f || 0.0
 
         words = response.next_int
-        for i in 0...words
+        words.times do
           word = response.next
           docs = response.next_int
           hits = response.next_int
@@ -615,11 +615,7 @@ module Riddle
       status   = -1
       version  = 0
       length   = 0
-      message  = Array(messages).join("")
-      
-      if message.respond_to?(:force_encoding)
-        message = message.force_encoding('ASCII-8BIT')
-      end
+      message  = Riddle.encode(Array(messages).join(""), 'ASCII-8BIT')
       
       connect do |socket|
         case command
@@ -642,6 +638,10 @@ module Riddle
         
         while response.length < (length || 0)
           part = socket.recv(length - response.length)
+
+          # will return 0 bytes if remote side closed TCP connection, e.g, searchd segfaulted.
+          break if part.length == 0 && socket.is_a?(TcpSocket)
+
           response << part if part
         end
       end

data/lib/riddle/client/message.rb

@@ -15,9 +15,7 @@ module Riddle
       
       # Append a string's length, then the string itself
       def append_string(str)
-        string = str.respond_to?(:force_encoding) ?
-          str.dup.force_encoding('ASCII-8BIT') : str
-        
+        string = Riddle.encode(str.dup, 'ASCII-8BIT')
         @message << [string.send(@size_method)].pack('N') + string
       end
       

data/lib/riddle/client/response.rb

@@ -17,7 +17,7 @@ module Riddle
         result = @str[@marker, len]
         @marker += len
         
-        return result
+        Riddle.encode(result)
       end
       
       # Return the next integer value from the stream
@@ -25,14 +25,14 @@ module Riddle
         int = @str[@marker, 4].unpack('N*').first
         @marker += 4
         
-        return int
+        int
       end
       
       def next_64bit_int
         high, low = @str[@marker, 8].unpack('N*N*')[0..1]
         @marker += 8
         
-        return (high << 32) + low
+        (high << 32) + low
       end
       
       # Return the next float value from the stream
@@ -40,49 +40,49 @@ module Riddle
         float = @str[@marker, 4].unpack('N*').pack('L').unpack('f*').first
         @marker += 4
         
-        return float
+        float
       end
       
       # Returns an array of string items
       def next_array
         count = next_int
         items = []
-        for i in 0...count
+        count.times do
           items << self.next
         end
         
-        return items
+        items
       end
       
       # Returns an array of int items
       def next_int_array
         count = next_int
         items = []
-        for i in 0...count
+        count.times do
           items << self.next_int
         end
         
-        return items
+        items
       end
       
       def next_float_array
         count = next_int
         items = []
-        for i in 0...count
+        count.times do
           items << self.next_float
         end
         
-        return items
+        items
       end
       
       def next_64bit_int_array
         count = next_int
         items = []
-        for i in 0...count
+        count.times do
           items << self.next_64bit_int
         end
         
-        return items
+        items
       end
       
       # Returns the length of the streamed data
@@ -91,4 +91,4 @@ module Riddle
       end
     end
   end
-end
+end

data/lib/riddle/configuration/distributed_index.rb

@@ -1,8 +1,12 @@
 module Riddle
   class Configuration
     class DistributedIndex < Riddle::Configuration::Section
-      self.settings = [:type, :local, :agent, :agent_blackhole,
-        :agent_connect_timeout, :agent_query_timeout]
+      def self.settings
+        [ 
+          :type, :local, :agent, :agent_blackhole,
+          :agent_connect_timeout, :agent_query_timeout
+        ]
+      end
       
       attr_accessor :name, :local_indexes, :remote_indexes, :agent_blackhole,
         :agent_connect_timeout, :agent_query_timeout
@@ -46,4 +50,4 @@ module Riddle
       end
     end
   end
-end
+end

data/lib/riddle/configuration/index.rb

@@ -1,17 +1,21 @@
 module Riddle
   class Configuration
     class Index < Riddle::Configuration::Section
-      self.settings = [:type, :source, :path, :docinfo, :mlock, :morphology,
-        :dict, :index_sp, :index_zones, :min_stemming_len, :stopwords,
-        :wordforms, :exceptions, :min_word_len, :charset_dictpath,
-        :charset_type, :charset_table, :ignore_chars, :min_prefix_len,
-        :min_infix_len, :prefix_fields, :infix_fields, :enable_star,
-        :expand_keywords, :ngram_len, :ngram_chars, :phrase_boundary,
-        :phrase_boundary_step, :blend_chars, :blend_mode, :html_strip,
-        :html_index_attrs, :html_remove_elements, :preopen, :ondisk_dict,
-        :inplace_enable, :inplace_hit_gap, :inplace_docinfo_gap,
-        :inplace_reloc_factor, :inplace_write_factor, :index_exact_words,
-        :overshort_step, :stopwords_step, :hitless_words]
+      def self.settings
+        [
+          :type, :source, :path, :docinfo, :mlock, :morphology,
+          :dict, :index_sp, :index_zones, :min_stemming_len, :stopwords,
+          :wordforms, :exceptions, :min_word_len, :charset_dictpath,
+          :charset_type, :charset_table, :ignore_chars, :min_prefix_len,
+          :min_infix_len, :prefix_fields, :infix_fields, :enable_star,
+          :expand_keywords, :ngram_len, :ngram_chars, :phrase_boundary,
+          :phrase_boundary_step, :blend_chars, :blend_mode, :html_strip,
+          :html_index_attrs, :html_remove_elements, :preopen, :ondisk_dict,
+          :inplace_enable, :inplace_hit_gap, :inplace_docinfo_gap,
+          :inplace_reloc_factor, :inplace_write_factor, :index_exact_words,
+          :overshort_step, :stopwords_step, :hitless_words
+        ]
+      end
       
       attr_accessor :name, :parent, :type, :sources, :path, :docinfo, :mlock,
         :morphologies, :dict, :index_sp, :index_zones, :min_stemming_len,
@@ -149,4 +153,4 @@ module Riddle
       end
     end
   end
-end
+end

data/lib/riddle/configuration/indexer.rb

@@ -1,8 +1,12 @@
 module Riddle
   class Configuration
     class Indexer < Riddle::Configuration::Section
-      self.settings = [:mem_limit, :max_iops, :max_iosize, :max_xmlpipe2_field,
-        :write_buffer, :max_file_field_buffer]
+      def self.settings
+        [ 
+          :mem_limit, :max_iops, :max_iosize, :max_xmlpipe2_field,
+          :write_buffer, :max_file_field_buffer
+        ]
+      end
       
       attr_accessor *self.settings
             
@@ -17,4 +21,4 @@ module Riddle
       end
     end
   end
-end
+end

data/lib/riddle/configuration/realtime_index.rb

@@ -1,8 +1,12 @@
 module Riddle
   class Configuration
     class RealtimeIndex < Riddle::Configuration::Section
-      self.settings = [:type, :path, :rt_mem_limit, :rt_field, :rt_attr_uint,
-        :rt_attr_bigint, :rt_attr_float, :rt_attr_timestamp, :rt_attr_string]
+      def self.settings
+        [
+          :type, :path, :rt_mem_limit, :rt_field, :rt_attr_uint,
+          :rt_attr_bigint, :rt_attr_float, :rt_attr_timestamp, :rt_attr_string
+        ]
+      end
       
       attr_accessor :name
       attr_accessor *self.settings

data/lib/riddle/configuration/searchd.rb

@@ -1,19 +1,24 @@
 module Riddle
   class Configuration
     class Searchd < Riddle::Configuration::Section
-      self.settings = [:listen, :address, :port, :log, :query_log,
-        :query_log_format, :read_timeout, :client_timeout, :max_children,
-        :pid_file, :max_matches, :seamless_rotate, :preopen_indexes,
-        :unlink_old, :attr_flush_period, :ondisk_dict_default, :max_packet_size,
-        :mva_updates_pool, :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, :collation_server,
-        :collation_libc_locale, :plugin_dir, :mysql_version_string,
-        :rt_flush_period, :thread_stack, :expansion_limit,
-        :compat_sphinxql_magics, :watchdog, :client_key]
+      def self.settings
+        [
+          :listen, :address, :port, :log, :query_log,
+          :query_log_format, :read_timeout, :client_timeout, :max_children,
+          :pid_file, :max_matches, :seamless_rotate, :preopen_indexes,
+          :unlink_old, :attr_flush_period, :ondisk_dict_default, :max_packet_size,
+          :mva_updates_pool, :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, :collation_server,
+          :collation_libc_locale, :plugin_dir, :mysql_version_string,
+          :rt_flush_period, :thread_stack, :expansion_limit,
+        :compat_sphinxql_magics, :watchdog, :client_key
+        ]
+      end
       
       attr_accessor *self.settings
+      attr_accessor :mysql41
             
       def render
         raise ConfigurationError unless valid?

data/lib/riddle/configuration/section.rb

@@ -1,12 +1,10 @@
 module Riddle
   class Configuration
     class Section
-      class << self
-        attr_accessor :settings
+      def self.settings
+        []
       end
       
-      settings = []
-      
       def valid?
         true
       end

data/lib/riddle/configuration/sql_source.rb

@@ -1,17 +1,21 @@
 module Riddle
   class Configuration
     class SQLSource < Riddle::Configuration::Source
-      self.settings = [:type, :sql_host, :sql_user, :sql_pass, :sql_db,
-        :sql_port, :sql_sock, :mysql_connect_flags, :mysql_ssl_cert,
-        :mysql_ssl_key, :mysql_ssl_ca, :odbc_dsn, :sql_query_pre, :sql_query,
-        :sql_joined_field, :sql_file_field, :sql_query_range, :sql_range_step,
-        :sql_query_killlist, :sql_attr_uint, :sql_attr_bool, :sql_attr_bigint,
-        :sql_attr_timestamp, :sql_attr_str2ordinal, :sql_attr_float,
-        :sql_attr_multi, :sql_attr_string, :sql_attr_str2wordcount,
-        :sql_column_buffers, :sql_field_string, :sql_field_str2wordcount,
-        :sql_query_post, :sql_query_post_index, :sql_ranged_throttle,
-        :sql_query_info, :mssql_winauth, :mssql_unicode, :unpack_zlib,
-        :unpack_mysqlcompress, :unpack_mysqlcompress_maxsize]
+      def self.settings
+        [
+          :type, :sql_host, :sql_user, :sql_pass, :sql_db,
+          :sql_port, :sql_sock, :mysql_connect_flags, :mysql_ssl_cert,
+          :mysql_ssl_key, :mysql_ssl_ca, :odbc_dsn, :sql_query_pre, :sql_query,
+          :sql_joined_field, :sql_file_field, :sql_query_range, :sql_range_step,
+          :sql_query_killlist, :sql_attr_uint, :sql_attr_bool, :sql_attr_bigint,
+          :sql_attr_timestamp, :sql_attr_str2ordinal, :sql_attr_float,
+          :sql_attr_multi, :sql_attr_string, :sql_attr_str2wordcount,
+          :sql_column_buffers, :sql_field_string, :sql_field_str2wordcount,
+          :sql_query_post, :sql_query_post_index, :sql_ranged_throttle,
+          :sql_query_info, :mssql_winauth, :mssql_unicode, :unpack_zlib,
+        :unpack_mysqlcompress, :unpack_mysqlcompress_maxsize
+        ]
+      end
       
       attr_accessor *self.settings
       
@@ -45,4 +49,4 @@ module Riddle
       end
     end
   end
-end
+end

data/lib/riddle/configuration/xml_source.rb

@@ -1,10 +1,14 @@
 module Riddle
   class Configuration
     class XMLSource < Riddle::Configuration::Source
-      self.settings = [:type, :xmlpipe_command, :xmlpipe_field,
-        :xmlpipe_attr_uint, :xmlpipe_attr_bool, :xmlpipe_attr_timestamp,
-        :xmlpipe_attr_str2ordinal, :xmlpipe_attr_float, :xmlpipe_attr_multi,
-        :xmlpipe_fixup_utf8]
+      def self.settings 
+        [
+          :type, :xmlpipe_command, :xmlpipe_field,
+          :xmlpipe_attr_uint, :xmlpipe_attr_bool, :xmlpipe_attr_timestamp,
+          :xmlpipe_attr_str2ordinal, :xmlpipe_attr_float, :xmlpipe_attr_multi,
+          :xmlpipe_fixup_utf8
+        ]
+      end
       
       attr_accessor *self.settings
       
@@ -26,4 +30,4 @@ module Riddle
       end
     end
   end
-end
+end

data/lib/riddle/controller.rb

@@ -12,7 +12,7 @@ module Riddle
     end
     
     def sphinx_version
-      `#{indexer} 2>&1`[/^Sphinx (\d+\.\d+(\.\d+|(?:-dev|(\-id64)?\-beta)))/, 1]
+      `#{indexer} 2>&1`[/Sphinx (\d+\.\d+(\.\d+|(?:-dev|(\-id64)?\-beta)))/, 1]
     rescue
       nil
     end
@@ -32,7 +32,7 @@ module Riddle
       
       cmd = "#{searchd} --pidfile --config \"#{@path}\""
       
-      if RUBY_PLATFORM =~ /mswin/
+      if RUBY_PLATFORM =~ /mswin|mingw/
         system("start /B #{cmd} 1> NUL 2>&1")
       else
         `#{cmd}`
@@ -53,7 +53,7 @@ module Riddle
       stop_flag = 'stop' if Riddle.loaded_version.split('.').first == '0'
       cmd = %(#{searchd} --pidfile --config "#{@path}" --#{stop_flag})
       
-      if RUBY_PLATFORM =~ /mswin/
+      if RUBY_PLATFORM =~ /mswin|mingw/
         system("start /B #{cmd} 1> NUL 2>&1")
       else
         `#{cmd}`

data/spec/riddle/configuration_spec.rb

@@ -1,5 +1,28 @@
 require 'spec_helper'
 
 describe Riddle::Configuration do
-  #
+  describe Riddle::Configuration::Index do
+    describe '#settings' do
+      it 'should return array with all settings of index' do
+        Riddle::Configuration::Index.settings.should_not be_empty
+      end
+
+      it 'should return array which contains a docinfo' do
+        Riddle::Configuration::Index.settings.should be_include :docinfo
+      end
+    end
+  end
+
+  describe 'class inherited from Riddle::Configuration::Index' do
+    before :all do
+      class TestIndex < Riddle::Configuration::Index; end
+    end
+   
+    describe '#settings' do
+      it 'should has same settings as Riddle::Configuration::Index' do
+        TestIndex.settings.should == Riddle::Configuration::Index.settings
+      end
+    end
+
+  end
 end

data/spec/spec_helper.rb

@@ -23,6 +23,10 @@ RSpec.configure do |config|
   config.after :all do
     sphinx.stop
   end
+
+  # enable filtering for examples
+  config.filter_run :wip => true
+  config.run_all_when_everything_filtered = true
 end
 
 def query_contents(key)

data/spec/sphinx_helper.rb

@@ -37,7 +37,7 @@ class SphinxHelper
     structure = File.open("spec/fixtures/sql/structure.sql") { |f| f.read }
     structure.split(/;/).each { |sql| client.query sql }
     client.query <<-SQL
-      LOAD DATA LOCAL INFILE '#{@path}/fixtures/sql/data.tsv' INTO TABLE
+      LOAD DATA 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)

data/spec/unit/configuration/searchd_spec.rb

@@ -5,17 +5,17 @@ describe Riddle::Configuration::Searchd do
     it "should be invalid without a listen or pid_file" do
       searchd = Riddle::Configuration::Searchd.new
       searchd.should_not be_valid
-    
+      
       searchd.port = 3312
       searchd.should_not be_valid
-    
+      
       searchd.pid_file = "file.pid"
       searchd.should be_valid
-    
+      
       searchd.port    = nil
       searchd.listen  = nil
       searchd.should_not be_valid
-    
+      
       searchd.listen = "localhost:3312"
       searchd.should be_valid
     end
@@ -101,6 +101,84 @@ searchd
   port = 3312
   pid_file = file.pid
   client_key = secret
+}
+      SEARCHD
+    end
+  end
+  
+  if Riddle.loaded_version.to_f >= 0.9
+    it "should render with mysql41 on the default port if true" do
+      searchd = Riddle::Configuration::Searchd.new
+      searchd.mysql41  = true
+      searchd.pid_file = 'file.pid'
+      
+      searchd.render.should == <<-SEARCHD
+searchd
+{
+  listen = 9306:mysql41
+  pid_file = file.pid
+}
+      SEARCHD
+    end
+    
+    it "should render with mysql41 on a given port" do
+      searchd = Riddle::Configuration::Searchd.new
+      searchd.mysql41  = 9307
+      searchd.pid_file = 'file.pid'
+      
+      searchd.render.should == <<-SEARCHD
+searchd
+{
+  listen = 9307:mysql41
+  pid_file = file.pid
+}
+      SEARCHD
+    end
+    
+    it "allows for both normal and mysql41 connections" do
+      searchd = Riddle::Configuration::Searchd.new
+      searchd.mysql41  = true
+      searchd.port     = 9312
+      searchd.pid_file = 'file.pid'
+      
+      searchd.render.should == <<-SEARCHD
+searchd
+{
+  listen = 9312
+  listen = 9306:mysql41
+  pid_file = file.pid
+}
+      SEARCHD
+    end
+    
+    it "uses given address for mysql41 connections" do
+      searchd = Riddle::Configuration::Searchd.new
+      searchd.mysql41  = true
+      searchd.address  = '127.0.0.1'
+      searchd.pid_file = 'file.pid'
+      
+      searchd.render.should == <<-SEARCHD
+searchd
+{
+  listen = 127.0.0.1:9306:mysql41
+  pid_file = file.pid
+}
+      SEARCHD
+    end
+    
+    it "applies the given address to both normal and mysql41 connections" do
+      searchd = Riddle::Configuration::Searchd.new
+      searchd.mysql41  = true
+      searchd.port     = 9312
+      searchd.address  = 'sphinx.server.local'
+      searchd.pid_file = 'file.pid'
+      
+      searchd.render.should == <<-SEARCHD
+searchd
+{
+  listen = sphinx.server.local:9312
+  listen = sphinx.server.local:9306:mysql41
+  pid_file = file.pid
 }
       SEARCHD
     end

metadata

@@ -2,7 +2,7 @@
 name: riddle
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.3
+  version: 1.4.0
 platform: ruby
 authors: 
 - Pat Allan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +02:00
+date: 2011-08-02 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3668127680877211237
+      hash: 1550771664451883617
       segments: 
       - 0
       version: "0"