bytemapper 1.0.26 → 1.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c2e215cabd7c201c72481a89a032dcd6034512b4242eb821fe097914c7f69f
-  data.tar.gz: 31615cfac602b73c2d3d36f1c9a0b4bc9ca55befec6cad72c4fae2fd7f39df80
+  metadata.gz: 7f16b61aeb646f03cd1a49dbaca9b948bd95c36a9bdf7582b8c97f50d0d6f5c2
+  data.tar.gz: 66d21d518947f760770e1fca457bb3d3b993f4d2b5514bc7ad94841f79af19b9
 SHA512:
-  metadata.gz: 4b8d9c242406a8d80d30e901231fe674b2d689c8d0f44310e5e021f305c23f1ea508ee0d9f607ec6c19b187c64d060f40b2b970e3ca7f99ab5ced89a48713d84
-  data.tar.gz: ed768686f5c64498d0c382a57ba92e292ef1a6fcf72fe69ded983378805aac32056e3e78e79be51c3d534bd222b448f6c69b193f49033e7775e90ea22177ecb7
+  metadata.gz: 56498f8a6f77dc55686077847d01f34b01cfbdad3004118cf3041bf80148f3af3b0ead05eb7ecefa1c24cea05c620613cbf6d4fd1247befa4d91b957850d8a06
+  data.tar.gz: 57ebf44b242121611b71ca6cd2913f2788a538d4af5cfe49c9ca14f1d90ea8d12f15395242cdc37115965b866bf82e5303ba3c527d4d6ce51b735eb5c1ebdc5e

data/lib/bytemapper.rb

@@ -23,6 +23,8 @@ module Bytemapper
   require 'bytemapper/chunk'
   require 'bytemapper/table'
 
+  using Refinements
+
   @@registry = Registry.new
 
   class << self
@@ -71,9 +73,11 @@ module Bytemapper
     end
 
     def map(bytes, shape, name = nil)
-      bytes.force_encoding(Encoding::ASCII_8BIT)
-      bytes = StringIO.new(bytes)
-      if shape.is_a?(Array)
+      bytes = StringIO.from(bytes)
+
+      if shape.is_a?(Bytemapper::Table)
+        shape.populate(bytes)
+      elsif shape.is_a?(Array)
         chunks = []
         shape.each { |s| chunks << Chunk.new(bytes.read(s.size), s, name) }
         chunks
@@ -95,6 +99,11 @@ module Bytemapper
       registry.get(obj)
     end
 
+    def get2(obj)
+      obj.each_pair { |k,v| obj[k] = get(v) if registry.registered_name?(v) }
+      registry.get(obj)
+    end
+
     def put(obj, name)
       registry.put(obj, name)
     end

data/lib/bytemapper/chunk.rb

@@ -30,7 +30,7 @@ module Bytemapper
         self[k] = if v.is_a?(Hash)
                     Chunk.new(@bytes.read(v.size), v, k)
                   elsif v.is_a?(Bytemapper::Table)
-                    if v.unbounded?
+                    if v.empty?
                       v.populate(@bytes.read(@bytes.size-@bytes.pos))
                     else
                       v.populate(@bytes.read(v.capacity))

data/lib/bytemapper/registry.rb

@@ -16,6 +16,7 @@
 
 module Bytemapper
   class Registry
+    require 'set'
     require 'bytemapper/nameable'
 
     attr_reader :names

data/lib/bytemapper/table.rb

@@ -1,32 +1,45 @@
 module Bytemapper
-  using Refinements
+  module NilTimes
+    refine NilClass do
+      def times
+        0
+      end
+    end
+  end
 
   class Table < Array
     include Flattenable
     include Nameable
-    attr_reader :bytes, :shape
+    attr_reader :shape, :rows, :bytes
+    using NilTimes
 
     def initialize(shape, rows = nil)
-      @bytes = nil
-      @shape = Bytemapper.get(shape)
+      @shape = Bytemapper.get(shape) || shape
+      rows.times { self << @shape  }
     end
 
     def populate(bytes)
-      @bytes = StringIO.from(bytes)
+      bytes = bytes.nil? ? '' : bytes
+      @bytes = bytes.is_a?(StringIO) ? bytes : StringIO.new(bytes)
+      @bytes.string.force_encoding(Encoding::ASCII_8BIT)
+      @shape = Bytemapper.get(shape).nil? ? Bytemapper.get2(shape) : Bytemapper.get(shape)
 
-      table = Table.new(shape)
-      table.clear
+      (bytes.size / shape.size).times { self << @shape } if unbounded?
 
+      table = Table.new(shape) 
+      table.clear
       (bytes.size / shape.size).times do
-        table << Chunk.new(@bytes.read(shape.size), shape, shape.name)
+        table << Chunk.new(@bytes.read(shape.size), shape, shape.name) 
       end
-
       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.26
+  version: 1.0.27
 platform: ruby
 authors:
 - Jefferson Hudson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-16 00:00:00.000000000 Z
+date: 2020-08-22 00:00:00.000000000 Z
 dependencies: []
 description: Model and interact with bytestrings using Ruby objects.
 email: jefferson.hudson@gmail.com