bin_struct 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6e644878c67b11f8006b130b0964a2349f0aa66645f2706cb97a20bf1ec6b77
-  data.tar.gz: 0bbf06e91de1bc410888f9c0e79f8caa0b7bb7f7082b5c775186c41c4a3d04db
+  metadata.gz: f7d87b0168273fd5ed8cb81c89ecbc1726d93544bf70d57467490d5732033ebc
+  data.tar.gz: 5f14f873d4d45ee090b81033a952d62e3673334444b61a62825c9925d9574af6
 SHA512:
-  metadata.gz: c1bd8b95ce395af08b53ea41385929e9d06490d4ab21588dd46e02d8ba1d66207879174ec2f3a98400667446956042b581a032d93e8b9b97cc2d8448b20ced44
-  data.tar.gz: b81c04e4ddcf9a4bbe3af1b36735a5221014f69f43ef5d11c166d33e595aa989f0feb436ed2ba5547f42372c636383a5196c302f54548d0525d49057576f2467
+  metadata.gz: f82248767c36240d4774ebab9cffb25c05efb328981a068349256442034f5ff510abc72693398b6e320b9ab8f59ed3b9d87e8b6d9f44f30884ff62afb960c531
+  data.tar.gz: 80a67a76677dbad046463541b7e9d8208033243c9a0f4633d48e25e1375adc0085f261d50e3b53fdc34b2c89152652b30f13d3432ce59c5ebe0f3918bf071b4a

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.5.1 - 2025-04-21
+
+### Fixed
+
+- Struct defined with bit attributes could not be cloned.
+
 ## 0.5.0 - 2025-02-17
 
 ### Added

data/lib/bin_struct/bit_attr.rb

@@ -32,8 +32,6 @@ module BinStruct
 
     # @return [Integer] width in bits of bit attribute
     attr_reader :width
-    # @return [::Array[Symbol]]
-    attr_reader :bit_methods
 
     # @private
     Parameters = Struct.new(:width, :fields, :int)
@@ -45,6 +43,10 @@ module BinStruct
       # @return [Parameters]
       attr_reader :parameters
 
+      # @private
+      # @return [::Array[Symbol]]
+      attr_reader :bit_methods
+
       # Create a new {BitAttr} subclass with specified parameters
       # @param [Integer] width size of bitfields in bits. Must be a size of an {Int} (8, 16, 24, 32 or 64 bits).
       # @param [:big,:little,:native] endian endianess of bit attribute as an integer
@@ -64,10 +66,7 @@ module BinStruct
         total_size = fields.reduce(0) { |acc, ary| acc + ary.last }
         raise ArgumentError, "sum of bitfield sizes is not equal to #{width}" unless total_size == width
 
-        cache[hsh] = Class.new(self) do
-          int_klass = BinStruct.const_get("Int#{width}")
-          @parameters = Parameters.new(width, fields, int_klass.new(endian: endian)).freeze
-        end
+        cache[hsh] = create_subclass(width, endian, fields.dup.freeze)
       end
 
       private
@@ -84,6 +83,39 @@ module BinStruct
       def compute_hash(*params)
         Digest::MD5.digest(Marshal.dump(params))
       end
+
+      def create_subclass(width, endian, fields)
+        klass = Class.new(self) do
+          int_klass = BinStruct.const_get("Int#{width}")
+          @parameters = Parameters.new(width, fields, int_klass.new(endian: endian)).freeze
+          @bit_methods = []
+        end
+
+        define_methods(klass, fields)
+        klass
+      end
+
+      # @param [Class] {BitAttr} subclass
+      # @param [Hash{Symbol => Integer}] fields
+      # @return [void]
+      def define_methods(klass, fields)
+        define_str = +''
+        fields.each do |name, size|
+          define_str << "def #{name}; @data[#{name.inspect}]; end\n"
+          klass.bit_methods << name
+          klass.bit_methods << :"#{name}="
+
+          if size == 1
+            define_str << "def #{name}?; @data[#{name.inspect}] != 0; end\n"
+            klass.bit_methods << :"#{name}?"
+            define_str << "def #{name}=(val); v = case val when TrueClass; 1 when FalseClass; 0 else val end; " \
+                          "@data[#{name.inspect}] = v; end\n"
+          else
+            define_str << "def #{name}=(val); @data[#{name.inspect}] = val; end\n"
+          end
+        end
+        klass.class_eval(define_str)
+      end
     end
 
     # Initialize bit attribute
@@ -101,13 +133,21 @@ module BinStruct
       @data = {}
       @bit_methods = []
 
-      parameters.fields.each do |name, size|
+      parameters.fields.each_key do |name|
         @data[name] = opts[name] || 0
-        define_methods(name, size)
       end
       @bit_methods.freeze
     end
 
+    def initialize_copy(_other)
+      @data = @data.dup
+    end
+
+    # @return [::Array[Symbol]]
+    def bit_methods
+      self.class.bit_methods
+    end
+
     # Get type name
     # @return [::String]
     def type_name
@@ -175,24 +215,5 @@ module BinStruct
 
       self
     end
-
-    # @param [Symbol] name
-    # @return [void]
-    def define_methods(name, size)
-      instance_eval "def #{name}; @data[#{name.inspect}]; end\n", __FILE__, __LINE__ # def name; data[:name]; end
-      bit_methods << name
-      bit_methods << :"#{name}="
-
-      # rubocop:disable Style/DocumentDynamicEvalDefinition
-      if size == 1
-        instance_eval "def #{name}?; @data[#{name.inspect}] != 0; end\n", __FILE__, __LINE__
-        instance_eval "def #{name}=(val); v = case val when TrueClass; 1 when FalseClass; 0 else val end; " \
-                      "@data[#{name.inspect}] = v; end", __FILE__, __LINE__ - 1
-        bit_methods << :"#{name}?"
-      else
-        instance_eval "def #{name}=(val); @data[#{name.inspect}] = val; end", __FILE__, __LINE__
-      end
-      # rubocop:enable Style/DocumentDynamicEvalDefinition
-    end
   end
 end

data/lib/bin_struct/struct.rb

@@ -268,13 +268,15 @@ module BinStruct
         bit_attr_klass = BitAttr.create(width: width, endian: endian, **fields)
         define_attr(attr, bit_attr_klass, default: default)
         fields.each_key { |field| register_bit_attr_field(attr, field) }
+        define_str = +''
         bit_attr_klass.new.bit_methods.each do |meth|
-          if meth.to_s.end_with?('=')
-            define_method(meth) { |value| self[attr].send(meth, value) }
-          else
-            define_method(meth) { self[attr].send(meth) }
-          end
+          define_str << if meth.to_s.end_with?('=')
+                          "def #{meth}(value); self[:#{attr}].#{meth}(value); end\n"
+                        else
+                          "def #{meth}; self[:#{attr}].#{meth}; end\n"
+                        end
         end
+        class_eval(define_str)
       end
 
       # Define a bit attribute, before another attribute

data/lib/bin_struct/version.rb

@@ -8,5 +8,5 @@
 
 module BinStruct
   # BinStruct version
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bin_struct
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - LemonTree55
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-17 00:00:00.000000000 Z
+date: 2025-04-21 00:00:00.000000000 Z
 dependencies: []
 description: 'BinStruct is a binary dissector and generator. It eases manipulating
   complex binary data.