magent 0.1.3 → 0.2

data/README.rdoc

@@ -8,7 +8,7 @@ Simple job queue system based on mongodb
 
 == FEATURES/PROBLEMS:
 
-* fast (enough?)
+* fast
 * simple
 * scalable
 
@@ -18,8 +18,8 @@ see examples/
 
 == REQUIREMENTS:
 
-* mongodb >= 1.0
-* mongo   >= 0.15.1 (gem install mongo -s http://gemcutter.org )
+* mongodb >= 1.3
+* mongo   >= 0.18.2 (gem install mongo)
 
 == INSTALL:
 

data/Rakefile

@@ -12,10 +12,10 @@ Hoe.plugin :newgem
 # Run 'rake -T' to see list of generated tasks (from gem root directory)
 $hoe = Hoe.spec 'magent' do
   self.developer 'David Cuadrado', 'krawek@gmail.com'
-  self.post_install_message = 'PostInstall.txt'
+  self.post_install_message = ''
   self.rubyforge_name       = self.name
-  self.extra_deps         = [['mongo','>= 0.16']]
-
+  self.extra_deps         = [['mongo','>= 0.18.2'],
+                             ['uuidtools', '>= 2.0.0']]
 end
 
 require 'newgem/tasks'

data/lib/magent.rb

@@ -3,6 +3,8 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 require 'mongo'
 require 'set'
+require 'uuidtools'
+
 require 'magent/utils'
 require 'magent/generic_channel'
 require 'magent/channel'
@@ -11,7 +13,7 @@ require 'magent/actor'
 require 'magent/processor'
 
 module Magent
-  VERSION = '0.1.3'
+  VERSION = '0.2'
 
   def self.connection
     @@connection ||= Mongo::Connection.new(nil, nil, :auto_reconnect => true)

data/lib/magent/actor.rb

@@ -23,8 +23,7 @@ module Magent
       end
 
       def can_handle?(action)
-        return false if @actions.nil?
-        @actions.include?(action.to_s)
+        actions.include?(action.to_s)
       end
 
       def channel

data/lib/magent/channel.rb

@@ -5,27 +5,24 @@ module Magent
     end
 
     def failed(info)
-      error_collection.save(info.merge({:channel_id => @name, :created_at => Time.now.utc}))
+      error_collection.save(info.merge({:_id => generate_uid, :channel => @name, :created_at => Time.now.utc}))
     end
 
     def error_count
-      error_collection.find({:channel_id => @name}).count()
+      error_collection.count()
     end
 
     def errors(conds = {})
       page = conds.delete(:page) || 1
       per_page = conds.delete(:per_page) || 10
 
-      error_collection.find({:channel_id => @name}, {:skip => (page-1)*per_page, :limit => per_page, :sort => [["created_at", "descending"]]})
+      error_collection.find({}, {:skip => (page-1)*per_page,
+                                 :limit => per_page,
+                                 :sort => [["created_at", -1]]})
     end
 
     def remove_error(error_id)
-      object_id = error_id
-      if error_id.kind_of?(String)
-        object_id = Mongo::ObjectID.from_string(error_id)
-      end
-
-      self.error_collection.remove(:_id => object_id, :channel_id => @name)
+      self.error_collection.remove(:_id => error_id)
     end
 
     def retry_error(error)
@@ -34,7 +31,7 @@ module Magent
     end
 
     def error_collection
-      @error_collection ||= Magent.database.collection("errors")
+      @error_collection ||= Magent.database.collection("#{@name}-errors")
     end
   end # Channel
 end

data/lib/magent/generic_channel.rb

@@ -1,64 +1,43 @@
 module Magent
   class GenericChannel
+    attr_reader :name
+
     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}, :$inc => {:message_count => 1}}, :repsert => true)
+      collection.save({:_id => generate_uid, :message => message, :priority => 3, :created_at => Time.now.to_i})
     end
 
     def message_count
-      channel = collection.find({:_id => @name}, :fields => [:message_count]).next_object
-      if channel
-        channel["message_count"] || 0
-      else
-        0
-      end
+      collection.count # TODO: number of processed messages (create a collection for stats)
     end
 
     def queue_count
-      Magent.database.eval(%@
-        function queue_count() {
-          var selector = {_id: '#{@name}'};
-          var q = db.channels.findOne(selector, {messages: 1 });
-          return q.messages.length;
-        }
-      @)
+      collection.count
     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;
-        }
-      @)
+      if m = self.next_message
+        m["message"]
+      end
     end
 
-    def collection
-      self.class.collection
+    def next_message
+      Magent.database.command(OrderedHash[:findandmodify, @name,
+                               :sort, [{:priority => -1}, {:created_at => 1}],
+                               :remove, true
+                              ])["value"]
     end
 
-    def self.collection
-      @collection ||= Magent.database.collection("channels")
+    def collection
+      @collection ||= Magent.database.collection(@name)
     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
+    protected
+    def generate_uid
+      UUIDTools::UUID.random_create.hexdigest
     end
   end # GenericChannel
 end

data/lib/magent/processor.rb

@@ -33,7 +33,7 @@ module Magent
           delay = 0
           $stderr.puts "#{@actor.class}##{@method}(#{@payload.inspect})"
           begin
-            if @actor.class.actions.include?(@method)
+            if @actor.class.can_handle?(@method)
               processed_messages += 1
               @actor.send(@method, @payload)
 

data/magent.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{magent}
-  s.version = "0.1.3"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Cuadrado"]
-  s.date = %q{2009-11-08}
+  s.date = %q{2010-01-06}
   s.default_executable = %q{magent}
   s.description = %q{Simple job queue system based on mongodb}
   s.email = ["krawek@gmail.com"]
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "PostInstall.txt"]
   s.files = ["History.txt", "Manifest.txt", "PostInstall.txt", "README.rdoc", "Rakefile", "bin/magent", "examples/comm/run.rb", "examples/comm/worker.rb", "examples/error/error.rb", "examples/simple/bot.rb", "examples/stats/stats.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.post_install_message = %q{}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{magent}
@@ -27,14 +27,17 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo>, [">= 0.16"])
+      s.add_runtime_dependency(%q<mongo>, [">= 0.18.2"])
+      s.add_runtime_dependency(%q<uuidtools>, [">= 2.0.0"])
       s.add_development_dependency(%q<hoe>, [">= 2.3.3"])
     else
-      s.add_dependency(%q<mongo>, [">= 0.16"])
+      s.add_dependency(%q<mongo>, [">= 0.18.2"])
+      s.add_dependency(%q<uuidtools>, [">= 2.0.0"])
       s.add_dependency(%q<hoe>, [">= 2.3.3"])
     end
   else
-    s.add_dependency(%q<mongo>, [">= 0.16"])
+    s.add_dependency(%q<mongo>, [">= 0.18.2"])
+    s.add_dependency(%q<uuidtools>, [">= 2.0.0"])
     s.add_dependency(%q<hoe>, [">= 2.3.3"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: magent
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: "0.2"
 platform: ruby
 authors: 
 - David Cuadrado
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-08 00:00:00 -05:00
+date: 2010-01-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.16"
+        version: 0.18.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: uuidtools
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -70,7 +80,7 @@ has_rdoc: true
 homepage: http://github.com/dcu/magent
 licenses: []
 
-post_install_message: PostInstall.txt
+post_install_message: ""
 rdoc_options: 
 - --main
 - README.rdoc