em-redis-unified 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f1ea48665c31050fa49d2da3d09a4bdbedbbd4f3
-  data.tar.gz: 7d25caee80d846063cc0c15cd1178c62fff1cdd9
+  metadata.gz: 54913b566f2a340684bd9a9406cec5ede44598cb
+  data.tar.gz: 04fd587693115490063b7dc5940a1574b097d840
 SHA512:
-  metadata.gz: ba8dddac2c415bfb793002d1506e3f47c32b4117114d872f7466d4205c043d1c715ec81123d65c0552de4806eafa370a51afd9a7ff5cde1d6a2c29c9dd6adc0d
-  data.tar.gz: ab139e9d3be94a9f9272a85b0e9c1c69087013f831a0d262a8495fee050be6055f283df30cb6bcc9eca0dd0f1ff833276f25a4d5da5af69d4f89ba5ed3cc931f
+  metadata.gz: a19fa4b7fba1819cb23599f8a1ae1c68822b5541fd0c356100a4c7f93cb29c2a5cb6fc6efe1d46f85d6d92ce338d2180c166bc1eb497b5cdc3e58edf15a73796
+  data.tar.gz: c33a49fb6177bb3bef4a79388ae8e36311501694d5cebed1f9d5f1bbece87f37d1bba2df42333705a18da80f381f54caf51bfa6efdda91a7cd9c82076d48fc61

data/.gitignore

@@ -1,2 +1,4 @@
 .DS_Store
 pkg
+*.lock
+*.gem

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/Rakefile

@@ -1,35 +1,6 @@
-# Look in the tasks/setup.rb file for the various options that can be
-# configured in this Rakefile. The .rake files in the tasks directory
-# are where the options are used.
+require "bundler/gem_tasks"
 
-begin
-  require 'bones'
-rescue LoadError
-  abort '### Please install the "bones" gem ###'
-end
-
-ensure_in_path 'lib'
-require 'em-redis'
-
-task :default => ['redis:test']
-
-Bones {
-  name 'em-redis-unified'
-  authors ['Jonathan Broad', 'Eugene Pimenov', 'Sean Porter']
-  email 'portertech@gmail.com'
-  url 'http://github.com/portertech/em-redis'
-  summary 'An eventmachine-based implementation of the Redis protocol'
-  description summary
-  version EMRedis::VERSION
-
-  readme_file  'README.rdoc'
-  ignore_file  '.gitignore'
-
-  depend_on 'eventmachine', '>=0.12.10'
-
-  depend_on "bacon", :development => true
-  depend_on "em-spec", :development => true 
-}
+task :default => ["redis:test"]
 
 namespace :redis do
   desc "Test em-redis against a live Redis"
@@ -37,5 +8,3 @@ namespace :redis do
     sh "bacon spec/live_redis_protocol_spec.rb spec/redis_commands_spec.rb spec/redis_protocol_spec.rb"
   end
 end
-
-# EOF

data/em-redis-unified.gemspec

@@ -0,0 +1,27 @@
+# coding: utf-8
+$:.unshift File.expand_path("../lib", __FILE__)
+require "em-redis/version"
+
+Gem::Specification.new do |spec|
+  spec.name          = "em-redis-unified"
+  spec.version       = EMRedis::VERSION
+  spec.authors       = ["Jonathan Broad", "Eugene Pimenov", "Sean Porter"]
+  spec.email         = ["portertech@gmail.com"]
+  spec.summary       = "An eventmachine-based implementation of the Redis protocol"
+  spec.description   = "An eventmachine-based implementation of the Redis protocol"
+  spec.homepage      = "https://github.com/portertech/em-redis"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files -z`.split("\x0")
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+
+  spec.add_dependency("eventmachine", ">= 0.12.10")
+
+  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "em-spec"
+  spec.add_development_dependency "bacon"
+end

data/lib/em-redis-unified.rb

@@ -0,0 +1 @@
+require "em-redis"

data/lib/em-redis.rb

@@ -1,8 +1,6 @@
+require File.join(File.dirname(__FILE__), 'em-redis/version')
 
 module EMRedis
-
-  # :stopdoc:
-  VERSION = '0.6.0'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/em-redis/redis_protocol.rb

@@ -7,11 +7,13 @@ module EventMachine
     module Redis
       include EM::Deferrable
 
+      attr_accessor :auto_reconnect, :reconnect_on_error
+
       ##
       # constants
       #########################
 
-      OK      = "OK".freeze
+      OK       = "OK".freeze
       MINUS    = "-".freeze
       PLUS     = "+".freeze
       COLON    = ":".freeze
@@ -191,6 +193,26 @@ module EventMachine
         end
       end
 
+      def subscribe(channel, proc=nil, &blk)
+        @subscribe_callbacks ||= Hash.new([])
+        @subscribe_callbacks[channel] += [(proc || blk)]
+        call_command(['subscribe', channel], &blk)
+      end
+
+      def unsubscribe(channel=nil, &blk)
+        @subscribe_callbacks ||= Hash.new([])
+        argv = ["unsubscribe"]
+        if channel
+          @subscribe_callbacks[channel] = [blk]
+          argv << channel
+        else
+          @subscribe_callbacks.each_key do |key|
+            @subscribe_callbacks[key] = [blk]
+          end
+        end
+        callback { send_command(argv) }
+      end
+
       # Ruby defines a now deprecated type method so we need to override it here
       # since it will never hit method_missing
       def type(key, &blk)
@@ -356,7 +378,7 @@ module EventMachine
 
       def auth_and_select_db
         # auth and select go to the front of the line
-        callbacks = @callbacks
+        callbacks = @callbacks || []
         @callbacks = []
         call_command(["auth", @password]) if @password
         call_command(["select", @db]) unless @db == 0
@@ -366,12 +388,12 @@ module EventMachine
 
       def connection_completed
         @logger.debug { "Connected to #{@host}:#{@port}" } if @logger
-        @reconnect_callbacks[:after].call if @reconnecting
         @redis_callbacks = []
         @multibulk_n     = false
-        @reconnecting    = false
         @connected       = true
         auth_and_select_db
+        @reconnect_callbacks[:after].call if @reconnecting
+        @reconnecting = false
         succeed
       end
 
@@ -451,6 +473,15 @@ module EventMachine
           end
         end
 
+        if @subscribe_callbacks && value.is_a?(Array)
+          if %w[message unsubscribe].include?(value[0])
+            @subscribe_callbacks[value[1]].each do |blk|
+              blk.call(*value) if blk
+            end
+            return
+          end
+        end
+
         callback = @redis_callbacks.shift
         if callback.kind_of?(Array) && callback.length == 2
           processor, blk = callback
@@ -478,6 +509,15 @@ module EventMachine
         @connected || false
       end
 
+      def reconnect!
+        @reconnect_callbacks[:before].call unless @reconnecting
+        @reconnecting = true
+        EM.add_timer(1) do
+          @logger.debug { "Reconnecting to #{@host}:#{@port}" } if @logger
+          reconnect(@host, @port)
+        end
+      end
+
       def close
         @closing = true
         close_connection_after_writing
@@ -488,12 +528,7 @@ module EventMachine
         if @closing
           @reconnecting = false
         elsif ((@connected || @reconnecting) && @auto_reconnect) || @reconnect_on_error
-          @reconnect_callbacks[:before].call unless @reconnecting
-          @reconnecting = true
-          EM.add_timer(1) do
-            @logger.debug { "Reconnecting to #{@host}:#{@port}" } if @logger
-            reconnect @host, @port
-          end
+          reconnect!
         elsif @connected
           error ConnectionError, 'connection closed'
         else

data/lib/em-redis/version.rb

@@ -0,0 +1,4 @@
+module EMRedis
+  # :stopdoc:
+  VERSION = '1.0.0'
+end

data/spec/live_redis_pubsub_spec.rb

@@ -0,0 +1,50 @@
+require File.expand_path(File.dirname(__FILE__) + "/test_helper.rb")
+
+EM.describe EM::Protocols::Redis, "connected to an empty db" do
+
+  before do
+    @s = EM::Protocols::Redis.connect(:db => 14)
+    @p = EM::Protocols::Redis.connect(:db => 14)
+  end
+
+  should "be able to publish a message to a channel" do
+    @p.flushdb do
+     @p.publish("foo", "test") do |r|
+        r.should == 0
+        done
+      end
+    end
+  end
+
+  should "be able to subscribe to a channel and then unsubscribe" do
+    @s.flushdb do
+      @s.subscribe("foo", Proc.new {}) do |type, channel, subscribers|
+        type.should == "subscribe"
+        channel.should == "foo"
+        subscribers.should == 1
+        @s.unsubscribe do
+          done
+        end
+      end
+    end
+  end
+
+  should "be able to subscribe to a channel and publish a message to it" do
+    @s.flushdb do
+      callback = Proc.new do |type, channel, message|
+        type.should == "message"
+        channel.should == "foo"
+        message.should == "test"
+        done
+      end
+      @s.subscribe("foo", callback) do |type, channel, subscribers|
+        type.should == "subscribe"
+        channel.should == "foo"
+        subscribers.should == 1
+        @p.publish("foo", "test") do |r|
+          r.should == 1
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-redis-unified
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Jonathan Broad
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-13 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -27,7 +27,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.12.10
 - !ruby/object:Gem::Dependency
-  name: bacon
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,44 +83,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bones
+  name: bacon
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.8.1
+        version: '0'
 description: An eventmachine-based implementation of the Redis protocol
-email: portertech@gmail.com
+email:
+- portertech@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- History.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
 - ".gitignore"
+- Gemfile
 - History.txt
 - README.rdoc
 - Rakefile
+- em-redis-unified.gemspec
+- lib/em-redis-unified.rb
 - lib/em-redis.rb
 - lib/em-redis/redis_protocol.rb
+- lib/em-redis/version.rb
 - spec/live_redis_protocol_spec.rb
+- spec/live_redis_pubsub_spec.rb
 - spec/redis_commands_spec.rb
 - spec/redis_protocol_spec.rb
 - spec/test_helper.rb
-homepage: http://github.com/portertech/em-redis
-licenses: []
+homepage: https://github.com/portertech/em-redis
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -106,9 +137,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: em-redis-unified
+rubyforge_project: 
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: An eventmachine-based implementation of the Redis protocol
-test_files: []
+test_files:
+- spec/live_redis_protocol_spec.rb
+- spec/live_redis_pubsub_spec.rb
+- spec/redis_commands_spec.rb
+- spec/redis_protocol_spec.rb
+- spec/test_helper.rb