orionz-minion 0.1.1 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/examples/math.rb

@@ -5,7 +5,7 @@ require 'minion'
 
 include Minion
 
-on_error do |e|
+error do |e|
 	puts "got an error!"
 end
 

data/lib/minion.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'json'
 require 'mq'
 require 'bunny'
+require 'minion/handler'
 
 module Minion
 	extend self
@@ -19,7 +20,12 @@ module Minion
 		bunny.queue(queue, :durable => true, :auto_delete => false).publish(data.to_json)
 	end
 
-	def on_error(&blk)
+	def log(msg)
+		@@logger ||= proc { |m| puts "#{Time.now} :minion: #{m}" }
+		@@logger.call(msg)
+	end
+
+	def error(&blk)
 		@@error_handler = blk
 	end
 
@@ -27,8 +33,15 @@ module Minion
 		@@logger = blk
 	end
 
-	def job(queue, &blk)
-		handler do
+	def job(queue, options = {}, &blk)
+		handler = Minion::Handler.new queue
+		handler.when = options[:when] if options[:when]
+		handler.unsub = lambda do
+			log "unsubscribing to #{queue}"
+			MQ.queue(queue).unsubscribe
+		end
+		handler.sub = lambda do
+			log "subscribing to #{queue}"
 			MQ.queue(queue).subscribe(:ack => true) do |h,m|
 				return if AMQP.closing?
 				begin
@@ -44,8 +57,16 @@ module Minion
 					error_handler.call(e)
 				end
 				h.ack
+				check_all
 			end
 		end
+		@@handlers ||= []
+		at_exit { Minion.run } if @@handlers.size == 0
+		@@handlers << handler
+	end
+
+	def check_all
+		@@handlers.each { |h| h.check }
 	end
 
 	def run
@@ -57,7 +78,7 @@ module Minion
 		EM.run do
 			AMQP.start(amqp_config) do
 				MQ.prefetch(1)
-				@@handlers.each { |h| h.call }
+				check_all
 			end
 		end
 	end
@@ -91,17 +112,6 @@ module Minion
 		@@bunny ||= new_bunny
 	end
 
-	def log(msg)
-		@@logger ||= proc { |m| puts "#{Time.now} :minion: #{m}" }
-		@@logger.call(msg)
-	end
-
-	def handler(&blk)
-		@@handlers ||= []
-		at_exit { Minion.run } if @@handlers.size == 0
-		@@handlers << blk
-	end
-
 	def next_job(args, response)
 		queue = args.delete("next_job")
 		enqueue(queue,args.merge(response)) if queue

data/lib/minion/handler.rb

@@ -0,0 +1,30 @@
+module Minion
+	class Handler
+		attr_accessor :queue, :sub, :unsub, :when, :on
+		def initialize(queue)
+			@queue = queue
+			@when = lambda { true }
+			@sub = lambda {}
+			@unsub = lambda {}
+			@on = false
+		end
+
+		def should_sub?
+			@when.call
+		end
+
+		def check
+			if should_sub?
+				@sub.call unless @on
+				@on = true
+			else
+				@unsub.call if @on
+				@on = false
+			end
+		end
+
+		def to_s
+			"<handler queue=#{@queue} on=#{@on}>"
+		end
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: orionz-minion
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Orion Henry
@@ -56,6 +56,7 @@ files:
 - examples/math.rb
 - examples/sandwich.rb
 - lib/minion.rb
+- lib/minion/handler.rb
 has_rdoc: true
 homepage: http://github.com/orionz/minion
 licenses: