iproto 0.3.12 → 0.3.13

data/iproto.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'iproto'
-  s.version           = '0.3.12'
+  s.version           = '0.3.13'
   s.date              = '2014-01-15'
   s.rubyforge_project = 'iproto'
 

data/lib/iproto/tcp_socket.rb

@@ -26,7 +26,7 @@ module IProto
 
     def could_be_connected?
       @socket ? @socket != :disconnected
-              : (@retry || @reconnect_time < Time.now)
+              : (@reconnect || @reconnect_time < Time.now)
     end
 
     def socket
@@ -38,7 +38,11 @@ module IProto
       end
       sock
     rescue Errno::ECONNREFUSED => e
-      @socket = :disconnected  unless @reconnect
+      unless @reconnect
+        @socket = :disconnected
+      else
+        @reconnect_time = Time.now + @reconnect_timeout
+      end
       raise CouldNotConnect, e
     end
 
@@ -46,6 +50,9 @@ module IProto
 
     # begin ConnectionAPI
     def send_request(request_type, body)
+      unless could_be_connected?
+        raise Disconnected, "connection is closed"
+      end
       begin
         request_id = next_request_id
         socket.send pack_request(request_type, request_id, body), 0

data/lib/iproto.rb

@@ -1,5 +1,5 @@
 module IProto
-  VERSION = '0.3.12'
+  VERSION = '0.3.13'
   class IProtoError < StandardError; end
   class ConnectionError < IProtoError; end
   class CouldNotConnect < ConnectionError; end

metadata

@@ -2,7 +2,7 @@
 name: iproto
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors:
 - Andrew Rudenko