validy 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9e940d02f71db4c73e4685ba00dbbfd39e3a88bf743b77612873555e85a071
-  data.tar.gz: 12f5aba56bf4638452a61c57be6adae2a5bb4a153a39c40e48acdf0ba6134533
+  metadata.gz: ae1ac788467cb913065937d6a6d46707f3e4b6806ab54f0d7066f4e14b5eae50
+  data.tar.gz: 01ecb46cd5f4049055c096104d66378cd52588459b433758ae39615cef46d802
 SHA512:
-  metadata.gz: a6d6f968d08f66ec0016052595607c91d8b65977338c62114b6262de7e4e720f003a92d73828fc1effed0d8f1282574a29f7bfab4e9052bb68a15d911e8411f2
-  data.tar.gz: 21f5f6e2935367cd191d4aa49e77ef218da902d7b18c0f99089ddfbb511bdf0c690c4cb5629aa498d0d6c4e41b26ee8e86fbcbb1f74f54ab5f7ca021af2ab3ff
+  metadata.gz: c2d1e5e617d22d62580be51d63d626e96d0f4d49b3d4c42373d2c8493b324d29b20678f8cb45cadd671d2032fafbd0cd489ac0e4f179fe6fb39b4572a51156c7
+  data.tar.gz: f7a4b0e171cfce9bea900d0e073156d1221cff2fad65a868055605fbdc9a10643535897ebe53eadab9687a9461488bca503473924d777a1c06bd02cbaadfa4ba

data/lib/validy.rb

@@ -3,7 +3,8 @@
 module Validy
   Error = Class.new(StandardError)
   NotImplementedError = Class.new(StandardError)
-  OverImplemented = Class.new(StandardError)
+
+  MUST_BE_IMPLEMENTED_ERROR = 'validy method given from validy_on method: argument, must be implemented!'
 
   def self.included(base)
     base.send(:extend, ClassMethods)
@@ -15,36 +16,36 @@ module Validy
     def initialize(*)
       @errors = {}
       @valid = true
-      @evaluating_attribute = nil
 
       super
-
+      # trigger validations
       if method_presented?(method_without_bang)
         send(method_without_bang)
       elsif method_presented?(method_with_bang)
         send(method_with_bang)
       else
-        raise NotImplementedError, 'validy method given from validy_on method: argument, must be implemented!'
+        raise NotImplementedError, MUST_BE_IMPLEMENTED_ERROR
       end
     end
   end
 
   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
+    # @param [Array] setters - optional, list of the instance variables for checking valid state while using setter
     # validation state
+    # @return [void]
     def validy_on(method:, setters: [])
       method_with_bang_name = (method[-1] == '!' ? method.to_s : "#{method}!")
       method_without_bang_name = method_with_bang_name.gsub('!', '')
 
-      define_method :method_with_bang do
-        method_with_bang_name
-      end
+      define_validation_methods_name(method_with_bang_name, method_without_bang_name)
 
-      define_method :method_without_bang do
-        method_without_bang_name
-      end
+      define_validation_triggers(method, setters)
+    end
 
+    private
+
+    def define_validation_triggers(method, setters)
       hooks = Module.new do
         method_with_bang_name = (method[-1] == '!' ? method.to_s : "#{method}!")
         method_without_bang_name = method_with_bang_name.gsub('!', '')
@@ -54,6 +55,12 @@ module Validy
           else
             super(*args, &block)
           end
+
+          if instance_variable_defined?('@evaluating_attribute_value')
+            remove_instance_variable(:@evaluating_attribute_value)
+          end
+          remove_instance_variable(:@optional) if instance_variable_defined?('@optional')
+
           raise ::Validy::Error, stringified_error unless valid?
         end
 
@@ -61,13 +68,32 @@ module Validy
           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)
+
+              if instance_variable_defined?('@evaluating_attribute_value')
+                remove_instance_variable(:@evaluating_attribute_value)
+              end
+              remove_instance_variable(:@optional) if instance_variable_defined?('@optional')
+
+              val
             end
           end
         end
       end
+
       prepend hooks
     end
+
+    def define_validation_methods_name(with_bang_name, without_bang_name)
+      define_method :method_with_bang do
+        with_bang_name
+      end
+
+      define_method :method_without_bang do
+        without_bang_name
+      end
+    end
   end
 
   module InstanceMethods
@@ -84,6 +110,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 +128,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 +142,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 +152,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 +163,23 @@ 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 +198,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.5
 platform: ruby
 authors:
 - Oleg Saltykov