asciipack 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ed12a4882ea2f096a50dba7dd1832324432d90d
-  data.tar.gz: 4437fc5441e2c033a8201a135bff2738f522c320
+  metadata.gz: be46f7232ac905640a7bd19e3e82cf01749583fe
+  data.tar.gz: b22494e05f3744b0d7a5b29eec137be100a0e9e8
 SHA512:
-  metadata.gz: 79fe2fde39fc99168eb2ce30db2b9078102414af5154ad98d4193917df1f3ef9de7e8a31c33625e77a072a54e729aac8a44730a33320f29b4f36a9d4084b100f
-  data.tar.gz: 451a0f8d12f1928f1057d8b60aebc74abfc5c5739ce7aa1e9fd95f1933b1c03b3238f32299f4b373eee1c60b50ea9c487b63e62ef83981dc1799ee744d13e08b
+  metadata.gz: 49eed811790910f6c0ea1c6d126d3d0b46b96bbbea336012aa7d8793f1b11c1d0728569d4844631bb739305c1ad723177a7e4d91aa407d08bd626c53ee8e8ee6
+  data.tar.gz: 811a435eb193cab0bce7cf632f4091f6d187082a04a827a2e4859a7288a053f9945af1c8842ed7169ef203f6131096037678f43ccb7c85dc76f9dcbb15e44c3d

data/README.md

@@ -7,7 +7,7 @@
 ```ruby
 demo = {"compact"=>true,"binary"=>0}
 ap = AsciiPack.pack demo
-p ap #=> "r2NcompactYMschema0"
+p ap #=> "r2NcompactYMbinary0"
 
 unpacked = AsciiPack.unpack ap
 p unpacked #=> {"compact"=>true,"binary"=>0}

data/asciipack.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = "co000ri@gmail.com"
   spec.description   = %q{AsciiPack is an object serialization inspired by MessagePack.}
   spec.summary       = %q{AsciiPack is an object serialization inspired by MessagePack.}
-  spec.homepage      = ""
+  spec.homepage      = "http://ksss.github.io/AsciiPack"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)

data/lib/asciipack/packer.rb

@@ -44,13 +44,13 @@ module AsciiPack
         when obj.kind_of?(String)
           case obj.length
           when 0...0x10
-            fixbin obj
+            fixstr obj
           when 0x10...0x100
-            bin8 obj
+            str8 obj
           when 0x100...0x10000
-            bin16 obj
+            str16 obj
           when 0x10000...0x100000000
-            bin32 obj
+            str32 obj
           else
             raise "pack size limit over"
           end
@@ -134,20 +134,20 @@ module AsciiPack
         ])
       end
 
-      def fixbin (obj)
+      def fixstr (obj)
         (obj.length + 71).chr + obj
       end
 
-      def bin8 (obj)
-        format_bin TypeMap.bin8, 2, obj
+      def str8 (obj)
+        format_str TypeMap.str8, 2, obj
       end
 
-      def bin16 (obj)
-        format_bin TypeMap.bin16, 4, obj
+      def str16 (obj)
+        format_str TypeMap.str16, 4, obj
       end
 
-      def bin32 (obj)
-        format_bin TypeMap.bin32, 8, obj
+      def str32 (obj)
+        format_str TypeMap.str32, 8, obj
       end
 
       def map (obj)
@@ -195,11 +195,11 @@ module AsciiPack
         type + zero + hex;
       end
 
-      def format_bin (type, length, bin)
-        hex = bin.length.to_s(16);
+      def format_str (type, length, str)
+        hex = str.length.to_s(16);
         len = length - hex.length;
         zero = '0' * len;
-        type + zero + hex + bin;
+        type + zero + hex + str;
       end
 
       def to_s16 (a)

data/lib/asciipack/typemap.rb

@@ -15,9 +15,9 @@ module AsciiPack
     :float32           => 'k',
     :float64           => 'l',
 #   (blank)            => 'm',
-    :bin8              => 'n',
-    :bin16             => 'o',
-    :bin32             => 'p',
+    :str8              => 'n',
+    :str16             => 'o',
+    :str32             => 'p',
 #   (blank)            => 'q',
     :map4              => 'r',
     :map8              => 's',
@@ -44,22 +44,22 @@ module AsciiPack
     :positive_fixint_D => 'D',
     :positive_fixint_E => 'E',
     :positive_fixint_F => 'F',
-    :fixbin_0          => 'G',
-    :fixbin_1          => 'H',
-    :fixbin_2          => 'I',
-    :fixbin_3          => 'J',
-    :fixbin_4          => 'K',
-    :fixbin_5          => 'L',
-    :fixbin_6          => 'M',
-    :fixbin_7          => 'N',
-    :fixbin_8          => 'O',
-    :fixbin_9          => 'P',
-    :fixbin_A          => 'Q',
-    :fixbin_B          => 'R',
-    :fixbin_C          => 'S',
-    :fixbin_D          => 'T',
-    :fixbin_E          => 'U',
-    :fixbin_F          => 'V',
+    :fixstr_0          => 'G',
+    :fixstr_1          => 'H',
+    :fixstr_2          => 'I',
+    :fixstr_3          => 'J',
+    :fixstr_4          => 'K',
+    :fixstr_5          => 'L',
+    :fixstr_6          => 'M',
+    :fixstr_7          => 'N',
+    :fixstr_8          => 'O',
+    :fixstr_9          => 'P',
+    :fixstr_A          => 'Q',
+    :fixstr_B          => 'R',
+    :fixstr_C          => 'S',
+    :fixstr_D          => 'T',
+    :fixstr_E          => 'U',
+    :fixstr_F          => 'V',
     :nil               => 'W',
     :false             => 'X',
     :true              => 'Y',

data/lib/asciipack/unpacker.rb

@@ -13,7 +13,7 @@ module AsciiPack
       move
       case @ch
       when /[0-9A-F]/; positive_fixint
-      when /[G-V]/; fixbin
+      when /[G-V]/; fixstr
       when TypeMap.int4; int4
       when TypeMap.int8; int8
       when TypeMap.int16; int16
@@ -32,9 +32,9 @@ module AsciiPack
       when TypeMap.array8; array8
       when TypeMap.array16; array16
       when TypeMap.array32; array32
-      when TypeMap.bin8; bin8
-      when TypeMap.bin16; bin16
-      when TypeMap.bin32; bin32
+      when TypeMap.str8; str8
+      when TypeMap.str16; str16
+      when TypeMap.str32; str32
       when TypeMap.nil; nil
       when TypeMap.false; false
       when TypeMap.true; true
@@ -155,22 +155,22 @@ private
     def array16; array(4) end
     def array32; array(8) end
 
-    def fixbin
-      len = @ch.ord - 71 # 71 = TypeMap.fixbin_0.ord
+    def fixstr
+      len = @ch.ord - 71 # 71 = TypeMap.fixstr_0.ord
       cut(len)
     end
 
-    def bin8
+    def str8
       len = cut(2).to_i(16)
       cut(len)
     end
 
-    def bin16
+    def str16
       len = cut(4).to_i(16)
       cut(len)
     end
 
-    def bin32
+    def str32
       len = cut(8).to_i(16)
       cut(len)
     end

data/lib/asciipack/version.rb

@@ -1,3 +1,3 @@
 module AsciiPack
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/bench.rb

@@ -1,4 +1,4 @@
-#! /usr/bin/env ruby
+#! /usr/str/env ruby
 
 lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -42,8 +42,8 @@ end
 {
   "positive fixint" => 0,
   "uint 4" => 16,
-  "fixbin" => "",
-  "bin 8" => '0123456789abcdef',
+  "fixstr" => "",
+  "str 8" => '0123456789abcdef',
   "float 64" => 1/3,
   "map 4" => {},
   "array 4" => [],

data/spec/format_spec.rb

@@ -1,4 +1,4 @@
-# encoding: ascii-8bit
+# encoding: utf-8
 
 require 'spec_helper'
 
@@ -6,6 +6,7 @@ describe AsciiPack do
   it "intro" do
     expect(AsciiPack.pack({"compact"=>true,"binary"=>0})).to eq('r2NcompactYMbinary0')
   end
+
   it "int 4" do
     format -1, T.int4, 2
     format -8, T.int4, 2
@@ -73,27 +74,29 @@ describe AsciiPack do
     expect(AsciiPack.pack(-1 / 0.0)).to eq(T.float64 + 'fff0000000000000')
   end
 
-  it "fixbin" do
-    format "", T.fixbin_0, 1
-    format " ", T.fixbin_1, 2
-    format " " * 0xe, T.fixbin_E, 15
-    format " " * 0xf, T.fixbin_F, 16
+  it "fixstr" do
+    format "", T.fixstr_0, 1
+    format " ", T.fixstr_1, 2
+    format "あ", T.fixstr_1, 2
+    format "漢字", T.fixstr_2, 3
+    format " " * 0xe, T.fixstr_E, 15
+    format " " * 0xf, T.fixstr_F, 16
   end
 
-  it "bin 8" do
-    format "a" * 0x10, T.bin8, 3 + 0x10
-    format "a" * 0xff, T.bin8, 3 + 0xff
+  it "str 8" do
+    format "a" * 0x10, T.str8, 3 + 0x10
+    format "a" * 0xff, T.str8, 3 + 0xff
   end
 
-  it "bin 16" do
-    format "a" * 0x100, T.bin16, 5 + 0x100
-    format "a" * 0xffff, T.bin16, 5 + 0xffff
+  it "str 16" do
+    format "a" * 0x100, T.str16, 5 + 0x100
+    format "a" * 0xffff, T.str16, 5 + 0xffff
   end
 
-  it "bin 32" do
-    format "a" * 0x10000, T.bin32, 9 + 0x10000
+  it "str 32" do
+    format "a" * 0x10000, T.str32, 9 + 0x10000
     # FIXME too late
-    # format "a" * 0xffffffff, T.bin32, 9 + 0xffffffff
+    # format "a" * 0xffffffff, T.str32, 9 + 0xffffffff
   end
 
   it "map 4" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciipack
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ksss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,7 @@ files:
 - spec/bench.rb
 - spec/format_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: http://ksss.github.io/AsciiPack
 licenses:
 - MIT
 metadata: {}
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.6
 signing_key: 
 specification_version: 4
 summary: AsciiPack is an object serialization inspired by MessagePack.