lab42_data_class 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fdfa61b721a7e006b42dd59c3dc61c4f3442faaa0d50feeaa5ed4b20ea5838c
-  data.tar.gz: fa5d7ab0e6133c398caaaa1762e75a5820123e67088acc4750c36e9246ff2dc0
+  metadata.gz: 746ce73ef4464de258f683f0d8366f15799cb8e3ea34a062cc6f4deb34f0a60d
+  data.tar.gz: 96c679474b72b872f4885ab2c98f7ddfd5f914268b3a9da5ba59f7ae026e5eed
 SHA512:
-  metadata.gz: 53af67931648a621cd0ff18912ce191dc2d0a005eacfd4df741bbdf8a58a9c695e168055129c76be08efcb4810d3910a5df362512996c8d2375da6ff17b61be8
-  data.tar.gz: c65a655f447f154b1a4e7584393fe3058403ef53cf5651a51fd39e5af7ebbd88768e90dc9b8d1a7d582316a35d2786abff6c6a04cc2f445f8d725657773c9a21
+  metadata.gz: 184dc66df2185e0869a5cbce9811c8bedf685123037fadf8d17c30bfd762884b9f0d0756bc0d43787dce2586c8094bb2a798aba9b54087198b59a1a0d95023c0
+  data.tar.gz: 859c555137b976c4885157c5b39d42393c528adf94abb3dd28b9cbd3e38625d3bccac9b5cf5e317cdf3dddb08494fa989dd11523902f79402ed915822d616a64

data/lib/lab42/data_class/builtin_constraints.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+require_relative "constraint"
+require_relative "constraints/kernel"
+
+module Lab42
+  module DataClass
+    module BuiltinConstraints
+      extend self
+    end
+  end
+end
+
+# SPDX-License-Identifier: Apache-2.0

data/lib/lab42/data_class/constraint.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require "lab42/data_class"
+module Lab42
+  module DataClass
+    class Constraint
+      attr_reader :name, :function
+
+      def call(value)
+        function.(value)
+      end
+
+      def to_s
+        "Constraint<#{name}>"
+      end
+
+      private
+      def initialize(name:, function:)
+        raise ArgumentError, "name not a String, but #{name}" unless String === name
+        unless function.respond_to?(:arity) && function.arity == 1
+          raise ArgumentError, "function not a callable with arity 1 #{function}"
+        end
+
+        @name = name
+        @function = function
+      end
+    end
+  end
+end
+# SPDX-License-Identifier: Apache-2.0

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

@@ -0,0 +1,86 @@
+# frozen_string_literal: true
+
+module Kernel
+  Constraint = Lab42::DataClass::Constraint
+  Maker = Lab42::DataClass::Proxy::Constraints::Maker # TODO: Move Maker to Lab42::DataClass:ConstraintMaker
+  Anything = Constraint.new(name: "Anything", function: ->(_) { true })
+  Boolean = Constraint.new(name: "Boolean", function: -> { [false, true].member?(_1) })
+
+  def All?(constraint = nil, &blk)
+    constraint = Maker.make_constraint(constraint, &blk)
+    f = -> do
+      _1.all?(&constraint)
+    end
+    Constraint.new(name: "All?(#{constraint})", function: f)
+  end
+
+  def Any?(constraint = nil, &blk)
+    constraint = Maker.make_constraint(constraint, &blk)
+    f = -> do
+      _1.any?(&constraint)
+    end
+    Constraint.new(name: "Any?(#{constraint})", function: f)
+  end
+
+  def Choice(*constraints)
+    constraints = constraints.map{ Maker.make_constraint _1 }
+    f = ->(value) do
+      constraints.any?{ _1.(value) }
+    end
+    Constraint.new(name: "Choice(#{constraints.join(', ')})", function: f)
+  end
+
+  def Contains(str)
+    f = -> { _1.include?(str) rescue false }
+    Constraint.new(name: "Contains(#{str})", function: f)
+  end
+
+  def EndsWith(str)
+    f = -> { _1.end_with?(str) rescue false }
+    Constraint.new(name: "EndsWith(#{str})", function: f)
+  end
+
+  def Lambda(arity)
+    f = -> do
+      _1.arity == arity rescue false
+    end
+    Constraint.new(name: "Lambda(#{arity})", function: f)
+  end
+
+  def NilOr(constraint = nil, &blk)
+    constraint = Maker.make_constraint(constraint, &blk)
+    f = -> { _1.nil? || constraint.(_1) }
+    Constraint.new(name: "NilOr(#{constraint})", function: f)
+  end
+
+  def Not(constraint = nil, &blk)
+    constraint = Maker.make_constraint(constraint, &blk)
+    f = -> { !constraint.(_1) }
+    Constraint.new(name: "Not(#{constraint})", function: f)
+  end
+
+  def PairOf(fst, snd)
+    fst_constraint = Maker.make_constraint(fst)
+    snd_constraint = Maker.make_constraint(snd)
+    f = -> do
+      Lab42::Pair === _1 && fst_constraint.(_1.first) && snd_constraint.(_1.second)
+    end
+    Constraint.new(name: "PairOf(#{fst_constraint}, #{snd_constraint})", function: f)
+  end
+
+  def StartsWith(str)
+    f = -> { _1.start_with?(str) rescue false }
+    Constraint.new(name: "StartsWith(#{str})", function: f)
+  end
+
+  def TripleOf(fst, snd, trd)
+    fst_constraint = Maker.make_constraint(fst)
+    snd_constraint = Maker.make_constraint(snd)
+    trd_constraint = Maker.make_constraint(trd)
+    f = -> do
+      Lab42::Triple === _1 && fst_constraint.(_1.first) && snd_constraint.(_1.second) && trd_constraint.(_1.third)
+    end
+    Constraint.new(name: "TripleOf(#{fst_constraint}, #{snd_constraint}, #{trd_constraint})", function: f)
+  end
+end
+# SPDX-License-Identifier: Apache-2.0

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "lab42/data_class/constraint"
 module Lab42
   module DataClass
     class Proxy
@@ -7,9 +8,17 @@ module Lab42
         module Maker
           extend self
 
-          def make_constraint(constraint)
+          def make_constraint(constraint, &blk)
+            raise ArgumentError, "must not pass a callable #{constraint} and a block" if constraint && blk
+
+            _make_constraint(constraint || blk)
+          end
+
+          private
+
+          def _make_constraint(constraint)
             case constraint
-            when Proc, Method
+            when Lab42::DataClass::Constraint, Proc, Method
               constraint
             when Symbol
               -> { _1.send(constraint) }
@@ -26,8 +35,6 @@ module Lab42
             end
           end
 
-          private
-
           def _make_member_constraint(constraint)
             if constraint.respond_to?(:member?)
               -> { constraint.member?(_1) }

data/lib/lab42/data_class/proxy.rb

@@ -30,12 +30,11 @@ module Lab42
         end
       end
 
-      def check!(**params)
-        @actual_params = params
+      def check!(params, merge_with = defaults)
         raise ArgumentError, "missing initializers for #{_missing_initializers}" unless _missing_initializers.empty?
         raise ArgumentError, "illegal initializers #{_illegal_initializers}" unless _illegal_initializers.empty?
 
-        _check_constraints!(defaults.merge(params))
+        _check_constraints!(merge_with.merge(params))
       end
 
       def define_class!
@@ -63,6 +62,10 @@ module Lab42
         _init(data_class, defaults.merge(params))
       end
 
+      def set_actual_params(params)
+        @actual_params = params
+      end
+
       def to_hash(data_class_instance)
         all_attributes
           .inject({}) { |result, (k, _)| result.merge(k => data_class_instance[k]) }
@@ -96,15 +99,40 @@ module Lab42
 
       def _define_derived_attribute(name, &blk)
         ->(*) do
+          if instance_methods.include?(name)
+            begin
+              remove_method(name)
+            rescue StandardError
+              nil
+            end
+          end
           define_method(name) { blk.call(self) }
         end
       end
 
       def _define_freezing_constructor
+        proxy = self
+        ->(*) do
+          define_method :new do |**params, &b|
+            allocate.tap do |o|
+              proxy.set_actual_params(params)
+              proxy.check!(params)
+              o.send(:initialize, **params, &b)
+            end.freeze
+          end
+        end
+      end
+
+      def _define_merging_constructor
+        proxy = self
         ->(*) do
-          define_method :new do |*a, **p, &b|
-            super(*a, **p, &b).freeze
+          define_method :_new_from_merge do |new_params, params|
+            allocate.tap do |o|
+              proxy.check!(new_params, {})
+              o.send(:initialize, **params)
+            end.freeze
           end
+          private :_new_from_merge
         end
       end
 
@@ -112,7 +140,6 @@ module Lab42
         proxy = self
         ->(*) do
           define_method :initialize do |**params|
-            proxy.check!(**params)
             proxy.init(self, **params)
             proxy.validate!(self)
           end
@@ -123,7 +150,7 @@ module Lab42
         ->(*) do
           define_method :merge do |**params|
             values = to_h.merge(params)
-            self.class.new(**values)
+            self.class.send(:_new_from_merge, params, values)
           end
         end
       end
@@ -137,6 +164,7 @@ module Lab42
 
       def _define_singleton_methods(singleton)
         singleton.module_eval(&_define_freezing_constructor)
+        singleton.module_eval(&_define_merging_constructor)
         singleton.module_eval(&_define_to_proc)
         singleton.module_eval(&_define_with_constraint)
         singleton.module_eval(&_define_derived)

data/lib/lab42/data_class/version.rb

@@ -2,7 +2,7 @@
 
 module Lab42
   module DataClass
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
   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.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Robert Dober
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-28 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies: []
 description: |
   An Immutable DataClass for Ruby
@@ -24,7 +24,10 @@ files:
 - LICENSE
 - README.md
 - lib/lab42/data_class.rb
+- lib/lab42/data_class/builtin_constraints.rb
+- lib/lab42/data_class/constraint.rb
 - lib/lab42/data_class/constraint_error.rb
+- lib/lab42/data_class/constraints/kernel.rb
 - lib/lab42/data_class/duplicate_definition_error.rb
 - lib/lab42/data_class/kernel.rb
 - lib/lab42/data_class/proxy.rb
@@ -44,7 +47,7 @@ homepage: https://github.com/robertdober/lab42_data_class
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -60,7 +63,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Finally a dataclass in ruby
 test_files: []