bytemapper 1.0.25 → 1.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce11df6e4ad42a1c8a81853d2e9188fd9a3caaa02692ef12a58dedcae33e296
-  data.tar.gz: f95e339d989e6346651cc45d07ca0ae1ffd55e2b0a8bd0071b0014b28aa9868c
+  metadata.gz: 76c2e215cabd7c201c72481a89a032dcd6034512b4242eb821fe097914c7f69f
+  data.tar.gz: 31615cfac602b73c2d3d36f1c9a0b4bc9ca55befec6cad72c4fae2fd7f39df80
 SHA512:
-  metadata.gz: 56c5919a1f298fe359eb3931e941965ac43d003ddf2691c2b93394ca8b0dbdba88ef9b64c55cdda5d0902ac148776bfcc6f6aa7c45d43d6320d5a5f028c0cbfd
-  data.tar.gz: '0698b1a5cc71653eb4044f920f4e4428244c88a8cc08ec22c72324e9943efdbbf0e1c7ec7da91bd319c61fdd3c4a3f9e9271889098f503fbb4f3ad52f112d03c'
+  metadata.gz: 4b8d9c242406a8d80d30e901231fe674b2d689c8d0f44310e5e021f305c23f1ea508ee0d9f607ec6c19b187c64d060f40b2b970e3ca7f99ab5ced89a48713d84
+  data.tar.gz: ed768686f5c64498d0c382a57ba92e292ef1a6fcf72fe69ded983378805aac32056e3e78e79be51c3d534bd222b448f6c69b193f49033e7775e90ea22177ecb7

data/lib/bytemapper.rb

@@ -15,6 +15,7 @@
 # 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'

data/lib/bytemapper/chunk.rb

@@ -41,6 +41,8 @@ module Bytemapper
         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

data/lib/bytemapper/nameable.rb

@@ -19,8 +19,8 @@ module Bytemapper
     attr_reader :name
     attr_accessor :names
 
-    def name=(val)
-      @name ||= val.to_sym
+    def name=(v)
+      @name ||= v.respond_to?(:to_sym) ? v.to_sym : v
     end
   end
 end

data/lib/bytemapper/shape.rb

@@ -20,6 +20,12 @@ module Bytemapper
   class Shape < Hash
     include Flattenable
     include Nameable
+    attr_accessor :hooks
+
+    def initialize
+      super
+      @hooks = []
+    end
 
     def []=(k,v)
       super
@@ -27,6 +33,10 @@ module Bytemapper
       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

data/lib/bytemapper/table.rb

@@ -1,44 +1,32 @@
 module Bytemapper
-  module NilTimes
-    refine NilClass do
-      def times
-        0
-      end
-    end
-  end
+  using Refinements
 
   class Table < Array
     include Flattenable
     include Nameable
-    attr_reader :shape, :rows, :bytes
-    using NilTimes
+    attr_reader :bytes, :shape
 
     def initialize(shape, rows = nil)
+      @bytes = 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
+      @bytes = StringIO.from(bytes)
 
-      table = Table.new(shape) 
+      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?
+      (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/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.25
+  version: 1.0.26
 platform: ruby
 authors:
 - Jefferson Hudson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 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
@@ -25,6 +25,7 @@ files:
 - 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