iostruct 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21f656cdac9fe221206c29eff87e7c068a4460a1cc7922eb25858ec0d657d840
-  data.tar.gz: 8eca414c087981d96cf919e96a7554dfa4bdb9336af39f56b4950410d815a9bc
+  metadata.gz: 535a978c6d95f5213d7a7e63523b46788adc2d6ca83c714758e9f30f927f546f
+  data.tar.gz: 5f52aea99a2615221a62e9b7d3228f129f1320e2a21c8b65eae3fec644e4007a
 SHA512:
-  metadata.gz: 8d0e8bdad84fb2e8995680dcf9ca7330868101bc196f4ff2d6cde7ec393b9c1c819a1a756dd939e002a8be1b35178ccce8328ef65e54ed85c915d6a5d6801ab9
-  data.tar.gz: 739cf3c06238c1e7601d52d60e625eec4bfa703c3ffb1503f6ed670200801c63c7913c58b30af860aed907ea5adab0ccbfb2981332b533790d33374e82a9eabb
+  metadata.gz: 5a7489c0f185fb36a4e54c51273c2b87bd344754522e6584b329f529ed0ae00c8c287a1abf224b4cd3bfc1ed44fa5694c8036c89b3ef881231f8cfb4f773b6b0
+  data.tar.gz: 4fa626885e4446c846594c1be13b67649928e45e919aabc660cc2c414c7cb225efb29841e5bd856737d905d988f5dd2219dd3c1622c976cb2e656799beb2a0fe

data/lib/iostruct/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IOStruct
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

data/lib/iostruct.rb

@@ -57,7 +57,7 @@ module IOStruct
     fields = []
     fmt.scan(/([a-z])(\d*)/i).map do |type,len|
       size, klass = FMTSPEC[type] || raise("Unknown field type #{type.inspect}")
-      len = [len.to_i, 1].max
+      len = len.empty? ? 1 : len.to_i
       case type
       when 'A', 'a', 'x'
         fields << FieldInfo.new(klass, size*len, offset) if klass
@@ -129,8 +129,18 @@ module IOStruct
   end # InstanceMethods
 
   module HexInspect
-    def inspect
-      @fmtstr ||= "<#{self.class.to_s} " + self.class.const_get('FIELDS').map do |name, f|
+    def to_s
+      s = "<#{self.class.to_s} " + to_h.map do |k, v|
+        if v.is_a?(Integer) && v > 9
+          "#{k}=0x%x" % v
+        else
+          "#{k}=#{v.inspect}"
+        end
+      end.join(' ') + ">"
+    end
+
+    def to_table
+      @fmtstr_tbl = "<#{self.class.to_s} " + self.class.const_get('FIELDS').map do |name, f|
         fmt =
           case 
           when f.type == Integer
@@ -142,7 +152,11 @@ module IOStruct
           end
         "#{name}=#{fmt}"
       end.join(' ') + ">"
-      sprintf @fmtstr, *to_a.map{ |v| v.is_a?(String) ? v.inspect : v }
+      sprintf @fmtstr_tbl, *to_a.map{ |v| v.is_a?(String) ? v.inspect : v }
+    end
+
+    def inspect
+      to_s
     end
   end
 end # IOStruct

data/spec/iostruct_spec.rb

@@ -25,6 +25,33 @@ describe IOStruct do
     end
   end
 
+  context "zero-length strings" do
+    let(:data) { [1, 2].pack('CC') }
+    let(:struct) { IOStruct.new('C a0 C', :a, :b, :c) }
+
+    it "deserializes" do
+      x = struct.read(data)
+      expect(x.a).to eq 1
+      expect(x.b).to eq ""
+      expect(x.c).to eq 2
+    end
+
+    it "has correct size" do
+      expect(struct::SIZE).to eq 2
+    end
+
+    it "reads correct number of bytes from IO" do
+      io = StringIO.new(data*2)
+      x = struct.read(io)
+      expect(io.pos).to eq 2
+    end
+
+    it "serializes" do
+      x = struct.read(data)
+      expect(x.pack).to eq data
+    end
+  end
+
   it "skips on 'x'" do
     a = [12345, 56789]
     data = a.pack('L2')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iostruct
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Andrey "Zed" Zaikin
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: A Struct that can read/write itself from/to IO-like objects