asciipack 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 164e298f484a42236cb887376ab27a88d6ea3bbc
-  data.tar.gz: 71363702a9be3a3e840f1abe6e802884eeda00c0
+  metadata.gz: 1691b37fbd3296bc64c616a4e4df2b4cd6889a07
+  data.tar.gz: a5e015148d90c132932e3fbed05c6379ce6f28ce
 SHA512:
-  metadata.gz: 31b12c722b94d276baf5061e782b041c26225564e0d14fd79e2182ffec089013c62663b20f681e9023ed9e51dd658a95be0065f68f3085730c948296a11ff36e
-  data.tar.gz: 0e16623d5a791f61f1b5cd2a2115759f44ec144d802107b20491c876dfc2e14c7c34cc65a7a6ea03b64581f9b3af9532c57fac6059e4d3b5da34482cb35a2ed1
+  metadata.gz: 06ce558462f2af4a6c07422a912bb78bcb65220e3ea49570ec317e997f98375258ec288fc099ca3531271432d901eb4cc7a429c6f6d58244386809997f2f8709
+  data.tar.gz: ecb62c4e1f7e0e79db03569de77649a67c35338de4db391f091455cf93cdd8c7c8fe7a65669e6b06d489a53de3d85bc41d2f9c175910a2f98473d4b219a740b2

data/ext/asciipack/unpacker.c

@@ -56,8 +56,7 @@ to_i16all (unpacker_t* ptr, int len)
 {
 	uint64_t ret = 0;
 	while (len--) {
-		ret += to_i16(*ptr->ch);
-		ptr->ch++;
+		ret += to_i16(*ptr->ch++);
 		if (len != 0) ret = ret << 4;
 	}
 	return ret;
@@ -102,6 +101,7 @@ Unpacker_str (unpacker_t* ptr, size_t len)
 
 	VALUE str = rb_str_new(head, len);
 	rb_funcall(str, rb_intern("force_encoding"), 1, rb_str_new2("utf-8"));
+	ptr->ch += len;
 	return str;
 }
 
@@ -133,9 +133,7 @@ Unpacker_read (unpacker_t* ptr)
 {
 	uint64_t num;
 
-	ptr->ch++;
-
-	switch (*(ptr->ch - 1)) {
+	switch (*ptr->ch++) {
 		case 'a': // int 4
 			num = Unpacker_int(ptr, 1);
 			return INT2FIX(num);
@@ -267,7 +265,7 @@ Unpacker_read (unpacker_t* ptr)
 		case 'Y': return Qtrue;
 	}
 
-	rb_raise(rb_eArgError, "undefined type:%c", *(ptr->ch));
+	rb_raise(rb_eArgError, "undefined type:%c,data:%s,at:%ld", *(ptr->ch), ptr->buffer, ptr->ch - ptr->buffer);
 	return Qnil;
 }
 

data/lib/asciipack/version.rb

@@ -1,3 +1,3 @@
 module AsciiPack
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/bench.rb

@@ -48,7 +48,6 @@ puts("|object|" + reports(0).keys.join("|") + "|")
 puts("|---|" + reports(0).keys.map{"---"}.join("|") + "|")
 
 map16 = {}
-a = '@'
 0x100.times {|i| map16[i.to_s] = 0 }
 
 tt = Time.now

data/spec/format_spec.rb

@@ -4,7 +4,9 @@ require 'spec_helper'
 
 describe AsciiPack do
   it "intro" do
-    expect(AsciiPack.pack({"compact"=>true,"binary"=>0})).to eq('r2NcompactYMbinary0')
+    demo = {"compact"=>true,"binary"=>0}
+    expect(AsciiPack.pack(demo)).to eq('r2NcompactYMbinary0')
+    expect(AsciiPack.unpack('r2NcompactYMbinary0')).to eq(demo)
   end
 
   it "int 4" do
@@ -70,6 +72,7 @@ describe AsciiPack do
     check_each_other(1.0000000000000004, T.float64 + '3ff0000000000002')
     check_each_other(1/3.0, T.float64 + '3fd5555555555555')
     expect(AsciiPack.pack(Float::NAN)).to eq(T.float64 + '7ff8000000000000')
+    expect(AsciiPack.unpack(T.float64 + '7ff8000000000000').nan?).to be true
     check_each_other(1 / 0.0, T.float64 + '7ff0000000000000')
     check_each_other(-1 / 0.0, T.float64 + 'fff0000000000000')
   end
@@ -89,10 +92,8 @@ describe AsciiPack do
   end
 
   it "str 16" do
-    100.times {
     format "a" * 0x100, T.str16, 5 + 0x100
     format "a" * 0xffff, T.str16, 5 + 0xffff
-    }
   end
 
   it "str 32" do
@@ -148,8 +149,7 @@ describe AsciiPack do
     1000.times {
       array = [array]
     }
-    ap = AsciiPack.pack(array)
-    expect(AsciiPack.unpack(ap)).to eq(array)
+    check_each_other(array, AsciiPack.pack(array))
   end
 
   it "nil" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciipack
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - ksss