evt-schema 2.4.0.0 → 2.5.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35387bf895aaceee0a8b592ba686dd1cdc24448c8bca10d7e7714f0ff55387b4
-  data.tar.gz: 8d60be6f2a80644f3fb6517d72c5d10842fc399386d509aeeb19cf051e99a61d
+  metadata.gz: 2da63ac381710f07d3eaf73c14935519846e1cf9f97ac4cbe27c472a8034af80
+  data.tar.gz: 7fa56b66b7524dda5089d1209040604f34247551d41dfc98f9497c576493114c
 SHA512:
-  metadata.gz: 712f0cc9e56c0d053226a21375336c16664b02ff8a77df029c32c01ad75c38bc02ce57bb3bcfef91ed93701a1c04e117ecb885d2da3e2e4b2da1ced3d5786cef
-  data.tar.gz: 5e403e19b077b933fc0d22783679ba3673e5afa8decc9e82dcb8d9f555222ab568241bfac3e5df6615e44d97ff1aedfb2975e0d5af6786536c76da04a4deb876
+  metadata.gz: bae6ed63b133103a875b85cbb83a89e4f5b3d051408eb7da056bf11778ee4ecc60c2cc4732bc04fa2ecf62a2dbf289be604b6f97d8e5778c777b9d8f5c8518b9
+  data.tar.gz: 0c5604d671d62e5104632d6733d481a633f6f7c79bcffcd07b59eeb976ed784a1fbacff9aa0840b989c5563aad0d16082795910616f5c5b6e8a001a907f1918f

data/lib/schema/controls/schema.rb

@@ -136,13 +136,29 @@ module Schema
           include ::Schema
           attribute :some_attribute, SomeType
         end
+      end
 
-        module Strict
-          class Example
-            include ::Schema
-            attribute :some_attribute, SomeType, strict: true
+      module TypeCheck
+        def self.valid_some_attribute
+          "some-valid-value"
+        end
+
+        def self.invalid_some_attribute
+          "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, ExampleType
+        end
       end
 
       module Boolean

data/lib/schema/schema/attribute.rb

@@ -5,12 +5,10 @@ module Schema
 
     attr_reader :name
     attr_reader :type
-    attr_reader :strict
 
-    def initialize(name, type, strict)
+    def initialize(name, type)
       @name = name
       @type = type
-      @strict = strict
     end
   end
 end

data/lib/schema/schema.rb

@@ -25,40 +25,12 @@ module Schema
   end
 
   module AttributeMacro
-    def attribute_macro(attribute_name, type=nil, strict: nil, default: nil)
-      if type.nil? && !strict.nil?
-        raise Schema::Attribute::Error, "The \"#{attribute_name}\" attribute is declared with the \"strict\" option but a type is not specified"
-      end
-
-      if type == Boolean && strict == false
-        raise Schema::Attribute::Error, "The \"#{attribute_name}\" attribute is declared with the \"strict\" option disabled but boolean type is specified"
-      end
-
-      check = nil
-
-      if type == Boolean
-        strict ||= true
+    def attribute_macro(attribute_name, type=nil, default: nil)
+      type_check = TypeCheck.get(type)
 
-        check = proc do |val|
-          unless val.nil? || Boolean.(val)
-            raise Schema::Attribute::TypeError, "#{val.inspect} of type #{val.class.name} cannot be assigned to attribute #{attribute_name.inspect} of type Boolean (Strict: #{strict.inspect})"
-          end
-        end
-      elsif !type.nil?
-        strict ||= false
-
-        check = proc do |val|
-          unless val.nil?
-            if strict
-              if not val.instance_of?(type)
-                raise Schema::Attribute::TypeError, "#{val.inspect} of type #{val.class.name} cannot be assigned to attribute #{attribute_name.inspect} of type #{type.name} (Strict: #{strict.inspect})"
-              end
-            else
-              if not val.is_a?(type)
-                raise Schema::Attribute::TypeError, "#{val.inspect} of type #{val.class.name} cannot be assigned to attribute #{attribute_name.inspect} of type #{type.name} (Strict: #{strict.inspect})"
-              end
-            end
-          end
+      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 attribute #{attribute_name.inspect} of #{self.to_s}"
         end
       end
 
@@ -72,10 +44,31 @@ module Schema
 
       ::Attribute::Define.(self, attribute_name, :accessor, check: check, &initialize_value)
 
-      attribute = attributes.register(attribute_name, type, strict)
+      attribute = attributes.register(attribute_name, type)
       attribute
     end
     alias :attribute :attribute_macro
+
+    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
   end
 
   module Attributes
@@ -135,16 +128,15 @@ module Schema
       entries.each_with_object(obj, &action)
     end
 
-    def add(name, type, strict=nil)
-      strict ||= false
-      attribute = Schema::Attribute.new(name, type, strict)
+    def add(name, type)
+      attribute = Schema::Attribute.new(name, type)
       entries << attribute
       attribute
     end
 
-    def register(name, type, strict=nil)
+    def register(name, type)
       remove(name)
-      add(name, type, strict)
+      add(name, type)
     end
 
     def remove(name)
@@ -161,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/scratch.rb

@@ -0,0 +1,50 @@
+Foo.build
+
+-> transform_read({})
+
+
+
+
+
+
+
+
+
+class Thing
+  attribute :some_attribute, String
+  attribute :some_object, SomeClass
+
+  def self.transform_read(data)
+    some_object_data = data[:some_object] # => nil or some hash
+
+    if not some_object_data.nil?
+      foo_data = some_object_data[:foo] # => Error
+    end
+
+    some_object = SomeClass.build(some_object_data)
+
+    data[:some_object] = some_object
+  end
+end
+
+class SomeClass
+  attribute :foo
+end
+
+
+data = {}
+thing = Thing.build(data)
+
+build(data) -> transform_read(data) # Rem: data is empty
+
+
+
+
+
+
+
+thing = data[:some_atttribute] 
+# => nil
+
+thing.other_thing
+# => nil reference error

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.4.0.0
+  version: 2.5.0.0.pre.2
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-29 00:00:00.000000000 Z
+date: 2024-10-11 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
@@ -115,6 +129,7 @@ files:
 - lib/schema/schema/compare.rb
 - lib/schema/schema/compare/comparison.rb
 - lib/schema/schema/compare/comparison/entry.rb
+- lib/schema/scratch.rb
 - lib/schema/validation/error.rb
 - lib/schema/validation/nil_attributes.rb
 homepage: https://github.com/eventide-project/schema
@@ -136,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Primitives for schema and data structure