em-hiredis 0.1.0 → 0.1.1

data/Gemfile

@@ -1,6 +1,3 @@
 source "http://rubygems.org"
 
-gem "em-spec", :git => "git://github.com/bcg/em-spec.git"
-gem "eventmachine"
-gem "hiredis"
-gem "rspec"
+gemspec

data/LICENCE

@@ -0,0 +1,19 @@
+Copyright (C) 2011 by Martyn Loughran
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -75,10 +75,10 @@ Hacking on em-hiredis is pretty simple, make sure you have Bundler installed:
 
 To run all the tests:
 
-    rake
+    bundle exec rake
 
 To run an individual test:
 
     bundle exec rspec spec/redis_commands_spec.rb
 
-Much thanks to the em-redis gem for getting this gem bootstrapped with some tests.
+Many thanks to the em-redis gem for getting this gem bootstrapped with some tests.

data/em-hiredis.gemspec

@@ -12,7 +12,11 @@ Gem::Specification.new do |s|
   s.summary     = %q{Eventmachine redis client}
   s.description = %q{Eventmachine redis client using hiredis native parser}
 
-  s.add_dependency 'hiredis', '~> 0.3.0'
+  s.add_dependency 'hiredis', '~> 0.4.0'
+
+  s.add_development_dependency 'em-spec', '~> 0.2.5'
+  s.add_development_dependency 'rspec', '~> 2.6.0'
+  s.add_development_dependency 'rake'
 
   s.rubyforge_project = "em-hiredis"
 

data/lib/em-hiredis/client.rb

@@ -14,6 +14,7 @@ module EventMachine::Hiredis
     def initialize(host, port, password = nil, db = nil)
       @host, @port, @password, @db = host, port, password, db
       @subs, @psubs, @defs = [], [], []
+      @closing_connection = false
     end
 
     def connect
@@ -25,18 +26,22 @@ module EventMachine::Hiredis
           @defs = []
           @deferred_status = nil
           @connected = false
-          @reconnecting = true
-          reconnect
+          unless @closing_connection
+            @reconnecting = true
+            reconnect
+          end
         else
-          EM.add_timer(1) { reconnect }
+          unless @closing_connection
+            EM.add_timer(1) { reconnect }
+          end
         end
       end
 
       @connection.on(:connected) do
         @connected = true
 
-        select(@db) if @db
         auth(@password) if @password
+        select(@db) if @db
 
         @subs.each { |s| method_missing(:subscribe, s) }
         @psubs.each { |s| method_missing(:psubscribe, s) }
@@ -94,6 +99,10 @@ module EventMachine::Hiredis
       @connected && @defs.size > 0
     end
 
+    def connected?
+      @connected
+    end
+
     def subscribe(channel)
       @subs << channel
       method_missing(:subscribe, channel)
@@ -141,6 +150,12 @@ module EventMachine::Hiredis
       method_missing(:info, &hash_processor)
     end
 
+    def close_connection
+      @closing_connection = true
+      @connection.close_connection_after_writing
+      @defs.each
+    end
+
     private
 
     def method_missing(sym, *args)

data/lib/em-hiredis/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Hiredis
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/live_redis_protocol_spec.rb

@@ -510,3 +510,18 @@ describe EventMachine::Hiredis, "when reconnecting" do
     end
   end
 end
+
+describe EventMachine::Hiredis, "when closing_connection" do
+  it "should fail deferred commands" do
+    errored = false
+    connect do |redis|
+      op = redis.blpop 'empty_list'
+      op.callback { fail }
+      op.errback { EM.stop }
+      
+      redis.close_connection
+      
+      EM.add_timer(1) { fail }
+    end
+  end
+end

metadata

@@ -1,42 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: em-hiredis
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.1
   prerelease: 
-  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Martyn Loughran
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-04 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-27 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: hiredis
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70172074018560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
+      - !ruby/object:Gem::Version
+        version: 0.4.0
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70172074018560
+- !ruby/object:Gem::Dependency
+  name: em-spec
+  requirement: &70172074030920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :development
+  prerelease: false
+  version_requirements: *70172074030920
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70172074026440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.6.0
+  type: :development
+  prerelease: false
+  version_requirements: *70172074026440
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70172074025080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70172074025080
 description: Eventmachine redis client using hiredis native parser
-email: 
+email:
 - me@mloughran.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
 - Gemfile
+- LICENCE
 - README.md
 - Rakefile
 - em-hiredis.gemspec
@@ -52,35 +81,31 @@ files:
 - spec/support/connection_helper.rb
 - spec/support/redis_mock.rb
 - spec/url_param_spec.rb
-has_rdoc: true
 homepage: http://github.com/mloughran/em-hiredis
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: em-hiredis
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Eventmachine redis client
-test_files: 
+test_files:
 - spec/connection_spec.rb
 - spec/live_redis_protocol_spec.rb
 - spec/redis_commands_spec.rb