remi-aim 0.1.0 → 0.1.1

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 0
+:patch: 1
 :major: 0
 :minor: 1

data/lib/aim.rb

@@ -18,7 +18,7 @@ class AIM
     #
     #   log_chatroom :some_chatroom, :output => 'some_chatroom.log'
     #
-    #   when :im_received do |im|
+    #   when :im do |im|
     #     im_user im.user, "thanks for the IM, #{ im.user.name }"
     #   end
     #
@@ -33,11 +33,19 @@ class AIM
     # this auto logs in too
     #
     def login_as_user username, password, &block
-      user = get_user username, password
-      user.login!
-      user.instance_eval &block if block
-      user.wait!
-      user
+      @block = block if block
+      @user = get_user username, password
+      @user.login!
+
+      reload! # take the @user, clear all of the user's event subscriptions, and reload the block
+      
+      @user.wait!
+      @user
+    end
+
+    def reload!
+      @user.clear_events!
+      @user.instance_eval &@block
     end
 
     # returns an AIM::User, but does not login
@@ -59,6 +67,11 @@ class AIM
       connection.connect
     end
 
+    # undoes all event subscriptions
+    def clear_events!
+      connection.clear_callbacks!
+    end
+
     # do something on an event
     #
     # user.when :im do |message, buddy|

data/lib/aim/net_toc.rb

@@ -531,7 +531,9 @@ module Net
           puts "chat_in val => #{ val.inspect }"
           room_id, screen_name, auto, *message = *val.split(":")
           message = message.join(":")
+          message = message.gsub('<br>',"\n") # ... before getting rid of html
           message = message.chomp.gsub(/<[^>]+>/,"") # get rid of html
+          message = message.gsub("\n",'<br />') # ... turn newlines back into br's
           buddy = @buddy_list.buddy_named(screen_name)
           room = @rooms[room_id] || room_id
           auto_response = auto == "T"
@@ -567,6 +569,10 @@ module Net
       def idle_time=(seconds)
         @conn.toc_set_idle seconds
       end
+
+      def clear_callbacks!
+        @callbacks = { }
+      end
       
       # Waits for the event-handling thread for +limit+ seconds, or indefinitely if no argument is given. Use this to prevent your program from exiting prematurely.
       # For example, the following script will exit right after connecting:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: remi-aim
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - remi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-11 00:00:00 -08:00
+date: 2009-02-24 00:00:00 -08:00
 default_executable: 
 dependencies: []