bencode_ext 0.2.3 → 0.2.4

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/bencode_ext.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bencode_ext}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["naquad"]
-  s.date = %q{2011-01-15}
+  s.date = %q{2011-01-16}
   s.description = %q{BEncodeExt is implementation of Bencode reader/writer (BitTorent encoding) in C.}
   s.email = %q{naquad@gmail.com}
   s.extensions = ["ext/bencode_ext/extconf.rb"]

data/ext/bencode_ext/bencode.c

@@ -120,6 +120,9 @@ static VALUE decode(VALUE self, VALUE encoded){
         break;
       }
       case 'e':
+        if(NIL_P(current_container))
+          rb_raise(DecodeError, "Unexpected container end at %d!", rlen - len);
+        current_container = rb_ary_pop(container_stack);
         state = ELEMENT_END;
         NEXT_CHAR;
         break;
@@ -127,15 +130,11 @@ static VALUE decode(VALUE self, VALUE encoded){
         rb_raise(DecodeError, "Unknown element type at %d: %c!", rlen - len, *str);
     }
 
-    if(state == ELEMENT_END){
-      if(NIL_P(current_container))
-        rb_raise(DecodeError, "Unexpected container end at %d!", rlen - len);
-      current_container = rb_ary_pop(container_stack);
-    }else if(NIL_P(current_container)){
+    if(NIL_P(current_container)){
       if(NIL_P(ret))
         ret = crt;
       break;
-    }else{
+    }else if(state != ELEMENT_END){
       if(BUILTIN_TYPE(current_container) == T_ARRAY){
         rb_ary_push(current_container, crt);
       }else if(NIL_P(key)){
@@ -224,9 +223,9 @@ static VALUE encode(VALUE self){
     return encode(rb_id2str(SYM2ID(self)));
   }if(rb_obj_is_kind_of(self, rb_cString)){
     long len = RSTRING_LEN(self);
-    return rb_sprintf("%d:%.*s", len, len, RSTRING_PTR(self));
+    return rb_sprintf("%ld:%.*s", len, len, RSTRING_PTR(self));
   }else if(rb_obj_is_kind_of(self, rb_cInteger)){
-    return rb_sprintf("i%de", NUM2LONG(self));
+    return rb_sprintf("i%lde", NUM2LONG(self));
   }else if(rb_obj_is_kind_of(self, rb_cHash)){
     VALUE ret = rb_str_new2("d");
     rb_hash_foreach(self, hash_traverse, ret);
@@ -247,7 +246,7 @@ static VALUE encode(VALUE self){
 
 static int hash_traverse(VALUE key, VALUE val, VALUE str){
   if(!rb_obj_is_kind_of(key, rb_cString) && TYPE(key) != T_SYMBOL)
-    rb_raise(EncodeError, "Keys must be strings, not %s!", rb_class2name(CLASS_OF(key)));
+    rb_raise(EncodeError, "Keys must be strings or symbols, not %s!", rb_class2name(CLASS_OF(key)));
 
   rb_str_concat(str, encode(key));
   rb_str_concat(str, encode(val));
@@ -321,8 +320,8 @@ static VALUE set_max_depth(VALUE self, VALUE depth){
 }
 
 void Init_bencode_ext(){
-  readId = rb_intern("read");
   max_depth = 5000;
+  readId = rb_intern("read");
   BEncode = rb_define_module("BEncode");
 
   /*

data/test/test_bencode_ext.rb

@@ -23,6 +23,7 @@ class TestBencodeExt < Test::Unit::TestCase
     assert_equal([{'k' => 1}, {'k' => 2}, {'k' => {'v' => '123'}}], 'ld1:ki1eed1:ki2eed1:kd1:v3:123eee'.bdecode)
     assert_equal([[[1],1],1], 'llli1eei1eei1ee'.bdecode)
 
+    assert_raises(BEncode::DecodeError) { 'i1ei2e'.bdecode }
     assert_raises(BEncode::DecodeError) {'33:unpexpected_end'.bdecode }
     assert_raises(BEncode::DecodeError) { 'i1x'.bdecode }
     assert_raises(ArgumentError) { BEncode.max_depth = 1.1 }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - naquad
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 +02:00
+date: 2011-01-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency