tkellem 0.8.9 → 0.8.10

data/lib/tkellem/bouncer_connection.rb

@@ -92,6 +92,7 @@ module BouncerConnection
   def receive_line(line)
     failsafe("message: {#{line}}") do
       trace "from client: #{line}"
+      return if line.blank?
       msg = IrcMessage.parse(line)
 
       command = msg.command

data/lib/tkellem/irc_server.rb

@@ -40,6 +40,7 @@ module IrcServerConnection
   def receive_line(line)
     @bouncer.failsafe(:receive_line) do
       @bouncer.trace "from server: #{line}"
+      return if line.blank?
       msg = IrcMessage.parse(line)
       @bouncer.server_msg(msg)
     end

data/lib/tkellem/tkellem_bot.rb

@@ -340,7 +340,7 @@ class TkellemBot
 
     def list
       public_networks = Network.all(:conditions => 'user_id IS NULL')
-      user_networks = user.reload.try(:networks) || []
+      user_networks = user.try(:reload).try(:networks) || []
       if user_networks.present? && public_networks.present?
         r "Public networks are prefixed with [P], user-specific networks with [U]."
       end

data/lib/tkellem/version.rb

@@ -1,3 +1,3 @@
 module Tkellem
-  VERSION = "0.8.9"
+  VERSION = "0.8.10"
 end

data/spec/bouncer_connection_spec.rb

@@ -5,16 +5,21 @@ include Tkellem
 
 describe BouncerConnection, "connect" do
   before do
-    u = User.create(:username => 'speccer')
-    u.password = 'test123'
-    u.save
-    tk = mock(TkellemServer)
+    @u = User.create(:username => 'speccer')
+    @u.password = 'test123'
+    @u.save
+    @tk = mock(TkellemServer)
     @b = mock(Bouncer)
-    tk.should_receive(:find_bouncer).with(u, 'testhost').and_return(@b)
-    @bc = em(BouncerConnection).new(tk, false)
+    @bc = em(BouncerConnection).new(@tk, false)
+  end
+
+  it "should ignore blank lines" do
+    @bc.should_receive(:error!).never
+    @bc.receive_line("")
   end
 
   it "should connect after receiving credentials" do
+    @tk.should_receive(:find_bouncer).with(@u, 'testhost').and_return(@b)
     @bc.receive_line("NICK speccer")
     @bc.receive_line("PASS test123")
     @b.should_receive(:connect_client).with(@bc)
@@ -22,6 +27,7 @@ describe BouncerConnection, "connect" do
   end
 
   it "should connect when receiving user before pass" do
+    @tk.should_receive(:find_bouncer).with(@u, 'testhost').and_return(@b)
     @bc.receive_line("USER speccer@testhost")
     @bc.receive_line("PASS test123")
     @b.should_receive(:connect_client).with(@bc)

data/spec/irc_server_spec.rb

@@ -47,6 +47,14 @@ describe Bouncer, "connection" do
     s.server_msg(IrcMessage.parse(":speccer!test@host ping :HAI"))
   end
 
+  it "should ignore blank lines" do
+    b = mock("bouncer", :trace => nil)
+    b.should_receive(:failsafe).and_yield
+    s = em(IrcServerConnection).new('connected', b, false)
+    b.should_receive(:server_msg).never
+    s.receive_line("")
+  end
+
   def tk_server
     $tk_server ||= TkellemServer.new
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tkellem
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 8
-  - 9
-  version: 0.8.9
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - Brian Palmer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 Z
+date: 2012-02-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: IRC bouncer with multi-client support