vident 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24963e09fb8ecd09d22f1254eecc8f2d8bf255123e92976f12d224531003b42a
-  data.tar.gz: 3b280628d9aa0ee62ad7b92b5ea58e628d3817e74567cfafb4ef22eadedd707e
+  metadata.gz: eb36bbcf0d3a46ec51c1a68e80dbf0ef4b85076412591d30215779d1ff2816e8
+  data.tar.gz: 6c4b6f98a4ac9bcbebaea4003a6532231a2e188aa94ec34889f4c1c624c9ae46
 SHA512:
-  metadata.gz: fe03e658c1d0ca0e537b66cf465c9628566507053aaf7fbd2d03125a98c1f5f829a1a7c51fb2751314aa38648f3119337ebfa2df932d462dd4e2ab31a235b730
-  data.tar.gz: 100fb3cbe9fce6cb5083ebd95237796f57d73f44a02385e274d0e433763c0037cbad8d257994aa059e5ab6e137fb781309ea24f2cf277e22ec59f79d3f370343
+  metadata.gz: 6ccf024bee94cccffccc5b8cf7999b0b1b2e47c1a4185ab2f5a2f5129b7494d66cdde1d7d8ee8364123386dedd3f1f15ae60c27798db73cea3be4f22f68b24f6
+  data.tar.gz: f09643a2d324a23012b5466b6bd7ad4a205f21238441891557a8d60d5a71860f5a64e866366bdb63744a62f6d7efed53bdfcb17f5711eab54e35675cefd60f88

data/lib/vident/attributes/typed.rb

@@ -13,6 +13,8 @@ if Gem.loaded_specs.has_key? "dry-struct"
       module Typed
         extend ActiveSupport::Concern
 
+        # TODO: better handling of when either class.schema is undefined (as no attributes configured) or when
+        # other methods ar called before prepare_attributes is called
         def prepare_attributes(attributes)
           @__attributes = self.class.schema.new(**attributes)
         end
@@ -58,32 +60,34 @@ if Gem.loaded_specs.has_key? "dry-struct"
 
           attr_reader :schema, :attribute_ivar_names
 
-          def attribute(name, type = :any, **options)
-            type_info = map_primitive_to_dry_type(type, !options[:convert])
-            type_info = set_constraints(type_info, type, options)
+          def attribute(name, signature = :any, **options, &converter)
+            type_info = map_primitive_to_dry_type(signature, options, converter)
+            type_info = set_constraints(type_info, options)
+            type_info = set_metadata(type_info, signature, options)
             define_on_schema(name, type_info, options)
           end
 
           private
 
-          def set_constraints(type_info, specified_type, options)
-            member_klass = options[:type] || options[:sub_type]
-            if member_klass && type_info.respond_to?(:of)
-              # Sub types of collections currently can be nil - this should be an option
-              type_info = type_info.of(
-                map_primitive_to_dry_type(member_klass, !options[:convert]).optional.meta(required: false)
-              )
+          def set_constraints(type_info, options)
+            if allows_nil?(options)
+              type_info = type_info.optional.meta(required: false)
+            end
+            unless allows_blank?(options)
+              type_info = type_info.constrained(filled: true)
             end
-            type_info = type_info.optional.meta(required: false) if allows_nil?(options)
-            type_info = type_info.constrained(filled: true) unless allows_blank?(options)
             if options[:default]&.is_a?(Proc)
               type_info = type_info.default(options[:default].freeze)
             elsif !options[:default].nil?
               type_info = type_info.default(->(_) { options[:default] }.freeze)
             end
-            type_info = type_info.constrained(included_in: options[:in].freeze) if options[:in]
+            if options[:in]
+              type_info.constrained(included_in: options[:in].freeze)
+            end
+            type_info
+          end
 
-            # Store adapter type info in the schema for use by typed form
+          def set_metadata(type_info, specified_type, options)
             metadata = {typed_attribute_type: specified_type, typed_attribute_options: options}
             type_info.meta(**metadata)
           end
@@ -92,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)
@@ -106,7 +110,7 @@ if Gem.loaded_specs.has_key? "dry-struct"
           def #{attr_name}
             @__attributes.attributes[:#{attr_name}]
           end
-  
+
           def #{attr_name}?
             send(:#{attr_name}).present?
           end
@@ -126,7 +130,28 @@ if Gem.loaded_specs.has_key? "dry-struct"
             allow_blank.nil? ? true : allow_blank
           end
 
-          def map_primitive_to_dry_type(type, strict)
+          def map_primitive_to_dry_type(signature, options, converter)
+            strict = !options[:convert]
+            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(subtype_info.optional.meta(required: false))
+            else
+              dry_type
+            end
+          end
+
+          def extract_member_type_and_subclass(signature, options)
+            if signature.is_a?(Array)
+              [Array, signature.first]
+            else
+              [signature, options[:type] || options[:sub_type]]
+            end
+          end
+
+          def dry_type_from_primary_type(type, strict, converter)
             if type == :any
               Types::Nominal::Any
             elsif type == Integer
@@ -160,7 +185,7 @@ if Gem.loaded_specs.has_key? "dry-struct"
               # values using the default constructor, `new`.
               Types.Instance(type)
             else
-              Types.Constructor(type) { |values| type.new(**values) }
+              Types.Constructor(type) { |values| converter ? converter.call(values) : type.new(**values) }
             end
           end
         end

data/lib/vident/version.rb

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

metadata

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