lab42_data_class 0.8.1 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6534869faa807d9d3f774d0fd1deef2d12d23475f06ab07208a46f7ef998056b
-  data.tar.gz: f099a45edac8b2daf5d0637e7345ba3301c1ac379f2d0f4319b34172f847e431
+  metadata.gz: 447747114cf7e2577b5a36da76f39dbc7ffe7e2935bb573d697878a1e4fc77bb
+  data.tar.gz: 5413ab67f94a9a1fb231043c9f6cc3229e8a57c89dab94572d546f1b97476550
 SHA512:
-  metadata.gz: 005cd3a1d4a52bfabaa371fb36769bce9530ed061d331f0009d39342a5af70c9126373eda6164471c0a58a14e27039261568439d40742b35b18e426b1fa61733
-  data.tar.gz: ed3c5a31cc163448ba912e76284946c0f4ed47bd7b2ee3841e7e5918ad350f5763656da819bea96826da614285de7b981092ae4ee924dce574e638dd684919af
+  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/constraint.rb

@@ -7,8 +7,12 @@ module Lab42
       class Constraint
         attr_reader :name, :function
 
-        def call(value) = function.(value)
+        def call(value)
+          function.(value)
+        end
+
         def setter_constraint? = false
+        def to_proc = function
         def to_s = "Constraint<#{name}>"
 
         private

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/constraints/maker.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "lab42/data_class/constraints/constraint"
+require_relative "../../constraints/constraint"
 module Lab42
   module DataClass
     class Proxy

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

@@ -5,9 +5,9 @@ module Lab42
   module DataClass
     class Proxy
       module Constraints
-        def check_constraints_against_defaults(constraints)
+        def check_constraints_against_defaults
           errors = constraints
-                   .map(&_check_constraint_against_default)
+                   .flat_map(&_check_constraint_against_default)
                    .compact
           raise ConstraintError, errors.join("\n\n") unless errors.empty?
         end
@@ -19,7 +19,7 @@ module Lab42
                   "constraints cannot be defined for undefined attributes #{errors.inspect}"
           end
 
-          check_constraints_against_defaults(constraints)
+          check_constraints_against_defaults
         end
 
         private
@@ -32,9 +32,11 @@ module Lab42
           end
         end
 
-        def _check_constraint_against_default_value(attr, value, constraint)
-          unless Maker.make_constraint(constraint).(value)
-            "default value #{value.inspect} is not allowed for attribute #{attr.inspect}"
+        def _check_constraint_against_default_value(attr, value, constraints)
+          constraints.map do |constraint|
+            unless constraint.(value)
+              "default value #{value.inspect} is not allowed for attribute #{attr.inspect}"
+            end
           end
         rescue StandardError => e
           "constraint error during validation of default value of attribute #{attr.inspect}\n  #{e.message}"

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.1"
+    VERSION = "0.8.4"
   end
 end
 #  SPDX-License-Identifier: Apache-2.0

data/lib/lab42/list.rb

@@ -7,27 +7,44 @@ module Lab42
     include Enumerable
     attr_reader :car, :cdr, :length
 
-    def ==(other) =
+    def ==(other)
       self.class.list?(other) &&
         length == other.length &&
         car == other.car &&
         cdr == other.cdr
+    end
 
-    def cadr = cdr.car
+    def cadr
+      cdr.car
+    end
 
-    def caddr = cdr.cdr.car
+    def caddr
+      cdr.cdr.car
+    end
 
-    def cddr = cdr.cdr
+    def cddr
+      cdr.cdr
+    end
 
-    def cdddr = cdr.cdr.cdr
+    def cdddr
+      cdr.cdr.cdr
+    end
 
-    def cons(new_head) = self.class.cons(new_head, self)
+    def cons(new_head)
+      self.class.cons(new_head, self)
+    end
 
-    def deconstruct = [car, cdr]
+    def deconstruct
+      [car, cdr]
+    end
 
-    def each(&blk) = self.class.each(self, &blk)
+    def each(&blk)
+      self.class.each(self, &blk)
+    end
 
-    def empty? = false
+    def empty?
+      false
+    end
   end
 end
 # SPDX-License-Identifier: Apache-2.0

data/lib/lab42/nil.rb

@@ -4,10 +4,25 @@ module Lab42
   module Nil
     extend self, Enumerable
 
-    def deconstruct = []
-    def each = self
-    def empty? = true
-    def length = 0
+    def deconstruct
+      []
+    end
+
+    def each
+      self
+    end
+
+    def empty?
+      true
+    end
+
+    def length
+      0
+    end
+
+    def cons(new_head)
+      List.cons(new_head, self)
+    end
   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.1
+  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