evt-schema 2.5.0.0.pre.1 → 2.5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81b342195e97b5f56c9763504e915f97a56e3f22f8f789b2d8dfd9a55eb62afb
-  data.tar.gz: bc242d36979dc1f82223cabced500fd62f289c915f4b925346eb97c9f6d2792e
+  metadata.gz: b7f39ba650c62ee4bf0f2de29183ab17eb1425d770f56d098584d744d6d6cb02
+  data.tar.gz: d0474a2e4d66b03ef4424a06fab9ecb0683570ff55bdd928895717cd238fd59f
 SHA512:
-  metadata.gz: 4f396482f4fca9cfb7210123bfcda0ea426f4a36d7bc8ac5616029b3d99daab19a89d865e2595e8d565c87cea947850e79963910f81d07bac3f6b671b5e895a1
-  data.tar.gz: 7d5736df27d4f8a607bb870a93d61f5ae37e8ab1e480234c92c580f3af072b1e3cd72c67e5e3de783012128deb0039950c79a2606ce85e63a339cc9c513b387d
+  metadata.gz: 3fb7c6d8ca133bd24cb212430e488a8dfbdf2e794cfc35addb7a186e1b1e9febbeaf70bfed375153fd8dda5cc216d6fc6f53f4135e2a1504da29c73a835e2383
+  data.tar.gz: dfd3e8e2e47d6dfbe0f064926f9b6fac9b26cfa0ece8956f1ecb5dda7fe6cf4dc1a1b45dadacea386c95adbef2b29edb63f392afd916eb4eee9c1d1adb84859e

data/lib/schema/controls/schema.rb

@@ -138,13 +138,7 @@ module Schema
         end
       end
 
-      module Check
-        def self.check
-          lambda do |type, value|
-            value == Check.valid_some_attribute
-          end
-        end
-
+      module TypeCheck
         def self.valid_some_attribute
           "some-valid-value"
         end
@@ -153,9 +147,17 @@ module Schema
           "some-invalid-value"
         end
 
+        class ExampleType
+          module TypeCheck
+            def self.call(type, value)
+              value == Schema::TypeCheck.valid_some_attribute
+            end
+          end
+        end
+
         class Example
           include ::Schema
-          attribute :some_attribute, check: Check.check
+          attribute :some_attribute, ExampleType
         end
       end
 

data/lib/schema/schema.rb

@@ -25,12 +25,12 @@ module Schema
   end
 
   module AttributeMacro
-    def attribute_macro(attribute_name, type=nil, default: nil, check: nil)
-      check ||= Defaults.check
+    def attribute_macro(attribute_name, type=nil, default: nil)
+      type_check = TypeCheck.get(type)
 
-      attribute_check = lambda do |val|
-        if not check.(type, val)
-          raise Schema::Attribute::TypeError, "#{val.inspect} of type #{val.class.name} cannot be assigned to attribute #{attribute_name.inspect} of #{self.to_s}"
+      check = lambda do |val|
+        if not type_check.(type, val)
+          raise Schema::Attribute::TypeError, "#{val.inspect} of type #{val.class.name} cannot be assigned to #{self.to_s} attribute #{attribute_name.inspect} of type #{type.name}"
         end
       end
 
@@ -42,25 +42,30 @@ module Schema
         raise Schema::Attribute::Error, "Default values must be callable, like procs, lambdas, or objects that respond to the call method (Attribute: #{attribute_name})"
       end
 
-      ::Attribute::Define.(self, attribute_name, :accessor, check: attribute_check, &initialize_value)
+      ::Attribute::Define.(self, attribute_name, :accessor, check: check, &initialize_value)
 
       attribute = attributes.register(attribute_name, type)
       attribute
     end
     alias :attribute :attribute_macro
 
-    module Defaults
-      def self.check
-        lambda do |type, val|
-          return true if val.nil?
-
-          if type == Boolean
-            Boolean.(val)
-          elsif !type.nil?
-            val.is_a?(type)
-          else
-            true
-          end
+    module TypeCheck
+      def self.call(type, val)
+        return true if val.nil?
+        return true if type.nil?
+
+        val.is_a?(type)
+      end
+
+      def self.get(type)
+        return self if type.nil?
+
+        result = Reflect.(type, :TypeCheck, ancestors: true, strict: false)
+
+        if not result.nil?
+          return result.constant
+        else
+          return self
         end
       end
     end
@@ -148,8 +153,12 @@ module Schema
   end
 
   module Boolean
-    def self.call(val)
-      val == true || val == false
+    module TypeCheck
+      def self.call(type, val)
+        return true if val.nil?
+
+        val == true || val == false
+      end
     end
   end
 

data/lib/schema.rb

@@ -3,6 +3,7 @@ require 'set_attributes'
 require 'initializer'
 require 'validate'
 require 'template_method'
+require 'reflect'
 
 require 'schema/schema'
 require 'schema/schema/compare/comparison'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-schema
 version: !ruby/object:Gem::Version
-  version: 2.5.0.0.pre.1
+  version: 2.5.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-01 00:00:00.000000000 Z
+date: 2024-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-attribute
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: evt-reflect
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_bench
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Primitives for schema and data structure