rainbows 4.1.0 → 4.2.0

data/GIT-VERSION-GEN

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v4.1.0.GIT
+DEF_VER=v4.2.0.GIT
 
 LF='
 '

data/lib/rainbows/const.rb

@@ -2,7 +2,7 @@
 # :enddoc:
 module Rainbows::Const
 
-  RAINBOWS_VERSION = '4.1.0'
+  RAINBOWS_VERSION = '4.2.0'
 
   include Unicorn::Const
 

data/lib/rainbows/event_machine.rb

@@ -50,6 +50,21 @@ module Rainbows::EventMachine
 
   include Rainbows::Base
 
+  # Cramp (and possibly others) can subclass Rainbows::EventMachine::Client
+  # and provide the :em_client_class option.  We /don't/ want to load
+  # Rainbows::EventMachine::Client in the master process since we need
+  # reloadability.
+  def em_client_class
+    case klass = Rainbows::O[:em_client_class]
+    when Proc
+      klass.call # e.g.: proc { Cramp::WebSocket::Rainbows }
+    when Symbol, String
+      eval(klass.to_s) # Object.const_get won't resolve multi-level paths
+    else # @use should be either :EventMachine or :NeverBlock
+      Rainbows.const_get(@use).const_get(:Client)
+    end
+  end
+
   # runs inside each forked worker, this sits around and waits
   # for connections and doesn't die until the parent dies (or is
   # given a INT, QUIT, or TERM signal)
@@ -63,11 +78,11 @@ module Rainbows::EventMachine
     EM.epoll
     EM.kqueue
     logger.info "#@use: epoll=#{EM.epoll?} kqueue=#{EM.kqueue?}"
-    client_class = Rainbows.const_get(@use).const_get(:Client)
+    client_class = em_client_class
     max = worker_connections + LISTENERS.size
     Rainbows::EventMachine::Server.const_set(:MAX, max)
     Rainbows::EventMachine::Server.const_set(:CL, client_class)
-    client_class.const_set(:APP, Rainbows.server.app)
+    Rainbows::EventMachine::Client.const_set(:APP, Rainbows.server.app)
     EM.run {
       conns = EM.instance_variable_get(:@conns) or
         raise RuntimeError, "EM @conns instance variable not accessible!"

data/t/test_isolate_cramp.rb

@@ -17,7 +17,7 @@ lock = File.open(__FILE__, "rb")
 lock.flock(File::LOCK_EX)
 Isolate.now!(opts) do
   if engine == "ruby"
-    gem 'cramp', '0.12'
+    gem 'cramp', '0.14'
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rainbows
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 4
-  - 1
+  - 2
   - 0
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors: 
 - Rainbows! hackers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-30 00:00:00 Z
+date: 2011-08-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack