bindata 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fb38e8b0ef072a6acb74e9a623307791ba9619423e445635bf949c6ede9a90a
-  data.tar.gz: 026e68ad13001b0ae2922bbe909882d5bec2c44c3380ab894cf73e3fbce8de61
+  metadata.gz: 0c768f9ce67cbaab54614d38246801939b4bb65ad02be42996b08613ed07aa92
+  data.tar.gz: d0409b0247506c870c314d089a5a9e0b806a1ab8e0c5ed05b2c280d81b9472c1
 SHA512:
-  metadata.gz: 3a46d236c6206417f271782956e3aaa376f793ef9cc58f88de92577b10537a5cd2ce8cc8f2399e1a58d0bb1f1ab749d57f0ea6aa8532c78fd80dc0e998b3abb4
-  data.tar.gz: a1d2988f1bcfda8c3f1177338d34b5af0e7f62dd4eea55905ef3c49e5cb989a7b07e30d1b7d42606a4ca005bcfa3ef034829520b52df86ca9bafe25cb7f2bf1c
+  metadata.gz: 65e8e7d1df5b3220dc61aca18e1aef0a026e09191c6a78cf63e7dd5b4c5437fb04f8db688f926c4e4048dba972518b970254236959948681b7335e1a1302bff6
+  data.tar.gz: 195f0a260ec3cbccaa4e2a2e060ae0cc65b9f843a0c17acafb426041bf0a7d3fe0e96a6ff46befa68ed6f4b36fc2655a3a458f138e5ab92c78684347f39abc8e

data/ChangeLog.rdoc

@@ -1,5 +1,10 @@
 = BinData Changelog
 
+== Version 2.5.1 (2025-04-11)
+
+* Added changelog link to gemspec. Thanks to Mark Young.
+* Support Ruby 3.4.
+
 == Version 2.5.0 (2024-02-16)
 
 * Removed experimental :check_offset and :adjust_offset parameters.

data/README.md

@@ -55,4 +55,4 @@ for dependent and variable length fields is built in.
 # Contact
 
 If you have any queries / bug reports / suggestions, please contact me
-(Dion Mendel) via email at bindata@dm9.info
+(Dion Mendel) via email at bindata@dmau.org

data/bindata.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.summary = 'A declarative way to read and write binary file formats'
   s.author = 'Dion Mendel'
-  s.email = 'bindata@dm9.info'
+  s.email = 'bindata@dmau.org'
   s.homepage = 'https://github.com/dmendel/bindata'
   s.require_path = 'lib'
   s.extra_rdoc_files = ['NEWS.rdoc']
@@ -31,4 +31,5 @@ Gem::Specification.new do |s|
     format.  It is an easier ( and more readable ) alternative to
     ruby's #pack and #unpack methods.
   END
+  s.metadata['changelog_uri'] = s.homepage + '/blob/master/ChangeLog.rdoc'
 end

data/lib/bindata/io.rb

@@ -456,7 +456,7 @@ module BinData
       private
 
       def create_empty_binary_string
-        "".force_encoding(Encoding::BINARY)
+        String.new.force_encoding(Encoding::BINARY)
       end
 
       def chain_seekable?

data/lib/bindata/registry.rb

@@ -36,14 +36,22 @@ module BinData
     end
 
     def lookup(name, hints = {})
-      the_class = @registry[normalize_name(name, hints)]
-      if the_class
-        the_class
-      elsif @registry[normalize_name(name, hints.merge(endian: :big))]
-        raise(UnRegisteredTypeError, "#{name}, do you need to specify endian?")
-      else
-        raise(UnRegisteredTypeError, name)
+      search_names(name, hints).each do |search|
+        register_dynamic_class(search)
+        if @registry.has_key?(search)
+          return @registry[search]
+        end
       end
+
+      # give the user a hint if the endian keyword is missing
+      search_names(name, hints.merge(endian: :big)).each do |search|
+        register_dynamic_class(search)
+        if @registry.has_key?(search)
+          raise(UnRegisteredTypeError, "#{name}, do you need to specify endian?")
+        end
+      end
+
+      raise(UnRegisteredTypeError, name)
     end
 
     # Convert CamelCase +name+ to underscore style.
@@ -60,27 +68,20 @@ module BinData
     #---------------
     private
 
-    def normalize_name(name, hints)
-      name = underscore_name(name)
-
-      if !registered?(name)
-        search_prefix = [""] + Array(hints[:search_prefix])
-        search_prefix.each do |prefix|
-          nwp = name_with_prefix(name, prefix)
-          if registered?(nwp)
-            name = nwp
-            break
-          end
-
-          nwe = name_with_endian(nwp, hints[:endian])
-          if registered?(nwe)
-            name = nwe
-            break
-          end
-        end
+    def search_names(name, hints)
+      base = underscore_name(name)
+      searches = []
+
+      search_prefix = [""] + Array(hints[:search_prefix])
+      search_prefix.each do |prefix|
+        nwp = name_with_prefix(base, prefix)
+        nwe = name_with_endian(nwp, hints[:endian])
+
+        searches << nwp
+        searches << nwe if nwe
       end
 
-      name
+      searches
     end
 
     def name_with_prefix(name, prefix)
@@ -93,7 +94,7 @@ module BinData
     end
 
     def name_with_endian(name, endian)
-      return name if endian.nil?
+      return nil if endian.nil?
 
       suffix = (endian == :little) ? 'le' : 'be'
       if /^u?int\d+$/.match?(name)
@@ -103,17 +104,11 @@ module BinData
       end
     end
 
-    def registered?(name)
-      register_dynamic_class(name) unless @registry.key?(name)
-
-      @registry.key?(name)
-    end
-
     def register_dynamic_class(name)
       if /^u?int\d+(le|be)$/.match?(name) || /^s?bit\d+(le)?$/.match?(name)
         class_name = name.gsub(/(?:^|_)(.)/) { $1.upcase }
         begin
-          # call const_get for side effects
+          # call const_get for side effect of creating class
           BinData.const_get(class_name)
         rescue NameError
         end
@@ -124,7 +119,7 @@ module BinData
       prev_class = @registry[name]
       if prev_class && prev_class != class_to_register
         Kernel.warn "warning: replacing registered class #{prev_class} " \
-             "with #{class_to_register}"
+                    "with #{class_to_register}"
       end
     end
   end

data/lib/bindata/version.rb

@@ -1,3 +1,3 @@
 module BinData
-  VERSION = '2.5.0'
+  VERSION = '2.5.1'
 end

data/lib/bindata.rb

@@ -1,5 +1,5 @@
 # BinData -- Binary data manipulator.
-# Copyright (c) 2007 - 2018 Dion Mendel.
+# Copyright (c) 2007 - 2025 Dion Mendel.
 
 require 'bindata/version'
 require 'bindata/array'
@@ -35,4 +35,4 @@ require 'bindata/warnings'
 #
 # BinData is released under the same license as Ruby.
 #
-# Copyright (c) 2007 - 2018 Dion Mendel.
+# Copyright (c) 2007 - 2025 Dion Mendel.

data/test/test_helper.rb

@@ -43,11 +43,15 @@ module Minitest::Assertions
     ex = assert_raises(exp, &block)
     assert_equal(msg, ex.message) if msg
 
-    idx = ex.backtrace.find_index { |bt| /:in `assert_raises_on_line'$/ =~ bt }
+    line_num_regex = /(.*):(\d+)(:in.*)$/
 
-    line_num_regex = /.*:(\d+)(:.*|$)/
-    err_line = line_num_regex.match(ex.backtrace[0])[1].to_i
-    ref_line = line_num_regex.match(ex.backtrace[idx + 2])[1].to_i
+    filename = line_num_regex.match(ex.backtrace[0])[1]
+
+    filtered = ex.backtrace.grep(/^#{Regexp.escape(filename)}/)
+    top = filtered.grep(Regexp.new(Regexp.escape("in <top (required)>")))
+
+    err_line = line_num_regex.match(filtered[0])[2].to_i
+    ref_line = line_num_regex.match(top[0])[2].to_i - 1
 
     assert_equal((err_line - ref_line), line)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bindata
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Dion Mendel
@@ -59,7 +59,7 @@ description: |
   data is, and BinData works out *how* to read and write data in this
   format.  It is an easier ( and more readable ) alternative to
   ruby's #pack and #unpack methods.
-email: bindata@dm9.info
+email: bindata@dmau.org
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -149,7 +149,8 @@ files:
 homepage: https://github.com/dmendel/bindata
 licenses:
 - BSD-2-Clause
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/dmendel/bindata/blob/master/ChangeLog.rdoc
 post_install_message:
 rdoc_options:
 - "--main"
@@ -167,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.22
+rubygems_version: 3.3.27
 signing_key:
 specification_version: 4
 summary: A declarative way to read and write binary file formats