vident 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24963e09fb8ecd09d22f1254eecc8f2d8bf255123e92976f12d224531003b42a
-  data.tar.gz: 3b280628d9aa0ee62ad7b92b5ea58e628d3817e74567cfafb4ef22eadedd707e
+  metadata.gz: d1ead61d39ae1b70058a4002d6b3ed7ad4baade0d03ccaa6f2501ba20ac028b5
+  data.tar.gz: bbebb2b863ee0e1b734dc50c6a03015e0375a28a43004f9f4954c681acd954ca
 SHA512:
-  metadata.gz: fe03e658c1d0ca0e537b66cf465c9628566507053aaf7fbd2d03125a98c1f5f829a1a7c51fb2751314aa38648f3119337ebfa2df932d462dd4e2ab31a235b730
-  data.tar.gz: 100fb3cbe9fce6cb5083ebd95237796f57d73f44a02385e274d0e433763c0037cbad8d257994aa059e5ab6e137fb781309ea24f2cf277e22ec59f79d3f370343
+  metadata.gz: 1ac922f2933bd655a2aa69ca5fbeb4bb05bb6ac8277a7bb0c7e6a85c6329aebe0dcc63b0fcdf5a03c29b775348044c536d9f460c6006a43b5190418cc47d23f2
+  data.tar.gz: 26f4db0079c735b6df0fa26aca20e96a564e24d07dca71b6a1396ea95a86993ef8a99209df6bdfd1be618dfa8f6933281e1506318ad2fb592ce42e47b0456ba7

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
@@ -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,29 @@ 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)
+              # 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)
+              )
+            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 +186,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.0"
 end

metadata

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