polyfill-data 1.0.4 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f13af5e73dbe544ce73a294748dee539285c7f8405ec7e68f4d2187b51364c
-  data.tar.gz: 0d4c325885a85e5ced977b50e38af25d44508d6c85a7d6e02f512a9e56d2dff8
+  metadata.gz: a03e6512ebc7c374354a31a97017b565d8f2ff9c0fa012d8d48f61e60e8457bb
+  data.tar.gz: b3964f4e5f39d4399e940d4234808c07738a7cc224d651353f4cc1d08daf7068
 SHA512:
-  metadata.gz: 73f956793df2920f6c13d564d56592c72a19327ed9451dd536c3f69a8057038775e5a02e1ec8962f85c135d588b0d54df8f337297eaf18f992e6d29ce910d6de
-  data.tar.gz: 25d0e20f500b2715c2ec352f8f2a46150832e40a9482f782450b2e0b2ebe3d9c6f78cafa19fc978b8fa78569771d22d10626b423ba71e555aa05f42112d38d03
+  metadata.gz: '03952e0dd824664e91fc3ff0eb88c68ab26b933c64894a06684afa5b3b0deb7891d0974dbcdde93062eba1ea6cd297098694c1d4b7f2157ec2cfbac75f2feea5'
+  data.tar.gz: 6ae3beceb86909ece7547d01f850e584fdd6411f8bb954b9e09ee987e04a445566f1f8a62e19ca7f19df73f05b27ed80afbdfe5c20361e933171fa0959cb3e52

data/CHANGELOG.md

@@ -5,6 +5,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Added
+
+### Fixed
+
+## 1.0.6
+
+### Fixed
+
+- use `each` to avoid allocating an unused array
+
+## 1.0.5
+
+### Fixed
+
+- member methods take precedence over methods defined in the block passed to `define`
+
 ## 1.0.4
 
 ### Fixed

data/lib/data.rb

@@ -1,132 +1,146 @@
-# frozen_string_literal: true
-
-require_relative "polyfill/data/version"
-
-if RUBY_VERSION >= "3.2.0"
-  warn "You can remove the 'polyfill-data' gem now."
-else
-  Object.send(:remove_const, :Data) rescue nil
-  class Data < Object
-    class << self
-      undef_method :new
-      attr_reader :members
-    end
-
-    def self.define(*args, &block)
-      raise ArgumentError if args.any?(/=/)
-      klass = ::Class.new(self, &block)
-
-      if args.first.is_a?(String)
-        name = args.shift
-        Data.const_set(name, klass)
-      end
-
-      klass.instance_variable_set(:@members, args)
-
-      klass.define_singleton_method(:new) do |*new_args, **new_kwargs, &block|
-        init_kwargs = if new_args.any?
-          raise ArgumentError, "unknown arguments #{new_args[members.size..].join(', ')}" if new_args.size > members.size
-          Hash[members.take(new_args.size).zip(new_args)]
-        else
-          new_kwargs
-        end
-
-        self.allocate.tap do |instance|
-          instance.send(:initialize, **init_kwargs, &block)
-        end.freeze
-      end
-      class << klass
-        alias_method :[], :new
-        undef_method :define
-      end
-
-      args.map do |arg|
-        if klass.method_defined?(arg)
-          raise ArgumentError, "duplicate member #{arg}"
-        end
-        klass.define_method(arg) do
-          @attributes[arg]
-        end
-      end
-
-      klass
-    end
-
-    def members
-      self.class.members
-    end
-
-    def initialize(**kwargs)
-      kwargs_size = kwargs.size
-      members_size = members.size
-
-      if kwargs_size > members_size
-        extras = kwargs.reject{|k, _v| members.include?(k) }.keys
-        raise ArgumentError, "unknown arguments #{extras.join(', ')}"
-      elsif kwargs_size < members_size
-        missing = members.select {|k, _v| !kwargs.include?(k) }
-        raise ArgumentError, "missing arguments #{missing.map{ ":#{_1}" }.join(', ')}"
-      end
-
-      @attributes = Hash[members.map {|m| [m,kwargs[m]] }]
-    end
-
-    def deconstruct
-      @attributes.values
-    end
-
-    def deconstruct_keys(array)
-      raise TypeError unless array.is_a?(Array) || array.nil?
-      return @attributes if array&.first.nil?
-
-      @attributes.slice(*array)
-    end
-
-    def to_h(&block)
-      @attributes.to_h(&block)
-    end
-
-    def hash
-      to_h.hash
-    end
-
-    def eql?(other)
-      self.class == other.class && hash == other.hash
-    end
-
-    def ==(other)
-      self.class == other.class && to_h == other.to_h
-    end
-
-    def inspect
-      name = ["data", self.class.name].compact.join(" ")
-      attribute_markers = @attributes.map do |key, value|
-        insect_key = key.to_s.start_with?("@") ? ":#{key}" : key
-        "#{insect_key}=#{value}"
-      end
-      %(#<#{name} #{attribute_markers.join(", ")}>)
-    end
-    alias_method :to_s, :inspect
-
-    def with(**kwargs)
-      return self if kwargs.empty?
-
-      self.class.new(**@attributes.merge(kwargs))
-    end
-
-    private
-
-    def marshal_dump
-      @attributes
-    end
-
-    def marshal_load(attributes)
-      @attributes = attributes
-      freeze
-    end
-
-    def initialize_copy(source)
-      super.freeze
-    end
-  end
-end
+# frozen_string_literal: true
+
+require_relative "polyfill/data/version"
+
+if RUBY_VERSION >= "3.2.0"
+  warn "You can remove the 'polyfill-data' gem now."
+else
+  Object.send(:remove_const, :Data) rescue nil
+  class Data < Object
+    class << self
+      undef_method :new
+      attr_reader :members
+    end
+
+    def self.define(*args, &block)
+      raise ArgumentError if args.any?(/=/)
+      if block
+        mod = Module.new
+        mod.define_singleton_method(:_,) do |klass|
+          klass.class_eval(&block)
+        end
+        arity_converter = mod.method(:_)
+      end
+      klass = ::Class.new(self)
+
+      if args.first.is_a?(String)
+        name = args.shift
+        Data.const_set(name, klass)
+      end
+
+      klass.instance_variable_set(:@members, args)
+
+      klass.define_singleton_method(:new) do |*new_args, **new_kwargs, &block|
+        init_kwargs = if new_args.any?
+          raise ArgumentError, "unknown arguments #{new_args[members.size..].join(', ')}" if new_args.size > members.size
+          Hash[members.take(new_args.size).zip(new_args)]
+        else
+          new_kwargs
+        end
+
+        self.allocate.tap do |instance|
+          instance.send(:initialize, **init_kwargs, &block)
+        end.freeze
+      end
+
+      class << klass
+        alias_method :[], :new
+        undef_method :define
+      end
+
+      args.each do |arg|
+        if klass.method_defined?(arg)
+          raise ArgumentError, "duplicate member #{arg}"
+        end
+        klass.define_method(arg) do
+          @attributes[arg]
+        end
+      end
+
+      if arity_converter
+        klass.class_eval(&arity_converter)
+      end
+
+      klass
+    end
+
+    def members
+      self.class.members
+    end
+
+    def initialize(**kwargs)
+      kwargs_size = kwargs.size
+      members_size = members.size
+
+      if kwargs_size > members_size
+        extras = kwargs.reject{|k, _v| members.include?(k) }.keys
+        raise ArgumentError, "unknown arguments #{extras.join(', ')}"
+      elsif kwargs_size < members_size
+        missing = members.select {|k, _v| !kwargs.include?(k) }
+        raise ArgumentError, "missing arguments #{missing.map{ ":#{_1}" }.join(', ')}"
+      end
+
+      @attributes = Hash[members.map {|m| [m,kwargs[m]] }]
+    end
+
+    def deconstruct
+      @attributes.values
+    end
+
+    def deconstruct_keys(array)
+      raise TypeError unless array.is_a?(Array) || array.nil?
+      return @attributes if array&.first.nil?
+
+      @attributes.slice(*array)
+    end
+
+    def to_h(&block)
+      @attributes.to_h(&block)
+    end
+
+    def hash
+      to_h.hash
+    end
+
+    def eql?(other)
+      self.class == other.class && hash == other.hash
+    end
+
+    def ==(other)
+      self.class == other.class && to_h == other.to_h
+    end
+
+    def inspect
+      attribute_markers = @attributes.map do |key, value|
+        insect_key = key.to_s.start_with?("@") ? ":#{key}" : key
+        "#{insect_key}=#{value}"
+      end.join(", ")
+
+      display = ["data", self.class.name, attribute_markers].compact.join(" ")
+
+      "#<#{display}>"
+    end
+    alias_method :to_s, :inspect
+
+    def with(**kwargs)
+      return self if kwargs.empty?
+
+      self.class.new(**@attributes.merge(kwargs))
+    end
+
+    private
+
+    def marshal_dump
+      @attributes
+    end
+
+    def marshal_load(attributes)
+      @attributes = attributes
+      freeze
+    end
+
+    def initialize_copy(source)
+      super.freeze
+    end
+  end
+end

data/lib/polyfill/data/version.rb

@@ -2,6 +2,6 @@
 
 module Polyfill
   module Data
-    VERSION = "1.0.4"
+    VERSION = "1.0.6"
   end
 end

data/test/test_data.rb

@@ -269,4 +269,25 @@ class TestData < Minitest::Test
 
     assert_equal(Data::Measure, klass)
   end
+
+  def test_member_precedence
+   name_mod = Module.new do
+      def name
+        "default name"
+      end
+
+      def other
+        "other"
+      end
+    end
+
+    klass = Data.define(:name) do
+      include name_mod
+    end
+
+    data = klass.new("test")
+
+    assert_equal("test", data.name)
+    assert_equal("other", data.other)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyfill-data
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.6
 platform: ruby
 authors:
 - Jim Gay
@@ -34,7 +34,7 @@ cert_chain:
   dxkiKqcX+yzo9RJLD9l/E1AWX125r1Fhiif4l6ehdl7Vllc3NQUOm1abdmHtCYjw
   dG3yPWBWzzN4ovoBRqsuTJbF1wjkCjl5ex5KhfYbeDc=
   -----END CERTIFICATE-----
-date: 2023-01-22 00:00:00.000000000 Z
+date: 2023-11-25 00:00:00.000000000 Z
 dependencies: []
 description: Add the ruby 3.2 Data class to older rubies. Do nothing in 3.2
 email:
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.5
 signing_key:
 specification_version: 4
 summary: Add the ruby 3.2 Data class to older rubies