valideizer 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 392cc887d7c1ed3dd023363b1ef3c8c610f2aff05f6434f37b4ec07a95045a2a
-  data.tar.gz: fcb343c519261c8b6b4f13e7db67546c4c87efd2686b9656d12f8b7e508c506f
+  metadata.gz: 14545dce6ae6d5c5fc1df9deee0a1663b5e1d2eb86b52abf4804045538b453b7
+  data.tar.gz: 0b99531d4a7897ac09f3c572c2266897b9bef945c91f5d6030ce85633063ac89
 SHA512:
-  metadata.gz: 8e5aeb86c274ef7e13107ff18c14de65312b20fb28f9e01cdd154d7869311ee68c8c6741aa8e2d37112c0aa5300208d3e61be3bad49cc2089fa27e551f101f55
-  data.tar.gz: fdf0ec79bf57da759149ad016c99c5a92e51907518b05485e50fab729eca6bd13502323f46e3b552a806f88e7f6bb605a077693c1290f36890e3565d0763bc00
+  metadata.gz: 2d763dcae2a1b36faffab0024404b28d8064e3852d8ff8cd4212d388d42540442b0a4a7b814d76badfa4bd6656e8970bee1477ad94ab073f91e034d8ac2051ab
+  data.tar.gz: 53580c7f4e8e343eda72be22fd2b69093d44e13fc26a12c4a67180bbf34a89acc5e537b7f1f920c1668e8789dc246a120e9923df7ff840f141d6cf32085c9f8a

data/lib/valideizer/core.rb

@@ -20,8 +20,7 @@ module Valideizer
     alias valideize add_rule
 
     def valideized?(params)
-      reinit_errrors
-      setup_defaults(params)
+      pre_process params
 
       params.each do |param, value|
         next unless nil_check(param, value)
@@ -35,7 +34,7 @@ module Valideizer
       end
 
       if @errors.empty?
-        recast(params)
+        post_process params
         true
       else
         false
@@ -49,6 +48,11 @@ module Valideizer
 
     private
 
+    def pre_process(params)
+      reinit_errrors
+      setup_defaults params
+    end
+
     def reinit_errrors
       @errors = {}
       @error_messages = []
@@ -90,30 +94,46 @@ module Valideizer
       nil_rule.nil? ? false : nil_rule.last
     end
 
-    def recast(params)
-      @rules.each do |param, rules|
-        next if params[param.to_s].nil? && params[param.to_sym].nil?
+    def post_process(params)
+      @rules.each do |key, rules|
+        next if params[key.to_s].nil? && params[key.to_sym].nil?
+        key = key.to_sym if params.include? key.to_sym
 
         type_rule = rules.find { |r, _c| r == :type }
+        recast(params, key, type_rule.last) if type_rule
 
-        if type_rule
-          constraint = type_rule.last
-          param = param.to_sym if params.include? param.to_sym
-          value = params[param]
-
-          if validate(value, :type, constraint)
-            params[param] = case constraint
-                            when :json    then cast_from_json  value
-                            when :bool    then cast_to_bool    value
-                            when :float   then cast_to_float   value
-                            when :integer then cast_to_integer value
-                            else value
-                            end
-          end
-        end
+        regexp_rule = rules.find { |r, _c| r == :regexp }
+        regexp_groups_substitution(params, key, regexp_rule.last) if regexp_rule
       end
     end
 
+
+    def recast(params, key, type)
+      value = params[key]
+      params[key] = case type
+                    when :json    then cast_from_json value
+                    when :bool    then cast_to_bool value
+                    when :float   then cast_to_float value
+                    when :integer then cast_to_integer value
+                    else value
+                    end
+    end
+
+    def regexp_groups_substitution(params, key, regexp)
+      value = params[key]
+
+      matched = value.match regexp
+      return if matched.nil?
+
+      params[key] = if matched.named_captures.any?
+                      matched.named_captures
+                    elsif matched.captures.count > 1
+                      matched.captures
+                    elsif matched.captures.count == 1
+                      matched.captures[0]
+                    end
+    end
+
     def build_error_messages
       @error_messages = print_errors
     end

data/lib/valideizer/version.rb

@@ -1,3 +1,3 @@
 module Valideizer
-  VERSION = "1.1.8"
+  VERSION = "1.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valideizer
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Arthur 'ArtK0DE' Korochansky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -32,7 +32,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/valideizer.rb
-- lib/valideizer/caster.rb
 - lib/valideizer/core.rb
 - lib/valideizer/error_printer.rb
 - lib/valideizer/holder.rb

data/lib/valideizer/caster.rb

@@ -1,20 +0,0 @@
-module Valideizer
-  module Caster
-    def cast_from_json(value)
-      JSON.parse(value) rescue nil
-    end
-
-    def cast_to_integer(value)
-      value.to_i rescue nil
-    end
-
-    def cast_to_float(value)
-      value.to_f rescue nil
-    end
-
-    def cast_to_bool(value)
-      return false if ['0', 'false'].include? value.to_s.downcase
-      return true  if ['1', 'true'].include? value.to_s.downcase
-    end
-  end
-end