contrails 0.1.0 → 0.2.0

data/Rakefile

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

data/lib/contrails/chainable.rb

@@ -1,16 +1,32 @@
+require 'em/deferrable'
+autoload "Parallel", 'contrails/parallel'
+autoload "Process", 'contrails/process'
 module Contrails
   module Chainable
 
+    module ClassMethods
+      def return(&b)
+        self.new(&b)
+      end
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.send(:include, EventMachine::Deferrable)
+    end
+
     def bind(other)
-      raise NotImplementedError
+      p = Process.new(&self)
+      p.callback(&other)
+      return p
     end
 
     def distribute(other)
-      raise NotImplementedError
+      Parallel.new(self, other)
     end
 
     def call(*a)
-      raise NotImplementedError
+      self.succeed(*run(*a))
     end
 
     def to_proc
@@ -24,7 +40,7 @@ module Contrails
     def *(other)
       self.distribute(other)
     end
-
+    
   end
 end
 

data/lib/contrails/parallel.rb

@@ -1,9 +1,8 @@
-require 'em/deferrable'
-require 'contrails/chainable'
 require 'contrails/semaphore'
+autoload "Chainable", 'contrails/chainable'
 module Contrails
   class Parallel
-    include EventMachine::Deferrable
+
     include Contrails::Chainable
     def initialize(*procs)
       results = []

data/lib/contrails/process.rb

@@ -1,32 +1,14 @@
-require 'em/deferrable'
-require 'contrails/parallel'
+autoload "Chainable", "contrails/chainable"
 module Contrails
-  class Process
-    include EventMachine::Deferrable
-    include Contrails::Chainable
-
-    class << self
-      def return(&b)
-        self.new(&b)
-      end
-    end
+  class Process 
+    include Chainable
 
     def initialize(&l)
       @lambda = l
     end
 
-    def bind(other)
-      p = Contrails::Process.new(&self)
-      p.callback(&other)
-      return p
-    end
-
-    def distribute(other)
-      Contrails::Parallel.new(self, other)
-    end
-    
-    def call(*a)
-      self.succeed(*@lambda.call(*a)) 
+    def run(*a)
+      @lambda.call(*a)
     end
   end
 end

data/lib/contrails.rb

@@ -1,5 +1,8 @@
 $: << File.join(File.dirname(__FILE__))
 module Contrails
 end
+require "contrails/chainable"
+require 'ruby-debug'
 require "contrails/process"
+require "contrails/parallel"
 require "contrails/utils"

metadata

@@ -2,7 +2,7 @@
 name: contrails
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tim Cowlishaw
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-19 00:00:00 +01:00
+date: 2011-08-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1260005474418307725
+      hash: -1600641507598680959
       segments: 
       - 0
       version: "0"