herpes 0.0.1.2 → 0.0.2.1

data/bin/herpes

@@ -10,8 +10,8 @@ fail 'no configuration file passed' if ARGV.empty?
 
 herpes = Herpes.load(*ARGV)
 
-trap 'INT' do
-	herpes.stop!
-end
+END {
+	herpes.stop
+}
 
-herpes.start!
+herpes.start

data/examples/rss.rb

@@ -2,6 +2,7 @@ require 'herpes/rss'
 require 'herpes/email'
 
 state '~/.herpes'
+save_every 5.minutes
 
 # load the RSS module
 use :rss do
@@ -18,10 +19,7 @@ use :rss do
 		register 'http://feeds.feedburner.com/incomaemeglio', :smeriglia
 		register 'https://github.com/blog.atom'
 	end
-end
 
-# only events coming from the RSS module
-from :rss do
 	# define some common helper methods on every event
 	before do |event|
 		require 'nokogiri'

data/lib/herpes/email.rb

@@ -10,7 +10,7 @@
 
 require 'pony'
 
-Herpes::Notifier.define :email, :mail do
+Herpes::Module.define :email, :mail do
 	@options = %w(from to cc bcc sender subject headers charset text_part_charset message_id via via_options attachments)
 
 	plain_accessor *@options

data/lib/herpes/module.rb

@@ -29,18 +29,45 @@ class Module
 
 	attr_reader    :name, :aliases, :owner
 	def_delegators :owner, :state
+	plain_accessor :check_every
 
 	def initialize (name, *aliases, &block)
 		@name    = name
 		@aliases = aliases
 
+		@before   = []
+		@matchers = []
+		@after    = []
+
 		instance_eval &block
 	end
 
-	def =~ (other)
-		return true if self == other
+	def method_missing (id, *args, &block)
+		return owner.__send__ id, *args, &block if owner and owner.respond_to?(id)
 
-		name.to_s.downcase == other.to_s.downcase || aliases.any? { |a| a.to_s.downcase == other.to_s.downcase }
+		super
+	end
+
+	def owner= (value)
+		@owner = value
+
+		owned(value) if respond_to? :owned
+
+		if respond_to? :check
+			owner.every(check_every, self, &method(:check))
+		end
+
+		@before.each {|matcher|
+			owner.before *matcher.arguments, &matcher.block
+		}
+
+		@matchers.each {|matcher|
+			owner.on *matcher.arguments, &matcher.block
+		}
+
+		@after.each {|matcher|
+			owner.after *matcher.arguments, &matcher.block
+		}
 	end
 
 	def default (&block)
@@ -57,34 +84,48 @@ class Module
 		clone.tap { |o| o.instance_eval &block }
 	end
 
-	def use (*)
-		raise NotImplementedError, 'you have to use a specialized module'
-	end
+	def use (owner, &block)
+		with {
+			self.owner = owner
 
-	def inspect
-		"#<#{self.class.name}(#{name}#{" [#{aliases.join ', '}]" unless aliases.empty?})>"
+			instance_eval &block
+		}
 	end
-end
-
-class Generator < Module
-	plain_accessor :check_every
 
-	def initialize (*)
-		super
+	def before (*args, &block)
+		if owner = self.owner
+			owner.from name do
+				owner.before *args do |*args|
+					owner.instance_exec *args, &block
+				end
+			end
+		else
+			@before << Struct.new(:arguments, :block).new(args, block)
+		end
 	end
 
-	def use (owner, &block)
-		with(&block).tap {|o|
-			o.instance_eval {
-				@owner = owner
-
-				owned if respond_to? :owned
+	def on (*args, &block)
+		if owner = self.owner
+			owner.from name do
+				owner.on *args do |*args|
+					owner.instance_exec *args, &block
+				end
+			end
+		else
+			@matchers << Struct.new(:arguments, :block).new(args, block)
+		end
+	end
 
-				if respond_to? :check
-					@owner.every(check_every, &method(:check))
+	def after (*args, &block)
+		if owner = self.owner
+			owner.from name do
+				owner.after *args do |*args|
+					owner.instance_exec *args, &block
 				end
-			}
-		}
+			end
+		else
+			@after << Struct.new(:arguments, :block).new(args, block)
+		end
 	end
 
 	def dispatch (event = nil, &block)
@@ -98,31 +139,15 @@ class Generator < Module
 
 		owner.dispatch(event)
 	end
-end
-
-class Notifier < Module
-	def initialize (*)
-		@matchers = []
 
-		super
-	end
+	def =~ (other)
+		return true if self == other
 
-	def on (*args, &block)
-		@matchers << Struct.new(:arguments, :block).new(args, block)
+		name.to_s.downcase == other.to_s.downcase || aliases.any? { |a| a.to_s.downcase == other.to_s.downcase }
 	end
 
-	def use (owner, &block)
-		with(&block).tap {|o|
-			o.instance_eval {
-				@owner = owner
-
-				owned if respond_to? :owned
-
-				@matchers.each {|matcher|
-					@owner.on *matcher.arguments, &matcher.block
-				}
-			}
-		}
+	def inspect
+		"#<#{self.class.name}(#{name}#{" [#{aliases.join ', '}]" unless aliases.empty?})>"
 	end
 end
 

data/lib/herpes/nerdz.rb

@@ -0,0 +1,18 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+Herpes::Module.define :nerdz do
+	plain_accessor :username, :password
+
+	check_every 2.minutes
+
+	def check
+	end
+end

data/lib/herpes/rss.rb

@@ -11,7 +11,7 @@
 require 'rss'
 require 'open-uri'
 
-Herpes::Generator.define :rss do
+Herpes::Module.define :rss do
 	plain_accessor :digest
 
 	check_every 5.minutes
@@ -21,18 +21,25 @@ Herpes::Generator.define :rss do
 
 	def tag (*tags, &block)
 		@tags.push tags
-		instance_eval &block
+		result = instance_eval &block
 		@tags.pop
+
+		result
 	end
 
 	def group (group, &block)
 		@group, tmp = group, @group
-		instance_eval &block
+		result = instance_eval &block
 		@group = tmp
+
+		result
 	end
 
 	def register (url, name = nil)
 		@rss << Struct.new(:url, :name, :tags, :group).new(url, name, @tags.flatten, @group)
+		@rss.uniq!
+
+		self
 	end
 
 	def check

data/lib/herpes/server.rb

@@ -0,0 +1,13 @@
+#--
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#                    Version 2, December 2004
+#
+#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+#
+#  0. You just DO WHAT THE FUCK YOU WANT TO.
+#++
+
+Herpes::Module.define :server do
+	plain_accessor :bind, :port
+end

data/lib/herpes/version.rb

@@ -10,6 +10,6 @@
 
 class Herpes
 	def self.version
-		'0.0.1.2'
+		'0.0.2.1'
 	end
 end

data/lib/herpes.rb

@@ -15,14 +15,15 @@ require 'herpes/module'
 
 class Herpes
 	class Callback
-		attr_reader :time, :block, :last
+		attr_reader :time, :discriminator, :block, :last
 
-		def initialize (time, one_shot = false, &block)
+		def initialize (time, discriminator, one_shot = false, &block)
 			raise ArgumentError, 'no block has been passed' unless block
 
-			@time     = time
-			@one_shot = one_shot
-			@block    = block
+			@time          = time
+			@discriminator = discriminator
+			@one_shot      = one_shot
+			@block         = block
 
 			if !one_shot?
 				@last = Time.now - time
@@ -48,7 +49,7 @@ class Herpes
 		end
 
 		def calling!
-			@calling = :gonna
+			@calling = true
 		end
 
 		def called!
@@ -60,12 +61,14 @@ class Herpes
 			@calling == true
 		end
 
-		def call (*args, &block)
+		def call (herpes, &block)
 			return if calling?
 
 			calling!
-			@block.call(*args, &block)
+			@block.call(&block)
 			called!
+
+			herpes.wake_up
 		end
 	end
 
@@ -103,12 +106,20 @@ class Herpes
 		end
 	end
 
+	def save_every (time)
+		cancel { |c| c.discriminator == self }
+
+		every time, self do save end
+	end
+
 	def save
 		return unless @state && @path
 
-		dump = Marshal.dump(@state)
+		Marshal.dump(@state).tap {|dump|
+			File.open(@path, 'wb') { |f| f.write(dump) }
+		}
 
-		File.open(@path, 'wb') { |f| f.write(dump) }
+		self
 	end
 
 	def load (*paths)
@@ -141,17 +152,30 @@ class Herpes
 	end
 
 	def before (&block)
-		@before[@current] = block
+		return unless block
+
+		@before[@current] << block
+		@before[@current].uniq!
+
+		self
 	end
 
 	def on (matcher, &block)
 		return unless block
 
 		@matchers[@current] << Struct.new(:matcher, :block).new(matcher, block)
+		@matchers[@current].uniq!
+
+		self
 	end
 
 	def after (&block)
-		@after[@current] = block
+		return unless block
+
+		@after[@current] << block
+		@after[@current].uniq!
+
+		self
 	end
 
 	def dispatch (event = nil, &block)
@@ -161,10 +185,10 @@ class Herpes
 
 		raise ArgumentError, 'you did not pass an Event' unless event.is_a?(Event)
 
-		@before.each {|name, block|
+		@before.each {|name, blocks|
 			next unless name.nil? || (event.generated_by && event.generated_by =~ name)
 
-			block.call(event)
+			blocks.each { |b| b.call(event) }
 		}
 
 		@matchers.each {|name, matchers|
@@ -184,62 +208,82 @@ class Herpes
 			}
 		}
 
-		@after.each {|name, block|
+		@after.each {|name, blocks|
 			next unless name.nil? || (event.generated_by && event.generated_by =~ name)
 
-			block.call(event)
+			blocks.each { |b| b.call(event) }
 		}
 	end
 
-	def every (time, &block)
-		@callbacks << Callback.new(time, &block)
+	def every (time, discriminator = nil, &block)
+		@callbacks << Callback.new(time, discriminator, &block)
 		wake_up
 	end
 
-	def after (time, &block)
-		@callbacks << Callback.new(time, true, &block)
+	def once (time, discriminator = nil, &block)
+		@callbacks << Callback.new(time, discriminator, true, &block)
+		wake_up
+	end; alias once_after once
+
+	def cancel (&block)
+		@callbacks.reject!(&block)
 		wake_up
 	end
 
 	def until_next
-		next_in = @callbacks.min_by(&:next_in).next_in
+		callbacks = @callbacks.reject(&:calling?).reject(&:gonna_call?)
+
+		return if callbacks.empty?
+
+		next_in = callbacks.min_by(&:next_in).next_in
 
-		next_in > 0 ? next_in : nil
-	rescue
-		nil
+		next_in > 0 ? next_in : 0
 	end
 
-	def running?; !!@running; end
-	def stopped?; !@running;  end
+	def running?; @running; end
+	def stopped?; @stopped; end
 
-	def start!
+	def start
 		@running = true
 
 		while running?
-			sleep until_next
+			begin
+				sleep until_next
+			rescue Interrupt
+				break
+			end
 
 			@callbacks.select {|callback|
 				callback.next_in <= 0
-			}.uniq.each {|callback|
+			}.each {|callback|
 				@callbacks.delete(callback) if callback.one_shot?
 
-				next if callback.gonna_call?
+				next if callback.gonna_call? or callback.calling?
 
 				callback.gonna_call!
 
 				process {
-					callback.call
+					callback.call(self)
 				}
 			}
 		end
 
 		save
+
+		@stopped = true
 	end
 
 	def stop!
 		@running = false
+
 		wake_up
 
 		@pool.kill
 	end
+
+	def stop
+		stop!
+
+		sleep 0.01 until stopped?
+	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herpes
 version: !ruby/object:Gem::Version
-  version: 0.0.1.2
+  version: 0.0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000 Z
+date: 2011-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: threadpool
-  requirement: &19904260 !ruby/object:Gem::Requirement
+  requirement: &10404920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19904260
+  version_requirements: *10404920
 description: 
 email: meh@paranoici.org
 executables:
@@ -39,7 +39,9 @@ files:
 - lib/herpes/event.rb
 - lib/herpes/extensions.rb
 - lib/herpes/module.rb
+- lib/herpes/nerdz.rb
 - lib/herpes/rss.rb
+- lib/herpes/server.rb
 - lib/herpes/version.rb
 homepage: http://github.com/meh/herpes
 licenses: []