bistro 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3005111ea2c6d80cebb2b9fbb18942b70b8c90d6c785bb1b54a65db01e978fa
-  data.tar.gz: 62fdd3216e53989c4fcb18b1a8a38c3399b44c2daac249c9cabfcafd4d907415
+  metadata.gz: '083a2a52e47ed66b526780f8bcfe4d3cb270a1dde098c496497bd6b5f4b8f774'
+  data.tar.gz: 9388db96083be467a06e1e0b8032454f7e26095bf6b8a4594b58b4b01d124b0d
 SHA512:
-  metadata.gz: e656723aae47b109c66804e0ec03838193c464b3a4d0377f7691f8ea02f0c783fbfc5e4ad04fcda4bdab88a8012d23f242f25ac688ecab8e86c84406b6a51fd8
-  data.tar.gz: ae09a95c27537d26b0bfcfa6c418e72cbe95c358ef0e3d10976924ecb0d2c8894341060887427c97fad8b3abcd7b3765bf77f9449a859b11e2a8902090c69761
+  metadata.gz: 4efee30bc303d5dd3725f69ffc16d544a1376b314e8d05d9c5aa9d7e2ef82d73aa45112d7f7ed3698bd9be5da2b65ddfc7e1583b7f3757b6e9f5f35a8521476a
+  data.tar.gz: 217c4ce2ddbb989d49da962d39d20c720be4c34c4e7fefd3186365661757ae1dab3852b52e13a91fdd85eb48fcf4e5c1b708e616bd42eafa363d5cc1ed90a398

data/lib/bistro.rb

@@ -60,10 +60,13 @@ class Bistro
     else
       value = value.to_a.map(&:reverse).flatten if value.kind_of?(Hash)
       value = Array(value)
+
       self.class.validate_definition(value)
       @definition = value
     end
-    @size = @decode_format = @decode_name = nil
+
+    @size = @decode_types = @decode_formats =
+    @decode_names = @decode_counts = nil
   end
 
   def size
@@ -81,15 +84,27 @@ class Bistro
 
   def decode_to_array(data, num = 1)
     raise ArgumentError, "data cannot be nil" if data.nil?
-    @decode_format, @decode_names = self.class.prep_decode(@definition) if @decode_format.nil?
-    format = (num == 1) ? @decode_format : @decode_format * num
+    @decode_types, @decode_formats,
+    @decode_names, @decode_counts =
+      self.class.prep_decode(@definition) if @decode_formats.nil?
+
+    format = (num == 1) ? @decode_formats : @decode_formats * num
     return data.unpack(format)
   end
 
   def decoded_array_to_hash!(array)
     hash = {}
-    @decode_names.each do |k|
-      v = array.shift
+    @decode_names.each_with_index do |k,i|
+      c = @decode_counts[i].to_i
+      t = @decode_types[i]
+
+      v = nil
+      if !STRING_FORMATS.include?(t) && c != 1
+        v = 0.upto(c-1).collect { array.shift }
+      else
+        v = array.shift
+      end
+
       next if k.nil?
       hash[k] = v
     end
@@ -107,12 +122,15 @@ class Bistro
   def encode_hash(hash)
     data = ""
     @definition.each_slice(2) do |format, name|
-      raise "member not found: #{name}" unless name.nil? || hash.has_key?(name)
+      raise "member not found: #{name}" unless name.nil? ||
+                                               hash.has_key?(name)
+
       value = unless name.nil?
         hash[name]
       else
         STRING_FORMATS.include?(format[0, 1]) ? '0' : 0
       end
+
       data << [value].pack(format)
     end
     return data
@@ -151,14 +169,19 @@ class Bistro
   private
 
   def self.struct_by_definition(definition)
-    @@structs_by_definition[definition] ||= definition.kind_of?(self) ? definition : self.new(definition)
+    @@structs_by_definition[definition] ||= definition.kind_of?(self) ?
+                                            definition :
+                                   self.new(definition)
   end
 
   def self.validate_definition(definition)
-    raise "definition must be an array of format/name pairs" if definition.empty? || definition.length % 2 != 0
+    raise "definition must be an array of format/name pairs" if definition.empty? ||
+                                                                definition.length % 2 != 0
+
     definition.each_slice(2) do |format, _|
-      type, count = format[0, 1], format[1..-1]
-      modifier, modcount = count[0, 1], count[1..-1]
+             type, count = format[0, 1], format[1..-1]
+      modifier, modcount =  count[0, 1],  count[1..-1]
+
       validate_definition_entry_type(type)
       if valid_definition_entry_modifier?(modifier)
         validate_definition_endian_modifier(modifier, type)
@@ -171,7 +194,7 @@ class Bistro
 
   def self.validate_definition_entry_type(type)
     raise "unrecognized format: #{type}" unless SIZES.has_key?(type)
-    raise "unsupported format: #{type}" if SIZES[type].nil?
+    raise "unsupported format: #{type}"      if SIZES[type].nil?
     return true
   end
 
@@ -192,7 +215,8 @@ class Bistro
 
   def self.validate_definition_endian_modifier(modifier, type)
     if ENDIAN_MODIFIERS.include? modifier
-      raise "unsupported type attribute #{type} for endian modifier #{modifier}" unless ENDIAN_FORMATS.include? type
+      raise "unsupported type attribute #{type} "\
+            "for endian modifier #{modifier}" unless ENDIAN_FORMATS.include? type
       return true
     end
     false
@@ -200,11 +224,13 @@ class Bistro
 
   def self.get_size(definition)
     size = 0
+
     definition.each_slice(2) do |format, _|
-      type, count        = format[0, 1], format[1..-1]
-      modifier, modcount = count[0, 1], count[1..-1]
+             type, count = format[0, 1], format[1..-1]
+      modifier, modcount =  count[0, 1],  count[1..-1]
       count = modcount if valid_definition_entry_modifier?(modifier)
       count = count.empty? ? 1 : count.to_i
+
       size +=
         if BIT_FORMATS.include?(type)
           (count / 8.0).ceil
@@ -214,16 +240,28 @@ class Bistro
           count * SIZES[type]
         end
     end
+
     size
   end
 
   def self.prep_decode(definition)
     formats = ""
-    names = []
+      types = []
+      names = []
+     counts = []
+
     definition.each_slice(2) do |format, name|
+             type, count = format[0, 1], format[1..-1]
+      modifier, modcount =  count[0, 1],  count[1..-1]
+      count = modcount if valid_definition_entry_modifier?(modifier)
+      count =        1 if count.empty?
+
+        types << type
       formats << format
-      names << name
+        names << name
+       counts << count
     end
-    return formats, names
+
+    return types, formats, names, counts
   end
 end

data/lib/bistro/version.rb

@@ -1,3 +1,3 @@
 class Bistro
-  VERSION = "2.1.0"
+  VERSION = "2.2.0"
 end

data/spec/accum_spec.rb

@@ -0,0 +1,29 @@
+describe Bistro do
+  ACCUM_STRUCT_DEF = [
+     'C', 'first',
+    'C2', 'second',
+     'H', 'third',
+    'H2', 'fourth',
+     'b', 'fifth',
+    'b2', 'sixth',
+     'i', 'seventh',
+    'i2', 'eighth',
+  ]
+
+  ACCUM_STRUCT_ENCODED_STR = "\0\1\2\3\4\5\6\7\8\9\0\1\2\3\4\5\6\7\8\9\0\1\2\3\4\5\6\7\8\9\0"
+
+  ACCUM_STRUCT_DECODED_HASH = {
+    "first"=>0,
+    "second"=>[1, 2],
+    "third"=>"0",
+    "fourth"=>"04",
+    "fifth"=>"1",
+    "sixth"=>"01",
+    "seventh"=>3749895,
+    "eighth"=>[67305985, 939984389]
+  }
+
+  it "accumulates numerical values" do
+    expect(Bistro.new(ACCUM_STRUCT_DEF).decode(ACCUM_STRUCT_ENCODED_STR)).to eq(ACCUM_STRUCT_DECODED_HASH)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bistro
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Dev Null Productions
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-16 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,6 +64,7 @@ files:
 - README.md
 - lib/bistro.rb
 - lib/bistro/version.rb
+- spec/accum_spec.rb
 - spec/bistro_spec.rb
 - spec/data/test.gif
 - spec/endian_spec.rb
@@ -94,6 +95,7 @@ signing_key:
 specification_version: 4
 summary: Bistro is a class for dealing with BInary STRuctured data.
 test_files:
+- spec/accum_spec.rb
 - spec/bistro_spec.rb
 - spec/data/test.gif
 - spec/endian_spec.rb