lab42_data_class 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5eeca60436c025c569f2b33678f4a52da196c909d8292de9fe1e1226aac9567
-  data.tar.gz: cd593944b7fb98dc0150ec2876a70c25f4afc23bb0afe0dffc1af437e81f1fdc
+  metadata.gz: 447747114cf7e2577b5a36da76f39dbc7ffe7e2935bb573d697878a1e4fc77bb
+  data.tar.gz: 5413ab67f94a9a1fb231043c9f6cc3229e8a57c89dab94572d546f1b97476550
 SHA512:
-  metadata.gz: 99a0f3bb88fc1f6cdcd67292da3822cb62f911d8e8970cf481db8389d1ec5751e556356c66616f68989842748a84069c913db8420a4bc97521188016036b5947
-  data.tar.gz: 1ccda21d84aea6275132aa86f50cc8ed98415dc79f806f4abe5736b73ab6e6604d861120644072e089ba8810243018e2c9de61a594e2b0fbeed6cb302c7a8afb
+  metadata.gz: c96c9b135d4be1c05ef413e8623982e6f7896b73c85cb538945fc5af4b4f1686deea02800d6c8a6f9325d212b71dbe8c07f35c1b3e6613308ae71aa9d38df373
+  data.tar.gz: 5d17992111e0925a44b691aa71bf4cb4cc8a35a2a2f73c4f01e3034a0ca3d91a850bde0ee15dc340342d618cbef8c3f26872ae46ddd6b9551013c591c6a782de

data/lib/lab42/data_class/constraints/attribute_setters/attribute_setter.rb

@@ -5,22 +5,27 @@ module Lab42
     module Constraints
       module AttributeSetters
         module AttributeSetter
-          attr_reader :attribute, :constraint, :instance
+          attr_reader :attribute, :constraint, :instance, :return_setter
 
           private
 
-          def initialize(attribute:, constraint:, instance:)
+          def initialize(attribute:, constraint:, instance:, return_setter: false)
             @attribute = attribute
             @constraint = constraint
             @instance = instance
+            @return_setter = return_setter
           end
 
           def _set_attr!(value)
             new_values = instance.to_h.merge(attribute => value)
-            instance.class.send(:_new_from_merge, {}, new_values)
+            instance.class.send(:_new_from_merge, {}, new_values).tap do |new_instance|
+              return return_setter ? new_instance.set(attribute, return_setter: true) : new_instance
+            end
           end
 
-          def _value = @___value__ ||= instance[attribute]
+          def _value
+            @___value__ ||= instance[attribute]
+          end
         end
       end
     end

data/lib/lab42/data_class/constraints/attribute_setters/list_of_attribute_setter.rb

@@ -18,6 +18,12 @@ module Lab42
           def cdr
             _set_attr!(_value.cdr)
           end
+
+          def set_car(value)
+            constraint.constraint.(value) or raise ConstraintError,
+                                                   "cannot set value #{value} in set(#{attribute}).cons"
+            _set_attr!(_value.cdr.cons(value))
+          end
         end
       end
     end

data/lib/lab42/data_class/constraints/setter_constraint.rb

@@ -8,13 +8,15 @@ module Lab42
 
         def setter_constraint? = true
 
-        def setter_for(attribute:, instance:)
+        def setter_for(attribute:, instance:, return_setter: false)
           attribute_setter.new(
             attribute:,
             constraint: self,
-            instance:
+            instance:,
+            return_setter:
           )
         end
+
         private
 
         def initialize(constraint:, **other)

data/lib/lab42/data_class/proxy.rb

@@ -110,6 +110,14 @@ module Lab42
         end
       end
 
+      def _define_instance_methods
+        klass.module_eval(&_define_access)
+        klass.module_eval(&_define_to_h)
+        klass.module_eval(&_define_merge)
+        klass.module_eval(&_define_set)
+        klass.module_eval(&_define_with_attribute)
+      end
+
       def _define_freezing_constructor
         proxy = self
         ->(*) do
@@ -157,10 +165,7 @@ module Lab42
 
       def _define_methods
         _define_singleton_methods(klass.singleton_class)
-        klass.module_eval(&_define_access)
-        klass.module_eval(&_define_to_h)
-        klass.module_eval(&_define_merge)
-        klass.module_eval(&_define_set)
+        _define_instance_methods
       end
 
       def _define_singleton_methods(singleton)
@@ -202,11 +207,23 @@ module Lab42
       def _define_set
         proxy = self
         ->(*) do
-          define_method :set do |attribute|
+          define_method :set do |attribute, return_setter: false|
+            setter_constraint = proxy.setter_attributes.fetch(attribute) do
+              raise UndefinedSetterError, "There is no constraint implementing a setter for attribute #{attribute}"
+            end
+            setter_constraint.setter_for(attribute:, instance: self, return_setter:)
+          end
+        end
+      end
+
+      def _define_with_attribute
+        proxy = self
+        ->(*) do
+          define_method :with_attribute do |attribute, &blk|
             setter_constraint = proxy.setter_attributes.fetch(attribute) do
               raise UndefinedSetterError, "There is no constraint implementing a setter for attribute #{attribute}"
             end
-            setter_constraint.setter_for(attribute:, instance: self)
+            blk.(setter_constraint.setter_for(attribute:, instance: self, return_setter: true)).instance
           end
         end
       end

data/lib/lab42/data_class/version.rb

@@ -2,7 +2,7 @@
 
 module Lab42
   module DataClass
-    VERSION = "0.8.3"
+    VERSION = "0.8.4"
   end
 end
 #  SPDX-License-Identifier: Apache-2.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lab42_data_class
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Robert Dober
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-08 00:00:00.000000000 Z
+date: 2022-03-09 00:00:00.000000000 Z
 dependencies: []
 description: |
   An Immutable DataClass for Ruby