sphinx 0.9.9.2117 → 0.9.10

data/lib/sphinx/request.rb

@@ -1,121 +1,50 @@
 module Sphinx
   # Pack ints, floats, strings, and arrays to internal representation
   # needed by Sphinx search engine.
-  #
   class Request
-    # Initialize new empty request.
-    #
+    # Initialize new request.
     def initialize
       @request = ''
     end
-
+    
     # Put int(s) to request.
-    #
-    # @param [Integer] ints one or more integers to put to the request.
-    # @return [Request] self.
-    #
-    # @example
-    #   request.put_int 10
-    #   request.put_int 10, 20, 30
-    #   request.put_int *[10, 20, 30]
-    #
     def put_int(*ints)
       ints.each { |i| @request << [i].pack('N') }
-      self
     end
 
     # Put 64-bit int(s) to request.
-    #
-    # @param [Integer] ints one or more 64-bit integers to put to the request.
-    # @return [Request] self.
-    #
-    # @example
-    #   request.put_int64 10
-    #   request.put_int64 10, 20, 30
-    #   request.put_int64 *[10, 20, 30]
-    #
     def put_int64(*ints)
       ints.each { |i| @request << [i].pack('q').reverse }#[i >> 32, i & ((1 << 32) - 1)].pack('NN') }
-      self
     end
 
-    # Put strings to request.
-    #
-    # @param [String] strings one or more strings to put to the request.
-    # @return [Request] self.
-    #
-    # @example
-    #   request.put_string 'str1'
-    #   request.put_string 'str1', 'str2', 'str3'
-    #   request.put_string *['str1', 'str2', 'str3']
-    #
+    # Put string(s) to request (first length, then the string itself).
     def put_string(*strings)
       strings.each { |s| @request << [s.length].pack('N') + s }
-      self
     end
-
+    
     # Put float(s) to request.
-    #
-    # @param [Integer, Float] floats one or more floats to put to the request.
-    # @return [Request] self.
-    #
-    # @example
-    #   request.put_float 10
-    #   request.put_float 10, 20, 30
-    #   request.put_float *[10, 20, 30]
-    #
     def put_float(*floats)
       floats.each do |f|
-        t1 = [f.to_f].pack('f') # machine order
+        t1 = [f].pack('f') # machine order
         t2 = t1.unpack('L*').first # int in machine order
         @request << [t2].pack('N')
       end
-      self
     end
-
-    # Put array of ints to request.
-    #
-    # @param [Array<Integer>] arr an array of integers to put to the request.
-    # @return [Request] self.
-    #
-    # @example
-    #   request.put_int_array [10]
-    #   request.put_int_array [10, 20, 30]
-    #
+    
+    # Put array of ints to request (first length, then the array itself)
     def put_int_array(arr)
       put_int arr.length, *arr
-      self
     end
 
-    # Put array of 64-bit ints to request.
-    #
-    # @param [Array<Integer>] arr an array of integers to put to the request.
-    # @return [Request] self.
-    #
-    # @example
-    #   request.put_int64_array [10]
-    #   request.put_int64_array [10, 20, 30]
-    #
+    # Put array of 64-bit ints to request (first length, then the array itself)
     def put_int64_array(arr)
-      put_int(arr.length)
+      put_int arr.length
       put_int64(*arr)
-      self
     end
-
-    # Returns the serialized request.
-    #
-    # @return [String] serialized request.
-    #
+    
+    # Returns the entire message
     def to_s
       @request
     end
-
-    # Returns CRC32 of the serialized request.
-    #
-    # @return [Integer] CRC32 of the serialized request.
-    #
-    def crc32
-      Zlib.crc32(@request)
-    end
   end
 end

data/lib/sphinx/response.rb

@@ -1,8 +1,6 @@
 module Sphinx
   # Unpack internal Sphinx representation of ints, floats, strings, and arrays.
   # needed by Sphinx search engine.
-  #
-  # @private
   class Response
     # Initialize new request.
     def initialize(response)

data/lib/sphinx.rb

@@ -1,51 +1,6 @@
-# Sphinx Client API
-#
-# Author::    Dmytro Shteflyuk <mailto:kpumuk@kpumuk.info>.
-# Copyright:: Copyright (c) 2006 — 2009 Dmytro Shteflyuk
-# License::   Distributes under the same terms as Ruby
-# Version::   0.9.9-r2117
-# Website::   http://kpumuk.info/projects/ror-plugins/sphinx
-# Sources::   http://github.com/kpumuk/sphinx
-#
-# This library is distributed under the terms of the Ruby license.
-# You can freely distribute/modify this library.
-#
-module Sphinx
-  VERSION = begin
-    require 'yaml'
-    config = YAML.load(File.read(File.dirname(__FILE__) + '/../VERSION.yml'))
-    "#{config[:major]}.#{config[:minor]}.#{config[:patch]}.#{config[:build]}"
-  end
-
-  # Base class for all Sphinx errors
-  class SphinxError < StandardError; end
-
-  # Connect error occurred on the API side.
-  class SphinxConnectError < SphinxError; end
-
-  # Request error occurred on the API side.
-  class SphinxResponseError < SphinxError; end
-
-  # Internal error occurred inside searchd.
-  class SphinxInternalError < SphinxError; end
+require File.dirname(__FILE__) + '/sphinx/request'
+require File.dirname(__FILE__) + '/sphinx/response'
+require File.dirname(__FILE__) + '/sphinx/client'
 
-  # Temporary error occurred inside searchd.
-  class SphinxTemporaryError < SphinxError; end
-
-  # Unknown error occurred inside searchd.
-  class SphinxUnknownError < SphinxError; end
-end
-
-require 'net/protocol'
-require 'socket'
-require 'zlib'
-
-path = File.dirname(__FILE__)
-require "#{path}/sphinx/constants"
-require "#{path}/sphinx/indifferent_access"
-require "#{path}/sphinx/request"
-require "#{path}/sphinx/response"
-require "#{path}/sphinx/timeout"
-require "#{path}/sphinx/buffered_io"
-require "#{path}/sphinx/server"
-require "#{path}/sphinx/client"
+module Sphinx
+end

data/spec/client_response_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../init'
 
 # To execute these tests you need to execute sphinx_test.sql and configure sphinx using sphinx.conf
 # (both files are placed under sphinx directory)
@@ -24,7 +24,7 @@ describe Sphinx::Client, 'connected' do
 
     it 'should process errors in Query method' do
       @sphinx.Query('wifi', 'fakeindex').should be_false
-      @sphinx.GetLastError.should_not be_empty
+      @sphinx.GetLastError.length.should_not == 0
     end
   end
   
@@ -34,14 +34,14 @@ describe Sphinx::Client, 'connected' do
       @sphinx.AddQuery('gprs', 'test1')
       results = @sphinx.RunQueries
       results.should be_an_instance_of(Array)
-      results.should have(2).items
+      results.length.should == 2
       validate_results_wifi(results[0])
     end
 
     it 'should process errors in RunQueries method' do
       @sphinx.AddQuery('wifi', 'fakeindex')
       r = @sphinx.RunQueries
-      r[0]['error'].should_not be_empty
+      r[0]['error'].length.should_not == 0
     end
   end
 
@@ -62,6 +62,25 @@ describe Sphinx::Client, 'connected' do
     end
   end
 
+  context 'in Open method' do
+    it 'should open socket' do
+      @sphinx.Open.should be_true
+      socket = @sphinx.instance_variable_get(:@socket)
+      socket.should be_kind_of(TCPSocket)
+      socket.close
+    end
+
+    it 'should produce an error when opened twice' do
+      @sphinx.Open.should be_true
+      @sphinx.Open.should be_false
+      @sphinx.GetLastError.should == 'already connected'
+
+      socket = @sphinx.instance_variable_get(:@socket)
+      socket.should be_kind_of(TCPSocket)
+      socket.close
+    end
+  end
+
   context 'in UpdateAttributes method' do
     it 'should parse response' do
       @sphinx.UpdateAttributes('test1', ['group_id'], { 2 => [1] }).should == 1
@@ -82,43 +101,23 @@ describe Sphinx::Client, 'connected' do
     end
   end
 
-  context 'in Open method' do
-    it 'should open socket' do
-      @sphinx.Open.should be_true
-      socket = @sphinx.servers.first.instance_variable_get(:@socket)
-      socket.should_not be_nil
-      socket.should be_kind_of(Sphinx::BufferedIO)
-      socket.close
-    end
-  
-    it 'should produce an error when opened twice' do
-      @sphinx.Open.should be_true
-      @sphinx.Open.should be_false
-      @sphinx.GetLastError.should == 'already connected'
-  
-      socket = @sphinx.servers.first.instance_variable_get(:@socket)
-      socket.should be_kind_of(Sphinx::BufferedIO)
-      socket.close
-    end
-  end
-  
   context 'in Close method' do
     it 'should open socket' do
       @sphinx.Open.should be_true
       @sphinx.Close.should be_true
-      @sphinx.servers.first.instance_variable_get(:@socket).should be_nil
+      @sphinx.instance_variable_get(:@socket).should be_false
     end
-  
+
     it 'should produce socket is closed' do
       @sphinx.Close.should be_false
       @sphinx.GetLastError.should == 'not connected'
-      @sphinx.servers.first.instance_variable_get(:@socket).should be_nil
-  
+      @sphinx.instance_variable_get(:@socket).should be_false
+
       @sphinx.Open.should be_true
       @sphinx.Close.should be_true
       @sphinx.Close.should be_false
       @sphinx.GetLastError.should == 'not connected'
-      @sphinx.servers.first.instance_variable_get(:@socket).should be_nil
+      @sphinx.instance_variable_get(:@socket).should be_false
     end
   end
 
@@ -130,15 +129,23 @@ describe Sphinx::Client, 'connected' do
     end
   end
 
+  context 'in FlushAttrs method' do
+    it 'should not raise an error' do
+      expect {
+        @sphinx.FlushAttrs
+      }.to_not raise_error
+    end
+  end
+
   def validate_results_wifi(result)
     result['total_found'].should == 3
     result['matches'].length.should == 3
     result['time'].should_not be_nil
     result['attrs'].should == {
-      'group_id' => Sphinx::SPH_ATTR_INTEGER,
-      'created_at' => Sphinx::SPH_ATTR_TIMESTAMP,
-      'rating' => Sphinx::SPH_ATTR_FLOAT,
-      'tags' => Sphinx::SPH_ATTR_MULTI | Sphinx::SPH_ATTR_INTEGER
+      'group_id' => Sphinx::Client::SPH_ATTR_INTEGER,
+      'created_at' => Sphinx::Client::SPH_ATTR_TIMESTAMP,
+      'rating' => Sphinx::Client::SPH_ATTR_FLOAT,
+      'tags' => Sphinx::Client::SPH_ATTR_MULTI | Sphinx::Client::SPH_ATTR_INTEGER
     }
     result['fields'].should == [ 'name', 'description' ]
     result['total'].should == 3