polyfill-data 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62f13af5e73dbe544ce73a294748dee539285c7f8405ec7e68f4d2187b51364c
-  data.tar.gz: 0d4c325885a85e5ced977b50e38af25d44508d6c85a7d6e02f512a9e56d2dff8
+  metadata.gz: 159535856d8a85a17e4a90dff438911c7e3a04fcff60b1a016662f97e2575e68
+  data.tar.gz: c83127bfa5a28bd26dccfcdfbe0b095236136635c3180720cab55912a2fa9796
 SHA512:
-  metadata.gz: 73f956793df2920f6c13d564d56592c72a19327ed9451dd536c3f69a8057038775e5a02e1ec8962f85c135d588b0d54df8f337297eaf18f992e6d29ce910d6de
-  data.tar.gz: 25d0e20f500b2715c2ec352f8f2a46150832e40a9482f782450b2e0b2ebe3d9c6f78cafa19fc978b8fa78569771d22d10626b423ba71e555aa05f42112d38d03
+  metadata.gz: 2527a6f9e79192cf29d798ee4eb34059e1562690d9b9e8afd921a421b816cefe6f888273d29f6d186a42f459d35217b5639e8eca505235d72c35434fcaa07177
+  data.tar.gz: f3a3fe35c950d650a13831df4fb6eabe97eac73b6dd2f55ad518a12180d74202a30492c0fad50caa854dea57d9534bf9d60c9658be0f996f752632dd694c84e7

data/CHANGELOG.md

@@ -5,6 +5,12 @@ 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).
 
+## 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

@@ -14,7 +14,14 @@ else
 
     def self.define(*args, &block)
       raise ArgumentError if args.any?(/=/)
-      klass = ::Class.new(self, &block)
+      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
@@ -35,6 +42,7 @@ else
           instance.send(:initialize, **init_kwargs, &block)
         end.freeze
       end
+
       class << klass
         alias_method :[], :new
         undef_method :define
@@ -49,6 +57,10 @@ else
         end
       end
 
+      if arity_converter
+        klass.class_eval(&arity_converter)
+      end
+
       klass
     end
 
@@ -99,12 +111,14 @@ else
     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.join(", ")
+
+      display = ["data", self.class.name, attribute_markers].compact.join(" ")
+
+      "#<#{display}>"
     end
     alias_method :to_s, :inspect
 

data/lib/polyfill/data/version.rb

@@ -2,6 +2,6 @@
 
 module Polyfill
   module Data
-    VERSION = "1.0.4"
+    VERSION = "1.0.5"
   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.5
 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-01-24 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.2.27
 signing_key:
 specification_version: 4
 summary: Add the ruby 3.2 Data class to older rubies