cinch 1.0.0 → 1.0.1

data/lib/cinch.rb

@@ -1,7 +1,7 @@
 require 'cinch/bot'
 
 module Cinch
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   # @return [String]
   # @todo Handle mIRC color codes more gracefully.

data/lib/cinch/irc.rb

@@ -138,7 +138,7 @@ module Cinch
       Channel.all.each do |channel|
         channel.remove_user(user)
       end
-      user.synced = false
+      msg.user.unsync_all
     end
 
     def on_mode(msg)
@@ -172,7 +172,7 @@ module Cinch
       Channel.all.each do |channel|
         channel.remove_user(msg.user)
       end
-      msg.user.synced = false
+      msg.user.unsync_all
     end
 
     def on_005(msg)
@@ -202,25 +202,11 @@ module Cinch
     def on_318(msg)
       # RPL_ENDOFWHOIS
       user = User.find_ensured(msg.params[1], @bot)
-      user.instance_variable_set(:@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
-        Thread.new do
-          sleep 2
-          user.whois
-        end
+        user.end_of_whois(nil)
       else
-        {
-          :authname => nil,
-          :idle => 0,
-          :secure? => false,
-        }.merge(@whois_updates[user]).each do |attr, value|
-          user.sync(attr, value, true)
-        end
-
-        user.sync(:unknown?, false, true)
-        user.instance_variable_set(:@synced, true)
+        user.end_of_whois(@whois_updates[user])
         @whois_updates.delete user
       end
     end
@@ -327,12 +313,17 @@ module Cinch
       # ERR_NOSUCHNICK
       user = User.find_ensured(msg.params[1], @bot)
       user.sync(:unknown?, true, true)
+      if @whois_updates.key?(user)
+        user.end_of_whois(nil, true)
+        @whois_updates.delete user
+      end
     end
 
     def on_402(msg)
       # ERR_NOSUCHSERVER
+
       if user = User.find(msg.params[1]) # not _ensured, we only want a user that already exists
-        user.sync(:unknown?, true, true)
+        user.end_of_whois(nil, true)
         @whois_updates.delete user
         # TODO freenode specific, test on other IRCd
       end

data/lib/cinch/syncable.rb

@@ -30,6 +30,10 @@ module Cinch
       @synced_attributes.delete(attribute)
     end
 
+    def unsync_all
+      @synced_attributes.clear
+    end
+
     # @api private
     def attr(attribute, data = false, unsync = false)
       unless unsync

data/lib/cinch/user.rb

@@ -151,6 +151,9 @@ module Cinch
 
       @when_requesting_synced_attribute = lambda {|attr|
         unless @synced
+          @data[:unknown?] = false
+          unsync :unknown?
+
           unsync attr
           whois
         end
@@ -187,6 +190,58 @@ module Cinch
     end
     alias_method :refresh, :whois
 
+    # @param [Hash, nil] values A hash of values gathered from WHOIS,
+    #   or `nil` if no data was returned
+    # @param [Boolean] not_found Has to be true if WHOIS resulted in
+    #   an unknown user
+    # @return [void]
+    # @api private
+    def end_of_whois(values, not_found = false)
+      @in_whois = false
+      if not_found
+        sync(:unknown?, true, true)
+        sync(:idle, 0, true)
+        sync(:channels, [], true)
+
+        fields = @data.keys
+        fields.delete(:unknown?)
+        fields.delete(:idle)
+        fields.delete(:channels)
+        fields.each do |field|
+          sync(field, nil, true)
+        end
+
+        return
+      end
+
+      if values.nil?
+        # for some reason, we did not receive user information. one
+        # reason is freenode throttling WHOIS
+        Thread.new do
+          sleep 2
+          whois
+        end
+        return
+      end
+
+      {
+        :authname => nil,
+        :idle => 0,
+        :secure? => false,
+      }.merge(values).each do |attr, value|
+        sync(attr, value, true)
+      end
+      p [self, values, not_found]
+      sync(:unknown?, false, true)
+      @synced = true
+    end
+
+    # @api private
+    def unsync_all
+      @synced = false
+      super
+    end
+
     # Send a message to the user.
     #
     # @param [String] message the message

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Lee Jarvis
@@ -15,14 +15,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-19 00:00:00 +01:00
+date: 2010-08-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
@@ -47,58 +46,58 @@ files:
 - LICENSE
 - Rakefile
 - README.md
-- spec/message_spec.rb
+- spec/user_spec.rb
+- spec/plugin_spec.rb
 - spec/spec_helper.rb
+- spec/bot_spec.rb
 - spec/spec.opts
+- spec/channel_spec.rb
+- spec/message_spec.rb
 - spec/cinch_spec.rb
-- spec/plugin_spec.rb
 - spec/irc_spec.rb
-- spec/bot_spec.rb
-- spec/channel_spec.rb
-- spec/user_spec.rb
-- lib/cinch.rb
-- lib/cinch/bot.rb
-- lib/cinch/user.rb
+- lib/cinch/irc.rb
 - lib/cinch/mask.rb
 - lib/cinch/exceptions.rb
-- lib/cinch/irc.rb
+- lib/cinch/rubyext/module.rb
+- lib/cinch/rubyext/queue.rb
+- lib/cinch/rubyext/string.rb
+- lib/cinch/rubyext/infinity.rb
+- lib/cinch/channel.rb
+- lib/cinch/message.rb
+- lib/cinch/bot.rb
+- lib/cinch/user.rb
+- lib/cinch/constants.rb
+- lib/cinch/callback.rb
+- lib/cinch/syncable.rb
+- lib/cinch/message_queue.rb
 - lib/cinch/helpers.rb
+- lib/cinch/ban.rb
+- lib/cinch/plugin.rb
 - lib/cinch/isupport.rb
-- lib/cinch/logger/null_logger.rb
 - lib/cinch/logger/logger.rb
 - lib/cinch/logger/formatted_logger.rb
-- lib/cinch/constants.rb
-- lib/cinch/ban.rb
-- lib/cinch/message.rb
-- lib/cinch/syncable.rb
-- lib/cinch/plugin.rb
-- lib/cinch/callback.rb
-- lib/cinch/channel.rb
-- lib/cinch/message_queue.rb
-- lib/cinch/rubyext/infinity.rb
-- lib/cinch/rubyext/queue.rb
-- lib/cinch/rubyext/string.rb
-- lib/cinch/rubyext/module.rb
-- examples/basic/join_part.rb
-- examples/basic/url_shorten.rb
-- examples/basic/urban_dict.rb
-- examples/basic/msg.rb
-- examples/basic/hello.rb
-- examples/basic/seen.rb
-- examples/basic/memo.rb
-- examples/basic/google.rb
-- examples/basic/autovoice.rb
-- examples/plugins/join_part.rb
-- examples/plugins/url_shorten.rb
-- examples/plugins/custom_prefix.rb
+- lib/cinch/logger/null_logger.rb
+- lib/cinch.rb
 - examples/plugins/urban_dict.rb
-- examples/plugins/msg.rb
-- examples/plugins/hello.rb
 - examples/plugins/multiple_matches.rb
+- examples/plugins/autovoice.rb
+- examples/plugins/hello.rb
+- examples/plugins/url_shorten.rb
 - examples/plugins/seen.rb
-- examples/plugins/memo.rb
+- examples/plugins/join_part.rb
 - examples/plugins/google.rb
-- examples/plugins/autovoice.rb
+- examples/plugins/memo.rb
+- examples/plugins/msg.rb
+- examples/plugins/custom_prefix.rb
+- examples/basic/urban_dict.rb
+- examples/basic/autovoice.rb
+- examples/basic/hello.rb
+- examples/basic/url_shorten.rb
+- examples/basic/seen.rb
+- examples/basic/join_part.rb
+- examples/basic/google.rb
+- examples/basic/memo.rb
+- examples/basic/msg.rb
 has_rdoc: true
 homepage: http://doc.injekt.net/cinch
 licenses: []
@@ -109,7 +108,6 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -119,7 +117,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 1
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -129,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: An IRC Bot Building Framework