vident 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba2054320ceb13a2646f5f88f4dcef219ad4a5482118f1245472b07d8848f313
-  data.tar.gz: 7e0af03ee04bc52c6b7f35cd0da6490116428581bae587249380df7c71c8d863
+  metadata.gz: a81f442775cc3413603ea1770059483978615f37809502245cca2f1ac8ddd868
+  data.tar.gz: 37ce0a04d8a8e37cfdc10f5b5174f771e93ecb2c8dd8909eb58ef842866d0ae2
 SHA512:
-  metadata.gz: 8cd4c1933065215f12d8640a4274164ddb869f9b013891f6ef569293b84dbcafea761c8442ebee81c0656c3c2d0e560f7d7ee4a36b5390cba2bc2148d5bc62b0
-  data.tar.gz: bd3549f2eaf0157bea9b8489c2fc9ea83f71d11afa998b6a013ef65ea86ff4f41cbb39caafb94b4ea5049c00b36e3be3a3b67c3cb9ec24020f842cda85476523
+  metadata.gz: ec38a1d6550386705dd6de2374d650ee890c147c9cf97cca299b01bf27616f2becccdebe273efa51153ad74ace43faef8006464a5a2418e9991ca3642fdb8dca
+  data.tar.gz: a1b01b01507a70e276ec14b6a358c520f1bc11aca8c713fe32bb5a0091230caf9fd38e8f4ef22beed50ed8a1f72c0bb48c40cd5e10cdfaa546dafe80780af337

data/lib/vident/attributes/typed.rb

@@ -61,9 +61,11 @@ if Gem.loaded_specs.has_key? "dry-struct"
           attr_reader :schema, :attribute_ivar_names
 
           def attribute(name, signature = :any, **options, &converter)
-            type_info = map_primitive_to_dry_type(signature, options, converter)
+            strict = !options[:convert]
+            signatures = extract_member_type_and_subclass(signature, options)
+            type_info = map_primitive_to_dry_type(signatures, strict, converter)
             type_info = set_constraints(type_info, options)
-            type_info = set_metadata(type_info, signature, options)
+            type_info = set_metadata(type_info, signatures, options)
             define_on_schema(name, type_info, options)
           end
 
@@ -87,8 +89,8 @@ if Gem.loaded_specs.has_key? "dry-struct"
             type_info
           end
 
-          def set_metadata(type_info, specified_type, options)
-            metadata = {typed_attribute_type: specified_type, typed_attribute_options: options}
+          def set_metadata(type_info, signatures, options)
+            metadata = {typed_attribute_type: signatures, typed_attribute_options: options}
             type_info.meta(**metadata)
           end
 
@@ -100,7 +102,7 @@ if Gem.loaded_specs.has_key? "dry-struct"
             @attribute_ivar_names ||= {}
             @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 ||= const_set(:TypedSchema, Class.new(Vident::Attributes::TypedNilingStruct))
             @schema.attribute attribute_name, type_info
           end
 
@@ -130,9 +132,7 @@ if Gem.loaded_specs.has_key? "dry-struct"
             allow_blank.nil? ? true : allow_blank
           end
 
-          def map_primitive_to_dry_type(signature, options, converter)
-            strict = !options[:convert]
-            signatures = extract_member_type_and_subclass(signature, options)
+          def map_primitive_to_dry_type(signatures, strict, converter)
             types = signatures.map do |type, subtype|
               dry_type = dry_type_from_primary_type(type, strict, converter)
               if subtype && dry_type.respond_to?(:of)
@@ -158,6 +158,19 @@ if Gem.loaded_specs.has_key? "dry-struct"
           end
 
           def dry_type_from_primary_type(type, strict, converter)
+            # If a converter is provided, we should use it to coerce the value
+            if converter && !strict && !type.is_a?(Symbol)
+              return Types.Constructor(type) do |value|
+                next value if value.is_a?(type)
+
+                converter.call(value).tap do |new_value|
+                  unless new_value.is_a?(type)
+                    raise ArgumentError, "Type conversion proc did not convert #{value} to #{type}"
+                  end
+                end
+              end
+            end
+
             if type == :any
               Types::Nominal::Any
             elsif type == Integer
@@ -191,15 +204,11 @@ if Gem.loaded_specs.has_key? "dry-struct"
               # values using the default constructor, `new`.
               Types.Instance(type)
             else
-              # dry calls this when initialising the Type. Check if type of input is correct or coerce
+              # dry calls this when initialising the Type. Check if type of input is correct or create new instance
               Types.Constructor(type) do |value|
                 next value if value.is_a?(type)
 
-                if converter
-                  converter.call(value)
-                else
-                  type.new(**value)
-                end
+                type.new(**value)
               end
             end
           end

data/lib/vident/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vident
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Stephen Ierodiaconou
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport