statinize 0.4.4 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2a7fe61fb4cc14c6a74ff3847b650a365688269d1e0ef34d7f1d061cd17a7a9
-  data.tar.gz: 9c8fe51192997a3e22bc15d392a1a7df7489e080dc6c6c8db6e615d40807961d
+  metadata.gz: 532ce092aa6b70f135589b09d8c8f7574105e7ecbc17036e3fd2d50ffaf47813
+  data.tar.gz: deb8189b91a4703070b769968d1858ff77a261afa9565a7695e957bdbf381a86
 SHA512:
-  metadata.gz: e81d152b1d3e596147d5d39ca4afdc701345cd6310b667823c824c3c88331081e4cbb3913914d48fade0b496e1b2ea5bdc32beafa6514ffdc54d679523dce1c4
-  data.tar.gz: ae3a96d472a35a3ccd04c6b52b62cbd1aedf66676006335442e3ef5a4c9f44a75b448dfd7e66a99fb6c3fd6b194ec178a2a6ad7254a96092588b04ddcda1b043
+  metadata.gz: 83956b014f99a2a5438bbf0304d0bc094cd0ed83329269d1d7d46fa6ca5dd46abf2b19948e980216e1e5bb1a906a9670b26bcd966d2c327f5bd567f59e5f1340
+  data.tar.gz: 49bc1829a8955fccc561277a5568f7cad00fa129e6c20e8956d2037dbbea29600052eff2da1f0b8f5af720e87a9548f621cbd9488da855a3b53b8f79b652a96d

data/lib/statinize/attribute.rb

@@ -2,7 +2,7 @@ module Statinize
   class Attribute
     include Comparable
 
-    attr_reader :klass, :name, :default, :arg_name
+    attr_reader :klass, :name, :default, :default_exec, :arg_name
     attr_accessor :options_collection, :options
 
     def initialize(klass, name, options)
@@ -13,6 +13,7 @@ module Statinize
       @options_collection << options.clone.extend(Options) unless options.empty?
 
       @default = options[:default] if options.key?(:default)
+      @default_exec = options[:default_exec] if options.key?(:default_exec)
       @arg_name = name
       @name = options[:name] || name
     end

data/lib/statinize/statinizable.rb

@@ -72,6 +72,10 @@ module Statinize
         statinizer.attributes.select { |a| a.options.key?(:default) }.each do |attribute|
           public_send("#{attribute.name}=", attribute.default.deep_dup)
         end
+
+        statinizer.attributes.select { |a| a.options.key?(:default_exec) }.each do |attribute|
+          public_send("#{attribute.name}=", instance_exec(&attribute.default_exec))
+        end
       end
     end
 

data/lib/statinize/statinizer.rb

@@ -50,7 +50,7 @@ module Statinize
 
     def populate(attrs)
       attrs.each do |attr|
-        attribute attr.arg_name, name: attr.name, default: attr.default
+        attribute attr.arg_name, name: attr.name, default: attr.default, default_exec: attr.default_exec
         attributes.find { _1.name == attr.name }.tap do |attr_to_populate|
           attr_to_populate.options_collection = attr.options_collection.clone
           attr_to_populate.options = attr.options.clone

data/lib/statinize/validation.rb

@@ -43,7 +43,7 @@ module Statinize
           attr_value = instance.public_send(attr.name)
 
           option.validators.each do |validator_class, validator_value|
-            validator_instance = validator_class.new(attr_value, validator_value)
+            validator_instance = validator_class.new(attr_value, validator_value, instance)
 
             if option[:type] && option.should_cast? && attr_value.nil? && (option[:presence] || option[:nil] == false)
               cast(attr, option)

data/lib/statinize/validator.rb

@@ -1,12 +1,13 @@
 module Statinize
   class Validator
-    NOT_VALIDATORS = %i[force cast if unless default name]
+    NOT_VALIDATORS = %i[force cast if unless default default_exec name]
 
-    attr_accessor :attr_value, :validator_value
+    attr_accessor :attr_value, :validator_value, :instance
 
-    def initialize(attr_value, validator_value)
+    def initialize(attr_value, validator_value, instance)
       @attr_value = attr_value
       @validator_value = validator_value
+      @instance = instance
     end
 
     def valid?

data/lib/statinize/validators/type_validator.rb

@@ -1,7 +1,11 @@
 module Statinize
   class TypeValidator < Validator
     def valid?
-      attr_value.is_a?(validator_value) || attr_value.nil?
+      if validator_value.is_a? Class
+        attr_value.is_a?(validator_value)
+      elsif validator_value.is_a? Proc
+        attr_value.is_a? instance.instance_exec(&validator_value)
+      end || attr_value.nil?
     end
 
     def error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: statinize
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.6
 platform: ruby
 authors:
 - Barseek
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-17 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies: []
 description: Statinization gem. Allows for creation of attributes for a class with
   a given type.