bytemapper 1.0.19 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9651d363a3ac3e436372c5527f7f8bed34015ea0687eaa93b3b89b31bd0bce81
-  data.tar.gz: 7ed18fc3bfd35527aea3eef93e038adc785019ae4857d00008639512d18bf974
+  metadata.gz: 76c2e215cabd7c201c72481a89a032dcd6034512b4242eb821fe097914c7f69f
+  data.tar.gz: 31615cfac602b73c2d3d36f1c9a0b4bc9ca55befec6cad72c4fae2fd7f39df80
 SHA512:
-  metadata.gz: 6d1b379ef5e3322c9b010377702cc7d4c5d1043ebbb9038a56e723df6537c558e6c4ca9b8f0b812015de4dc1199cb7043ada03f00d3850292ef60e55949ab20f
-  data.tar.gz: 93db768253293483ff66349868b577704e75cce5f18169cd7b0eb3fc7e52906ebb1c0d0a28b944d260918bbc21987a59d84dfff1f3de08af7d30ff37be0b84a0
+  metadata.gz: 4b8d9c242406a8d80d30e901231fe674b2d689c8d0f44310e5e021f305c23f1ea508ee0d9f607ec6c19b187c64d060f40b2b970e3ca7f99ab5ced89a48713d84
+  data.tar.gz: ed768686f5c64498d0c382a57ba92e292ef1a6fcf72fe69ded983378805aac32056e3e78e79be51c3d534bd222b448f6c69b193f49033e7775e90ea22177ecb7

data/lib/bytemapper.rb

@@ -15,11 +15,13 @@
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 module Bytemapper
+  require 'refinements'
   require 'bytemapper/registry'
   require 'bytemapper/shape'
   require 'bytemapper/type'
   require 'bytemapper/nameable'
   require 'bytemapper/chunk'
+  require 'bytemapper/table'
 
   @@registry = Registry.new
 
@@ -71,8 +73,18 @@ module Bytemapper
     def map(bytes, shape, name = nil)
       bytes.force_encoding(Encoding::ASCII_8BIT)
       bytes = StringIO.new(bytes)
-      shape = wrap(shape, name)
-      Chunk.new(bytes, shape, name)
+      if shape.is_a?(Array)
+        chunks = []
+        shape.each { |s| chunks << Chunk.new(bytes.read(s.size), s, name) }
+        chunks
+      else
+        shape = wrap(shape, name)
+        Chunk.new(bytes, shape, name)
+      end
+    end
+
+    def repeat(obj, times = nil)
+      Table.new(obj, times)
     end
 
     def registered?(obj)
@@ -87,6 +99,10 @@ module Bytemapper
       registry.put(obj, name)
     end
 
+    def names(filter_key = nil)
+      registry.names.keys
+    end
+
     def print
       registry.print
     end
@@ -98,5 +114,21 @@ module Bytemapper
     def reset(with_basic_types = true)
       @@registry = Registry.new(with_basic_types)
     end
+
+    def reverse_lookup(prefix, value = nil)
+      @@rl_cache ||= {}
+      prefix = "#{prefix.to_s}_"
+      lookup = @@rl_cache[prefix]
+
+      if lookup.nil?
+        labels = names.filter { |n| n.start_with?(prefix) } 
+        values = labels.map { |l| get(l) }
+        lookup = Hash[values.zip(labels)]
+        @@rl_cache[prefix] = lookup
+      end
+
+      value.nil? ? lookup : lookup[value]
+    end
+
   end
 end

data/lib/bytemapper/chunk.rb

@@ -17,24 +17,32 @@
 module Bytemapper
   require 'bytemapper/flattenable'
   class Chunk < Hash
+    include Nameable
     include Flattenable
-    attr_reader :bytes, :shape, :name
+    attr_reader :bytes, :shape
 
     def initialize(bytes, shape, name)
       @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
         singleton_class.instance_eval { attr_reader k }
         instance_variable_set("@#{k.to_s}", self[k])
       end
+
+      shape.hooks.each {|h| h.call(self) }
     end
 
     def string
@@ -49,11 +57,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

@@ -5,17 +5,22 @@
 # the terms of the GNU Affero General Public License as published by the Free
 # Software Foundation, either version 3 of the License, or (at your option) any
 # later version.
-
+#
 # This program is distributed in the hope that it will be useful, but WITHOUT
 # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
 # FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
 # details.
-
+#
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <https://www.gnu.org/licenses/>.
+
 module Bytemapper
   module Nameable
+    attr_reader :name
     attr_accessor :names
-    alias :name :names
+
+    def name=(v)
+      @name ||= v.respond_to?(:to_sym) ? v.to_sym : v
+    end
   end
 end

data/lib/bytemapper/registry.rb

@@ -182,16 +182,24 @@ module Bytemapper
     def register_basic_types
       [
         [:uint8_t, [8,'C']],
+        [:u8, [8,'C']],
         [:uchar, [8,'C']],
         [:bool, [8,'C']],
         [:uint16_t, [16,'S']],
+        [:u16, [16,'S']],
         [:uint32_t, [32,'L']],
+        [:u32, [32,'L']],
         [:uint64_t, [64,'Q']],
+        [:u64, [64,'Q']],
         [:int8_t, [8,'c']],
+        [:i8, [8,'c']],
         [:char, [8,'c']],
         [:int16_t, [16,'s']],
+        [:i16, [16,'s']],
         [:int32_t, [32,'l']],
-        [:int64_t, [64,'q']]
+        [:i32, [32,'l']],
+        [:int64_t, [64,'q']],
+        [:i64, [64,'q']]
       ].each do |name, type|
         type = Type.new(type)
         put(type, name)

data/lib/bytemapper/shape.rb

@@ -20,11 +20,25 @@ module Bytemapper
   class Shape < Hash
     include Flattenable
     include Nameable
+    attr_accessor :hooks
+
+    def initialize
+      super
+      @hooks = []
+    end
 
     def []=(k,v)
       super
       singleton_class.instance_eval { attr_reader k }
       instance_variable_set("@#{k.to_s}", self[k])
     end
+
+    def hook(&block)
+      @hooks << block if block_given?
+    end
+
+    def size
+      flatten.values.map(&:size).reduce(:+)
+    end
   end
 end

data/lib/bytemapper/table.rb

@@ -0,0 +1,32 @@
+module Bytemapper
+  using Refinements
+
+  class Table < Array
+    include Flattenable
+    include Nameable
+    attr_reader :bytes, :shape
+
+    def initialize(shape, rows = nil)
+      @bytes = nil
+      @shape = Bytemapper.get(shape)
+    end
+
+    def populate(bytes)
+      @bytes = StringIO.from(bytes)
+
+      table = Table.new(shape)
+      table.clear
+
+      (bytes.size / shape.size).times do
+        table << Chunk.new(@bytes.read(shape.size), shape, shape.name)
+      end
+
+      table
+    end
+
+    def size
+      empty? ? 0 : map(&:size).reduce(:+)
+    end
+
+  end
+end

data/lib/bytemapper/typeable.rb

@@ -0,0 +1,21 @@
+# Bytemapper - Model arbitrary bytestrings as Ruby objects.  
+# Copyright (C) 2020 Jefferson Hudson
+#
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+# details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+module Bytemapper
+  module Typeable
+    attr_accessor :type
+  end
+end

data/lib/refinements.rb

@@ -0,0 +1,24 @@
+module Refinements
+  refine StringIO do
+    def peek
+      string[pos]
+    end
+
+    def extract(offset, length)
+      prev = pos
+      seek(offset)
+      bytes = read(length)
+      seek(prev)
+      bytes
+    end
+  end
+
+  refine StringIO.singleton_class do
+    def from(obj)
+      obj = obj.nil? ? '' : obj
+      obj = obj.is_a?(StringIO) ? obj : new(obj)
+      obj.string.force_encoding(Encoding::ASCII_8BIT)
+      obj
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bytemapper
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.26
 platform: ruby
 authors:
 - Jefferson Hudson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-01 00:00:00.000000000 Z
+date: 2020-08-16 00:00:00.000000000 Z
 dependencies: []
 description: Model and interact with bytestrings using Ruby objects.
 email: jefferson.hudson@gmail.com
@@ -22,7 +22,10 @@ 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
+- lib/refinements.rb
 homepage: https://github.com/l4cr0ss/bytemapper
 licenses:
 - AGPL-3.0-or-later