polyfill-data 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e9e19a876c3cbc13a20fb597baa45c3a5a17938c20b6cee2853facfbba5381
-  data.tar.gz: 9e64aea3b7c8a184a5887645ed4755268344a417a05676b96d51a6f9e16314ca
+  metadata.gz: 20b2218a1dd7298ead1e7bd8f08502558a2828f7aef9a5be33424084bd2d1c9b
+  data.tar.gz: fc1c0a53cab242883ffcae75f523a959e5a9b273c14f9e8fd334f5db78875802
 SHA512:
-  metadata.gz: 25002a3731483f15d8a2ddb33ec15a3b023fe92188b29587b4c1155a364c759dd499cd60af701169440c1666852e72959c9403ef69505febb445db71c83feab9
-  data.tar.gz: 869b512afad6f1e9b8c0d45300ebf69a0bee3ac95cd9fa5763c171866cbde0a0f89664da53fc2a5b840beb9f15950bb686ac85d905a2b4562164c70537fbdaf5
+  metadata.gz: 9291cd87f95c34b47e5a32f87bffa79f5eca7d0419c1fc741ee88ca3e3518a7435b63c827db569a2960b7fb3d516a408058db3a7fbde49f2dc1328d8dcc5109d
+  data.tar.gz: df56331c22ecc1ce85aaf5f2e743230b944f07298b1fdc248a337c3731628152f5fffc699d4eaa6ca3490767ff71ab23ea5cb98bbe9dd3f778fbe525c46e9807

data/CHANGELOG.md

@@ -5,6 +5,20 @@ 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.3
+
+### Fixed
+
+- `new` correctly raises ArugmentErrors with incorrect arguments on Data subclasses
+
+## 1.0.2
+
+### Fixed
+
+- freeze after initializing
+- `to_a` removed
+- `deconstruct` fixed to return array in order of members as defined
+
 ## 1.0.1
 
 ### Added 

data/lib/data.rb

@@ -23,18 +23,16 @@ else
       klass.define_singleton_method(:members) { args.map{ _1.intern } }
 
       klass.define_singleton_method(:new) do |*new_args, **new_kwargs, &block|
-        arg_comparison = new_kwargs.any? ? new_kwargs.keys : new_args
-        if arg_comparison.size != args.size
-          raise ArgumentError
+        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|
-          args_to_hash = if !new_kwargs.any?
-            Hash[members.take(new_args.size).zip(new_args)]
-          else
-            new_kwargs
-          end
-          instance.send(:initialize, **args_to_hash, &block)
-        end
+          instance.send(:initialize, **init_kwargs, &block)
+        end.freeze
       end
       class << klass
         alias_method :[], :new
@@ -57,11 +55,22 @@ else
     end
 
     def initialize(**kwargs)
-      @attributes = 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
-      to_a
+      @attributes.values
     end
 
     def deconstruct_keys(array)
@@ -71,10 +80,6 @@ else
       @attributes.slice(*array)
     end
 
-    def to_a
-      @attributes.values
-    end
-
     def to_h(&block)
       @attributes.to_h(&block)
     end
@@ -102,7 +107,7 @@ else
     alias_method :to_s, :inspect
 
     def with(**kwargs)
-      self.class.new(*@attributes.merge(kwargs).values)
+      self.class.new(**@attributes.merge(kwargs))
     end
   end
 end

data/lib/polyfill/data/version.rb

@@ -2,6 +2,6 @@
 
 module Polyfill
   module Data
-    VERSION = "1.0.1"
+    VERSION = "1.0.3"
   end
 end

data/test/test_data.rb

@@ -86,7 +86,7 @@ class TestData < Minitest::Test
         super(foo: 1, bar: 2) # so we can experiment with passing wrong numbers of args
       end
     end
-    # require 'debug'; debugger
+
     assert_equal([[], {foo: 1, bar: 2}], klass.new(foo: 1, bar: 2).passed)
 
     # Positional arguments are converted to keyword ones
@@ -118,8 +118,10 @@ class TestData < Minitest::Test
     assert_equal({foo: 1}, test.deconstruct_keys(%i[foo baz]))
     assert_raises(TypeError) { test.deconstruct_keys(0) }
 
+    test = klass.new(bar: 2, foo: 1)
     assert_equal([1, 2], test.deconstruct)
-    assert_equal([1, 2], test.to_a)
+
+    assert_predicate(test, :frozen?)
 
     assert_kind_of(Integer, test.hash)
   end

metadata

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