vident 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb36bbcf0d3a46ec51c1a68e80dbf0ef4b85076412591d30215779d1ff2816e8
-  data.tar.gz: 6c4b6f98a4ac9bcbebaea4003a6532231a2e188aa94ec34889f4c1c624c9ae46
+  metadata.gz: a81f442775cc3413603ea1770059483978615f37809502245cca2f1ac8ddd868
+  data.tar.gz: 37ce0a04d8a8e37cfdc10f5b5174f771e93ecb2c8dd8909eb58ef842866d0ae2
 SHA512:
-  metadata.gz: 6ccf024bee94cccffccc5b8cf7999b0b1b2e47c1a4185ab2f5a2f5129b7494d66cdde1d7d8ee8364123386dedd3f1f15ae60c27798db73cea3be4f22f68b24f6
-  data.tar.gz: f09643a2d324a23012b5466b6bd7ad4a205f21238441891557a8d60d5a71860f5a64e866366bdb63744a62f6d7efed53bdfcb17f5711eab54e35675cefd60f88
+  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,28 +132,45 @@ 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]
-            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
+          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)
+                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
+            types.reduce(:|)
           end
 
           def extract_member_type_and_subclass(signature, options)
-            if signature.is_a?(Array)
-              [Array, signature.first]
+            case signature
+            when Set
+              signature.flat_map { |s| extract_member_type_and_subclass(s, options) }
+            when Array
+              [[Array, signature.first]]
             else
-              [signature, options[:type] || options[:sub_type]]
+              [[signature, options[:type] || options[:sub_type]]]
             end
           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
@@ -185,7 +204,12 @@ if Gem.loaded_specs.has_key? "dry-struct"
               # values using the default constructor, `new`.
               Types.Instance(type)
             else
-              Types.Constructor(type) { |values| converter ? converter.call(values) : type.new(**values) }
+              # 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)
+
+                type.new(**value)
+              end
             end
           end
         end

data/lib/vident/base.rb

@@ -104,7 +104,12 @@ module Vident
         else
           RootComponent::UsingViewComponent
         end
-        klass.new(**stimulus_options_for_component(options))
+        element_attrs = options
+          .except(:id, :element_tag, :html_options, :controller, :controllers, :actions, :targets, :named_classes, :data_maps)
+          .merge(
+            stimulus_options_for_component(options)
+          )
+        klass.new(**element_attrs)
       end
     end
     alias_method :root, :parent_element
@@ -148,12 +153,11 @@ module Vident
     end
     module_function :stimulus_identifier_from_path
 
-    protected
+    private
 
     # Prepare the stimulus attributes for a StimulusComponent
     def stimulus_options_for_component(options)
       {
-        **options.except(:id, :element_tag, :html_options, :controller, :controllers, :actions, :targets, :named_classes, :data_maps),
         id: respond_to?(:id) ? id : (attribute(:id) || options[:id]),
         element_tag: attribute(:element_tag) || options[:element_tag] || :div,
         html_options: prepare_html_options(options[:html_options]),
@@ -167,8 +171,6 @@ module Vident
       }
     end
 
-    private
-
     def prepare_html_options(erb_options)
       # Options should override in this order:
       # - defined on component class methods (lowest priority)

data/lib/vident/caching/cache_key.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "benchmark"
-
 # Rails fragment caching works by either expecting the cached key object to respond to `cache_key` or for that object
 # to be an array or hash. In our case the object maybe an instance of Core::Presenter so here we add a default
 # `cache_key` implementation.
@@ -26,10 +24,6 @@ module Vident
           named_cache_key_includes(name, *attrs)
         end
 
-        def enable_cache_key_benchmarking
-          @enable_cache_key_benchmarking = true
-        end
-
         attr_reader :named_cache_key_attributes
 
         # TypedComponents can be used with fragment caching, but you need to be careful! Read on...
@@ -100,17 +94,7 @@ module Vident
             else
               @cache_key ||= {}
             end
-
-            # TODO: remove the benchmarking code here
-
-            if @enable_cache_key_benchmarking
-              time = ::Benchmark.measure { generate_cache_key(n) }
-              ::Logging::Log.debug "Cache key #{self.class.name}: #{time.real}"
-              ::Thread.current[:total_key_generation_time] ||= 0
-              ::Thread.current[:total_key_generation_time] += time.real
-            else
-              generate_cache_key(n)
-            end
+            generate_cache_key(n)
             @cache_key[n]
           end
         end

data/lib/vident/version.rb

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

metadata

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