lab42_checked_class 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff1daba1d7c01bd5f4af095171c104f71fdaa6d180659ebdf6fdbb86a6f9c6e9
-  data.tar.gz: ac04957601c51e0a505dfb2621a5f44ff3664aeb09a0e00d412fba45de71bc33
+  metadata.gz: 010c1b5675022a9214b591ff4a4516928d5a55019c2203fadf75b6206a3fa744
+  data.tar.gz: b9b6e7396a49f3fe5b2e29734623108112556095a8b13d3086b42e94d987166c
 SHA512:
-  metadata.gz: cae9380f7d40546c63af28f0abdb59bca958298208cc9b9ec39b1d0ca93acbdfd3eeec642af53e9eeceae9c75259abe79ce7b313dd6be33e6a4d52da7c94755c
-  data.tar.gz: a57c32b8094f45501ca71c7bbcf77fa3880732ecadcff5b56ce44a50df824b458cdc6ba4a391c2f12ce58dc32416776b833e0d9ca1f6ab1b159716bf17aead7d
+  metadata.gz: c128e03d74d01e824ba153e5d21a2dee18035c0953b1f4ccea9f346fdcbe0f57bf83ec7815c7e83559e72e2c0174ce4b0bcdb0a5d1d0b0da1e813beacb61eece
+  data.tar.gz: 8e4ddb87d4b4dfa542c76fb5c8a91203fdd6bb99b598d67575692dd2003d0e96007d8ae0063f275a97518b587d703a954142530cc8c76c9deb234ae0e558cf16

data/README.md

@@ -69,11 +69,11 @@ Then we will get them loaded
 ```ruby
   expected_output = <<~EOT
   #{ENV["PWD"]}/lib/lab42/checked_class/all.rb:5: warning: already initialized constant CheckedClass
-  #{ENV["PWD"]}/spec/spec_helper.rb:36: warning: previous definition of CheckedClass was here
+  #{ENV["PWD"]}/spec/spec_helper.rb:38: warning: previous definition of CheckedClass was here
   #{ENV["PWD"]}/lib/lab42/checked_class/all.rb:6: warning: already initialized constant Constraint
-  #{ENV["PWD"]}/spec/spec_helper.rb:37: warning: previous definition of Constraint was here
+  #{ENV["PWD"]}/spec/spec_helper.rb:39: warning: previous definition of Constraint was here
   #{ENV["PWD"]}/lib/lab42/checked_class/all.rb:7: warning: already initialized constant ConstraintError
-  #{ENV["PWD"]}/spec/spec_helper.rb:38: warning: previous definition of ConstraintError was here
+  #{ENV["PWD"]}/spec/spec_helper.rb:40: warning: previous definition of ConstraintError was here
   EOT
   expect {
     require 'lab42/checked_class/all'
@@ -89,10 +89,10 @@ Given a checked class
         attr :a # No constraints, no defaults
         attr b: 42 # No constraints, but a default
         attr :c, Integer # Constraint, no default
-        attr(d: 1) { it > 0 } # Constraint and default 
+        attr(d: 1) { it > 0 } # Default and block constraint
         attr(:e, :even?) # Symbolic constraint, no default
         attr(:f) { (it % 10).zero? } # Block constraint, no default
-        attr(g: 2) { it > 1 } # Block Constraint and default
+        attr(:g, [:>, 1], default: 2) # Default and functional constraint
 
         # Named constraint
         constrain("a + b > e") { it.a + it.b > it.e }   

data/lib/lab42/checked_class/constraint.rb

@@ -7,7 +7,7 @@ module Lab42
 
 
       def check(subject)
-        subject = @attr ? subject[@attr] : subject
+       subject = @attr ? subject[@attr] : subject
         return nil if @constraint.(subject)
 
         @name
@@ -28,18 +28,14 @@ module Lab42
 
       def _mk_constraint(constraint, name, &blk)
         case constraint
-        in Symbol
-          constraint.to_proc
-        in [Symbol, *] => args
-          -> { it.send(*args) }
-        in Module
-          -> { constraint === it }
+        in Proc
+          constraint
         in [Predefined, blk, name]
           @name = [name, @name].join(' ')   
           blk
         in nil
           blk
-        in _
+        else
           raise ArgumentError, "Type Error for constraint of attr #{name.inspect}; must be a Module, Symbol, or an array starting with a Symbol, but was #{constraint.inspect}"
         end
       end

data/lib/lab42/checked_class/proxy.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'ex_aequo/base/fn'
+require 'ex_aequo/base/to_proc'
+
 require_relative 'constraint'
 require_relative 'constraint_checker'
 require_relative 'injector'
@@ -7,6 +10,7 @@ require_relative 'injector'
 module Lab42
   module CheckedClass
     class Proxy
+      Fn = ExAequo::Base::Fn
       None = Object.new.freeze
 
       attr_reader :klass
@@ -26,22 +30,27 @@ module Lab42
         @klass = klass
       end
 
-      def attr(att, *args, &blk)
-        if Hash === att 
-          raise ArgumentError, "attr definition with default does not support symbolic constraints" unless args.empty?
-          raise ArgumentError, "only one attribute can be defined with defaults, not #{att.keys.inspect}" if att.size != 1
-
-          return _define_att(att.keys.first, default: att.values.first, &blk)
-        end
-
-        raise ArgumentError, "attributes must be symbols, not: #{att.inspect}" unless Symbol === att
-
-        if args.empty?
-          return _define_att(att, &blk)
+      def attr(*args, &block)
+        case [block, *args]
+        in [constraint, Symbol => name]
+          _def_undefaulted_attr(name:, constraint:)
+        in [nil, Symbol => name, fun]
+          constraint = _make_fun_or_constraint(fun)
+          _def_undefaulted_attr(name:, constraint:)
+        in [constraint, Symbol => name, {default:, **nil}]
+          _def_defaulted_attr(name:, constraint:, default:)
+        in [default, Symbol => name, fun]
+          constraint = _make_fun_or_constraint(fun)
+          _def_defaulted_attr(name:, default: default.(), constraint:)
+        in [constraint, Hash => arg]
+          _def_defaulted_attr(name: arg.keys.first, default: arg.values.first, constraint:)
+        in [nil, Symbol => name, fun, {default:, **nil}]
+          constraint = _make_fun_or_constraint(fun)
+          _def_defaulted_attr(name:, default:, constraint:)
+        in [_, Symbol => name, _, {default:, **nil}]
+          raise ArgumentError, "functional constraint default kwd and block"
         else
-          raise ArgumentError, "must not define symbolic and functional constraint" if @blk
-
-          _define_att(att, args.first)
+          raise ArgumentError, "too many arguments"
         end
       end
 
@@ -70,12 +79,24 @@ module Lab42
         attr(name, *a, **k, &b)
       end
 
-      def _define_att(name, constraint = nil, default: None, &blk)
+      def _def_defaulted_attr(name:, constraint:, default:)
         _attributes << name
+        _defaults[name] = default
+        _constraints[name] = Constraint.new(attr: name, constraint:) if constraint
+      end
+
+      def _def_undefaulted_attr(name:, constraint:)
+        _attributes << name
+        _constraints[name] = Constraint.new(attr: name, constraint:) if constraint
+      end
 
-        # allow nil default to avoid implicit nil defaults
-        _defaults[name] = default unless default == None
-        _constraints[name] = Constraint.new(attr: name, constraint:, &blk) if constraint || blk
+      def _make_fun_or_constraint(fun)
+        case fun
+        in [c, *] if Constraint == c
+          fun
+        else
+          Fn.mk_fun(fun)
+        end
       end
 
       def _attributes

data/lib/lab42/checked_class/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Lab42
   module CheckedClass
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end
 # SPDX-License-Identifier: AGPL-3.0-or-later

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: lab42_checked_class
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Robert Dober
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
-dependencies: []
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: ex_aequo_base
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.17
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.17
 description: 'Mutable classes with constraints and lots of boilerplate code removal.
 
   '
@@ -42,14 +56,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.4.1
+      version: 3.4.5
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.8
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Mutable classes with constraints and lots of boilerplate code removal.
 test_files: []