evt-schema 2.3.1.6 → 2.5.0.0.pre.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d2604faa3a43356561c9c0ccaf6ef63550d3351d79a6f4f032acf62b4ebb6d0
-  data.tar.gz: 4e93fb8a36bb8fb3de0220c08450b56254a14ef3447ea242a9d09774e4bb3ba0
+  metadata.gz: 81b342195e97b5f56c9763504e915f97a56e3f22f8f789b2d8dfd9a55eb62afb
+  data.tar.gz: bc242d36979dc1f82223cabced500fd62f289c915f4b925346eb97c9f6d2792e
 SHA512:
-  metadata.gz: 4d6b5342a2df666e0fcbe3e1d3c25afd67a2854b1f1e46c02fc836c92f94568e3df6a9da492dd0d8f50ef4b4b0c6393175056aba8bb8ed2faa07d1115cd926df
-  data.tar.gz: 6bd8e4673db5859e8b29a2b587afe94a1faf55966c52683f5d5e3a64ee18f0ebb036eff3516a48a385988e1e18ca8645955023ebdf1d42a236e54aceeaba564c
+  metadata.gz: 4f396482f4fca9cfb7210123bfcda0ea426f4a36d7bc8ac5616029b3d99daab19a89d865e2595e8d565c87cea947850e79963910f81d07bac3f6b671b5e895a1
+  data.tar.gz: 7d5736df27d4f8a607bb870a93d61f5ae37e8ab1e480234c92c580f3af072b1e3cd72c67e5e3de783012128deb0039950c79a2606ce85e63a339cc9c513b387d

data/lib/schema/controls/schema.rb

@@ -119,25 +119,9 @@ module Schema
         end
 
         class Example
-          include ::Schema
-          attribute :some_attribute, default: 'some default value'
-          attribute :some_other_attribute
-        end
-
-        class Primitive
-          include ::Schema
-          attribute :some_attribute, default: 11
-          attribute :some_other_attribute
-        end
-
-        class Proc
           include ::Schema
           attribute :some_attribute, default: proc { 'some default value' }
-        end
-
-        class ObjectReference
-          include ::Schema
-          attribute :some_attribute, default: []
+          attribute :some_other_attribute
         end
       end
 
@@ -152,13 +136,27 @@ module Schema
           include ::Schema
           attribute :some_attribute, SomeType
         end
+      end
 
-        module Strict
-          class Example
-            include ::Schema
-            attribute :some_attribute, SomeType, strict: true
+      module Check
+        def self.check
+          lambda do |type, value|
+            value == Check.valid_some_attribute
           end
         end
+
+        def self.valid_some_attribute
+          "some-valid-value"
+        end
+
+        def self.invalid_some_attribute
+          "some-invalid-value"
+        end
+
+        class Example
+          include ::Schema
+          attribute :some_attribute, check: Check.check
+        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,56 +25,45 @@ 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
+    def attribute_macro(attribute_name, type=nil, default: nil, check: nil)
+      check ||= Defaults.check
 
-      if type == Boolean
-        strict ||= true
-
-        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
+      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}"
         end
       end
 
-      initialize_value = nil
-      if default.is_a? Proc
+      if default.nil?
+        initialize_value = nil
+      elsif default.respond_to?(:call)
         initialize_value = default
-      elsif !default.nil?
-        initialize_value = proc { default.clone }
+      else
+        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: check, &initialize_value)
+      ::Attribute::Define.(self, attribute_name, :accessor, check: attribute_check, &initialize_value)
 
-      attribute = attributes.register(attribute_name, type, strict)
+      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
+        end
+      end
+    end
   end
 
   module Attributes
@@ -134,16 +123,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)

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-schema
 version: !ruby/object:Gem::Version
-  version: 2.3.1.6
+  version: 2.5.0.0.pre.1
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-21 00:00:00.000000000 Z
+date: 2024-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-attribute
@@ -115,6 +115,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 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Primitives for schema and data structure