riddle 1.0.6 → 1.0.7

data/lib/riddle/client.rb

@@ -132,7 +132,7 @@ module Riddle
       Riddle.version_warning
       
       @server = server || "localhost"
-      @port   = port   || 3312
+      @port   = port   || 9312
       @socket = nil
       
       reset
@@ -474,9 +474,10 @@ module Riddle
     # Connects to the Sphinx daemon, and yields a socket to use. The socket is
     # closed at the end of the block.
     def connect(&block)
-      unless @socket.nil?
+      if @socket && !@socket.closed?
         yield @socket
       else
+        @socket = nil
         open_socket
         begin
           yield @socket

data/lib/riddle/configuration.rb

@@ -18,8 +18,6 @@ module Riddle
     attr_accessor :indexer
     
     def initialize
-      Riddle.version_warning
-      
       @indexer = Riddle::Configuration::Indexer.new
       @searchd = Riddle::Configuration::Searchd.new
       @indexes = []

data/spec/functional/connection_spec.rb

@@ -4,7 +4,7 @@ class RiddleSpecConnectionProcError < StandardError; end
 
 describe "Sphinx Client" do
   before :each do
-    @client = Riddle::Client.new("localhost", 3313)
+    @client = Riddle::Client.new("localhost", 9313)
   end
 
   after :each do

data/spec/functional/excerpt_spec.rb

@@ -2,7 +2,7 @@ require 'spec/spec_helper'
 
 describe "Sphinx Excepts" do
   before :each do
-    @client = Riddle::Client.new("localhost", 3313)
+    @client = Riddle::Client.new("localhost", 9313)
   end
   
   it "should highlight a single word multiple times in a document" do

data/spec/functional/keywords_spec.rb

@@ -2,7 +2,7 @@ require 'spec/spec_helper'
 
 describe "Sphinx Keywords" do
   before :each do
-    @client = Riddle::Client.new("localhost", 3313)
+    @client = Riddle::Client.new("localhost", 9313)
   end
   
   it "should return an array of hashes" do

data/spec/functional/persistance_spec.rb

@@ -2,7 +2,7 @@ require 'spec/spec_helper'
 
 describe "Sphinx Persistance Connection" do
   before :each do
-    @client = Riddle::Client.new("localhost", 3313)
+    @client = Riddle::Client.new("localhost", 9313)
   end
   
   it "should raise errors once already opened" do

data/spec/functional/search_spec.rb

@@ -2,7 +2,7 @@ require 'spec/spec_helper'
 
 describe "Sphinx Searches" do
   before :each do
-    @client = Riddle::Client.new("localhost", 3313)
+    @client = Riddle::Client.new("localhost", 9313)
   end
   
   it "should return a single hash if a single query" do

data/spec/functional/status_spec.rb

@@ -3,7 +3,7 @@ require 'spec/spec_helper'
 if Riddle.loaded_version == '0.9.9'
   describe "Sphinx Status" do
     before :each do
-      @client = Riddle::Client.new("localhost", 3313)
+      @client = Riddle::Client.new("localhost", 9313)
       @status = @client.status
     end
   

data/spec/functional/update_spec.rb

@@ -2,7 +2,7 @@ require 'spec/spec_helper'
 
 describe "Sphinx Updates" do
   before :each do
-    @client = Riddle::Client.new("localhost", 3313)
+    @client = Riddle::Client.new("localhost", 9313)
   end
   
   it "should update a single record appropriately" do

data/spec/riddle/configuration_spec.rb

@@ -1,11 +1,5 @@
 require 'spec/spec_helper'
 
 describe Riddle::Configuration do
-  describe '#initialize' do
-    it "should check the loaded Sphinx version" do
-      Riddle.should_receive(:version_warning)
-      
-      Riddle::Configuration.new
-    end
-  end
+  #
 end

data/spec/riddle/controller_spec.rb

@@ -6,6 +6,11 @@ describe Riddle::Controller do
       @controller = Riddle::Controller.new stub('controller'), 'sphinx.conf'
     end
     
+    it "should return 0.9.9 if using 0.9.9" do
+      @controller.stub!(:` => 'Sphinx 0.9.9-release (r2117)')
+      @controller.sphinx_version.should == '0.9.9'
+    end
+    
     it "should return 0.9.9 if using 0.9.9 rc2" do
       @controller.stub!(:` => 'Sphinx 0.9.9-rc2 (r1785)')
       @controller.sphinx_version.should == '0.9.9'

data/spec/unit/client_spec.rb

@@ -10,8 +10,8 @@ describe Riddle::Client do
     Riddle::Client.new.server.should == "localhost"
   end
   
-  it "should default to port 3312" do
-    Riddle::Client.new.port.should == 3312
+  it "should default to port 9312" do
+    Riddle::Client.new.port.should == 9312
   end
   
   it "should translate anchor arguments correctly" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: riddle
 version: !ruby/object:Gem::Version 
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-02 00:00:00 +11:00
+date: 2009-12-08 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency