statinize 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7814eb5a73fe5fb67c846398c6d22573b183cafd88c243175ef4fb39c5f71fbe
-  data.tar.gz: b7eec7d141ae6a0deda224802f67dae791ea7b9c96957922c9a7fa9c1b052e6a
+  metadata.gz: 1df88422c35ca62b3fe9b3efab22633e9f72a0e59690db7a005ae2cb9ad8cb4f
+  data.tar.gz: d72c1c0fdae71d168d082ee6e368970bdc81748cfa7ea293ec970065cd6232ef
 SHA512:
-  metadata.gz: 8bea982ae518d67bb7f9c0a9cab47dd081d869dabbdf01874e14de5c2004217bd6f395e5e040f93499cbe5de413e1d3ed6b59222e9d8089cb6b01289748d1be9
-  data.tar.gz: '08111b888a705bb74fe044f9de93ebcfd6863646df65510bf62e0566b23af1e4ef410609a22b0fc1afb1b15ffac62edbd9b43264a02191504e25296a99eab1e8'
+  metadata.gz: 21b6c73e849260241b4a2301bdbdf1663ceff7279b666564761818618728058be4e5e67dd9d6d11a1f7adc382468d8b5e7fdfcfaf67acbb3b294879a415d7a28
+  data.tar.gz: c984be3998b0e6a4ee7e0c4c57263a88f9c1c9698fc91487a499980353c5be9b6a72c2f94ba87cf95d543b9ef5418303e32b2b3edd8299163660cd4c629bae33

data/lib/statinize/statinizer.rb

@@ -8,27 +8,32 @@ module Statinize
     end
 
     def attribute(*attrs, **options)
-      options.merge!(@with) if @with
-
       attrs.each do |attr|
         Attribute.create(klass, attr, options)
       end
     end
 
     def validate(*attrs, **options)
-      options.merge!(@with) if @with
-
       attrs.each do |attr|
         attribute = attributes.find { _1.name == attr }
         attribute&.add_options(options)
       end
     end
 
-    def with(**kwargs, &block)
-      @with = kwargs
-      instance_exec(&block)
+    def with(**options, &block)
+      trace = TracePoint.trace(:call) do |tp|
+        tp.disable
+
+        if %i[attribute validate].include? tp.method_id
+          tp.binding.local_variable_get(:options).merge!(options)
+        end
 
-      remove_instance_variable(:@with) if @with
+        tp.enable
+      end
+
+      trace.enable
+      instance_exec(&block)
+      trace.disable
     end
 
     def force(force = nil)

data/lib/statinize/validation.rb

@@ -51,9 +51,10 @@ module Statinize
             force = option[:force] ||
               (statinizer.force? && option[:force].nil?)
 
-            erroneous_attributes[attr.name].add option
+            if erroneous_attributes[attr.name].add? option
+              @errors << { attr.name => validator_instance.error }
+            end
             erroneous_forced_attributes[attr.name].add option if force
-            @errors << { attr.name => validator_instance.error }
           end
         end
       end

metadata

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