Reverted revision 62.

diff --git a/ChangeLog b/ChangeLog
index eed0fa6274dc023f74b2b52c92766c1a101992b6..bd36e6980ecd3b68137e33a2d9ded6ad29acddac 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,12 @@
 --
 --

-$Id: ChangeLog 70 2005-07-15 20:31:58Z tilman $
+$Id: ChangeLog 71 2005-07-16 12:28:17Z tilman $

 ++
 
 ++
 

+2005-07-16 Tilman Sauerbeck (tilman at code-monkey de)
+        * ext/ext.c, test/test_stream.rb: Don't raise BadElementError if
+          Stream#serialize is called on a stream that includes non-Chunk
+          elements
+

 2005-07-15 Tilman Sauerbeck (tilman at code-monkey de)
         * ext/ext.c: Code cleanup
 
 2005-07-15 Tilman Sauerbeck (tilman at code-monkey de)
         * ext/ext.c: Code cleanup
 

diff --git a/ext/ext.c b/ext/ext.c
index d88367fc74162828afaf1f306572f4f94da57079..bf1c4f03572c08089f1df51d823fcaf4efbabedd 100644 (file)
--- a/ext/ext.c
+++ b/ext/ext.c
@@ -1,5 +1,5 @@
 /*
 /*

- * $Id: ext.c 70 2005-07-15 20:31:58Z tilman $
+ * $Id: ext.c 71 2005-07-16 12:28:17Z tilman $

  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *
  *
  * Copyright (c) 2005 Tilman Sauerbeck (tilman at code-monkey de)
  *


@@ -47,8 +47,7 @@
 static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,
 static VALUE c_close (VALUE self);
 
 static VALUE cStream, cChunk,

-             eEetError, eNameError, ePropError, eStreamError,
-             eBadElementError,
+             eEetError, eNameError, ePropError,

              sym_lossy, sym_level, sym_quality, sym_char, sym_short,
              sym_long_long, sym_double;
 static ID id_include, id_serialize, id_keys, id_pack,
              sym_lossy, sym_level, sym_quality, sym_char, sym_short,
              sym_long_long, sym_double;
 static ID id_include, id_serialize, id_keys, id_pack,


@@ -453,9 +452,6 @@ stream_serialize (VALUE self)
        for (i = 0; i < stream->len; i++) {
                VALUE str;
 
        for (i = 0; i < stream->len; i++) {
                VALUE str;
 

-               if (rb_obj_is_kind_of (stream->ptr[i], cChunk) == Qfalse)
-                       rb_raise (eBadElementError, "stream member is not a Chunk");
-

                str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
 
                rb_ary_push (ret, str);
                str = rb_funcall (stream->ptr[i], id_serialize, 0, NULL);
 
                rb_ary_push (ret, str);


@@ -691,9 +687,6 @@ Init_eet_ext ()
        eEetError = rb_define_class_under (m, "EetError", rb_eStandardError);
        eNameError = rb_define_class_under (m, "NameError", eEetError);
        ePropError = rb_define_class_under (m, "PropertyError", eEetError);
        eEetError = rb_define_class_under (m, "EetError", rb_eStandardError);
        eNameError = rb_define_class_under (m, "NameError", eEetError);
        ePropError = rb_define_class_under (m, "PropertyError", eEetError);

-       eStreamError = rb_define_class_under (m, "StreamError", eEetError);
-       eBadElementError = rb_define_class_under (m, "BadElementError",
-                                                 eStreamError);

 
        id_include = rb_intern ("include?");
        id_serialize = rb_intern ("serialize");
 
        id_include = rb_intern ("include?");
        id_serialize = rb_intern ("serialize");

diff --git a/test/test_stream.rb b/test/test_stream.rb
index d203d9dd260f5c9b82f838db4f1f01186bc72551..ba15007bf47a4f1b3994364418f1d67a5d6c9c62 100644 (file)
--- a/test/test_stream.rb
+++ b/test/test_stream.rb
@@ -1,4 +1,4 @@
-# $Id: test_stream.rb 62 2005-06-09 17:42:34Z tilman $
+# $Id: test_stream.rb 71 2005-07-16 12:28:17Z tilman $

 
 require "eet"
 require "test/unit"
 
 require "eet"
 require "test/unit"


@@ -39,13 +39,4 @@ class StreamTest < Test::Unit::TestCase
 
                assert_equal([], stream)
        end
 
                assert_equal([], stream)
        end

-
-       def test_broken_stream
-               stream = Eet::Stream.new
-               stream << "FooBarBaz"
-
-               assert_raise(Eet::BadElementError) do
-                       stream.serialize
-               end
-       end

 end
 end