vident 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1ead61d39ae1b70058a4002d6b3ed7ad4baade0d03ccaa6f2501ba20ac028b5
-  data.tar.gz: bbebb2b863ee0e1b734dc50c6a03015e0375a28a43004f9f4954c681acd954ca
+  metadata.gz: eb36bbcf0d3a46ec51c1a68e80dbf0ef4b85076412591d30215779d1ff2816e8
+  data.tar.gz: 6c4b6f98a4ac9bcbebaea4003a6532231a2e188aa94ec34889f4c1c624c9ae46
 SHA512:
-  metadata.gz: 1ac922f2933bd655a2aa69ca5fbeb4bb05bb6ac8277a7bb0c7e6a85c6329aebe0dcc63b0fcdf5a03c29b775348044c536d9f460c6006a43b5190418cc47d23f2
-  data.tar.gz: 26f4db0079c735b6df0fa26aca20e96a564e24d07dca71b6a1396ea95a86993ef8a99209df6bdfd1be618dfa8f6933281e1506318ad2fb592ce42e47b0456ba7
+  metadata.gz: 6ccf024bee94cccffccc5b8cf7999b0b1b2e47c1a4185ab2f5a2f5129b7494d66cdde1d7d8ee8364123386dedd3f1f15ae60c27798db73cea3be4f22f68b24f6
+  data.tar.gz: f09643a2d324a23012b5466b6bd7ad4a205f21238441891557a8d60d5a71860f5a64e866366bdb63744a62f6d7efed53bdfcb17f5711eab54e35675cefd60f88

data/lib/vident/attributes/typed.rb

@@ -96,12 +96,12 @@ if Gem.loaded_specs.has_key? "dry-struct"
             options[:delegates] != false
           end
 
-          def define_on_schema(name, type_info, options)
+          def define_on_schema(attribute_name, type_info, options)
             @attribute_ivar_names ||= {}
-            @attribute_ivar_names[name] = :"@#{name}"
-            define_attribute_delegate(name) if delegates?(options)
-            @schema ||= Class.new(Vident::Attributes::TypedNilingStruct)
-            @schema.attribute name, type_info
+            @attribute_ivar_names[attribute_name] = :"@#{attribute_name}"
+            define_attribute_delegate(attribute_name) if delegates?(options)
+            @schema ||= const_set("TypedSchema", Class.new(Vident::Attributes::TypedNilingStruct))
+            @schema.attribute attribute_name, type_info
           end
 
           def define_attribute_delegate(attr_name)
@@ -135,10 +135,9 @@ if Gem.loaded_specs.has_key? "dry-struct"
             type, subtype = extract_member_type_and_subclass(signature, options)
             dry_type = dry_type_from_primary_type(type, strict, converter)
             if subtype && dry_type.respond_to?(:of)
+              subtype_info = dry_type_from_primary_type(subtype, strict, converter)
               # Sub types of collections currently can be nil - this should be an option
-              dry_type.of(
-                map_primitive_to_dry_type(subtype, options, converter).optional.meta(required: false)
-              )
+              dry_type.of(subtype_info.optional.meta(required: false))
             else
               dry_type
             end

data/lib/vident/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vident
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vident
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Stephen Ierodiaconou
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-24 00:00:00.000000000 Z
+date: 2023-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport