em-scenario 0.0.1 → 0.0.2

data/lib/scenario.rb

@@ -9,95 +9,135 @@ module EventMachine
             include EM::Deferrable
 
             def initialize &block
-                @actions = []
-                self.callback &block
-            end
-
-            def then &block
-                d = EM::DefaultDeferrable.new
-                d.callback(&block)
-                @actions << d
+                @actions = AbInitioActions.new
+                block.call @actions
+                self
             end
 
             def nextStep
-                if @actions.length > 0
-                  @actions.pop.succeed(Proc.new { nextStep })
+                if @actions.actions.length > 0
+                  @actions.actions.pop.succeed(Proc.new { nextStep })
                 else
                     self.succeed
                 end
             end
 
-            def invoke
-                @actions.reverse!
+            def finally &block
+                self.callback &block
+                @actions.actions.reverse!
                 self.nextStep
             end
         end
 
+        class AbInitioActions
+            attr_accessor :actions
+            def initialize
+                @actions = []
+            end
+
+            def then &block
+                d = EM::DefaultDeferrable.new
+                d.callback(&block)
+                @actions << d
+                self
+            end
+
+       end
+
         #Trigger when a quota of actions is done
         class Quorum
             include EM::Deferrable
-            def initialize
-                @times = 0
-                @when = false
-            end
 
-            def add
-              @times += 1;
-              yield Proc.new { finished }
+            def initialize times, &block
+                @times = times
+                @loop = block
+                self
             end
 
-            def when(&block)
-              @when = true
-              self.callback(&block)
-              finished
+            def finally &block
+                self.callback(&block)
+                @loop.call( Proc.new {nextStep} )
             end
 
             protected
-            def finished
-              @times -= 1
-              self.succeed if @times == 0 && @when
+            def nextStep
+                if @times == 0
+                    self.succeed
+                else
+                    @times -= 1
+                    @loop.call( Proc.new {nextStep} )
+                end
             end
         end
 
         # Repeat sequentially an action
         class AdLib
             include EM::Deferrable
-            def initialize &block
-                @cpt = 0
-                self.callback(&block)
-            end
 
-            def repeat times, &block
+            def initialize times, &block
+                @cpt = 0
                 @times = times
                 @loop = block
-                self._oneStep
+                self
             end
 
-            def _oneStep
-                @loop.call @cpt
-                @cpt += 1
+            def finally &block
+                self.callback(&block)
+                self.nextStep
             end
 
-            def next *arg
+            def nextStep
                 if @cpt == @times
-                    self.succeed *arg
+                    self.succeed
                 else
-                    self._oneStep
+                    @loop.call( Proc.new {nextStep}, @cpt)
+                    @cpt += 1
                 end
             end
+        end
+
+        class AdNauseum
+            include EM::Deferrable
+
+            def initialize &block
+                @loop = block
+                self
+            end
+
+            def until &block
+                @criteria = block
+                self
+            end
+
+            def finally &block
+                self.callback &block
+                @loop.call( Proc.new { nextStep })
+                self
+            end
 
+            def nextStep
+                if @criteria.call
+                    self.succeed
+                else
+                    @loop.call( Proc.new { nextStep })
+                end
+            end
         end
     end
 end
 
-def quorum
-    EventMachine::Scenario::Quorum.new
+def quorum(times, &block)
+    EventMachine::Scenario::Quorum.new times, &block
 end
 
-def adlib(&block)
-    EventMachine::Scenario::AdLib.new &block
+def adlib(times, &block)
+    EventMachine::Scenario::AdLib.new times, &block
 end
 
 def abinitio(&block)
     EventMachine::Scenario::AbInitio.new &block
 end
+
+def adnauseum(&block)
+    EventMachine::Scenario::AdNauseum.new &block
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-scenario
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-05 00:00:00.000000000 Z
+date: 2011-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &2152115400 !ruby/object:Gem::Requirement
+  requirement: &2152000200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0.beta3
   type: :runtime
   prerelease: false
-  version_requirements: *2152115400
+  version_requirements: *2152000200
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152113020 !ruby/object:Gem::Requirement
+  requirement: &2151999100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2152113020
+  version_requirements: *2151999100
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152108000 !ruby/object:Gem::Requirement
+  requirement: &2151998320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152108000
+  version_requirements: *2151998320
 description: Handling simpler story with event machine's callback
 email: mathieu@garambrogne.net
 executables: []