newton 0.0.1 → 0.0.2

data/README.md

@@ -119,7 +119,7 @@ unformatted log output of IRC commands? Help is on its way! Newton
 will by default output colorized logs if printing to a terminal –
 output redirected to a file or pipe will remain without color codes.
 
-### Customg logging
+### Custom logging
 
 If you want to print debug statements, you can use
 `FormattedLogger.debug(message)`.

data/examples/memo.rb

@@ -29,10 +29,6 @@ bot = Newton::Bot.new do
     end
   end
 
-  on :message, /^test (.+) (.+)$/ do |a, b|
-    p [a, b]
-  end
-
   on :message, /^!memo (\S+) (.+)$/ do |target, text|
     p [target, text]
     target = User(target)

data/lib/newton/bot.rb

@@ -173,7 +173,8 @@ module Newton
     # though
     #
     # @return [void]
-    def on(event, *regexps, &block)
+    def on(event, regexps = [], *args, &block)
+      regexps = [*regexps]
       regexps = [//] if regexps.empty?
 
       event = event.to_sym
@@ -186,7 +187,7 @@ module Newton
           regexp
         end
       end
-      (@events[event] ||= []) << [regexps, block]
+      (@events[event] ||= []) << [regexps, args, block]
     end
 
     # Define helper methods in the context of the bot.
@@ -304,8 +305,7 @@ module Newton
     def dispatch(event, msg = nil)
       if handlers = find(event, msg)
         handlers.each do |handler|
-          regexps, block = *handler
-
+          regexps, args, block = *handler
           # calling Message#match multiple times is not a problem
           # because we cache the result
           if msg
@@ -315,7 +315,7 @@ module Newton
             captures = []
           end
 
-          invoke(block, msg, captures)
+          invoke(block, args, msg, captures)
         end
       end
     end
@@ -327,27 +327,27 @@ module Newton
           return events
         end
 
-        events.select { |regexps,_|
-          regexps.any? { |regexp|
+        events.select { |regexps|
+          regexps.first.any? { |regexp|
             msg.match(regexp, type)
           }
         }
       end
     end
 
-    def invoke(block, msg, match)
+    def invoke(block, args, msg, match)
       # -1  splat arg, send everything
       #  0  no args, send nothing
       #  1  defined number of args, send only those
       bargs = case block.arity <=> 0
               when -1; match
               when 0; []
-              when 1; match[0..block.arity-1]
+              when 1; match[0..block.arity-1 - args.size]
               end
       Thread.new do
         begin
           catch(:halt) do
-            Callback.new(block, msg, self).call(*bargs)
+            Callback.new(block, args, msg, self).call(*bargs)
           end
         rescue => e
           FormattedLogger.debug "#{e.backtrace.first}: #{e.message} (#{e.class})"

data/lib/newton/callback.rb

@@ -1,13 +1,13 @@
 module Newton
   # @api private
   class Callback
-    def initialize(block, msg, bot)
-      @block, @msg, @bot, @bargs = block, msg, bot
+    def initialize(block, args, msg, bot)
+      @block, @args, @msg, @bot, @bargs = block, args, msg, bot
     end
 
     # @return [void]
     def call(*bargs)
-      instance_exec(*bargs, &@block)
+      instance_exec(*@args, *bargs, &@block)
     end
 
     # Forwards method calls to the current message and bot instance.

data/lib/newton/irc.rb

@@ -75,6 +75,16 @@ module Newton
                         [:message, :private]
                       end)
 
+        dispatch_msg = msg
+      elsif msg.command == "NOTICE"
+        events.concat(if msg.ctcp?
+                        [:ctcp]
+                      elsif msg.channel?
+                        [:notice, :channel]
+                      else
+                        [:notice, :private]
+                      end)
+
         dispatch_msg = msg
       elsif msg.command == "PING"
         events << :ping

data/lib/newton/user.rb

@@ -115,6 +115,11 @@ module Newton
       @data[:authname]
     end
 
+    # @see Syncable#attr
+    def attr(attribute, data = true, unsync = false)
+      super
+    end
+
     # Queries the IRC server for information on the user. This will
     # set the User's state to not synced. After all information are
     # received, the object will be set back to synced.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Dominik Honnef
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 +02:00
+date: 2010-05-20 00:00:00 +02:00
 default_executable: 
 dependencies: []