bytemapper 1.0.22 → 1.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9383a019c471ccf2979e92c7c2e8a8c7a20f5c63fa74613837c2d38a84632a52
-  data.tar.gz: 903ecf62d057d5ee4f478e022df4129cccf1c9ce545ab60eeef1314bbcbaad67
+  metadata.gz: ea6f9b415c3147f7af5584a41f5f6c49dbe68fd7137771e6930bba37c8164400
+  data.tar.gz: c40ea7b989e39da462f13a2a9e43730eb8efdfdf5e5b4053d0c4d9ffd1eecd43
 SHA512:
-  metadata.gz: 753673f95b723b32f1c0b1aa9dc88418e9e1bc740bc07185a4f5896c05fb388be68f23b5192aeba58bfb3d1c90368687cfda1d7d51471527b1e16e9b0d1b102e
-  data.tar.gz: 21e687cb299ee9aee44a068df8c37cc7a5cca987b7c7175d3677eb3af9ae26a74e5ddc10c1ce8eada691502202a8b5d36dc65e19972e3ac8b70e3e47d2f223c3
+  metadata.gz: dfbbbd391b56398a95d77bb2e0777241684f4621d0d16a782af0dde25c10afa186817839e01ef659c15aa7b1a46ed7aab0c6a5811c08e8cc15b51fef0ec8ff41
+  data.tar.gz: 8c6e57cdf80bb6b921444a5b4d48ee56b682644534d411e9079fc7551018ed692415caa72066588d90c7966816bdc3ad7ee89600beca782afcace6656932f14a

data/lib/bytemapper.rb

@@ -20,6 +20,7 @@ module Bytemapper
   require 'bytemapper/type'
   require 'bytemapper/nameable'
   require 'bytemapper/chunk'
+  require 'bytemapper/table'
 
   @@registry = Registry.new
 
@@ -81,6 +82,10 @@ module Bytemapper
       end
     end
 
+    def repeat(obj, times = nil)
+      Table.new(obj, times)
+    end
+
     def registered?(obj)
       registry.registered?(obj)
     end

data/lib/bytemapper/chunk.rb

@@ -24,11 +24,16 @@ module Bytemapper
       @name = name
       @shape = shape
       @bytes = bytes.is_a?(StringIO) ? bytes : StringIO.new(bytes)
-      @bytes.truncate(shape.size)
       replace(shape)
       each_pair do |k,v|
         self[k] = if v.is_a?(Hash)
                     Chunk.new(@bytes.read(v.size), v, k)
+                  elsif v.is_a?(Bytemapper::Table)
+                    if v.unbounded?
+                      v.populate(@bytes.read(@bytes.size-@bytes.pos))
+                    else
+                      v.populate(@bytes.read(v.capacity))
+                    end
                   else
                     unpack(v)
                   end
@@ -49,11 +54,20 @@ module Bytemapper
       bytes.string.split(//).map(&:chr)
     end
 
+    def capacity
+      shape.size
+    end
+
     def size
       bytes.size
     end
 
-    def print
+    def consumed
+      size
+    end
+
+    def remaining
+      capacity - consumed
     end
 
     def unpack(value, endian = nil)

data/lib/bytemapper/flattenable.rb

@@ -21,6 +21,8 @@ module Bytemapper
         k = prefix.nil? ?  k : "#{prefix}_#{k}".to_sym
         if v.is_a?(Hash)
           v.flatten(flattened, k)
+        elsif v.is_a?(Bytemapper::Table)
+          v.each_with_index { |e,i| e.flatten(flattened, i) }
         else
           flattened[k] = v
         end

data/lib/bytemapper/nameable.rb

@@ -16,7 +16,11 @@
 
 module Bytemapper
   module Nameable
-    attr_accessor :name
+    attr_reader :name
     attr_accessor :names
+
+    def name=(val)
+      @name ||= val.to_sym
+    end
   end
 end

data/lib/bytemapper/table.rb

@@ -0,0 +1,44 @@
+module Bytemapper
+  module NilTimes
+    refine NilClass do
+      def times
+        0
+      end
+    end
+  end
+
+  class Table < Array
+    include Flattenable
+    include Nameable
+    attr_reader :shape, :rows, :bytes
+    using NilTimes
+
+    def initialize(shape, rows = nil)
+      @shape = Bytemapper.get(shape)
+      rows.times { self << @shape  }
+    end
+
+    def populate(bytes)
+      bytes = bytes.nil? ? '' : bytes
+      @bytes = bytes.is_a?(StringIO) ? bytes : StringIO.new(bytes)
+      @bytes.string.force_encoding(Encoding::ASCII_8BIT)
+      if unbounded?
+        (bytes.size / shape.size).times { self << @shape } 
+      end
+
+      table = Table.new(shape) 
+      table.clear
+      (bytes.size / shape.size).times { table << Chunk.new(@bytes.read(shape.size), shape, shape.name) }
+      table
+    end
+
+    def unbounded?
+      empty?
+    end
+
+    def size
+      empty? ? 0 : map(&:size).reduce(:+)
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bytemapper
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.24
 platform: ruby
 authors:
 - Jefferson Hudson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-08-14 00:00:00.000000000 Z
 dependencies: []
 description: Model and interact with bytestrings using Ruby objects.
 email: jefferson.hudson@gmail.com
@@ -22,6 +22,7 @@ files:
 - lib/bytemapper/nameable.rb
 - lib/bytemapper/registry.rb
 - lib/bytemapper/shape.rb
+- lib/bytemapper/table.rb
 - lib/bytemapper/type.rb
 - lib/bytemapper/typeable.rb
 homepage: https://github.com/l4cr0ss/bytemapper