contrails 0.2.1 → 0.2.2

data/Rakefile

@@ -38,7 +38,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "contrails"
-  s.version           = "0.2.1"
+  s.version           = "0.2.2"
   s.summary           = "Declarative concurrency for EventMachine"
   s.author            = "Tim Cowlishaw"
   s.email             = "tim@timcowlishaw.co.uk"

data/lib/contrails/chainable.rb

@@ -1,9 +1,11 @@
 require 'em/deferrable'
-autoload "Parallel", 'contrails/parallel'
-autoload "Process", 'contrails/process'
 module Contrails
   module Chainable
 
+    def run
+      raise NotImplementedError
+    end
+
     module ClassMethods
       def return(&b)
         self.new(&b)
@@ -16,18 +18,17 @@ module Contrails
     end
 
     def bind(other)
-      p = Process.new(&self)
-      p.callback(&other)
-      return p
+      require 'contrails/serial'
+      Serial.new(self, other)
     end
 
     def distribute(other)
+      require 'contrails/parallel'
       Parallel.new(self, other)
     end
 
     def call(*a)
       result = run(*a)
-      result = result.is_a?(Array) ? result : [result]
       self.succeed(*result)
     end
 

data/lib/contrails/parallel.rb

@@ -1,5 +1,5 @@
 require 'contrails/semaphore'
-autoload "Chainable", 'contrails/chainable'
+require 'contrails/chainable'
 module Contrails
   class Parallel
 

data/lib/contrails/process.rb

@@ -1,4 +1,4 @@
-autoload "Chainable", "contrails/chainable"
+require 'contrails/chainable'
 module Contrails
   class Process 
     include Chainable

data/lib/contrails/serial.rb

@@ -0,0 +1,25 @@
+require 'contrails/chainable'
+module Contrails
+  class Serial
+    include Chainable
+    def initialize(*procs)
+      @procs = procs
+      @procs_with_callbacks = @procs.map(&:dup)
+      @procs_with_callbacks.zip(@procs_with_callbacks[1..-1]).each do |proc1, proc2|
+        if proc2
+          proc1.callback {|*args| proc2.call(*args) }
+        else
+          proc1.callback {|*args| self.succeed(*args)}
+        end
+      end
+    end
+
+    def bind(other)
+      Contrails::Serial.new(*(@procs + [other]))
+    end
+    
+    def call(*args)
+      @procs_with_callbacks.first.call(*args)
+    end
+  end
+end

data/spec/process_spec.rb

@@ -51,9 +51,13 @@ describe Contrails::Process do
       it "passes the return value of each process to its successors" do
         for_all do
           int= integer
-          proc1 = Contrails::Process.new { |x| x.should == int; x+1}
-          proc2 = Contrails::Process.new { |x| x.should == int+1; x+1}
-          proc3 = Contrails::Process.new { |x| x.should == int+2; x+1}
+          context = mock
+          context.expects(:test).with(int).in_sequence
+          context.expects(:test).with(int+1).in_sequence
+          context.expects(:test).with(int+2).in_sequence
+          proc1 = Contrails::Process.new { |x| context.test(x); x+1}
+          proc2 = Contrails::Process.new { |x| context.test(x); x+1}
+          proc3 = Contrails::Process.new { |x| context.test(x); x+1}
           async_assertion(proc1.bind(proc2).bind(proc3), int) {|x| x.should == int+3}
         end
       end
@@ -100,8 +104,8 @@ describe Contrails::Process do
       it "executes any subsequently distributed processes in parallel" do
         for_all {
           time = float
-          guard time > 0.05
-          guard time < 0.25
+          guard time > 0.1
+          guard time < 0.3
           context = mock
           context.expects(:first).in_sequence
           context.expects(:second).in_sequence

metadata

@@ -2,7 +2,7 @@
 name: contrails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Tim Cowlishaw
@@ -54,6 +54,7 @@ files:
 - lib/contrails/process.rb
 - lib/contrails/chainable.rb
 - lib/contrails/parallel.rb
+- lib/contrails/serial.rb
 - lib/contrails/utils.rb
 - lib/contrails/semaphore.rb
 - lib/contrails/helpers.rb
@@ -73,7 +74,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 533098101810096538
+      hash: -2865547770720461986
       segments: 
       - 0
       version: "0"