validy 1.0.99 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89bc7ec77c5a43d71df94fa67ed470ec6865eb251779ece8e4cf8d34dd85247
-  data.tar.gz: 3e8e93f9566766992b46c30db7e9b1013eb55d758b3a8524775545ed7c0bdad2
+  metadata.gz: d5ba15eaa85e57c3dad933c2ec2529bedab3b4df3c7ee872fa2b6e76ec84c48f
+  data.tar.gz: 6b2c4411763c4a9759c90297700b82d28a133199eeba688df55b3aba45a107ec
 SHA512:
-  metadata.gz: 9eb955a7874c1df5da04f1f5ab99a8f5d5c84bbbc58f12532f8f69ba728559af93adcd48f4a85bb1117c569586683b9f608bacfba5654a1449b7a0db6850a9ea
-  data.tar.gz: f3c7310ee04b5d41dbf35188afb4ba73a8ac779013636f485caa89afd803e580e846839387bf04e663944de20a561afc4d1b6dd3db5c7a357007fc2a43318f92
+  metadata.gz: 28042c029f3d322ff70540f5ebe5cbe5a8121463f820320bab838823e0882028ccae920536a2f0429430d9866e8f7396beedc2d0b0fd1bbab717bf98856d88b8
+  data.tar.gz: 6badd77f876d0803f286c2bc11be71499075b481885a14761e4c08c5a6df733ab99064adf4b22dcd3650f4090d6b8179aa8cce3ed80291d9b8e12f38a6d591ca

data/lib/validy.rb

@@ -15,7 +15,7 @@ module Validy
     def initialize(*)
       @errors = {}
       @valid = true
-      @evaluating_attribute = nil
+      @evaluating_attribute_value = nil
 
       super
 
@@ -31,8 +31,9 @@ module Validy
 
   module ClassMethods
     # @param [String] method - indicates custom, must be implemented method for which will be triggered for defining
+    # @param [Array<String>] - optional, list of the instance variables for checking valid state while using setter
     # validation state
-    def validy_on(method:)
+    def validy_on(method:, setters: [])
       method_with_bang_name = (method[-1] == '!' ? method.to_s : "#{method}!")
       method_without_bang_name = method_with_bang_name.gsub('!', '')
 
@@ -55,6 +56,15 @@ module Validy
           end
           raise ::Validy::Error, stringified_error unless valid?
         end
+
+        if setters.any?
+          setters.each do |name|
+            define_method("#{name}=".to_sym) do |val|
+              instance_variable_set("@#{name}", val)
+              method[-1] == '!' ? send(method_with_bang) : send(method_without_bang)
+            end
+          end
+        end
       end
       prepend hooks
     end
@@ -74,6 +84,12 @@ module Validy
       @valid
     end
 
+    # "invalid?" returns opposite value of inner valid state
+    # @return [Boolean]
+    def invalid?
+      !valid?
+    end
+
     # "errors" returns errors hash
     # @return [Hash]
     def errors
@@ -86,6 +102,7 @@ module Validy
     # @param [Proc] block
     def condition(method, error = nil, &block)
       return self unless valid?
+      return self if skip_optional?
 
       condition = method.respond_to?(:call) ? method.call : send(method)
       validate_condition(condition, error, &block)
@@ -99,8 +116,8 @@ module Validy
     def required(attribute, error = nil, &block)
       return self unless valid?
 
-      @evaluating_attribute = instance_variable_get("@#{attribute}")
-      validate_condition(@evaluating_attribute, error || "#{attribute} required!", &block)
+      @evaluating_attribute_value = instance_variable_get("@#{attribute}")
+      validate_condition(@evaluating_attribute_value, error || "#{attribute} required!", &block)
       self
     end
 
@@ -109,7 +126,8 @@ module Validy
     def optional(attribute)
       return self unless valid?
 
-      @evaluating_attribute = instance_variable_get("@#{attribute}")
+      @optional = true
+      @evaluating_attribute_value = instance_variable_get("@#{attribute}")
       self
     end
 
@@ -119,14 +137,21 @@ module Validy
     # @param [Proc] block
     def type(clazz, error = nil, &block)
       return self unless valid?
+      return self if skip_optional?
 
-      validate_condition(@evaluating_attribute&.is_a?(clazz),
-                         error || "`#{@evaluating_attribute}` is not a type #{clazz}", &block)
+      validate_condition(@evaluating_attribute_value&.is_a?(clazz),
+                         error || "`#{@evaluating_attribute_value}` is not a type #{clazz}", &block)
       self
     end
 
     private
 
+    def skip_optional?
+      return false unless @optional
+
+      @evaluating_attribute_value.nil?
+    end
+
     def method_presented?(method)
       method_to_symed = method.to_sym
       methods.any? { |m| m == method_to_symed }
@@ -145,8 +170,8 @@ module Validy
     def validate_condition(condition, error = nil, &block)
       return if condition
 
-      error_hash = error_hash(error)
-      add_error(error_hash)
+      error_hash = error_hash error
+      add_error error_hash
 
       block.call if block_given?
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: validy
 version: !ruby/object:Gem::Version
-  version: 1.0.99
+  version: 1.1.4
 platform: ruby
 authors:
 - Oleg Saltykov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-09 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies: []
 description:
 email: