newton 0.0.2 → 0.1.0

data/README.md

@@ -91,7 +91,7 @@ least in certain implementations of Ruby.
 
 Nobody is able to remember all IRC numeric replies (e.g. 401 for "no
 such nick"). Unfortunately, some frameworks, like for example Isaac,
-require you to uses those codes when hooking on errors (`on :error,
+require you to use those codes when hooking on errors (`on :error,
 401 do`). Those codes, however, also all have a name, e.g.
 ERR_NOSUCHNICK instead of 401 – and Newton provides all of those names
 as constants.

data/lib/newton/bot.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'socket'
 require "thread"
+require "ostruct"
 require "newton/rubyext/module"
 require "newton/rubyext/queue"
 require "newton/rubyext/string"
@@ -23,7 +24,7 @@ require "newton/isupport"
 
 Thread.abort_on_exception = true
 module Newton
-  VERSION = '0.0.1'
+  VERSION = '0.1.0'
 
   # @member [String] server The address of the server to connnect to
   # @member [Number] port The port of the server to connect to
@@ -34,8 +35,6 @@ module Newton
   # @member [Float] messages_per_second How many messages the server processes per second
   # @member [Number] server_queue_size The size of the message queue of the server
   # @member [Symbol] strictness The strictness of Newton. Allowed values: :strict and :forgiving
-  class Config < Struct.new(:server, :port, :ssl, :password, :nick, :realname, :verbose, :messages_per_second, :server_queue_size, :strictness)
-  end
 
   class Bot
     # @return [Config]
@@ -102,7 +101,20 @@ module Newton
     # @yield
     def initialize(&b)
       @events = {}
-      @config = Config.new("localhost", 6667, false, nil, "newton", "Newton", false, 0.5, 10, :forgiving)
+      @config = OpenStruct.new({
+                                 :server => "localhost",
+                                 :port   => 6667,
+                                 :ssl    => false,
+                                 :password => nil,
+                                 :nick   => "newton",
+                                 :realname => "Newton",
+                                 :verbose => false,
+                                 :messages_per_second => 0.5,
+                                 :server_queue_size => 10,
+                                 :strictness => :forgiving,
+                                 :message_split_start => '... ',
+                                 :message_split_end   => ' ...',
+                               })
 
       @store = {}
       @semaphores = {}
@@ -224,11 +236,30 @@ module Newton
     # @see User#send
     def msg(recipient, text)
       text = text.to_s
+      split_start = @config.message_split_start || ""
+      split_end   = @config.message_split_end   || ""
+
       text.split("\n").each do |line|
-        # 512 is the overall max length. command, recipients and stuff account to it
-        line.split("").each_slice(400) do |chars|
-          string = chars.join
-          raw("PRIVMSG #{recipient} :#{string}")
+        # 498 = 510 - length(":" . " PRIVMSG " . " :");
+        maxlength = 498 - self.mask.to_s.length - recipient.to_s.length
+        maxlength_without_end = maxlength - split_end.length
+
+        if text.length > maxlength
+          splitted = []
+
+          while text.length > maxlength_without_end
+            pos = text.rindex(/\s/, maxlength)
+            r = pos || maxlength_without_end
+            splitted << text.slice!(0, r) + split_end
+            text = split_start + text
+          end
+
+          splitted << text
+          splitted.each do |string|
+            raw("PRIVMSG #{recipient} :#{string}")
+          end
+        else
+          raw("PRIVMSG #{recipient} :#{text}")
         end
       end
     end
@@ -271,6 +302,25 @@ module Newton
       @config.nick
     end
 
+    # @return [String]
+    attr_reader :host
+    attr_reader :mask
+    attr_reader :user
+    attr_reader :realname
+    attr_reader :signed_on_at
+    def secure?
+    end
+
+    def unknown?
+      false
+    end
+
+    [:host, :mask, :user, :realname, :signed_on_at, :secure?].each do |attr|
+      define_method(attr) do
+        User(nick).__send__(attr)
+      end
+    end
+
     # Sets the bot's nick.
     #
     # @param [String] new_nick

data/lib/newton/callback.rb

@@ -1,8 +1,10 @@
 module Newton
   # @api private
   class Callback
+    attr_reader :bot
+
     def initialize(block, args, msg, bot)
-      @block, @args, @msg, @bot, @bargs = block, args, msg, bot
+      @block, @args, @msg, @bot = block, args, msg, bot
     end
 
     # @return [void]

data/lib/newton/channel.rb

@@ -348,6 +348,17 @@ module Newton
       @bot.raw "JOIN #{[@name, key].compact.join(" ")}"
     end
 
+    # @return [Boolean]
+    def ==(other)
+      @name == other.to_s
+    end
+    alias_method :eql?, "=="
+
+    # @return [Fixnum]
+    def hash
+      @name.hash
+    end
+
     # @return [String]
     def to_s
       @name

data/lib/newton/irc.rb

@@ -195,6 +195,7 @@ module Newton
           user.sync(:unknown?, true, true)
         elsif msg.command == RPL_ENDOFWHOIS.to_s
           user = User.find_ensured(msg.params[1], @bot)
+          user.in_whois = false
           if @whois_updates[user].empty? && !user.attr(:unknown?, true, true)
             # for some reason, we did not receive user information. one
             # reason is freenode throttling WHOIS
@@ -239,6 +240,9 @@ module Newton
           end
 
           msg.channel.mark_as_synced(:bans)
+        elsif msg.command == "396"
+          # note: designed for freenode
+          User(msg.params[0]).sync(:host, params[1], true)
         end
 
         # TODO work with strings/constants, too

data/lib/newton/user.rb

@@ -61,6 +61,8 @@ module Newton
     attr_accessor :bot
     # @return [Boolean]
     attr_accessor :synced
+    # @return [Boolean]
+    attr_accessor :in_whois
 
     # By default, you can use methods like User#user, User#host and
     # alike – If you however fear that another thread might change
@@ -126,10 +128,13 @@ module Newton
     #
     # @return [void]
     def whois
+      return if @in_whois
       @synced = false
       @data.keys.each do |attr|
         unsync attr
       end
+
+      @in_whois = true
       @bot.raw "WHOIS #@nick #@nick"
     end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 2
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dominik Honnef
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-20 00:00:00 +02:00
+date: 2010-07-19 00:00:00 +02:00
 default_executable: 
 dependencies: []