Merge pull request #151 from gaffneyc/master

Improvements to LineProtocol and have it autoload.

lib/em/protocols.rb

@@ -32,5 +32,6 @@ module Protocols
     autoload :Postgres3, 'em/protocols/postgres3'
     autoload :ObjectProtocol, 'em/protocols/object_protocol'
     autoload :Socks4, 'em/protocols/socks4'
+    autoload :LineProtocol, 'em/protocols/line_protocol'
   end
 end

lib/em/protocols/line_protocol.rb

@@ -15,8 +15,8 @@ module LineProtocol
       def receive_data data
         (@buf ||= '') << data
 
-        while line = @buf.slice!(/(.*)\r?\n/)
-          receive_line(line)
+        while @buf.slice!(/(.*?)\r?\n/)
+          receive_line($1)
         end
       end
 

tests/test_line_protocol.rb

@@ -0,0 +1,33 @@
+require 'em_test_helper'
+
+class TestLineProtocol < Test::Unit::TestCase
+  class LineProtocolTestClass
+    include EM::Protocols::LineProtocol
+
+    def lines
+      @lines ||= []
+    end
+
+    def receive_line(line)
+      lines << line
+    end
+  end
+
+  def setup
+    @proto = LineProtocolTestClass.new
+  end
+
+  def test_simple_split_line
+    @proto.receive_data("this is")
+    assert_equal([], @proto.lines)
+
+    @proto.receive_data(" a test\n")
+    assert_equal(["this is a test"], @proto.lines)
+  end
+
+  def test_simple_lines
+    @proto.receive_data("aaa\nbbb\r\nccc\nddd")
+    assert_equal(%w(aaa bbb ccc), @proto.lines)
+  end
+
+end