em-resque 1.0.0.beta3 → 1.0.0.beta4

data/lib/em-resque/version.rb

@@ -1,5 +1,5 @@
 module EventMachine
   module Resque
-    Version = VERSION = '1.0.0.beta3'
+    Version = VERSION = '1.0.0.beta4'
   end
 end

data/lib/em-resque/worker_machine.rb

@@ -33,7 +33,7 @@ module EventMachine
         @verbose = opts[:logging] || opts[:verbose] || false
         @very_verbose = opts[:vverbose] || false
         @pidfile = opts[:pidfile]
-        @redis = opts[:redis].split('/', 3).last.split(':') if opts[:redis]
+        @redis = opts[:redis]
 
         raise(ArgumentError, "Should have at least one fiber") if @fibers_count.to_i < 1
 
@@ -47,7 +47,7 @@ module EventMachine
       # Start the machine and start polling queues.
       def start
         EM.synchrony do
-          EM::Resque.redis = EM::Protocols::Redis.connect(:host => @redis[0], :port => @redis[1])
+          EM::Resque.redis = redis_instance(@redis)
           @fibers.each(&:resume)
           system_monitor.resume
         end
@@ -116,6 +116,28 @@ module EventMachine
       def create_pidfile
         File.open(@pidfile, 'w') { |f| f << @workers.first.pid } if @pidfile
       end
+
+      def redis_instance(server)
+        case server
+        when String
+          if server =~ /redis\:\/\//
+            host, port = server.split('/', 3).last.split(':')
+            redis = EM::Protocols::Redis.connect(:host => host, :port => port, :thread_safe => true)
+          else
+            server, namespace = server.split('/', 2)
+            host, port, db = server.split(':')
+            redis = EM::Protocols::Redis.new(:host => host, :port => port,
+                                             :thread_safe => true, :db => db)
+          end
+          namespace ||= :resque
+
+          Redis::Namespace.new(namespace, :redis => redis)
+        when Redis::Namespace
+          server
+        else
+          Redis::Namespace.new(:resque, :redis => server)
+        end
+      end
     end
   end
 end

data/lib/em-resque.rb

@@ -3,25 +3,4 @@ require 'em-synchrony/em-redis'
 
 module EM::Resque
   extend Resque
-  def redis=(server)
-    case server
-    when String
-      if server =~ /redis\:\/\//
-        host, port = server.split('/', 3).last.split(':')
-        redis = EM::Protocols::Redis.connect(:host => host, :port => port)
-      else
-        server, namespace = server.split('/', 2)
-        host, port, db = server.split(':')
-        redis = EM::Protocols::Redis.new(:host => host, :port => port,
-                                         :thread_safe => true, :db => db)
-      end
-      namespace ||= :resque
-
-      @redis = Redis::Namespace.new(namespace, :redis => redis)
-    when Redis::Namespace
-      @redis = server
-    else
-      @redis = Redis::Namespace.new(:resque, :redis => server)
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-resque
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: resque
-  requirement: &13289380 !ruby/object:Gem::Requirement
+  requirement: &19367640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.19.0
   type: :runtime
   prerelease: false
-  version_requirements: *13289380
+  version_requirements: *19367640
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &13288720 !ruby/object:Gem::Requirement
+  requirement: &19366960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *13288720
+  version_requirements: *19366960
 - !ruby/object:Gem::Dependency
   name: em-redis
-  requirement: &13288200 !ruby/object:Gem::Requirement
+  requirement: &19366480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *13288200
+  version_requirements: *19366480
 description: ! "    Em-resque is a version of Resque, which offers non-blocking and
   non-forking\n    workers. The idea is to have fast as possible workers for tasks
   with lots of\n    IO like pinging third party servers or hitting the database.\n\n