params_checker 0.2.2 → 0.2.3

data/lib/params_checker/param_checker.rb

@@ -1,312 +1,326 @@
+# frozen_string_literal: true
+
 module ParamsChecker
-    module ParamChecker
-        class BaseParamChecker
-            def initialize(key = '', fields = {}, opts = {})
-                @key = key
-                @fields = fields
-                @opts = opts
-            end
-        
-            def call; end
-        
-            def add_error(message = '')
-                errors.add(key, message)
-            end
-        
-            attr_accessor :key, :fields, :opts
-        end
-        
-        class NumParamChecker < BaseParamChecker
-            prepend SimpleCommand
-        
-            def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-                check_type && check_param
-                opts[key]
-            end
-        
-            def check_type
-                valid = opts[key].is_a? Numeric
-                add_error("This field's type must be numeric.") unless valid
-                valid
-            end
-        
-            def check_param
-                min = fields[key][:min]
-                max = fields[key][:max]
-                valid =(min..max).include? opts[key]
-                add_error("This numeric field's value must be in range from #{min} to #{max}.") unless valid
-                valid
-            end
-        end
+  module ParamChecker
+    class BaseParamChecker
+      def initialize(key = '', schema = {}, params = {})
+        @key = key
+        @schema = schema
+        @params = params
+      end
 
-        class IntParamChecker < BaseParamChecker
-          prepend SimpleCommand
-      
-          def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-              check_type && check_param
-              opts[key]
-          end
-      
-          def check_type
-              valid = opts[key].is_a? Integer
-              add_error("This field's type must be integer.") unless valid
-              valid
-          end
-      
-          def check_param
-              min = fields[key][:min]
-              max = fields[key][:max]
-              valid = (min..max).include? opts[key]
-              add_error("This integer field's value must be in range from #{min} to #{max}.") unless valid
-              valid
-          end
-        end
-        
-        class CharParamChecker < BaseParamChecker
-            prepend SimpleCommand
-        
-            def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-                check_type && check_allow_blank && check_length && opts[key]
-            end
-        
-            def check_type
-                valid = opts[key].is_a?(String)
-                add_error("This field's type must be string.") unless valid
-                valid
-            end
-        
-            def check_allow_blank
-                valid = !(!fields[key][:allow_blank] && opts[key].blank?)
-                add_error('This field cannot be blank.') unless valid
-                valid
-            end
-        
-            def check_length
-                min_length = fields[key][:min_length]
-                max_length = fields[key][:max_length]
-                valid = (min_length..max_length).include? opts[key].length
-                add_error("This string field's length must be in range from #{min_length} to #{max_length}.") unless valid
-                valid
-            end
-        end
-        
-        class ArrParamChecker < BaseParamChecker
-            prepend SimpleCommand
-        
-            def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-                check_type && check_allow_empty && opts[key]
-            end
-        
-            def check_type
-                valid =opts[key].is_a? Array
-                add_error("This field's type must be array.") unless valid
-                valid
-            end
-        
-            def check_allow_empty
-                valid =!(!fields[key][:allow_empty] && opts[key].empty?)
-                add_error('This field cannot be empty.') unless valid
-                valid
-            end
-        end
+      def call; end
 
-        class NestedHashChecker
-            prepend SimpleCommand
-            def initialize(key = '', fields = {}, opts = {}, context = {})
-                @key = key
-                @fields = fields
-                @opts = opts
-                @context = context
-            end
-        
-            def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-                check_type && formatted_nested_hash
-            end
-
-            def formatted_nested_hash
-                cmd = fields[key][:class].call(params:opts[key], context: context, is_outest_hash: false)
-                if cmd.success?
-                    cmd.result
-                else
-                    add_error cmd.errors
-                end
-            end
-
-            def check_type
-                valid = opts[key].is_a?(ActionController::Parameters) || opts[key].is_a?(Hash)
-                add_error("This field's type must be object or ActionController::Parameters.") unless valid
-                valid
-            end
-
-            def add_error(message = '')
-                errors.add(key, message)
-            end
-        
-            attr_accessor :key, :fields, :opts, :class, :context
-        end
+      def add_field_error(message = '')
+        errors.add(key, message)
+      end
 
-        class NestedHashsChecker
-            prepend SimpleCommand
-            def initialize(key = '', fields = {}, opts = {}, context = {})
-                @key = key
-                @fields = fields
-                @opts = opts
-                @context = context
-            end
-        
-            def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-                check_type && formatted_nested_hashs
-            end
-
-            def formatted_nested_hashs
-                opts[key].map do |nested_hash|
-                  formatted_nested_hash(nested_hash)
-                end
-            end
-
-            def formatted_nested_hash nested_hash
-                cmd = fields[key][:class].call(params: nested_hash, context: context, is_outest_hash: false)
-                if cmd.success?
-                    cmd.result
-                else
-                    add_error cmd.errors
-                end
-            end
-
-            def check_type
-                valid = opts[key].is_a?(Array)
-                add_error("This field's type must be array.") unless valid
-                valid
-            end
-        
-            def add_error(message = '')
-                errors.add(key, message)
-            end
-        
-            attr_accessor :key, :fields, :opts, :class, :context
-        end
-                
-        class DateParamChecker < BaseParamChecker
-            prepend SimpleCommand
-        
-            def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-                formatted_date
-            end
-        
-            def formatted_date
-                Date.parse opts[key]
-            rescue => e
-                add_error 'Invalid date.'
-            end
-        end
+      attr_accessor :key, :schema, :params
+    end
 
-        class TimeParamChecker < BaseParamChecker
-            prepend SimpleCommand
-        
-            def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-                formatted_time
-            end
-        
-            def formatted_time
-                Time.parse opts[key]
-            rescue => e
-                add_error 'Invalid time.'
-            end
-        end
+    class NumParamChecker < BaseParamChecker
+      prepend SimpleCommand
 
-        class DateTimeParamChecker < BaseParamChecker
-            prepend SimpleCommand
-        
-            def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-                formatted_datetime
-            end
-        
-            def formatted_datetime
-                DateTime.parse(opts[key])
-            rescue => e
-                add_error 'Invalid datetime.'
-            end
-        end
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
 
-        class EmailParamChecker < BaseParamChecker
-          prepend SimpleCommand
-      
-          def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-              check_type && check_regrex && opts[key]
-          end
-      
-          def check_type
-              valid = opts[key].is_a? String
-              add_error("Invalid email.") unless valid
-              valid
-          end
-      
-          def check_regrex
-              valid = opts[key].match(URI::MailTo::EMAIL_REGEXP)
-              add_error('Invalid email.') unless valid
-              valid
-          end
-      
-        end
+        check_type && check_param
+        params[key]
+      end
+
+      def check_type
+        valid = params[key].is_a? Numeric
+        add_field_error("This field's type must be numeric.") unless valid
+        valid
+      end
+
+      def check_param
+        min = schema[key][:min]
+        max = schema[key][:max]
+        valid = (min..max).include? params[key]
+        add_field_error("This numeric field's value must be in range from #{min} to #{max}.") unless valid
+        valid
+      end
+    end
+
+    class IntParamChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        check_type && check_param
+        params[key]
+      end
+
+      def check_type
+        valid = params[key].is_a? Integer
+        add_field_error("This field's type must be integer.") unless valid
+        valid
+      end
+
+      def check_param
+        min = schema[key][:min]
+        max = schema[key][:max]
+        valid = (min..max).include? params[key]
+        add_field_error("This integer field's value must be in range from #{min} to #{max}.") unless valid
+        valid
+      end
+    end
+
+    class CharParamChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        check_type && check_allow_blank && check_length && params[key]
+      end
+
+      def check_type
+        valid = params[key].is_a?(String)
+        add_field_error("This field's type must be string.") unless valid
+        valid
+      end
+
+      def check_allow_blank
+        valid = !(!schema[key][:allow_blank] && params[key].blank?)
+        add_field_error('This field cannot be blank.') unless valid
+        valid
+      end
+
+      def check_length
+        min_length = schema[key][:min_length]
+        max_length = schema[key][:max_length]
+        valid = (min_length..max_length).include? params[key].length
+        add_field_error("This string field's length must be in range from #{min_length} to #{max_length}.") unless valid
+        valid
+      end
+    end
+
+    class ArrParamChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        check_type && check_allow_empty && params[key]
+      end
+
+      def check_type
+        valid = params[key].is_a? Array
+        add_field_error("This field's type must be array.") unless valid
+        valid
+      end
+
+      def check_allow_empty
+        valid = !(!schema[key][:allow_empty] && params[key].empty?)
+        add_field_error('This field cannot be empty.') unless valid
+        valid
+      end
+    end
+
+    class HashParamChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        check_type && params[key]
+      end
+
+      def check_type
+        valid = params[key].is_a? Hash
+        add_field_error("This field's type must be hash.") unless valid
+        valid
+      end
+    end
+
+    class NestedHashChecker
+      prepend SimpleCommand
+      def initialize(key = '', schema = {}, params = {}, context = {})
+        @key = key
+        @schema = schema
+        @params = params
+        @context = context
+      end
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        check_type && formatted_nested_hash
+      end
+
+      def formatted_nested_hash
+        cmd = schema[key][:class].call(params: params[key], context: context, is_outest_hash: false)
+        return cmd.result if cmd.success?
 
-        class BooleanChecker < BaseParamChecker
-          prepend SimpleCommand
-      
-          def call
-              return nil if fields[key][:allow_nil] && opts[key].nil?
-
-              check_type && formatted_boolean
-          end
-      
-          def formatted_boolean
-            [false, "false", "1"].exclude?(opts[key])
-          end
-
-          def check_type
-              valid = opts[key].in? [true, false, "true", "false", "1", "0"]
-              add_error("This field's type must be boolean.") unless valid
-              valid
-          end
-      
+        add_nested_hash_error(cmd.errors)
+      end
+
+      def check_type
+        valid = params[key].is_a?(ActionController::Parameters) || params[key].is_a?(Hash)
+        add_field_error("This field's type must be object or ActionController::Parameters.") unless valid
+
+        valid
+      end
+
+      def add_nested_hash_error(message = '')
+        errors.add(key, message[:errors][0][:field_errors])
+      end
+
+      def add_field_error(message = '')
+        errors.add(key, message)
+      end
+
+      attr_accessor :key, :schema, :params, :class, :context
+    end
+
+    class NestedHashsChecker
+      prepend SimpleCommand
+      def initialize(key = '', schema = {}, params = {}, context = {})
+        @key = key
+        @schema = schema
+        @params = params
+        @context = context
+      end
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        check_type && add_errors && formatted_nested_hashs
+      end
+
+      def add_errors
+        all_errors = params[key].map do |nested_hash|
+          get_error(nested_hash)
         end
+        return if all_errors.all?(&:nil?)
+
+        errors.add(key, all_errors)
+      end
 
-        class FileChecker < BaseParamChecker
-          prepend SimpleCommand
-      
-          def call
-                return nil if fields[key][:allow_nil] && opts[key].nil?
-
-              check_type && opts[key]
-          end
-      
-          def check_type
-              valid = opts[key].is_a?(ActionDispatch::Http::UploadedFile)
-              add_error("This field's type must be file.") unless valid
-              valid
-          end
-      
+      def get_error(nested_hash)
+        cmd = schema[key][:class].call(
+          params: nested_hash,
+          context: context,
+          is_outest_hash: false
+        )
+        return nil if cmd.success?
+
+        cmd.errors[:errors][0][:field_errors]
+      end
+
+      def formatted_nested_hashs
+        params[key].map do |nested_hash|
+          formatted_nested_hash(nested_hash)
         end
+      end
+
+      def formatted_nested_hash(nested_hash)
+        cmd = schema[key][:class].call(
+          params: nested_hash,
+          context: context,
+          is_outest_hash: false
+        )
+        cmd.result
+      end
 
+      def check_type
+        valid = params[key].is_a?(Array)
+        add_field_error("This field's type must be array.") unless valid
+        valid
+      end
+
+      def add_field_error(message = '')
+        errors.add(key, message)
+      end
+
+      attr_accessor :key, :schema, :params, :class, :context
+    end
+
+    class DateParamChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        formatted_date
+      end
+
+      def formatted_date
+        Date.parse params[key]
+      rescue => e
+        add_field_error('Invalid date.')
+      end
     end
-end
 
+    class TimeParamChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        formatted_time
+      end
+
+      def formatted_time
+        Time.parse params[key]
+      rescue => e
+        add_field_error('Invalid time.')
+      end
+    end
+
+    class DateTimeParamChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        formatted_datetime
+      end
+
+      def formatted_datetime
+        DateTime.parse(params[key])
+      rescue => e
+        add_field_error('Invalid datetime.')
+      end
+    end
+
+    class BooleanChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        check_type && formatted_boolean
+      end
+
+      def formatted_boolean
+        [false, "false", "1"].exclude?(params[key])
+      end
+
+      def check_type
+        valid = params[key].in? [true, false, "true", "false", "1", "0"]
+        add_field_error("This field's type must be boolean.") unless valid
+        valid
+      end
+    end
+
+    class FileChecker < BaseParamChecker
+      prepend SimpleCommand
+
+      def call
+        return nil if schema[key][:allow_nil] && params[key].nil?
+
+        check_type && params[key]
+      end
+
+      def check_type
+        valid = params[key].is_a?(ActionDispatch::Http::UploadedFile)
+        add_field_error("This field's type must be file.") unless valid
+        valid
+      end
+    end
+  end
+end

data/lib/params_checker/version.rb

@@ -1,3 +1,3 @@
 module ParamsChecker
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/lib/params_checker.rb

@@ -1,9 +1,11 @@
-require "simple_command"
-require "params_checker/engine"
-require "params_checker/fields"
-require "params_checker/my_error"
-require "params_checker/param_checker"
-require "params_checker/base_params_checker"
+require 'simple_command'
+require 'params_checker/engine'
+require 'params_checker/fields'
+require 'params_checker/general_error'
+require 'params_checker/field_error'
+require 'params_checker/param_checker'
+require 'params_checker/base_params_checker'
+require 'params_checker/helper'
+
 module ParamsChecker
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: params_checker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - rexy tech
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.3.1
+- !ruby/object:Gem::Dependency
+  name: simple_command
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -54,20 +68,15 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
-- app/assets/config/params_checker_manifest.js
-- app/assets/stylesheets/params_checker/application.css
-- app/controllers/params_checker/application_controller.rb
-- app/helpers/params_checker/application_helper.rb
-- app/jobs/params_checker/application_job.rb
-- app/mailers/params_checker/application_mailer.rb
-- app/models/params_checker/application_record.rb
-- app/views/layouts/params_checker/application.html.erb
 - config/routes.rb
 - lib/params_checker.rb
 - lib/params_checker/base_params_checker.rb
+- lib/params_checker/constants.rb
 - lib/params_checker/engine.rb
+- lib/params_checker/field_error.rb
 - lib/params_checker/fields.rb
-- lib/params_checker/my_error.rb
+- lib/params_checker/general_error.rb
+- lib/params_checker/helper.rb
 - lib/params_checker/param_checker.rb
 - lib/params_checker/version.rb
 homepage: https://rexy.tech/