Changeset 725

Timestamp:

06/29/08 19:04:48 (2 months ago)

Author:

francis

Message:

Fixed bug in set_text_mode which made it break when called inside receive_binary_data.

Files:

• trunk/lib/protocols/linetext2.rb (modified) (1 diff)
• trunk/tests/test_ltp2.rb (modified) (1 diff)

trunk/lib/protocols/linetext2.rb

@@ -84 +84 @@
-                                                @lt2_textpos += will_take
-                                                if @lt2_textpos >= @lt2_textsize
+                                                        # Reset line mode (the default behavior) BEFORE calling the
+                                                        # receive_binary_data. This makes it possible for user code
+                                                        # to call set_text_mode, enabling chains of text blocks
+                                                        # (which can possibly be of different sizes).
+                                                        set_line_mode
-                                                        receive_binary_data @lt2_textbuffer.join
-                                                        receive_end_of_binary_data
-                                                        set_line_mode
-                                                end
-

trunk/tests/test_ltp2.rb

@@ -292 +292 @@
-                assert( a.end )
-        end
+
+
+        # This tests a bug fix in which calling set_text_mode failed when called
+        # inside receive_binary_data.
+        #
+        class BinaryPair
+                include EM::Protocols::LineText2
+                attr_reader :sizes
+                def initialize *args
+                        super
+                        set_text_mode 1
+                        @sizes = []
+                end
+                def receive_binary_data dt
+                        @sizes <<  dt.length
+                        set_text_mode( (dt.length == 1) ? 2 : 1 )
+                end
+        end
+        def test_binary_pairs
+                test_data = "123" * 5
+                a = BinaryPair.new
+                a.receive_data test_data
+                assert_equal( [1,2,1,2,1,2,1,2,1,2], a.sizes )
+        end
+
-end
-