validy 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9e940d02f71db4c73e4685ba00dbbfd39e3a88bf743b77612873555e85a071
-  data.tar.gz: 12f5aba56bf4638452a61c57be6adae2a5bb4a153a39c40e48acdf0ba6134533
+  metadata.gz: d5ba15eaa85e57c3dad933c2ec2529bedab3b4df3c7ee872fa2b6e76ec84c48f
+  data.tar.gz: 6b2c4411763c4a9759c90297700b82d28a133199eeba688df55b3aba45a107ec
 SHA512:
-  metadata.gz: a6d6f968d08f66ec0016052595607c91d8b65977338c62114b6262de7e4e720f003a92d73828fc1effed0d8f1282574a29f7bfab4e9052bb68a15d911e8411f2
-  data.tar.gz: 21f5f6e2935367cd191d4aa49e77ef218da902d7b18c0f99089ddfbb511bdf0c690c4cb5629aa498d0d6c4e41b26ee8e86fbcbb1f74f54ab5f7ca021af2ab3ff
+  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
 
@@ -84,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
@@ -96,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)
@@ -109,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
 
@@ -119,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
 
@@ -129,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 }
@@ -155,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validy
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Oleg Saltykov