bindata 2.4.8 → 2.4.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 930073ad9a50e67aa2d584a17c0138f3cb4008e4bd96851ceef305e16c7cadd2
-  data.tar.gz: ec59bb6fcff33192da1ee33952c69e1069c214c0f41f9b21786694ed7fa4c87c
+  metadata.gz: 651bb61168cb520dbec6550dc4ee3d566e950a0a4e3c373752a37d9ced6dc17e
+  data.tar.gz: 543f3849f0502255c976520e3d11f2e988f0733314b905d098b8617025ef2d99
 SHA512:
-  metadata.gz: c2ebc4a2e56294d7b503d73cfee08fa165c37b96a4216e6ac17206b2566d3b5ea77adb188b819a8e63bf1a059ab79d068d1def5059d7b2b6811609f099a3656f
-  data.tar.gz: 96c38802d6197001dfbfb76a4a338bcc7dbf2e8f7ec685b5007cdc6a8917b502ad8bc1ca106323a52f3555cada27f1b90ba204a5c72253447983026af020c27f
+  metadata.gz: 5ab4ddc205727d64b5b4f1354c6c738965745ff6736030f440c3982799351e68af06c9f1e0faff28d6e52830a0abf55d678a0ea7ffefa160f9f7bf3c309b6e7b
+  data.tar.gz: 834bdfa27436e578043e8b92ded99a02e6fc5ca2d0e11f0503bf3d8d68c1c7c9e491e66fe59f264156fb9675437cc9f014193f42132a8e6aec3a11b6f84f5312

data/ChangeLog.rdoc

@@ -1,5 +1,14 @@
 = BinData Changelog
 
+== Version 2.4.10 (2021-05-18)
+
+* Improve speed of dynamic object creation.  Reported by Charlie Ablett.
+
+== Version 2.4.9 (2021-04-22)
+
+* Change example from Fixnum to Integer.  Thanks to Tim Chambers.
+* Now works with frozen string literals.  Requested by Jeremy Evans.
+
 == Version 2.4.8 (2020-07-21)
 
 * Bug fix array self assignment.  Thanks to Spencer McIntyre.

data/bindata.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.summary = 'A declarative way to read and write binary file formats'
   s.author = 'Dion Mendel'
   s.email = 'bindata@dm9.info'
-  s.homepage = 'http://github.com/dmendel/bindata'
+  s.homepage = 'https://github.com/dmendel/bindata'
   s.require_path = 'lib'
   s.extra_rdoc_files = ['NEWS.rdoc']
   s.rdoc_options << '--main' << 'NEWS.rdoc'

data/examples/list.rb

@@ -105,7 +105,7 @@ class Term < BinData::Record
   end
 
   def self.encode(val)
-    if Fixnum === val
+    if Integer === val
       Term.new(tag: 'a', term: Atom.encode(val))
     else
       Term.new(tag: 'l', term: List.encode(val))

data/lib/bindata/alignment.rb

@@ -47,7 +47,7 @@ module BinData
       end
       def readbytes(n)
         n.times.inject("") do |bytes, _|
-          bytes << @io.readbits(8, :big).chr
+          bytes += @io.readbits(8, :big).chr
         end
       end
     end

data/lib/bindata/bits.rb

@@ -115,14 +115,14 @@ module BinData
         end
 
         if signed == :signed
-          max = (1 << (nbits - 1)) - 1
-          min = -(max + 1)
+          max = "max = (1 << (#{nbits} - 1)) - 1"
+          min = "min = -(max + 1)"
         else
-          min = 0
-          max = (1 << nbits) - 1
+          min = "min = 0"
+          max = "max = (1 << #{nbits}) - 1"
         end
 
-        clamp = "(val < #{min}) ? #{min} : (val > #{max}) ? #{max} : val"
+        clamp = "(#{max}; #{min}; val = (val < min) ? min : (val > max) ? max : val)"
 
         if nbits == 1
           # allow single bits to be used as booleans

data/lib/bindata/int.rb

@@ -59,14 +59,16 @@ module BinData
 
       def create_clamp_code(nbits, signed)
         if signed == :signed
-          max = (1 << (nbits - 1)) - 1
-          min = -(max + 1)
+          max = "max = (1 << (#{nbits} - 1)) - 1"
+          min = "min = -(max + 1)"
         else
-          max = (1 << nbits) - 1
-          min = 0
+          max = "max = (1 << #{nbits}) - 1"
+          min = "min = 0"
         end
 
-        "val = (val < #{min}) ? #{min} : (val > #{max}) ? #{max} : val"
+        clamp = "(#{max}; #{min}; val = (val < min) ? min : (val > max) ? max : val)"
+
+        "val = #{clamp}"
       end
 
       def create_read_code(nbits, endian, signed)
@@ -107,7 +109,7 @@ module BinData
         parts = (0...nwords).collect do |i|
                   "(ints.at(#{idx[i]}) << #{bits_per_word(nbits) * i})"
                 end
-        parts[0].sub!(/ << 0\b/, "")  # Remove " << 0" for optimisation
+        parts[0] = parts[0].sub(/ << 0\b/, "")  # Remove " << 0" for optimisation
 
         parts.join(" + ")
       end
@@ -132,7 +134,7 @@ module BinData
         mask   = (1 << bits_per_word(nbits)) - 1
 
         vals = (0...nwords).collect { |i| "val >> #{bits_per_word(nbits) * i}" }
-        vals[0].sub!(/ >> 0\b/, "")  # Remove " >> 0" for optimisation
+        vals[0] = vals[0].sub(/ >> 0\b/, "")  # Remove " >> 0" for optimisation
         vals.reverse! if (endian == :big)
 
         vals = vals.collect { |val| "#{val} & #{mask}" }  # TODO: "& mask" is needed to work around jruby bug. Remove this line when fixed.
@@ -160,7 +162,7 @@ module BinData
         directives = { 8 => "C", 16 => "S", 32 => "L", 64 => "Q" }
 
         d = directives[bits_per_word(nbits)]
-        d << ((endian == :big) ? ">" : "<") unless d == "C"
+        d += ((endian == :big) ? ">" : "<") unless d == "C"
 
         if signed == :signed && directives.key?(nbits)
           (d * nwords).downcase

data/lib/bindata/io.rb

@@ -169,7 +169,7 @@ module BinData
 
           unless @read_data.empty? || @in_readahead
             bytes_to_consume = [n, @read_data.length].min
-            data << @read_data.slice!(0, bytes_to_consume)
+            data += @read_data.slice!(0, bytes_to_consume)
             n -= bytes_to_consume
 
             if @read_data.empty?
@@ -180,10 +180,10 @@ module BinData
           end
 
           raw_data = @raw_io.read(n)
-          data << raw_data if raw_data
+          data += raw_data if raw_data
 
           if @in_readahead
-            @read_data << data
+            @read_data += data
           end
 
           @offset += data.size

data/lib/bindata/stringz.rb

@@ -54,7 +54,7 @@ module BinData
       # read until zero byte or we have read in the max number of bytes
       while ch != "\0" && i != max_length
         ch = io.readbytes(1)
-        str << ch
+        str += ch
         i += 1
       end
 

data/lib/bindata/version.rb

@@ -1,3 +1,3 @@
 module BinData
-  VERSION = "2.4.8"
+  VERSION = "2.4.10"
 end

data/test/bits_test.rb

@@ -101,14 +101,14 @@ def generate_bit_classes_to_test(endian, signed)
 
   (start .. 64).each do |nbits|
     name = "#{base}#{nbits}"
-    name << "le" if endian == :little
+    name += "le" if endian == :little
     obj = BinData.const_get(name).new
     bits << [obj, nbits]
   end
 
   (start .. 64).each do |nbits|
     name = "#{base}"
-    name << "Le" if endian == :little
+    name += "Le" if endian == :little
     obj = BinData.const_get(name).new(nbits: nbits)
     bits << [obj, nbits]
   end

data/test/delayed_io_test.rb

@@ -99,7 +99,7 @@ describe BinData::DelayedIO, "subclassed with a single type" do
   end
 
   it "writes explicitly" do
-    io = StringIO.new "\001\002\003\004\005\006\007\010\011"
+    io = StringIO.new "\001\002\003\004\005\006\007\010\011".dup
     obj = IntDelayedIO.new(3)
     obj.write(io)
     obj.write_now!
@@ -107,7 +107,7 @@ describe BinData::DelayedIO, "subclassed with a single type" do
   end
 
   it "writes explicitly after setting abs_offset" do
-    io = StringIO.new "\001\002\003\004\005\006\007\010\011"
+    io = StringIO.new "\001\002\003\004\005\006\007\010\011".dup
     obj = IntDelayedIO.new(7)
     obj.write(io)
 
@@ -139,7 +139,7 @@ describe BinData::DelayedIO, "subclassed with multiple types" do
   end
 
   it "writes explicitly" do
-    io = StringIO.new "\001\002\003\004\005\006\007\010\011\012\013\014\015"
+    io = StringIO.new "\001\002\003\004\005\006\007\010\011\012\013\014\015".dup
     obj = StringDelayedIO.new(str: "hello")
     obj.write(io)
     obj.write_now!

data/test/int_test.rb

@@ -128,7 +128,7 @@ module AllIntegers
   end
 
   def int_to_binary_str(val)
-    str = "".force_encoding(Encoding::BINARY)
+    str = "".dup.force_encoding(Encoding::BINARY)
     v = val & ((1 << (@nbytes * 8)) - 1)
     @nbytes.times do
       str.concat(v & 0xff)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bindata
 version: !ruby/object:Gem::Version
-  version: 2.4.8
+  version: 2.4.10
 platform: ruby
 authors:
 - Dion Mendel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2021-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -149,7 +149,7 @@ files:
 - test/uint8_array_test.rb
 - test/virtual_test.rb
 - test/warnings_test.rb
-homepage: http://github.com/dmendel/bindata
+homepage: https://github.com/dmendel/bindata
 licenses:
 - Ruby
 metadata: {}
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A declarative way to read and write binary file formats