herpes 0.0.1 → 0.0.1.1

data/herpes.gemspec

@@ -14,5 +14,5 @@ Gem::Specification.new {|s|
 	s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
 	s.require_paths = ['lib']
 
-  s.add_dependency 'actionpool'
+	s.add_dependency 'threadpool'
 }

data/lib/herpes.rb

@@ -10,7 +10,6 @@
 
 require 'herpes/version'
 require 'herpes/extensions'
-require 'herpes/workers'
 require 'herpes/event'
 require 'herpes/module'
 
@@ -74,12 +73,15 @@ class Herpes
 		new.load(*path)
 	end
 
-	attr_reader :workers, :modules
+	include Awakenable
+	extend Forwardable
+
+	attr_reader    :modules
+	def_delegators :@pool, :do, :process
 
 	def initialize
+		@pool    = ThreadPool.new
 		@modules = []
-		@workers = Workers.new
-		@pipes   = IO.pipe
 
 		@before   = Hash.new { |h, k| h[k] = [] }
 		@matchers = Hash.new { |h, k| h[k] = [] }
@@ -88,6 +90,10 @@ class Herpes
 		@callbacks = []
 	end
 
+	def workers (number)
+		@pool.resize(number)
+	end
+
 	def state (path = nil)
 		if path && path != @path
 			@path  = File.expand_path(path)
@@ -198,19 +204,9 @@ class Herpes
 	def until_next
 		next_in = @callbacks.min_by(&:next_in).next_in
 
-		next_in > 0 ? next_in : 0
+		next_in > 0 ? next_in : nil
 	rescue
-		10
-	end
-
-	def sleep (time)
-		@pipes.first.read_nonblock 1337 rescue nil
-
-		IO.select([@pipes.first], nil, nil, time)
-	end
-
-	def wake_up
-		@pipes.last.write 'x'
+		nil
 	end
 
 	def running?; !!@running; end
@@ -231,7 +227,7 @@ class Herpes
 
 				callback.gonna_call!
 
-				workers.do {
+				process {
 					callback.call
 				}
 			}
@@ -241,7 +237,9 @@ class Herpes
 	end
 
 	def stop!
-		@running = false;
+		@running = false
 		wake_up
+
+		@pool.kill
 	end
 end

data/lib/herpes/extensions.rb

@@ -9,6 +9,7 @@
 #++
 
 require 'forwardable'
+require 'threadpool'
 
 class Numeric
 	def seconds
@@ -56,7 +57,6 @@ class Object
 			define_singleton_method "no_#{name}!" do
 				instance_variable_set "@#{name}", false
 			end
-
 		}
 	end
 end
@@ -89,7 +89,6 @@ class Module
 			define_method "no_#{name}!" do
 				instance_variable_set "@#{name}", false
 			end
-
 		}
 	end
 end

data/lib/herpes/module.rb

@@ -28,7 +28,7 @@ class Module
 	extend Forwardable
 
 	attr_reader    :name, :aliases, :owner
-	def_delegators :owner, :state, :workers
+	def_delegators :owner, :state
 
 	def initialize (name, *aliases, &block)
 		@name    = name

data/lib/herpes/rss.rb

@@ -42,20 +42,33 @@ Herpes::Generator.define :rss do
 			(state[:rss] ||= {})[r.url] ||= []
 
 			RSS::Parser.parse(open(r.url).read, false).tap {|p|
-				p.items.each {|item|
-					next if state[:rss][r.url].member? [item.date, item.title]
+				p.items.reverse_each {|item|
+					if p.is_a?(RSS::Atom::Feed)
+						next if state[:rss][r.url].member? [item.updated.content, item.title.content]
+					else
+						next if state[:rss][r.url].member? [item.date, item.title]
+					end
 
 					event = Herpes::Event.new {
 						tags  r.tags
 						group r.group
 						name  r.name
 
-						channel p.channel.dup
-
-						title       item.title.dup
-						link        item.link.dup
-						description item.description.dup
-						date        item.date
+						if p.is_a?(RSS::Atom::Feed)
+							channel Struct.new(:title, :date, :link).new(p.title.content.dup, p.updated.content, p.link.href.dup)
+
+							title       item.title.content.dup
+							link        item.link.href.dup
+							description item.content.content.dup
+							date        item.updated.content
+						else
+							channel p.channel.dup
+
+							title       item.title.dup
+							link        item.link.dup
+							description item.description.dup
+							date        item.date
+						end
 					}
 
 					if digest
@@ -64,12 +77,20 @@ Herpes::Generator.define :rss do
 						dispatch(event)
 					end
 
-					state[:rss][r.url].push [item.date, item.title]
+					if p.is_a?(RSS::Atom::Feed)
+						state[:rss][r.url].push [item.updated.content, item.title.content]
+					else
+						state[:rss][r.url].push [item.date, item.title]
+					end
 				}
 
 				state[:rss][r.url].reject! {|(date, title)|
 					p.items.none? {|item|
-						item.date == date && item.title == title
+						if p.is_a?(RSS::Atom::Feed)
+							 item.updated.content == date && item.title.content == title
+						else
+							item.date == date && item.title == title
+						end
 					}
 				}
 			}

data/lib/herpes/version.rb

@@ -10,6 +10,6 @@
 
 class Herpes
 	def self.version
-		'0.0.1'
+		'0.0.1.1'
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herpes
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-24 00:00:00.000000000 Z
+date: 2011-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionpool
-  requirement: &10434500 !ruby/object:Gem::Requirement
+  name: threadpool
+  requirement: &14985100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10434500
+  version_requirements: *14985100
 description: 
 email: meh@paranoici.org
 executables:
@@ -41,7 +41,6 @@ files:
 - lib/herpes/module.rb
 - lib/herpes/rss.rb
 - lib/herpes/version.rb
-- lib/herpes/workers.rb
 homepage: http://github.com/meh/herpes
 licenses: []
 post_install_message: 

data/lib/herpes/workers.rb

@@ -1,26 +0,0 @@
-#--
-#            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.
-#++
-
-require 'actionpool'
-
-class Workers
-	extend Forwardable
-
-	def_delegators :@pool, :max, :max=, :min, :min=
-
-	def initialize (range = 2 .. 4)
-		@pool = ActionPool::Pool.new(:min_threads => range.begin, :max_threads => range.end)
-	end
-
-	def do (*args, &block)
-		@pool.process(*args, &block)
-	end
-end
-