bindata 2.4.11 → 2.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8da7873dc256b291c991e6577d886a78ba27b347b6ef03dd55b7d23ae797611
-  data.tar.gz: c44844d397e1d1c8a332c99bc16f18a64a979f8251ce3dc2e71246882e40f10c
+  metadata.gz: 3688cea66b3a68f7f45ecd4b89b632e9e4438ee40ff4f59c57bbe0a68130e7d6
+  data.tar.gz: 647a570fd024d8938297d2fb4d2ac0123d03befaf0e5d3441627601d86694d8f
 SHA512:
-  metadata.gz: 391299bd3e2f04892a42b1fffabd7e494872f4085d2bef50f6e37b267a7e496ecd61081cd838550d87e5702dcefc8ed63c76446fa72ba02a52e1b60cb13a941a
-  data.tar.gz: ebf86b0c30ceea48215d9beaa39706c9fed31b2b1da788b2c9ddaf1d861ac4ff33a27b7a3211d6e097e077da8625ef6ad2d21a40a6dc9232bc88ec8ad39a0143
+  metadata.gz: ddb2cd1156f3200fcc1bcce2d1a0bf5554f52babd692652debb71a8b56a9dced9c0f76db22884599f475b91d549f915344fcc1ec71a7f28be8dcb87192c968a5
+  data.tar.gz: ea223714bb2753b3b5dd626711dbffdc328ed326d2218a5ef2d8817ad797de66299d438dbf2ad8a9904ea774e758efd8c6bef47bafe51e391247d32acc92f5ee

data/ChangeLog.rdoc

@@ -1,5 +1,9 @@
 = BinData Changelog
 
+== Version 2.4.12 (2022-10-03)
+
+* Do not include DelayedIO objects when :onlyif is false.
+
 == Version 2.4.11 (2022-09-27)
 
 * Make DelayedIO work with :onlyif.  Reported by Spencer McIntyre.

data/lib/bindata/delayed_io.rb

@@ -116,19 +116,8 @@ module BinData
       0
     end
 
-    def eval_parameter_with_delayed_io(key, overrides = nil)
-      result = eval_parameter_without_delayed_io(key, overrides)
-
-      # Delay processing :onlyif until we do the actual read/write
-      result = true if key == :onlyif && ! result
-
-      result
-    end
-    alias_method :eval_parameter_without_delayed_io, :eval_parameter
-    alias_method :eval_parameter, :eval_parameter_with_delayed_io
-
     def include_obj?
-      ! has_parameter?(:onlyif) || eval_parameter_without_delayed_io(:onlyif)
+      ! has_parameter?(:onlyif) || eval_parameter(:onlyif)
     end
 
     # DelayedIO objects aren't read when #read is called.

data/lib/bindata/struct.rb

@@ -1,4 +1,5 @@
 require 'bindata/base'
+require 'bindata/delayed_io'
 
 module BinData
 
@@ -136,12 +137,12 @@ module BinData
 
     def do_read(io) #:nodoc:
       instantiate_all_objs
-      @field_objs.each { |f| f.do_read(io) if include_obj?(f) }
+      @field_objs.each { |f| f.do_read(io) if include_obj_for_io?(f) }
     end
 
     def do_write(io) #:nodoc
       instantiate_all_objs
-      @field_objs.each { |f| f.do_write(io) if include_obj?(f) }
+      @field_objs.each { |f| f.do_write(io) if include_obj_for_io?(f) }
     end
 
     def do_num_bytes #:nodoc:
@@ -263,6 +264,12 @@ module BinData
       end
     end
 
+    def include_obj_for_io?(obj)
+      # Used by #do_read and #do_write, to ensure the stream is passed to
+      # DelayedIO objects for delayed processing.
+      include_obj?(obj) || DelayedIO === obj
+    end
+
     def include_obj?(obj)
       !obj.has_parameter?(:onlyif) || obj.eval_parameter(:onlyif)
     end

data/lib/bindata/version.rb

@@ -1,3 +1,3 @@
 module BinData
-  VERSION = "2.4.11"
+  VERSION = "2.4.12"
 end

data/test/delayed_io_test.rb

@@ -200,7 +200,7 @@ describe BinData::DelayedIO, "inside a Record with onlyif" do
   it "reads" do
     obj = DelayedIOOnlyIfRecord.read "\x01\x00\x03\x0012345"
     obj.num_bytes.must_equal 1
-    obj.snapshot.must_equal({flag: 1, my_int1: 6, my_int2: 7})
+    obj.snapshot.must_equal({flag: 1, my_int1: 6})
   end
 
   it "reads explicitly when flag is set" do
@@ -208,7 +208,7 @@ describe BinData::DelayedIO, "inside a Record with onlyif" do
     obj.my_int1.read_now!
     obj.my_int2.read_now!
     obj.num_bytes.must_equal 1
-    obj.snapshot.must_equal({flag: 1, my_int1: 2, my_int2: 7})
+    obj.snapshot.must_equal({flag: 1, my_int1: 2})
   end
 
   it "reads explicitly when flag is not set" do
@@ -216,7 +216,7 @@ describe BinData::DelayedIO, "inside a Record with onlyif" do
     obj.my_int1.read_now!
     obj.my_int2.read_now!
     obj.num_bytes.must_equal 1
-    obj.snapshot.must_equal({flag: 0, my_int1: 6, my_int2: 1})
+    obj.snapshot.must_equal({flag: 0, my_int2: 1})
   end
 
   it "writes" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindata
 version: !ruby/object:Gem::Version
-  version: 2.4.11
+  version: 2.4.12
 platform: ruby
 authors:
 - Dion Mendel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-27 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake