rails_validation_api 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4f6763bbc5879669935aedb9a4c25437da3a78c480ee2d0fd89a8c20ba52eec
-  data.tar.gz: d262f3175cb60f276c0f28b286fa2fcf3ccf294275943da75c6eb9e8b5dc8810
+  metadata.gz: 83ba96c72236af10ef1179343132ef56d9f9b83e00daaa79cb40b0380dfbcbb7
+  data.tar.gz: 0673b7734ebda2392018999e750b171daecb63c65904ba98011625ed86c9e3d1
 SHA512:
-  metadata.gz: 0baf32fb6aca2cde5a15c874f5f46d69b3d7e3c0ab00f9f7cb51583359a70c454c2dc259bc981fd22dafe832c08758358d0659b6b4f881c3e8a58ca8a9ebe290
-  data.tar.gz: 737cf138b2137716889652e0155f9dd9905527a4bb3f439b9b0395201db551d01ed9e115eeb3d855d08d7cc30b76c81922b3c11e65f2a4030bc28864bf8bcf29
+  metadata.gz: b1f6669cc6aa2ddf529280dd74558f13e77147db34af9b23e80a792187248dfb8c293a34723c01d18880b9e5ada817656c3da10e046d4b2663196e35b56651d5
+  data.tar.gz: 18ca8b1b28f3a2675db6dc344b4b64ea0630faeefa18649382b2f6cd7cf801e56c5883d1cdf0da026f2b73570a3f55a126be697e025c46667f274a0be8b7e6bd

data/exe/commands/usage.rb

@@ -1,7 +1,6 @@
 puts <<~TEXT
   -------------------------------------------------------------------------------------------------------------------------------------------------
-  |    Add "include AutoLoadRailsValidationApi" to your controller ex: API::BaseController < ApplicationController to use the RailsValidationApi  |
-  |    Add "config.autoload_paths += %w(\#{config.root}/app/validators/)" in config/application.rb to autoload validators.                         |
+  |    Install: bundle exec rails generate rails_validation_api:install                                                                           |
   |-----------------------------------------------------------------------------------------------------------------------------------------------|                                                                                                                                       |     
   |    To use the RailsValidationApi, you need to add the following line to your Gemfile:                                                         |
   |    Usage: bundle exec rails_validation_api <command> [name]                                                                                   |

data/lib/generators/rails_validation_api/install_generator.rb

@@ -0,0 +1,13 @@
+require "rails/generators"
+
+module RailsValidationApi
+  module Generators
+    class InstallGenerator < Rails::Generators::Base
+      source_root File.expand_path("templates", __dir__)
+
+      def copy_initializer
+        template "rails_validation_api.rb", "config/initializers/rails_validation_api.rb"
+      end
+    end
+  end
+end

data/lib/generators/rails_validation_api/templates/rails_validation_api.rb

@@ -0,0 +1,7 @@
+require "auto_load_rails_validation_api"
+
+Rails.application.config.autoload_paths += %W(#{Rails.root}/app/validators)
+
+ActiveSupport.on_load(:action_controller) do
+  include AutoLoadRailsValidationApi
+end

data/lib/rails_validation_api/validator.rb

@@ -2,9 +2,12 @@ require "date"
 require "time"
 require "bigdecimal"
 require "active_support/all"
-require "debug"
+require "rails_param"
+
 module RailsValidationApi
   class Validator
+    include RailsParam
+
     attr_accessor :params
     attr_reader :errors
 
@@ -17,14 +20,15 @@ module RailsValidationApi
     def validate
       return false if @rules.nil? || @rules.empty?
 
-      @rules.each do |rule, _|
-        validate_field(rule)
+      @rules.each do |rule_name, rule|
+        validate_field(rule_name)
       end
       if @errors.any?
-        # Only raise the first error to match expected behavior
-        first_error = @errors.first
-        raise RailsValidationApi::Error.new(first_error[:field], :unprocessable_entity, first_error[:message])
+        @errors.each do |error|
+          raise RailsValidationApi::Error.new(error[:field], :unprocessable_entity, error[:message])
+        end
       end
+      nil
     end
 
     private
@@ -39,37 +43,32 @@ module RailsValidationApi
 
       return unless field && type
 
-      # Get the field value from params
-      value = params[field]
-
       # Validate the main field
       opts.each do |opt|
         next unless opt.is_a?(Hash)
 
-        # Check if field is required and missing
-        if opt[:required] && (value.nil? || (value.is_a?(String) && value.empty?))
-          message = opt[:message] || "Parameter #{field} is required"
-          @errors << { field: field, message: message }
-          next
-        end
-
-        # Skip further validation if field is not required and is nil/empty
-        next if !opt[:required] && (value.nil? || (value.is_a?(String) && value.empty?))
-
-        # Type validation
-        unless value.nil? || valid_type?(value, type)
-          message = opt[:message] || "Parameter #{field} must be of type #{type}"
+        begin
+          if type == Array && opt[:type] # => Nested item type inside Array
+            param! field, Array do |array_param, index|
+              begin
+                array_param.param! index, opt[:type], **opt.except(:type)
+              rescue RailsParam::InvalidParameterError => e
+                message = opt[:message] || e.message ||  "Invalid value at index #{index} for #{field}"
+                @errors << { field: "#{field}[#{index}]", message: message }
+              end
+            end
+          else
+            param! field, type, **opt
+          end
+        rescue RailsParam::InvalidParameterError => e
+          message = (e.message).include?(type.to_s) ? e.message : opt[:message]
           @errors << { field: field, message: message }
-          next
         end
-
-        # Additional validations
-        validate_options(field, value, opt)
       end
 
       # Validate nested items if present (for Hash/Array fields)
-      if items && value.is_a?(Hash)
-        validate_nested_items(field, items, value)
+      if items && params[field].is_a?(Hash)
+        validate_nested_items(field, items, params[field])
       end
     end
 
@@ -85,88 +84,19 @@ module RailsValidationApi
 
         next unless item_field && item_type
 
-        # Validate nested field
-        value = nested_params[item_field]
+        # Create a temporary validator for nested validation
+        temp_validator = self.class.new(nested_params, {})
         item_opts.each do |opt|
           next unless opt.is_a?(Hash)
 
-          # Check if field is required and missing
-          if opt[:required] && (value.nil? || (value.is_a?(String) && value.empty?))
-            message = opt[:message] || "Parameter #{parent_field}.#{item_field} is required"
+          begin
+            temp_validator.param! item_field, item_type, **opt
+          rescue RailsParam::InvalidParameterError => e
+            message = (e.message).include?(item_type.to_s) ? e.message : opt[:message]
             @errors << { field: "#{parent_field}.#{item_field}", message: message }
-            next
           end
-
-          # Skip further validation if field is not required and is nil/empty
-          next if !opt[:required] && (value.nil? || (value.is_a?(String) && value.empty?))
-
-          # Type validation
-          unless value.nil? || valid_type?(value, item_type)
-            message = opt[:message] || "Parameter #{parent_field}.#{item_field} must be of type #{item_type}"
-            @errors << { field: "#{parent_field}.#{item_field}", message: message }
-            next
-          end
-
-          # Additional validations
-          validate_options("#{parent_field}.#{item_field}", value, opt)
         end
       end
     end
-
-    def valid_type?(value, type)
-      value = format_string_to_int(value, type)
-      case type.to_s
-      when String.to_s
-        value.is_a?(String)
-      when Integer.to_s
-        value.is_a?(Integer)
-      when Float.to_s
-        value.is_a?(Float) || value.is_a?(Integer)
-      when Hash.to_s
-        value.is_a?(Hash)
-      when Array.to_s
-        value.is_a?(Array)
-      when TrueClass.to_s, FalseClass.to_s
-        value.is_a?(TrueClass) || value.is_a?(FalseClass)
-      else
-        value.is_a?(type)
-      end
-    end
-
-    def validate_options(field, value, opt)
-      # Handle min validation
-      if opt[:min] && value.respond_to?(:to_i) && value.to_i < opt[:min]
-        message = opt[:message] || "Parameter #{field} must be at least #{opt[:min]}"
-        @errors << { field: field, message: message }
-      end
-
-      # Handle max validation
-      if opt[:max] && value.respond_to?(:to_i) && value.to_i > opt[:max]
-        message = opt[:message] || "Parameter #{field} must be at most #{opt[:max]}"
-        @errors << { field: field, message: message }
-      end
-
-      # Handle format validation
-      if opt[:format] && value.is_a?(String) && !(value =~ opt[:format])
-        message = opt[:message] || "Parameter #{field} format is invalid"
-        @errors << { field: field, message: message }
-      end
-
-      # Handle blank validation
-      if opt[:blank] == false && value.is_a?(String) && value.strip.empty?
-        message = opt[:message] || "Parameter #{field} cannot be blank"
-        @errors << { field: field, message: message }
-      end
-    end
-
-    def format_string_to_int(value, type)
-      return value unless value.is_a?(String)
-
-      return Integer(value) rescue value if type == Integer
-      return Float(value) rescue value if type == Float
-      value
-    rescue ArgumentError
-      value
-    end
   end
 end

data/lib/rails_validation_api/version.rb

@@ -1,3 +1,3 @@
 module RailsValidationApi
-  VERSION = "1.2.2"
+  VERSION = "1.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_validation_api
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Linh Nguyen Quang
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -96,6 +110,8 @@ files:
 - exe/commands/usage.rb
 - exe/rails_validation_api
 - lib/auto_load_rails_validation_api.rb
+- lib/generators/rails_validation_api/install_generator.rb
+- lib/generators/rails_validation_api/templates/rails_validation_api.rb
 - lib/rails_validation_api.rb
 - lib/rails_validation_api/dsl.rb
 - lib/rails_validation_api/validator.rb