valideizer 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00ecebcfbd69263f706de4ac7fc78cb0f8d326edcc6077bad8bf8cd29d1ed42c
-  data.tar.gz: '00929bf85b5617fca26d2027af6ae091d281112c1274993ffc1ec4407ad8a4f1'
+  metadata.gz: 1921ea849a60852ef035cc51a79037cdc7ef02a0139fb9f89f9c45e9c0c3c8f9
+  data.tar.gz: fe729bb874467444bbb70f161503fab938e00d879307e717160fdfacab010fbb
 SHA512:
-  metadata.gz: c013eefa977e113a5b3ae553b4ffd7fc3facc728e66d574209e36dbfa94072258d8d84ec9d3bb2641f0359d0cf08d5f45b54a33c2301c78d22c6f5e084997f27
-  data.tar.gz: 9976e77e1d6fd69f62cd348a754307e3ed7868776629cf1d5dc64c1401da33c0d965c099cd29bfcce7e24922e4c58ab75758c4ce54bfbed67486db5ac8fbf223
+  metadata.gz: a73800c820ff8c4ea87f1ce2a2bc57efa9cc981a68aeb5d6bcf5f4250cf3dfd123b4d47ac7e6c1ef4dcb7e961a6a5cb0c0e7c8140ab240cdf6cd435e77e5558b
+  data.tar.gz: 5c1f4364db9a02ea1681208da2a61f15edf2e8db26c0a383c26b7011e08888fb86550b547e98c5f86f504d2f759dce600d0b111e17f4ad336aaa0da2e1c8603f

data/lib/valideizer/core.rb

@@ -12,7 +12,7 @@ module Valideizer
     end
 
     def add_rule(param, *rules)
-      @rules[param] = rules[0]
+      @rules[param.to_s] = rules[0]
     end
 
     alias valideize add_rule
@@ -22,14 +22,13 @@ module Valideizer
       setup_defaults(params)
       params.each do |param, value|
         next unless nil_check(param, value)
-
-        @rules[param].each do |type, constraint|
+        @rules[param.to_s].each do |type, constraint|
           begin
-          push_error(param, value, type, constraint) unless validate(value, type, constraint)
+            push_error(param, value, type, constraint) unless validate(value, type, constraint)
           rescue ArgumentError => ex
             puts ex
           end
-        end
+        end if @rules.include? param.to_s
       end
 
       @errors.empty?
@@ -53,8 +52,8 @@ module Valideizer
     end
 
     def setup_defaults(params)
-      @rules.each do |param, rules|
-        default_rule  = rules.find { |r, _c| r == :default }
+      params.each do |param|
+        default_rule = @rules[param.to_s]&.find { |r, _c| r == :default }
         params[param] = default_rule.last unless default_rule.nil?
       end
     end

data/lib/valideizer/error_printer.rb

@@ -5,7 +5,7 @@ module Valideizer
     protected
 
     def print_errors
-      @errors.map { |param_name, errors| errors.each { |error| { message: print_error(param_name, error) }}}
+      @errors.map { |param_name, errors| errors.map { |error| { message: print_error(param_name, error) }}}.flatten
     end
 
     private
@@ -32,7 +32,7 @@ module Valideizer
     end
 
     def print_postfix(type, value)
-      "Current value: `#{value}`." if %i[type array_type custom_type active_record length].include?(type)
+      "Current value: `#{value}`." unless %i[type array_type custom_type active_record length].include?(type)
     end
 
     # Validation error: :some param. Should be greater or equal than 200. Current value (100).

data/lib/valideizer/holder.rb

@@ -1,3 +1,5 @@
+require 'singleton'
+
 module Valideizer
   class Holder
     include Singleton

data/lib/valideizer/rails.rb

@@ -3,47 +3,59 @@ require 'valideizer/holder'
 
 module Valideizer
   module Rails
-    class << self
-      def valideize(method, &options_block)
-        holder.valideizers[controller_name] = {} if holder.valideizers[controller_name].nil?
+    extend ActiveSupport::Concern
 
-        raise "Action #{method} is not defined in #{controller_name}" unless action_methods.include? method.to_s
+    def self.included(base)
+      base.before_action :valideize!
 
-        if holder.valideizers[controller_name][method].nil?
-          holder.valideizers[controller_name][method] = Valideizer::Core.new
-        end
+      base.class_eval do
+        def self.valideize(method, &options_block)
+          method = method.to_s
+          holder = Valideizer::Holder.instance
+          holder.valideizers[controller_path] = {} if holder.valideizers[controller_name].nil?
 
-        valideizer = holder.valideizers[controller_name][method]
-        valideizer.instance_exec(options_block)
-      end
+          # raise "Action #{method} is not defined in #{controller_name}" unless action_methods.include? method.to_s
 
-      def valideize!
-        valideizer = holder.valideizers[controller_name][action_name]
+          if holder.valideizers[controller_path][method].nil?
+            holder.valideizers[controller_path][method] = Valideizer::Core.new
+          end
 
-        if !valideizer.nil? && !holder.callback_method.nil?
-          redirect_to(controller: holder.callback_controller,
-            action: holder.callback_method, errors: valideizer.errors) unless validiezer.valideize?(params)
+          valideizer = holder.valideizers[controller_path][method]
+          valideizer.instance_eval(&options_block)
         end
-      end
 
-      def valideized?(params)
-        holder.valideizers[controller_name][action_name].valideized?(params)
+        def self.valideizer_callback(method_name)
+          holder = Valideizer::Holder.instance
+          unless holder.callback_controller.present?
+            holder.callback_controller = controller_path
+            holder.callback_method = method_name.to_s
+          end
+        end
       end
+    end
 
-      def valideizer_errors
-        holder.valideizers[controller_name][action_name].errors
-      end
+    def valideize!
+      valideizer = holder.valideizers[controller_path][action_name] rescue nil
+      return unless valideizer
 
-      def valideizer_callback(method_name)
-        holder.callback_controller = controller_name
-        holder.callback_method     = method_name
+      unless valideizer.nil? || holder.callback_method.nil?
+        redirect_to(controller: holder.callback_controller,
+          action: holder.callback_method, errors: valideizer.errors) unless valideizer.valideized?(params)
       end
+    end
 
-      private
+    def valideized?(params)
+      holder.valideizers[controller_path][action_name].valideized?(params)
+    end
 
-      def holder
-        Valideizer::Holder.instance
-      end
+    def valideizer_errors
+      holder.valideizers[controller_path][action_name].errors
+    end
+
+    private
+
+    def holder
+      Valideizer::Holder.instance
     end
   end
 end

data/lib/valideizer/version.rb

@@ -1,3 +1,3 @@
 module Valideizer
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valideizer
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Arthur 'ArtK0DE' Korochansky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler