ponder 0.1.1 → 0.2.0

data/examples/echo.rb

@@ -3,14 +3,12 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'ponder'
 
 # This Thaum will parrot all channel messages.
-@ponder = Ponder::Thaum.new
-
-@ponder.configure do |c|
-  c.server    = 'chat.freenode.org'
-  c.port      = 6667
-  c.nick      = 'Ponder'
-  c.verbose   = true
-  c.logging   = false
+@ponder = Ponder::Thaum.new do |t|
+  t.server    = 'chat.freenode.org'
+  t.port      = 6667
+  t.nick      = 'Ponder'
+  t.verbose   = true
+  t.logging   = false
 end
 
 @ponder.on :connect do

data/examples/redis_last_seen.rb

@@ -32,14 +32,12 @@ def remember(lowercase_nick, nick, user, host, channel, action,
     'updated_at',     Time.now.to_i)
 end
 
-@ponder = Ponder::Thaum.new
-
-@ponder.configure do |c|
-  c.server  = 'chat.freenode.org'
-  c.port    = 6667
-  c.nick    = 'Ponder'
-  c.verbose = true
-  c.logging = false
+@ponder = Ponder::Thaum.new do |t|
+  t.server  = 'chat.freenode.org'
+  t.port    = 6667
+  t.nick    = 'Ponder'
+  t.verbose = true
+  t.logging = false
 end
 
 @ponder.on :connect do
@@ -124,16 +122,24 @@ end
       @ponder.message event_data[:channel], "Too many results (#{results})."
     end
   # single search
-  elsif @redis.exists nick
-    msg = last_seen(nick)
-    if online_nick = @ponder.whois(nick)
-      msg = "#{online_nick[:nick]} is online. (#{msg})"
-    end
-    @ponder.message event_data[:channel], msg
-  elsif online_nick = @ponder.whois(nick)
-    @ponder.message event_data[:channel], "#{online_nick[:nick]} is online."
   else
-    @ponder.message event_data[:channel], "#{nick} not found."
+    @ponder.whois(nick).callback do |result|
+      message = if @redis.exists nick
+        if result
+          "#{result[:nick]} is online. (#{last_seen(nick)})"
+        else
+          last_seen(nick)
+        end
+      else
+        if result
+          "#{result[:nick]} is online."
+        else
+          "#{nick} not found."
+        end
+      end
+
+      @ponder.message event_data[:channel], message
+    end
   end
 end
 

data/lib/core_ext/array.rb

@@ -0,0 +1,9 @@
+class Array
+  def extract_options!
+    if last.is_a?(Hash)
+      pop
+    else
+      {}
+    end
+  end
+end

data/lib/ponder.rb

@@ -3,9 +3,18 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 module Ponder
   ROOT = File.dirname($0)
 
-  autoload :Filter,     'ponder/filter'
+  autoload :AsyncIRC, 'ponder/async_irc'
+  autoload :Callback, 'ponder/callback'
+  autoload :Connection, 'ponder/connection'
+  autoload :Filter, 'ponder/filter'
   autoload :Formatting, 'ponder/formatting'
-  autoload :Thaum,      'ponder/thaum'
-  autoload :VERSION,    'ponder/version'
+  autoload :IRC, 'ponder/irc'
+  autoload :Thaum, 'ponder/thaum'
+  autoload :VERSION, 'ponder/version'
+
+  module Logger
+    autoload :Twoflogger, 'ponder/logger/twoflogger'
+    autoload :BlindIo, 'ponder/logger/blind_io'
+  end
 end
 

data/lib/ponder/async_irc.rb

@@ -1,120 +1,151 @@
 require 'thread'
 require 'timeout'
+require 'eventmachine'
 
 module Ponder
   module AsyncIRC
-    TIMEOUT = 30
+    class Topic
+      # number of seconds the deferrable will wait for a response before failing
+      TIMEOUT = 15
 
-    def get_topic(channel)
-      queue = Queue.new
-      @observer_queues[queue] = [/:\S+ (331|332|403|442) \S+ #{Regexp.escape(channel)} :/i]
-      raw "TOPIC #{channel}"
+      include EventMachine::Deferrable
 
-      topic = begin
-        Timeout::timeout(TIMEOUT) do
-          response = queue.pop
-          raw_numeric = response.scan(/^:\S+ (\d{3})/)[0][0]
+      def initialize(channel, timeout_after, thaum)
+        @channel = channel
+        @thaum = thaum
 
-          case raw_numeric
+        self.timeout(timeout_after)
+        self.errback { @thaum.deferrables.delete self }
+
+        @thaum.deferrables.add self
+        @thaum.raw "TOPIC #{@channel}"
+      end
+
+      def try(message)
+        if message =~ /:\S+ (331|332|403|442) \S+ #{Regexp.escape(@channel)} :/i
+          case $1
           when '331'
-            {:raw_numeric => 331, :message => 'No topic is set'}
+            succeed({:raw_numeric => 331, :message => 'No topic is set'})
           when '332'
-            {:raw_numeric => 332, :message => response.scan(/ :(.*)/)[0][0]}
+            succeed({:raw_numeric => 332, :message => message.scan(/ :(.*)/)[0][0]})
           when '403'
-            {:raw_numeric => 403, :message => 'No such channel'}
+            succeed({:raw_numeric => 403, :message => 'No such channel'})
           when '442'
-            {:raw_numeric => 442, :message => "You're not on that channel"}
+            succeed({:raw_numeric => 442, :message => "You're not on that channel"})
           end
         end
-      rescue Timeout::Error
-        false
       end
 
-      @observer_queues.delete queue
-      return topic
+      def succeed(*args)
+        @thaum.deferrables.delete self
+        set_deferred_status :succeeded, *args
+      end
     end
 
-    def channel_info(channel)
-      queue = Queue.new
-      @observer_queues[queue] = [/:\S+ (324|329|403|442) \S+ #{Regexp.escape(channel)}/i]
-      raw "MODE #{channel}"
-      information = {}
-      running = true
-
-      begin
-        Timeout::timeout(TIMEOUT) do
-          while running
-            response = queue.pop
-            raw_numeric = response.scan(/^:\S+ (\d{3})/)[0][0]
-
-            case raw_numeric
-            when '324'
-              information[:modes] = response.scan(/^:\S+ 324 \S+ \S+ \+(\w*)/)[0][0].split('')
-              limit = response.scan(/^:\S+ 324 \S+ \S+ \+\w* (\w*)/)[0]
-              information[:channel_limit] = limit[0].to_i if limit
-            when '329'
-              information[:created_at] = Time.at(response.scan(/^:\S+ 329 \S+ \S+ (\d+)/)[0][0].to_i)
-              running = false
-            when '403', '442'
-              information = false
-              running = false
+    class Whois
+      # number of seconds the deferrable will wait for a response before failing
+      TIMEOUT = 15
+
+      include EventMachine::Deferrable
+
+      def initialize(nick, timeout_after, thaum)
+        @nick = nick
+        @thaum = thaum
+        @whois_data = {}
+
+        self.timeout(timeout_after)
+        self.errback { @thaum.deferrables.delete self }
+
+        @thaum.deferrables.add self
+        @thaum.raw "WHOIS #{@nick}"
+      end
+
+      def try(message)
+        if message =~ /^:\S+ (307|311|312|318|319|330|401) \S+ #{Regexp.escape(@nick)}/i
+          case $1
+          when '307', '330'
+            @whois_data[:registered] = true
+          when '311'
+            message = message.scan(/^:\S+ 311 \S+ (\S+) :?(\S+) (\S+) \* :(.*)$/)[0]
+            @whois_data[:nick]      = message[0]
+            @whois_data[:username]  = message[1]
+            @whois_data[:host]      = message[2]
+            @whois_data[:real_name] = message[3]
+          when '312'
+            message = message.scan(/^:\S+ 312 \S+ \S+ (\S+) :(.*)/)[0]
+            @whois_data[:server] = {:address => message[0], :name => message[1]}
+          when '318'
+            succeed @whois_data
+          when '319'
+            channels_with_mode = message.scan(/^:\S+ 319 \S+ \S+ :(.*)/)[0][0].split(' ')
+            @whois_data[:channels] = {}
+            channels_with_mode.each do |c|
+              @whois_data[:channels][c.scan(/(.)?(#\S+)/)[0][1]] = c.scan(/(.)?(#\S+)/)[0][0]
             end
+          when '401'
+            succeed false
           end
         end
-      rescue Timeout::Error
-        information = false
       end
 
-      @observer_queues.delete queue
-      return information
+      def succeed(*args)
+        @thaum.deferrables.delete self
+        set_deferred_status :succeeded, *args
+      end
     end
 
-    def whois(nick)
-      queue = Queue.new
-      @observer_queues[queue] = [/^:\S+ (307|311|312|318|319|330|401) \S+ #{Regexp.escape(nick)}/i]
-      raw "WHOIS #{nick}"
-      whois = {}
-      running = true
-
-      begin
-        Timeout::timeout(TIMEOUT) do
-          while running
-            response = queue.pop
-            raw_numeric = response.scan(/^:\S+ (\d{3})/)[0][0]
-
-            case raw_numeric
-            when '307', '330'
-              whois[:registered] = true
-            when '311'
-              response = response.scan(/^:\S+ 311 \S+ (\S+) :?(\S+) (\S+) \* :(.*)$/)[0]
-              whois[:nick]      = response[0]
-              whois[:username]  = response[1]
-              whois[:host]      = response[2]
-              whois[:real_name] = response[3]
-            when '312'
-              response = response.scan(/^:\S+ 312 \S+ \S+ (\S+) :(.*)/)[0]
-              whois[:server] = {:address => response[0], :name => response[1]}
-            when '318'
-              running = false
-            when '319'
-              channels_with_mode = response.scan(/^:\S+ 319 \S+ \S+ :(.*)/)[0][0].split(' ')
-              whois[:channels] = {}
-              channels_with_mode.each do |c|
-                whois[:channels][c.scan(/(.)?(#\S+)/)[0][1]] = c.scan(/(.)?(#\S+)/)[0][0]
-              end
-            when '401'
-              whois = false
-              running = false
-            end
+    class Channel
+      # number of seconds the deferrable will wait for a response before failing
+      TIMEOUT = 15
+
+      include EventMachine::Deferrable
+
+      def initialize(channel, timeout_after, thaum)
+        @channel = channel
+        @thaum = thaum
+        @channel_information = {}
+
+        self.timeout(timeout_after)
+        self.errback { @ponder.deferrables.delete self }
+
+        @thaum.deferrables.add self
+        @thaum.raw "MODE #{@channel}"
+      end
+
+      def try(message)
+        if message =~ /:\S+ (324|329|403|442) \S+ #{Regexp.escape(@channel)}/i
+          case $1
+          when '324'
+            @channel_information[:modes] = message.scan(/^:\S+ 324 \S+ \S+ \+(\w*)/)[0][0].split('')
+            limit = message.scan(/^:\S+ 324 \S+ \S+ \+\w* (\w*)/)[0]
+            @channel_information[:channel_limit] = limit[0].to_i if limit
+          when '329'
+            @channel_information[:created_at] = Time.at(message.scan(/^:\S+ 329 \S+ \S+ (\d+)/)[0][0].to_i)
+            succeed @channel_information
+          when '403', '442'
+            succeed false
           end
         end
-      rescue Timeout::Error
-        nil
       end
 
-      @observer_queues.delete queue
-      return whois
+      def succeed(*args)
+        @thaum.deferrables.delete self
+        set_deferred_status :succeeded, *args
+      end
+    end
+
+    module Delegate
+      def get_topic(channel, timeout_after = AsyncIRC::Topic::TIMEOUT)
+        AsyncIRC::Topic.new(channel, timeout_after, self)
+      end
+
+      def whois(nick, timeout_after = AsyncIRC::Whois::TIMEOUT)
+        AsyncIRC::Whois.new(nick, timeout_after, self)
+      end
+
+      def channel_info(channel, timeout_after = AsyncIRC::Channel::TIMEOUT)
+        AsyncIRC::Channel.new(channel, timeout_after, self)
+      end
     end
   end
 end
-

data/lib/ponder/callback.rb

@@ -1,16 +1,19 @@
 module Ponder
   class Callback
     LISTENED_TYPES = [:connect, :channel, :query, :join, :part, :quit, :nickchange, :kick, :topic, :disconnect] # + 3-digit numbers
-    
-    def initialize(event_type = :channel, match = //, proc = Proc.new {})
+
+    attr_reader :options
+
+    def initialize(event_type = :channel, match = //, options = {}, proc = Proc.new {})
       unless self.class::LISTENED_TYPES.include?(event_type) || event_type.is_a?(Integer)
         raise TypeError, "#{event_type} is an unsupported event-type"
       end
-      
+
       self.match = match
       self.proc = proc
+      @options = options
     end
-    
+
     def call(event_type, event_data = {})
       if (event_type == :channel) || (event_type == :query)
         @proc.call(event_data) if event_data[:message] =~ @match
@@ -20,9 +23,9 @@ module Ponder
         @proc.call(event_data)
       end
     end
-    
+
     private
-    
+
     def match=(match)
       if match.is_a?(Regexp)
         @match = match
@@ -30,7 +33,7 @@ module Ponder
         raise TypeError, "#{match} must be a Regexp"
       end
     end
-    
+
     def proc=(proc)
       if proc.is_a?(Proc)
         @proc = proc

data/lib/ponder/logger/blind_io.rb

@@ -1,24 +1,26 @@
 module Ponder
-  class BlindIo
-    def debug(*args, &block)
-    end
+  module Logger
+    class BlindIo
+      def debug(*args, &block)
+      end
 
-    def info(*args, &block)
-    end
+      def info(*args, &block)
+      end
 
-    def warn(*args, &block)
-    end
+      def warn(*args, &block)
+      end
 
-    def error(*args, &block)
-    end
+      def error(*args, &block)
+      end
 
-    def fatal(*args, &block)
-    end
+      def fatal(*args, &block)
+      end
 
-    def unknown(*args, &block)
-    end
+      def unknown(*args, &block)
+      end
 
-    def method_missing(*args, &block)
+      def method_missing(*args, &block)
+      end
     end
   end
 end

data/lib/ponder/logger/twoflogger.rb

@@ -1,11 +1,13 @@
 require 'logger'
 
 module Ponder
-  class Twoflogger < Logger
-    def initialize(*args)
-      super(*args)
-      self.formatter = proc do |severity, datetime, progname, msg|
-        "#{severity} #{datetime.strftime('%Y-%m-%d %H:%M:%S')} #{msg}\n"
+  module Logger
+    class Twoflogger < ::Logger
+      def initialize(*args)
+        super(*args)
+        self.formatter = proc do |severity, datetime, progname, msg|
+          "#{severity} #{datetime.strftime('%Y-%m-%d %H:%M:%S')} #{msg}\n"
+        end
       end
     end
   end

data/lib/ponder/thaum.rb

@@ -1,21 +1,25 @@
+require 'core_ext/array'
+require 'fileutils'
+require 'ostruct'
+require 'set'
 require 'ponder/async_irc'
 require 'ponder/callback'
 require 'ponder/connection'
+require 'ponder/filter'
 require 'ponder/irc'
 require 'ponder/logger/twoflogger'
 require 'ponder/logger/blind_io'
-require 'ostruct'
-autoload :FileUtils, 'fileutils'
 
 module Ponder
   class Thaum
     include IRC
-    include AsyncIRC
+    include AsyncIRC::Delegate
 
     attr_reader :config, :callbacks
-    attr_accessor :connected, :logger, :console_logger
+    attr_accessor :connected, :logger, :console_logger, :deferrables
 
-    def initialize
+    def initialize(&block)
+      # default settings
       @config = OpenStruct.new(
         :server             => 'localhost',
         :port               => 6667,
@@ -28,13 +32,34 @@ module Ponder
         :reconnect_interval => 30
       )
 
-      @logger = BlindIo.new
-      @console_logger = Twoflogger.new($stdout)
+      # custom settings
+      block.call(@config) if block_given?
+
+      # setting up loggers
+      @console_logger = if @config.verbose
+        Logger::Twoflogger.new($stdout)
+      else
+        Logger::BlindIo.new
+      end
+
+      @logger = if @config.logging
+        if @config.logger
+          @config.logger
+        else
+          log_path = File.join(ROOT, 'logs', 'log.log')
+          log_dir = File.dirname(log_path)
+          FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
+          Logger::Twoflogger.new(log_path, File::WRONLY | File::APPEND)
+        end
+      else
+        Logger::BlindIo.new
+      end
 
-      @observer_queues = {}
+      # when using methods like #get_topic or #whois, a Deferrable object will wait
+      # for the response and call a callback. these Deferrables are stored in this Set
+      @deferrables = Set.new
 
       @connected = false
-      @reloading = false
 
       # user callbacks
       @callbacks = Hash.new { |hash, key| hash[key] = [] }
@@ -58,36 +83,13 @@ module Ponder
       @after_filters = Hash.new { |hash, key| hash[key] = [] }
     end
 
-    def configure(&block)
-      unless @reloading
-        block.call(@config)
-
-        # logger changes (if differing from initialize)
-        if @config.verbose
-          @console_logger = @config.console_logger if @config.console_logger
-        else
-          @console_logger = BlindIo.new
-        end
-
-        if @config.logging
-          log_path = @config.log_path || File.join(ROOT, 'logs', 'log.log')
-          log_dir = File.dirname(log_path)
-          FileUtils.mkdir_p(log_dir) unless File.exist?(log_dir)
+    def on(event_types = [:channel], match = //, *options, &block)
+      options = options.extract_options!
 
-          if @config.logger
-            @logger = @config.logger
-          else
-            @logger = Twoflogger.new(log_path, File::WRONLY | File::APPEND)
-          end
-        end
-      end
-    end
-
-    def on(event_types = [:channel], match = //, &block)
       if event_types.is_a?(Array)
-        callbacks = event_types.map { |event_type| Callback.new(event_type, match, block) }
+        callbacks = event_types.map { |event_type| Callback.new(event_type, match, options, block) }
       else
-        callbacks = [Callback.new(event_types, match, block)]
+        callbacks = [Callback.new(event_types, match, options, block)]
         event_types = [event_types]
       end
 
@@ -97,27 +99,14 @@ module Ponder
     end
 
     def connect
-      unless @reloading
-        @logger.info '-- Starting Ponder'
-        @console_logger.info '-- Starting Ponder'
+      @logger.info '-- Starting Ponder'
+      @console_logger.info '-- Starting Ponder'
 
-        EventMachine::run do
-          @connection = EventMachine::connect(@config.server, @config.port, Connection, self)
-        end
+      EventMachine::run do
+        @connection = EventMachine::connect(@config.server, @config.port, Connection, self)
       end
     end
 
-    def reload!
-      @reloading = true
-      @callbacks.clear
-      load $0
-      @reloading = false
-    end
-
-    def reloading?
-      @reloading
-    end
-
     # parsing incoming traffic
     def parse(message)
       message.chomp!
@@ -128,7 +117,7 @@ module Ponder
       when /^PING \S+$/
         raw message.sub(/PING/, 'PONG')
 
-      when /^:\S+ (\d\d\d) /
+      when /^(?:\:\S+ )?(\d\d\d) /
         number = $1.to_i
         parse_event(number, :type => number, :params => $')
 
@@ -157,51 +146,52 @@ module Ponder
         parse_event(:topic, :type => :topic, :nick => $1, :user => $2, :host => $3, :channel => $4, :topic => $')
       end
 
-      @observer_queues.each do |queue, regexps|
-        regexps.each do |regexp|
-          if message =~ regexp
-            queue << message
-          end
-        end
-      end
+      # if there are pending deferrabels, check if the message suits their matching pattern
+      @deferrables.each { |d| d.try(message) }
     end
 
     # process callbacks with its begin; rescue; end
     def process_callbacks(event_type, event_data)
       @callbacks[event_type].each do |callback|
-        EM.defer(
-          Proc.new do
-            begin
-              stop_running = false
-
-              # before filters (specific filters first, then :all)
-              (@before_filters[event_type] + @before_filters[:all]).each do |filter|
-                if filter.call(event_type, event_data) == false
-                  stop_running = true
-                  break
-                end
+        # process chain of before_filters, callback handling and after_filters
+        process = proc do
+          begin
+            stop_running = false
+
+            # before filters (specific filters first, then :all)
+            (@before_filters[event_type] + @before_filters[:all]).each do |filter|
+              if filter.call(event_type, event_data) == false
+                stop_running = true
+                break
               end
+            end
 
-              unless stop_running
-                # handling
-                callback.call(event_type, event_data)
+            unless stop_running
+              # handling
+              callback.call(event_type, event_data)
 
-                # after filters (specific filters first, then :all)
-                (@after_filters[event_type] + @after_filters[:all]).each do |filter|
-                  filter.call(event_type, event_data)
-                end
-              end
-            rescue => e
-              [@logger, @console_logger].each do |logger|
-                logger.error("-- #{e.class}: #{e.message}")
-                e.backtrace.each { |line| logger.error("-- #{line}") }
+              # after filters (specific filters first, then :all)
+              (@after_filters[event_type] + @after_filters[:all]).each do |filter|
+                filter.call(event_type, event_data)
               end
             end
+          rescue => e
+            [@logger, @console_logger].each do |logger|
+              logger.error("-- #{e.class}: #{e.message}")
+              e.backtrace.each { |line| logger.error("-- #{line}") }
+            end
           end
-        )
+        end
+
+        # defer the whole process
+        if callback.options[:defer]
+          EM.defer(process)
+        else
+          process.call
+        end
       end
     end
-    
+
     def before_filter(event_types = :all, match = //, &block)
       filter(@before_filters, event_types, match, block)
     end
@@ -225,10 +215,10 @@ module Ponder
     def filter(filter_type, event_types = :all, match = //, block = Proc.new)
       if event_types.is_a?(Array)
         event_types.each do |event_type|
-          filter_type[event_type] << Filter.new(event_type, match, block)
+          filter_type[event_type] << Filter.new(event_type, match, {}, block)
         end
       else
-        filter_type[event_types] << Filter.new(event_types, match, block)
+        filter_type[event_types] << Filter.new(event_types, match, {}, block)
       end
     end
   end

data/lib/ponder/version.rb

@@ -1,4 +1,4 @@
 module Ponder
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end
 

data/ponder.gemspec

@@ -5,13 +5,13 @@ require 'lib/ponder/version'
 Gem::Specification.new do |s|
   s.name = 'ponder'
   s.version = Ponder::VERSION
-  s.date = '2011-05-19'
+  s.date = '2011-08-28'
   s.summary = 'IRC bot framework'
   s.description = 'Ponder (Stibbons) is a Domain Specific Language for writing IRC Bots using the EventMachine library.'
 
   s.author = 'Tobias Bühlmann'
   s.email = 'tobias.buehlmann@gmx.de'
-  s.homepage = 'http://github.com/tbuehlmann/ponder'
+  s.homepage = 'https://github.com/tbuehlmann/ponder'
 
   s.required_ruby_version = '>= 1.8.6'
   s.add_dependency('eventmachine', '>= 0.12.10')
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
     README.md
     Rakefile
     examples/echo.rb
-    examples/github_blog.rb
     examples/redis_last_seen.rb
+    lib/core_ext/array.rb
     lib/ponder.rb
     lib/ponder/async_irc.rb
     lib/ponder/callback.rb

data/spec/async_irc_spec.rb

@@ -2,144 +2,185 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'spec_helper'
 require 'ponder/thaum'
+require 'ponder/async_irc'
 
 describe Ponder::AsyncIRC do
-  PERIODIC_TIME = 0.01
-
   before(:each) do
-    @ponder = Ponder::Thaum.new
-    @ponder.configure { |c| c.verbose = false }
+    @ponder = Ponder::Thaum.new { |c| c.verbose = false }
   end
 
-  context 'tries to get a topic when' do
-    it 'there is no topic set' do
-      @ponder.should_receive(:raw).with('TOPIC #channel')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.get_topic('#channel') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) { @ponder.parse(":server 331 Ponder #channel :No topic is set.\r\n") }
-      end
-      @result.should eql({:raw_numeric => 331, :message => 'No topic is set'})
-    end
-
-    it 'there is no topic set' do
-      @ponder.should_receive(:raw).with('TOPIC #channel')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.get_topic('#channel') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) { @ponder.parse(":server 332 Ponder #channel :topic content\r\n") }
+  describe Ponder::AsyncIRC::Whois do
+    context 'tries to get whois information when' do
+      it 'there is no such nick' do
+        @ponder.should_receive(:raw).with('WHOIS not_online')
+        EM.run do
+          whois = @ponder.whois('not_online', 1.5)
+          whois.callback do |result|
+            result.should be_false
+            EM.stop
+          end
+          whois.errback do
+            fail 'Wrong Callback called'
+            EM.stop
+          end
+
+          EM.next_tick { @ponder.parse(":server 401 Ponder not_online :No such nick\r\n") }
+        end
       end
-      @result.should eql({:raw_numeric => 332, :message => 'topic content'})
-    end
 
-    it 'there is no such channel' do
-      @ponder.should_receive(:raw).with('TOPIC #no_channel')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.get_topic('#no_channel') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) { @ponder.parse(":server 403 Ponder #no_channel :No such channel\r\n") }
+      it 'the user is online' do
+        @ponder.should_receive(:raw).with('WHOIS Ridcully')
+        EM.run do
+          whois = @ponder.whois('Ridcully', 1.5)
+          whois.callback do |result|
+            result.should be_kind_of(Hash)
+            result[:nick].should eql('Ridcully')
+            result[:username].should eql('ridc')
+            result[:host].should eql('host')
+            result[:real_name].should eql('Ridcully the wizard')
+      
+            result[:server].should be_kind_of(Hash)
+            result[:server][:address].should eql('foo.host.net')
+            result[:server][:name].should eql('That host thing')
+      
+            result[:channels].should be_kind_of(Hash)
+            result[:channels]['#foo'].should be_nil
+            result[:channels]['##bar'].should be_nil
+            result[:channels]['#baz'].should eql('<')
+            result[:channels]['#sushi'].should eql('@')
+            result[:channels]['#ramen'].should eql('+')
+      
+            result[:registered].should be_true
+            EM.stop
+          end
+          whois.errback do
+            fail 'Wrong Callback called'
+            EM.stop
+          end
+
+          EM.next_tick do
+            @ponder.parse(":server 311 Ponder Ridcully :ridc host * :Ridcully the wizard\r\n")
+            @ponder.parse(":server 312 Ponder Ridcully foo.host.net :That host thing\r\n")
+            @ponder.parse(":server 319 Ponder Ridcully :#foo ##bar <#baz @#sushi +#ramen\r\n")
+            @ponder.parse(":server 330 Ponder Ridcully rid_ :is logged in as\r\n")
+            @ponder.parse(":server 318 Ponder Ridcully :End of /WHOIS list.\r\n")
+          end
+        end
       end
-      @result.should eql({:raw_numeric => 403, :message => 'No such channel'})
     end
 
-    it "you're not on that channel" do
-      @ponder.should_receive(:raw).with('TOPIC #channel')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.get_topic('#channel') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) { @ponder.parse(":server 442 Ponder #channel :You're not on that channel\r\n") }
+    context 'it tries to get channel information when' do
+      it 'there is no such channel' do
+        @ponder.should_receive(:raw).with('MODE #no_channel')
+
+        EM.run do
+          channel_info = @ponder.channel_info('#no_channel')
+          channel_info.callback do |result|
+            result.should be_false
+            EM.stop
+          end
+          channel_info.errback do
+            fail 'Wrong Callback called'
+            EM.stop
+          end
+
+          EM.next_tick { @ponder.parse(":server 403 Ponder #no_channel :No such channel\r\n") }
+        end
       end
-      @result.should eql({:raw_numeric => 442, :message => "You're not on that channel"})
     end
   end
 
-  context 'it tries to get channel information when' do
-    it 'there is no such channel' do
-      @ponder.should_receive(:raw).with('MODE #no_channel')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.channel_info('#no_channel') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) { @ponder.parse(":server 403 Ponder #no_channel :No such channel\r\n") }
+  describe Ponder::AsyncIRC::Topic do    
+    context 'tries to get a topic' do
+      it ', adds the Deferrable object to the Set and deletes if afterwards for a success' do
+        @ponder.should_receive(:raw).with('TOPIC #channel')
+        EM.run do
+          @ponder.deferrables.should be_empty
+          topic = @ponder.get_topic('#channel')
+          @ponder.deferrables.should include(topic)
+          topic.callback do |result|
+            @ponder.deferrables.should be_empty
+            EM.stop
+          end
+          topic.errback do
+            fail 'Wrong Callback called'
+            EM.stop
+          end
+
+          EM.next_tick { @ponder.parse(":server 331 Ponder #channel :No topic is set.\r\n") }
+        end
       end
-      @result.should be_false
-    end
 
-    it "you're not on that channel" do
-      @ponder.should_receive(:raw).with('MODE #channel')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.channel_info('#channel') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) { @ponder.parse(":server 442 Ponder #channel :You're not on that channel\r\n") }
-      end
-      @result.should be_false
-    end
-
-    it "there are regular channel modes" do
-      @ponder.should_receive(:raw).with('MODE #channel')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.channel_info('#channel') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) do
-          @ponder.parse(":server 324 Ponder #channel +cnst\r\n")
-          @ponder.parse(":server 329 Ponder #channel 1233034048\r\n")
+      it ', adds the Deferrable object to the Set and deletes if afterwards for a failure (timeout)' do
+        @ponder.should_receive(:raw).with('TOPIC #channel')
+        EM.run do
+          @ponder.deferrables.should be_empty
+          topic = @ponder.get_topic('#channel', 1.5)
+          @ponder.deferrables.should include(topic)
+          topic.callback do |result|
+            fail 'Wrong Callback called'
+            EM.stop
+          end
+          topic.errback do
+            @ponder.deferrables.should be_empty
+            EM.stop
+          end
         end
       end
-      @result.should be_kind_of(Hash)
-      @result[:modes].should include('c', 'n', 's', 't')
-      @result[:created_at].should eql(Time.at(1233034048))
-    end
 
-    it "there are regular channel modes with a limit" do
-      @ponder.should_receive(:raw).with('MODE #channel')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.channel_info('#channel') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) do
-          @ponder.parse(":server 324 Ponder #channel +cnstl 8\r\n")
-          @ponder.parse(":server 329 Ponder #channel 1233034048\r\n")
+      it 'when there is no topic set' do
+        @ponder.should_receive(:raw).with('TOPIC #channel')
+        EM.run do
+          @ponder.deferrables.should be_empty
+          topic = @ponder.get_topic('#channel', 2)
+          @ponder.deferrables.should include(topic)
+          topic.callback do |result|
+            result.should eql({:raw_numeric => 331, :message => 'No topic is set'})
+            @ponder.deferrables.should be_empty
+            EM.stop
+          end
+          topic.errback do
+            fail 'Wrong Callback called'
+            EM.stop
+          end
+
+          EM.next_tick { @ponder.parse(":server 331 Ponder #channel :No topic is set.\r\n") }
         end
       end
-      @result.should be_kind_of(Hash)
-      @result[:modes].should include('c', 'n', 's', 't')
-      @result[:created_at].should eql(Time.at(1233034048))
-      @result[:channel_limit].should equal(8)
-    end
-  end
 
-  context 'tries to get whois information when' do
-    it 'there is no such nick' do
-      @ponder.should_receive(:raw).with('WHOIS not_online')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.whois('not_online') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) { @ponder.parse(":server 401 Ponder not_online :No such nick\r\n") }
+      it 'when there is no such channel' do
+        @ponder.should_receive(:raw).with('TOPIC #no_channel')
+        EM.run do
+          topic = @ponder.get_topic('#no_channel')
+          topic.callback do |result|
+            result.should eql({:raw_numeric => 403, :message => 'No such channel'})
+            EM.stop
+          end
+          topic.errback do
+            fail 'Wrong Callback called'
+            EM.stop
+          end
+
+          EM.next_tick { @ponder.parse(":server 403 Ponder #no_channel :No such channel\r\n") }
+        end
       end
-      @result.should be_false
-    end
 
-    it 'the user is online' do
-      @ponder.should_receive(:raw).with('WHOIS Ridcully')
-      EM.run do
-        EM.defer(Proc.new { @result = @ponder.whois('Ridcully') }, Proc.new { EM.schedule { EM.stop } })
-        EM::PeriodicTimer.new(PERIODIC_TIME) do
-          @ponder.parse(":server 311 Ponder Ridcully :ridc host * :Ridcully the wizard\r\n")
-          @ponder.parse(":server 312 Ponder Ridcully foo.host.net :That host thing\r\n")
-          @ponder.parse(":server 319 Ponder Ridcully :#foo ##bar <#baz @#sushi +#ramen\r\n")
-          @ponder.parse(":server 330 Ponder Ridcully rid_ :is logged in as\r\n")
-          @ponder.parse(":server 318 Ponder Ridcully :End of /WHOIS list.\r\n")
+      it "you're not on that channel" do
+        @ponder.should_receive(:raw).with('TOPIC #channel')
+        EM.run do
+          topic = @ponder.get_topic('#channel')
+          topic.callback do |result|
+            result.should eql({:raw_numeric => 442, :message => "You're not on that channel"})
+            EM.stop
+          end
+          topic.errback do
+            fail 'Wrong Callback called'
+            EM.stop
+          end
+
+          EM.next_tick { @ponder.parse(":server 442 Ponder #channel :You're not on that channel\r\n") }
         end
       end
-
-      @result.should be_kind_of(Hash)
-      @result[:nick].should eql('Ridcully')
-      @result[:username].should eql('ridc')
-      @result[:host].should eql('host')
-      @result[:real_name].should eql('Ridcully the wizard')
-
-      @result[:server].should be_kind_of(Hash)
-      @result[:server][:address].should eql('foo.host.net')
-      @result[:server][:name].should eql('That host thing')
-
-      @result[:channels].should be_kind_of(Hash)
-      @result[:channels]['#foo'].should be_nil
-      @result[:channels]['##bar'].should be_nil
-      @result[:channels]['#baz'].should eql('<')
-      @result[:channels]['#sushi'].should eql('@')
-      @result[:channels]['#ramen'].should eql('+')
-
-      @result[:registered].should be_true
     end
   end
 end
-

data/spec/callback_spec.rb

@@ -7,8 +7,7 @@ describe Ponder::Callback do
   before(:all) { @proc = Proc.new { } }
 
   before(:each) do
-    @ponder = Ponder::Thaum.new
-    @ponder.configure { |c| c.verbose = true }
+    @ponder = Ponder::Thaum.new { |c| c.verbose = true }
   end
 
   context 'tries to create a callback' do
@@ -25,12 +24,12 @@ describe Ponder::Callback do
     end
 
     it 'with an invalid proc' do
-      lambda { Ponder::Callback.new(:channel, /foo/, 8) }.should raise_error(TypeError)
+      lambda { Ponder::Callback.new(:channel, /foo/, {}, 8) }.should raise_error(TypeError)
     end
   end
 
   it "calls the callback's proc on right match" do
-    callback = Ponder::Callback.new(:channel, /wizzard/, Proc.new { 8 })
+    callback = Ponder::Callback.new(:channel, /wizzard/, {}, Proc.new { 8 })
     callback.call(:channel, {:message => 'I like wizzards'}).should eql(8)
   end
 

data/spec/irc_spec.rb

@@ -5,12 +5,11 @@ require 'ponder/thaum'
 
 describe Ponder::IRC do
   before(:each) do
-    @ponder = Ponder::Thaum.new
-    @ponder.configure do |c|
-      c.nick      = 'Ponder'
-      c.username  = 'Ponder'
-      c.real_name = 'Ponder Stibbons'
-      c.reconnect = true
+    @ponder = Ponder::Thaum.new do |t|
+      t.nick      = 'Ponder'
+      t.username  = 'Ponder'
+      t.real_name = 'Ponder Stibbons'
+      t.reconnect = true
     end
   end
 
@@ -26,10 +25,16 @@ describe Ponder::IRC do
   end
 
   it 'registers with the server with a password' do
+    @ponder = Ponder::Thaum.new do |t|
+      t.nick      = 'Ponder'
+      t.username  = 'Ponder'
+      t.real_name = 'Ponder Stibbons'
+      t.reconnect = true
+      t.password  = 'secret'
+    end
     @ponder.should_receive(:raw).with('NICK Ponder').once
     @ponder.should_receive(:raw).with('USER Ponder * * :Ponder Stibbons').once
     @ponder.should_receive(:raw).with('PASS secret').once
-    @ponder.configure { |c| c.password = 'secret' }
     @ponder.register
   end
 

data/spec/thaum_spec.rb

@@ -8,7 +8,7 @@ describe Ponder::Thaum do
     @ponder = Ponder::Thaum.new
   end
 
-  it 'sets a default configuration without calling the #configure method' do
+  it 'sets a default configuration' do
     @ponder.config.server.should eql('localhost')
     @ponder.config.port.should equal(6667)
     @ponder.config.nick.should eql('Ponder')
@@ -19,14 +19,13 @@ describe Ponder::Thaum do
     @ponder.config.reconnect.should be_true
     @ponder.config.reconnect_interval.should equal(30)
 
-    @ponder.logger.should be_an_instance_of(Ponder::BlindIo)
-    @ponder.console_logger.should be_an_instance_of(Ponder::Twoflogger)
+    @ponder.logger.should be_an_instance_of(Ponder::Logger::BlindIo)
+    @ponder.console_logger.should be_an_instance_of(Ponder::Logger::Twoflogger)
   end
 
   it 'sets the logger correctly' do
-    FileUtils.stub!(:mkdir_p)
-    Ponder::Twoflogger.should_receive(:new)
-    @ponder.configure { |c| c.logging = true }
+    Ponder::Logger::Twoflogger.should_receive(:new).twice
+    @ponder = Ponder::Thaum.new { |t| t.logging = true }
   end
 
   it 'sets default callbacks' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ponder
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-19 00:00:00.000000000Z
+date: 2011-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &16716980 !ruby/object:Gem::Requirement
+  requirement: &21592080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *16716980
+  version_requirements: *21592080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16716600 !ruby/object:Gem::Requirement
+  requirement: &21591680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16716600
+  version_requirements: *21591680
 description: Ponder (Stibbons) is a Domain Specific Language for writing IRC Bots
   using the EventMachine library.
 email: tobias.buehlmann@gmx.de
@@ -44,8 +44,8 @@ files:
 - README.md
 - Rakefile
 - examples/echo.rb
-- examples/github_blog.rb
 - examples/redis_last_seen.rb
+- lib/core_ext/array.rb
 - lib/ponder.rb
 - lib/ponder/async_irc.rb
 - lib/ponder/callback.rb
@@ -63,7 +63,7 @@ files:
 - spec/irc_spec.rb
 - spec/spec_helper.rb
 - spec/thaum_spec.rb
-homepage: http://github.com/tbuehlmann/ponder
+homepage: https://github.com/tbuehlmann/ponder
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -83,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: IRC bot framework

data/examples/github_blog.rb

@@ -1,31 +0,0 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
-require 'rubygems'
-require 'ponder'
-require 'nokogiri'
-require 'open-uri'
-
-# This Thaum answers the channel message "blog?" with the title of the newest github blog entry.
-@ponder = Ponder::Thaum.new
-
-@ponder.configure do |c|
-  c.server  = 'chat.freenode.org'
-  c.port    = 6667
-  c.nick    = 'Ponder'
-  c.verbose = true
-  c.logging = false
-end
-
-@ponder.on :connect do
-  @ponder.join '#ponder'
-end
-
-@ponder.on :channel, /^blog\?$/ do |event_data|
-  doc = Nokogiri::HTML(open('https://github.com/blog'))
-  title = doc.xpath('/html/body/div/div[2]/div/div/ul/li/h2/a')[0].text
-
-  @ponder.message event_data[:channel], "Newest Github Blog Post: #{title}"
-end
-
-@ponder.connect
-