em-synchrony 1.0.2 → 1.0.3

data/README.md

@@ -8,7 +8,7 @@ Collection of convenience classes and primitives to help untangle evented code,
  * Fiber aware Multi-request interface for any callback enabled clients
  * Fiber aware TCPSocket replacement, powered by EventMachine
  * Fiber aware Thread, Mutex, ConditionVariable clases
- * Fiber aware sleep
+ * Fiber aware sleep, defer, system
 
 Supported clients:
 

data/em-synchrony.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "em-synchrony"
-  s.version     = "1.0.2"
+  s.version     = "1.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Ilya Grigorik"]
   s.email       = ["ilya@igvita.com"]

data/lib/em-synchrony.rb

@@ -18,14 +18,29 @@ require "em-synchrony/iterator"  if EventMachine::VERSION > '0.12.10'
 
 module EventMachine
 
-  # A convenience method for wrapping EM.run body within
+  # A convenience method for wrapping a given block within
   # a Ruby Fiber such that async operations can be transparently
   # paused and resumed based on IO scheduling.
-  def self.synchrony(blk=nil, tail=nil, &block)
-    blk ||= block
-    context = Proc.new { Fiber.new { blk.call }.resume }
+  # It detects whether EM is running or not.
+  def self.synchrony(blk=nil, tail=nil)
+    # EM already running.
+    if reactor_running?
+      if block_given?
+        Fiber.new { yield }.resume
+      else
+        Fiber.new { blk.call }.resume
+      end
+      tail && add_shutdown_hook(tail)
+
+    # EM not running.
+    else
+      if block_given?
+        run(nil, tail) { Fiber.new { yield }.resume }
+      else
+        run(Proc.new { Fiber.new { blk.call }.resume }, tail)
+      end
 
-    self.run(context, tail)
+    end
   end
 
   module Synchrony
@@ -98,6 +113,22 @@ module EventMachine
     def self.next_tick(&blk)
       EM.next_tick { Fiber.new { blk.call }.resume }
     end
+    
+    # Fiber-aware EM.defer 
+    #            
+    def self.defer op = nil, &blk
+      fiber = Fiber.current
+      EM.defer(op || blk, lambda{ |result| fiber.resume(result) })
+      Fiber.yield
+    end
+    
+    # Fiber-aware EM.system
+    #
+    def self.system cmd, *args
+      fiber = Fiber.current
+      EM.system(cmd, *args){ |out, status| fiber.resume( [out, status] ) }
+      Fiber.yield
+    end
 
     # Routes to EM::Synchrony::Keyboard
     #

data/lib/em-synchrony/amqp.rb

@@ -116,9 +116,21 @@ module EventMachine
       class Exchange < ::AMQP::Exchange
         def initialize(channel, type, name, opts = {}, &block)
           f = Fiber.current
-          super(channel, type, name, opts, &EM::Synchrony::AMQP.sync_cb(f))
-          exchange, declare_ok = Fiber.yield
-          raise Error.new unless declare_ok.is_a?(::AMQ::Protocol::Exchange::DeclareOk)
+
+          # AMQP Exchange constructor handles certain special exchanges differently.
+          # The callback passed in isn't called when the response comes back
+          # but is called immediately on the original calling fiber. That means that
+          # when the sync_cb callback yields the fiber when called, it will hang and never
+          # be resumed.  So handle these exchanges without yielding
+          if name == "amq.#{type}" or name.empty? or opts[:no_declare]
+            exchange = nil
+            super(channel, type, name, opts) { |ex| exchange = ex }
+          else
+            super(channel, type, name, opts, &EM::Synchrony::AMQP.sync_cb(f))
+            exchange, declare_ok = Fiber.yield
+            raise Error.new(declare_ok.to_s) unless declare_ok.is_a?(::AMQ::Protocol::Exchange::DeclareOk)
+          end
+
           exchange
         end
 
@@ -143,9 +155,9 @@ module EventMachine
         end
 
         alias :asubscribe :subscribe
-        def subscribe &block
+        def subscribe(opts = {}, &block)
           Fiber.new do
-            asubscribe(&EM::Synchrony::AMQP.sync_cb(Fiber.current))
+            asubscribe(opts, &EM::Synchrony::AMQP.sync_cb(Fiber.current))
             loop { block.call(Fiber.yield) }
           end.resume
         end

data/lib/em-synchrony/em-http.rb

@@ -6,7 +6,7 @@ end
 
 module EventMachine
   module HTTPMethods
-     %w[get head post delete put].each do |type|
+     %w[get head post delete put patch options].each do |type|
        class_eval %[
          alias :a#{type} :#{type}
          def #{type}(options = {}, &blk)
@@ -16,7 +16,7 @@ module EventMachine
            if conn.error.nil?
              conn.callback { f.resume(conn) }
              conn.errback  { f.resume(conn) }
-             
+
              Fiber.yield
            else
              conn

data/lib/em-synchrony/mongo.rb

@@ -1,5 +1,5 @@
 begin
-  require "mongo/connection"
+  require "mongo"
 rescue LoadError => error
   raise "Missing EM-Synchrony dependency: gem install mongo"
 end

data/spec/amqp_spec.rb

@@ -83,7 +83,7 @@ describe EM::Synchrony::AMQP do
       nb_q1, nb_q2 = 0, 0
       stop_cb = proc { EM.stop if nb_q1 + nb_q2 == 2 * nb_msg }
 
-      q1.subscribe do |meta, msg|
+      q1.subscribe(:ack => false) do |meta, msg|
         msg.should match(/^Bonjour [0-9]+/)
         nb_q1 += 1
         stop_cb.call

data/spec/defer_spec.rb

@@ -0,0 +1,40 @@
+require "spec/helper/all"
+
+describe EventMachine::Synchrony do
+
+  it "defer: simple" do
+    EM.synchrony do
+      x = 1
+    
+      result = EM::Synchrony.defer do
+        x = 2
+        sleep 0.1
+        3
+      end
+      
+      result.should == 3      
+      x.should == 2
+      
+      EM.stop    
+    end
+  end
+  
+  it "defer: with lambda" do
+    EM.synchrony do
+    
+      x = 1
+      
+      op = lambda do
+        sleep 0.1
+        x += 1
+        3
+      end
+      
+      EM::Synchrony.defer(op).should == 3
+      x.should == 2
+              
+      EM.stop
+    end                                                  
+  end
+  
+end

data/spec/http_spec.rb

@@ -28,9 +28,11 @@ describe EventMachine::HttpRequest do
       order.push :head if EventMachine::HttpRequest.new(URL).head
       order.push :post if EventMachine::HttpRequest.new(URL).delete
       order.push :put  if EventMachine::HttpRequest.new(URL).put
+      order.push :options if EventMachine::HttpRequest.new(URL).options
+      order.push :patch  if EventMachine::HttpRequest.new(URL).patch
 
       (now - start.to_f).should be_within(DELAY * order.size * 0.15).of(DELAY * order.size)
-      order.should == [:get, :post, :head, :post, :put]
+      order.should == [:get, :post, :head, :post, :put, :options, :patch]
 
       s.stop
       EventMachine.stop
@@ -49,10 +51,12 @@ describe EventMachine::HttpRequest do
       multi.add :c, EventMachine::HttpRequest.new(URL).ahead
       multi.add :d, EventMachine::HttpRequest.new(URL).adelete
       multi.add :e, EventMachine::HttpRequest.new(URL).aput
+      multi.add :f, EventMachine::HttpRequest.new(URL).aoptions
+      multi.add :g, EventMachine::HttpRequest.new(URL).apatch
       res = multi.perform
 
       (now - start.to_f).should be_within(DELAY * 0.15).of(DELAY)
-      res.responses[:callback].size.should == 5
+      res.responses[:callback].size.should == 7
       res.responses[:errback].size.should == 0
 
       s.stop

data/spec/system_spec.rb

@@ -0,0 +1,17 @@
+require "spec/helper/all"
+
+describe EventMachine::Synchrony do
+
+  it "system: simple" do
+    EM.synchrony do
+      out, status = EM::Synchrony.system("echo 'some'")
+      
+      status.should == 0
+      out.should == "some\n"
+      
+      EM.stop    
+    end
+  end
+  
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -74,6 +74,7 @@ files:
 - spec/amqp_spec.rb
 - spec/beanstalk_spec.rb
 - spec/connection_pool_spec.rb
+- spec/defer_spec.rb
 - spec/em-mongo_spec.rb
 - spec/fiber_iterator_spec.rb
 - spec/helper/all.rb
@@ -91,6 +92,7 @@ files:
 - spec/redis_spec.rb
 - spec/remcached_spec.rb
 - spec/synchrony_spec.rb
+- spec/system_spec.rb
 - spec/tcpsocket_spec.rb
 - spec/thread_spec.rb
 - spec/timer_spec.rb
@@ -123,6 +125,7 @@ test_files:
 - spec/amqp_spec.rb
 - spec/beanstalk_spec.rb
 - spec/connection_pool_spec.rb
+- spec/defer_spec.rb
 - spec/em-mongo_spec.rb
 - spec/fiber_iterator_spec.rb
 - spec/helper/all.rb
@@ -140,6 +143,7 @@ test_files:
 - spec/redis_spec.rb
 - spec/remcached_spec.rb
 - spec/synchrony_spec.rb
+- spec/system_spec.rb
 - spec/tcpsocket_spec.rb
 - spec/thread_spec.rb
 - spec/timer_spec.rb