validate-rb 1.0.0.alpha.2 → 1.0.0.alpha.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cbdd9ab7995b1b5affe50fce32d2f32fd3d49d12fc03484cbc934d312e4a15f
-  data.tar.gz: 593628eaacb2eed4d85d991fd0045395c82b43a28801b68801b065b62708b0f4
+  metadata.gz: bbb3ff4387fdcdf89831a255462ce6e01c647a3ac443d85b48d7eb4b61337f71
+  data.tar.gz: 1d8d0e388222fa64c92483293ff2ac15cc409fdb118bebfb807996e879c43f60
 SHA512:
-  metadata.gz: 38f7c973117e67ad6fe86fa0dcd2f2c5edce5263ab884f2153a679f00b453336668167992a16e540c03905fedf2b0710a8dc035bfcd88f26c31c687153d9900f
-  data.tar.gz: 74fd63f44829727fb8c5360b3a9675c5aefc7e61829d6441addf7430a86c42177974f327ac9468285de84e4b36220594eb54709ac1802b1295ca355078b33cdd
+  metadata.gz: 98bc8e416ee5c8e8b5d018cb5fe7a667aead58fc8ff27d818ef9129074f1f1d36f74807a00e6704fdac4311b30b1c06c98b1a61951d099ac75b9b7bd0a9e17e0
+  data.tar.gz: b1ce371355794068bb406a1721e4baa9d75d3101b51f915381a8866c8e44a53ed9b25f708a285ac13ee3c7c3ee961be0d9f872664dca95cc8bba6e51d3ee4a16

data/lib/validate/arguments.rb

@@ -3,32 +3,12 @@ module Validate
     module ClassMethods
       def method_added(method_name)
         super
-        return if @args.empty?
-
-        method = instance_method(method_name)
-        guard = ArgumentsGuard.new(method, @args.dup)
-
-        @methods_guard.__send__(:define_method, method_name) do |*args, &block|
-          guard.send(method_name, *args, &block)
-          super(*args, &block)
-        end
-      ensure
-        @args.clear
+        guard_method(instance_method(method_name), @methods_guard)
       end
 
       def singleton_method_added(method_name)
         super
-        return if @args.empty?
-
-        method = singleton_method(method_name)
-        guard = ArgumentsGuard.new(method, @args.dup)
-
-        @methods_guard.__send__(:define_singleton_method, method_name) do |*args, &block|
-          guard.send(method_name, *args, &block)
-          super(*args, &block)
-        end
-      ensure
-        @args.clear
+        guard_method(singleton_method(method_name), @singleton_methods_guard)
       end
 
       def arg(name, &body)
@@ -39,6 +19,24 @@ module Validate
         @args[name] = Assertions.create(&body)
         self
       end
+
+      private
+
+      def guard_method(method, guard_module)
+        return if @args.empty?
+        guard = ArgumentsGuard.new(method, @args)
+        guard_module.__send__(:define_method, method.name) do |*args, **kwargs, &block|
+          if kwargs.empty?
+            guard.enforce!(*args, &block)
+            super(*args, &block)
+          else
+            guard.enforce!(*args, **kwargs, &block)
+            super(*args, **kwargs, &block)
+          end
+        end
+      ensure
+        @args = {}
+      end
     end
 
     def self.included(base)
@@ -46,6 +44,7 @@ module Validate
       base.instance_exec do
         @args = {}
         prepend(@methods_guard = Module.new)
+        singleton_class.prepend(@singleton_methods_guard = Module.new)
       end
     end
 
@@ -73,17 +72,19 @@ module Validate
           when :block
             signature << "&#{name}"
           else
-            raise Error::ArgumentError, "unsupported parameter type #{kind}"
+            raise Error::ArgumentError,
+                  "unsupported parameter type #{kind}"
           end
           next unless rules.include?(name)
 
-          assertions << "@rules[:#{name}].assert(#{name}, message: 'invalid argument #{name}')"
+          assertions <<
+            "@rules[:#{name}].assert(#{name}, message: '#{name}') unless #{name}.eql?(DEFAULT_VALUE)"
         end
 
-        singleton_class.class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-            def #{method.name}(#{signature.join(', ')})
-              #{assertions.join("\n  ")}
-            end
+        singleton_class.class_eval(<<~RUBY, __FILE__, __LINE__)
+          def enforce!(#{signature.join(', ')})
+            #{assertions.join("\n  ")}
+          end
         RUBY
 
         @rules = rules

data/lib/validate/constraints/validation_context.rb

@@ -66,8 +66,10 @@ module Validate
         !@violations.empty?
       end
 
-      def to_err
-        Error::ConstraintViolationError.new(@violations.freeze)
+      def to_err(backtrace = [])
+        err = Error::ConstraintViolationError.new(@violations.freeze)
+        err.set_backtrace(backtrace)
+        err
       end
 
       def merge(other)
@@ -104,6 +106,8 @@ module Validate
             Path.new(@paths.dup << path)
           when Path
             Path.new(@paths.dup << path.to_a)
+          else
+            raise ArgumentError, 'invalid path'
           end
         end
 

data/lib/validate/errors.rb

@@ -31,9 +31,9 @@ module Validate
 
       def message
         @violations.group_by(&:path)
-            .transform_values { |violations| violations.map(&:message) }
-            .map { |path, messages| "#{path}: #{messages.join(' ')}" }
-            .join("\n")
+                   .transform_values { |violations| violations.map(&:message) }
+                   .map { |path, messages| "#{path}: #{messages.join(', ')}" }
+                   .join("\n")
       end
     end
   end

data/lib/validate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Validate
-  VERSION = '1.0.0.alpha.2'
+  VERSION = '1.0.0.alpha.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate-rb
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.2
+  version: 1.0.0.alpha.3
 platform: ruby
 authors:
 - Bulat Shakirzyanov