emmy-machine 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af90dd06e107ddfab402d4e78eb7b9aa3112bca4
-  data.tar.gz: 4e9081e0309625ebe177256489f22d11c7cef1b3
+  metadata.gz: cbcf6dad55c2c829b3c317639952d0b1d1a73cd9
+  data.tar.gz: 2df6741e6561736c9065ffa3a816d88a9cdef981
 SHA512:
-  metadata.gz: 56c432fce256b7ac5012f819457dd0f804a7658d53860692fcfc64205fc5043f08dc86f25f275a426aab34a566de697bb6fe4d5dce27abe6952412c11ef95256
-  data.tar.gz: 0a75bf638505a3a690e880c4d46e33da5c0a43d093788bd6c210a3f30ba89a2297c84170450cdcc082cb8552df3367aac03ca0237869cd65b711af42d083292b
+  metadata.gz: b9242b823d1f132e80dadc98382f09642c788ff0398142ea5ac9aa9a2c230a909d8b3b490dca89ae52333f91c64fe5b9e1b2a69fe9aad81e54fac6ff84a4cfbe
+  data.tar.gz: 8ca89dede626c70cf4c00b266cacf819ba3dac7cdf6618056c7f02f8a2ed2603c2de3fcf362c0362c8998f5daa90fa8171ad3f0ad40efd3dcf032ebf2f4b23fb

data/lib/emmy_machine/class_methods.rb

@@ -17,8 +17,11 @@ module EmmyMachine
     end
 
     def run_block &b
-      EventMachine.run_block do
-        fiber_block &b
+      EventMachine.run do
+        fiber_block do
+          yield
+          EventMachine.stop
+        end
       end
     end
 
@@ -55,9 +58,9 @@ module EmmyMachine
     # emmy.connect(*emmy.http.get(url))
     def connect(url, *a, &b)
       url = URI(url.to_s)
-      b = a.last if b.nil? && a.size > 0 && a.last.is_a?(Proc)
-      handler = a.empty? ? Connection : a.first
-
+      handler = a.empty? ? Connection : a.shift
+      b ||= a.shift if a.first.is_a?(Proc) || a.first.is_a?(Method)
+      
       case url.scheme
       when "tcp" then
         EventMachine.connect(url.host, url.port, handler, *a, &b)
@@ -76,8 +79,8 @@ module EmmyMachine
     # emmy.bind(* emmy.server.thin("tcp://localhost:4780", app))
     def bind(url, *a, &b)
       url = URI(url.to_s)
-      b = a.last if b.nil? && a.size > 0 && a.last.is_a?(Proc)
-      handler = a.empty? ? Connection : a.first
+      handler = a.empty? ? Connection : a.shift
+      b ||= a.shift if a.first.is_a?(Proc) || a.first.is_a?(Method)
 
       case url.scheme
       when "tcp" then

data/lib/emmy_machine/version.rb

@@ -1,3 +1,3 @@
 module EmmyMachine
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emmy-machine
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine