astro-remcached 0.2.1 → 0.2.2

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 2

data/lib/remcached/client.rb

@@ -24,14 +24,6 @@ module Memcached
       @connect_deferrable
     end
 
-    def close
-      close_connection
-      @connected = false
-      @pending.each do |opaque, callback|
-        callback.call :status => Errors::DISCONNECTED
-      end
-    end
-
     def post_init
       @recv_buf = ""
       @recv_state = :header
@@ -46,7 +38,7 @@ module Memcached
     RECONNECT_DELAY = 10
     RECONNECT_JITTER = 5
     def unbind
-      close
+      @connected = false
       EventMachine::Timer.new(RECONNECT_DELAY + rand(RECONNECT_JITTER),
                               method(:reconnect))
     end
@@ -86,6 +78,14 @@ module Memcached
       @pending = []
     end
 
+    def unbind
+      super
+      @pending.each do |opaque, callback|
+        callback.call :status => Errors::DISCONNECTED
+      end
+      @pending = []
+    end
+
     def send_request(pkt, &callback)
       @opaque_counter += 1
       @opaque_counter %= 1 << 32

data/lib/remcached.rb

@@ -5,12 +5,15 @@ require 'remcached/client'
 module Memcached
   class << self
     ##
-    # +servers+: either Array of host:port strings or Hash of
-    # host:port => weight integers
+    # +servers+: Array of host:port strings
     def servers=(servers)
       if defined?(@clients) && @clients
         while client = @clients.shift
-          client.close
+          begin
+            client.close
+          rescue Exception
+            # This is allowed to fail silently
+          end
         end
       end
 

data/remcached.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{remcached}
-  s.version = "0.2.1"
- 
+  s.version = "0.2.2"
+
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephan Maka"]
-  s.date = %q{2009-09-11}
+  s.date = %q{2009-09-12}
   s.description = %q{Ruby EventMachine memcached client}
   s.email = %q{astro@spaceboyz.net}
   s.files = [

data/spec/client_spec.rb

@@ -9,6 +9,7 @@ describe Memcached::Client do
     end
   end
   def stop
+    @cl.close_connection
     EM.stop
   end
 

data/spec/memcached_spec.rb

@@ -17,6 +17,7 @@ describe Memcached::Client do
     end
   end
   def stop
+    Memcached.servers = []
     EM.stop
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: astro-remcached
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Stephan Maka
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-11 00:00:00 -07:00
+date: 2009-09-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -36,6 +36,7 @@ files:
 - spec/packet_spec.rb
 has_rdoc: false
 homepage: http://github.com/astro/remcached/
+licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -56,7 +57,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Ruby EventMachine memcached client