magent 0.1.0 → 0.1.1

data/Manifest.txt

@@ -4,10 +4,13 @@ PostInstall.txt
 README.rdoc
 Rakefile
 bin/magent
+examples/comm/run.rb
+examples/comm/worker.rb
 examples/simple/bot.rb
 lib/magent.rb
 lib/magent/actor.rb
 lib/magent/channel.rb
+lib/magent/generic_channel.rb
 lib/magent/processor.rb
 lib/magent/push.rb
 lib/magent/utils.rb

data/examples/comm/run.rb

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.dirname(__FILE__)+"/../../lib/"                                          
+require 'magent' 
+
+id = "#{rand(16)}#{rand(16)}#{rand(16)}#{rand(16)}"
+
+values = (1..5).to_a.map { rand(10) }
+puts values.join(" + ")
+Magent.push("/workers", :sum, id, *values)
+
+channel = Magent::GenericChannel.new("+#{id}")
+
+loop do
+  v = channel.dequeue;
+  if v
+    $stdout.puts v.inspect
+    break
+  end
+  sleep 0.1
+end
+

data/examples/comm/worker.rb

@@ -0,0 +1,30 @@
+$:.unshift File.dirname(__FILE__)+"/../../lib/"
+require 'magent'
+
+# Use: magent /path/to/this/file
+
+class Worker
+  include Magent::Actor
+  channel_name "workers"
+  expose :sum
+
+  def sum(payload)
+    id, *args = payload
+
+    s = args.inject(0) { |v, a| a += v }
+    send_to_client(id, {:method => :sum, :result => s})
+  end
+
+  private
+  def send_to_client(id, message)
+    c = Magent::GenericChannel.new("+#{id}")
+    c.enqueue(message)
+  end
+end
+
+Magent.register(Worker.new)
+
+if $0 == __FILE__
+  Magent::Processor.new(Magent.current_actor).run!
+end
+

data/lib/magent.rb

@@ -4,13 +4,14 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'mongo'
 require 'set'
 require 'magent/utils'
+require 'magent/generic_channel'
 require 'magent/channel'
 require 'magent/push'
 require 'magent/actor'
 require 'magent/processor'
 
 module Magent
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   def self.connection
     @@connection ||= Mongo::Connection.new(nil, nil, :auto_reconnect => true)

data/lib/magent/channel.rb

@@ -1,15 +1,7 @@
 module Magent
-  class Channel
-    def initialize(name)
-      @name = name
-
-      if !collection.find_one({:_id => @name}, {:fields => [:_id]})
-        collection.save({:_id => @name, :messages => [], :errors => []})
-      end
-    end
-
+  class Channel < GenericChannel
     def enqueue(message, args)
-      collection.update({:_id => @name}, {:$push => {:messages => [message, args]}}, :repsert => true)
+      super([message, args])
     end
 
     def failed(info)
@@ -23,38 +15,8 @@ module Magent
       error_collection.find({:channel_id => @name}, {:offset => (page-1)*per_page, :limit => per_page, :sort => ["created_at"]})
     end
 
-    def dequeue
-      Magent.database.eval(%@
-        function dequeue() {
-          var selector = {_id: '#{@name}'};
-          var q = db.channels.findOne(selector, {messages: 1 });
-          var m = q.messages[0];
-          if(m)
-            db.channels.update(selector, { $pop: { messages : -1 } })
-          return m;
-        }
-      @)
-    end
-
-    def collection
-      self.class.collection
-    end
-
     def error_collection
       @error_collection ||= Magent.database.collection("errors")
     end
-
-    def self.collection
-      @collection ||= Magent.database.collection("channels")
-    end
-
-    def self.all(&block)
-      cursor = collection.find({}, :fields => [:_id])
-      if block_given?
-        cursor.map {|c| name = c["_id"]; yield name; name }
-      else
-        cursor.map {|c| c["_id"] }
-      end
-    end
   end # Channel
 end

data/lib/magent/generic_channel.rb

@@ -0,0 +1,45 @@
+module Magent
+  class GenericChannel
+    def initialize(name)
+      @name = name
+
+      if !collection.find_one({:_id => @name}, {:fields => [:_id]})
+        collection.save({:_id => @name, :messages => []})
+      end
+    end
+
+    def enqueue(message)
+      collection.update({:_id => @name}, {:$push => {:messages => message}}, :repsert => true)
+    end
+
+    def dequeue
+      Magent.database.eval(%@
+        function dequeue() {
+          var selector = {_id: '#{@name}'};
+          var q = db.channels.findOne(selector, {messages: 1 });
+          var m = q.messages[0];
+          if(m)
+            db.channels.update(selector, { $pop: { messages : -1 } })
+          return m;
+        }
+      @)
+    end
+
+    def collection
+      self.class.collection
+    end
+
+    def self.collection
+      @collection ||= Magent.database.collection("channels")
+    end
+
+    def self.all(&block)
+      cursor = collection.find({}, :fields => [:_id])
+      if block_given?
+        cursor.map {|c| name = c["_id"]; yield name; name }
+      else
+        cursor.map {|c| c["_id"] }
+      end
+    end
+  end # GenericChannel
+end

data/magent.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magent}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Cuadrado"]
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.email = ["krawek@gmail.com"]
   s.executables = ["magent"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
-  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/magent", "examples/simple/bot.rb", "lib/magent.rb", "lib/magent/actor.rb", "lib/magent/channel.rb", "lib/magent/processor.rb", "lib/magent/push.rb", "lib/magent/utils.rb", "magent.gemspec", "script/console", "test/test_helper.rb", "test/test_magent.rb"]
+  s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/magent", "examples/comm/run.rb", "examples/comm/worker.rb", "examples/simple/bot.rb", "lib/magent.rb", "lib/magent/actor.rb", "lib/magent/channel.rb", "lib/magent/generic_channel.rb", "lib/magent/processor.rb", "lib/magent/push.rb", "lib/magent/utils.rb", "magent.gemspec", "script/console", "test/test_helper.rb", "test/test_magent.rb"]
   s.homepage = %q{http://github.com/dcu/magent}
   s.post_install_message = %q{PostInstall.txt}
   s.rdoc_options = ["--main", "README.rdoc"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: magent
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - David Cuadrado
@@ -50,10 +50,13 @@ files:
 - README.rdoc
 - Rakefile
 - bin/magent
+- examples/comm/run.rb
+- examples/comm/worker.rb
 - examples/simple/bot.rb
 - lib/magent.rb
 - lib/magent/actor.rb
 - lib/magent/channel.rb
+- lib/magent/generic_channel.rb
 - lib/magent/processor.rb
 - lib/magent/push.rb
 - lib/magent/utils.rb