bindata 2.4.6 → 2.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c4dad8d006c1df84f2f6e241e0309a6efdd41622e9d4469b72c5f4ab23c681f
-  data.tar.gz: 649973630d5544a6aa50185f20006d77ff75349d67448fe7b32b66417de87359
+  metadata.gz: 9be5b49e663e2525dfc786351b811954d2069d17796271f39dd2e6023b42b25b
+  data.tar.gz: d3f43e1edb07968d56ad0ae8afb6db509ac234670cd5695a8e6f3ea4ef1f24f0
 SHA512:
-  metadata.gz: 769971878d5575cb15cdab697ef7226f8e43c4a932e0f52fad91eaf32cbfeda2d8d027e10fb5be2498a6af2389b9bfe60aea0d1a11496303f0f5c55fdc582b0a
-  data.tar.gz: d623fe3a282df4a2fd68cc9235225ec56338ea0e02ffd6c659e797fd4369d651cd9087fc1457197546a2e05c149b9608f4686ebf58a850215be40588c76d69dd
+  metadata.gz: 19f3a5d4f957c8136048df08132f3db8445e85c5cf894f046840724ff712ee656ecd1c0c40e962a90d00deae2af901b9aae7909e99ad68c91e9d1d133ead29dd
+  data.tar.gz: 162b363f3618ba5f89bdd5f8018e948d726ae52e153339fbd8071c9aefeedbd3a88146a987424871799949033047e02658eee8c0671bc17e5f9f0d8b9af3e9ae

data/ChangeLog.rdoc

@@ -1,5 +1,9 @@
 = BinData Changelog
 
+== Version 2.4.7 (2020-03-31)
+
+* Fix choice assignment inside arrays.  Reported by Spencer McIntyre.
+
 == Version 2.4.6 (2020-02-27)
 
 * More encoding fixes.  Thanks to Aaron Patterson.

data/lib/bindata/array.rb

@@ -82,7 +82,8 @@ module BinData
     def assign(array)
       raise ArgumentError, "can't set a nil value for #{debug_name}" if array.nil?
 
-      @element_list = to_storage_formats(array.to_ary)
+      @element_list = []
+      concat(array)
     end
 
     def snapshot
@@ -119,7 +120,17 @@ module BinData
 
     def insert(index, *objs)
       extend_array(index - 1)
-      elements.insert(index, *to_storage_formats(objs))
+      abs_index = (index >= 0) ? index : index + 1 + length
+
+      # insert elements before...
+      new_elements = objs.map { new_element }
+      elements.insert(index, *new_elements)
+
+      # ...assigning values
+      objs.each_with_index do |obj, i|
+        self[abs_index + i] = obj
+      end
+
       self
     end
 
@@ -238,10 +249,6 @@ module BinData
       end
     end
 
-    def to_storage_formats(els)
-      els.collect { |el| new_element(el) }
-    end
-
     def elements
       @element_list ||= []
     end
@@ -252,8 +259,8 @@ module BinData
       element
     end
 
-    def new_element(value = nil)
-      @element_prototype.instantiate(value, self)
+    def new_element
+      @element_prototype.instantiate(nil, self)
     end
 
     def sum_num_bytes_for_all_elements

data/lib/bindata/version.rb

@@ -1,3 +1,3 @@
 module BinData
-  VERSION = "2.4.6"
+  VERSION = "2.4.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindata
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.4.7
 platform: ruby
 authors:
 - Dion Mendel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-27 00:00:00.000000000 Z
+date: 2020-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake