rumpy 0.9.11 → 0.9.12

data/lib/rumpy.rb

@@ -67,8 +67,9 @@ module Rumpy
       connect
       @logger.debug 'clear wrong users'
       clear_users
-      start_subscription_callback
-      start_message_callback
+      set_subscription_callback
+      set_message_callback
+      set_iq_callback
       @logger.info 'Bot is going ONLINE'
       @client.send Jabber::Presence.new.set_priority(@priority).set_status(@status)
 
@@ -82,7 +83,7 @@ module Rumpy
         rescue ActiveRecord::StatementInvalid
           @logger.warn 'Statement Invalid catched'
           @logger.info 'Reconnecting to database'
-          @main_model.connection.reconnect!
+          reconnect_db!
           retry
         rescue => e
           $logger.error e.inspect
@@ -149,11 +150,10 @@ module Rumpy
         end
       end
       @roster.items.each do |jid, item|
-        user = @main_model.find_by_jid jid
+        user = find_user_by_jid jid
         if user.nil? then
           @logger.info "deleting from roster user with jid #{jid}"
           item.remove
-          next
         elsif item.subscription != :both then
           @logger.info "deleting from roster&database user with jid #{jid}"
           item.remove
@@ -162,7 +162,7 @@ module Rumpy
       end
     end
 
-    def start_subscription_callback
+    def set_subscription_callback
       @roster.add_subscription_request_callback do |item, presence|
         jid = presence.from
         @roster.accept_subscription jid
@@ -184,17 +184,25 @@ module Rumpy
         rescue ActiveRecord::StatementInvalid
           @logger.warn 'Statement Invalid catched'
           @logger.info 'Reconnecting to database'
-          @main_model.connection.reconnect!
+          reconnect_db!
           retry
         end
       end
     end
 
-    def start_message_callback
+    def find_user_by_jid(jid)
+      @main_model.find_by_jid jid
+    end
+
+    def reconnect_db!
+      @main_model.connection.reconnect!
+    end
+
+    def set_message_callback
       @client.add_message_callback do |msg|
         begin
           if msg.type != :error and msg.body and msg.from then
-            if user = @main_model.find_by_jid(msg.from) then
+            if user = find_user_by_jid(msg.from) then
               @logger.debug "get normal message from #{msg.from}"
               pars_results = parser_func msg.body
               @logger.debug "parsed message: #{pars_results.inspect}"
@@ -214,13 +222,16 @@ module Rumpy
         rescue ActiveRecord::StatementInvalid
           @logger.warn 'Statement Invalid catched!'
           @logger.info 'Reconnecting to database'
-          @main_model.connection.reconnect!
+          reconnect_db!
           retry
         rescue => e
           @logger.error e.inspect
           @logger.error e.backtrace
         end
       end
+    end
+
+    def set_iq_callback
       @client.add_iq_callback do |iq|
         @logger.debug "got iq #{iq.inspect}"
         if iq.type == :get then # hack for pidgin (STOP USING IT)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rumpy
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 35
   prerelease: false
   segments: 
   - 0
   - 9
-  - 11
-  version: 0.9.11
+  - 12
+  version: 0.9.12
 platform: ruby
 authors: 
 - Tsokurov A.G.
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-20 00:00:00 +03:00
+date: 2011-08-10 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency