validate-params 0.5.2 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6ab3ca178e0872231216da505527fc494dfa77ec389827c4db303e935ef5ead
-  data.tar.gz: d36f7fcee87464448330e6414e9962214c51295606773a1060460a2fb4926aa5
+  metadata.gz: d7ca97c7e091dd9ec8f28cb7fcfe146ec315e4d7513f145b0a27015c5ecf826d
+  data.tar.gz: 9b6159617d663834cf65707aa80a51e5e411dc03f218588e9136069494269ce7
 SHA512:
-  metadata.gz: af6b5f6b529eb3b848f1da4cbb590255a7122560327a695c22fdcaeaf3689bad84626ea2ecef2c3451c136b8ed64eb58846672d084a84080e25adf4e4c12365c
-  data.tar.gz: 7d86a7ddf3e57603b428b37cc01b5e9cc334348d2bd87a8fa36da108544e9f2a68f61a4cfd7095645e17e2a1c4afcefa91c5702157ab81f8f32d14d095b61fed
+  metadata.gz: 5738ecc1bec5808caaa44a71633beb13e0e2ffe77fea4921afea41d1e2d44852833f2f6783b2fbb05cd8f4b140587051a1b5008d0020d13166eb2fb8a059e12b
+  data.tar.gz: 7d688728061b1a044b564ad199649828d961f0b9bcc21f3b3b19861723048fa2ff5eaad6527e758052c9aebdd04fda5068998c957d62063125a98f866e0ce403

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    validate-params (0.5.2)
+    validate-params (0.6.1)
       activesupport (>= 6.1.0)
 
 GEM

data/README.md

@@ -20,7 +20,7 @@ Definition of the validator with symbols as keys:
 
 ```ruby
 class TestController < ActionController::Base
-  include ValidateParams::ParamsValidator
+  include ValidateParams::Validatable
 
   validate_params :index do |p|
     p.param :name, String, default: "John Doe"
@@ -41,6 +41,23 @@ class TestController < ActionController::Base
   end
 end
 ```
+
+## Response
+
+If the parameters are valid, the controller action will be executed as normal. If the parameters are invalid, a **400 Bad Request** response will be returned with a JSON body containing the errors, or an empty HTML response.
+
+## Format
+
+By default responses are returned in JSON format. To return responses as an empty HTML response, change the :format options in the validate_params methods to :html.
+
+Example: 
+
+```ruby
+validate_params :index, format: :html do |p|
+    p.param :name, String, default: "John Doe"
+end
+```
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rspec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/validate_params/types/date.rb

@@ -0,0 +1,19 @@
+module ValidateParams
+  class Types
+    class Date
+      def self.valid?(value)
+        value = value.to_s
+        return false if !/\d{4}-\d{2}-\d{2}/.match?(value)
+
+        parsed_date = begin
+                        ::Date.strptime(value, "%Y-%m-%d")
+                      rescue StandardError
+                        nil
+                      end
+        return false if parsed_date.nil?
+        return false if parsed_date.year > 9999
+        true
+      end
+    end
+  end
+end

data/lib/validate_params/types/date_time.rb

@@ -0,0 +1,12 @@
+module ValidateParams
+  class Types
+    class DateTime
+      def self.valid?(value)
+        Time.at(Integer(value))
+        true
+      rescue ArgumentError, TypeError
+        false
+      end
+    end
+  end
+end

data/lib/validate_params/types/integer.rb

@@ -0,0 +1,10 @@
+module ValidateParams
+  class Types
+    class Integer
+      def self.valid?(value)
+        value = value.to_s
+        /\A[-+]?\d+\z/ === value
+      end
+    end
+  end
+end

data/lib/validate_params/{params_validator.rb → validatable.rb}

@@ -1,7 +1,11 @@
-require "active_support/concern"
+# frozen_string_literal: true
+
+require "validate_params/types/date"
+require "validate_params/types/date_time"
+require "validate_params/types/integer"
 
 module ValidateParams
-  module ParamsValidator
+  module Validatable
     extend ::ActiveSupport::Concern
 
     included do
@@ -23,8 +27,9 @@ module ValidateParams
         end
       end
 
-      def validate_params_for(request_action, &block)
-        @request_action = request_action
+      def validate_params_for(controller_action, options = {}, &block)
+        @controller_action = controller_action
+        @response_format = options[:format] || :json
 
         yield(self) if block
       end
@@ -34,8 +39,12 @@ module ValidateParams
       self.class.instance_variable_get(:@params_validations) || []
     end
 
-    def request_action
-      self.class.instance_variable_get(:@request_action) || nil
+    def controller_action
+      self.class.instance_variable_get(:@controller_action) || nil
+    end
+
+    def response_format
+      self.class.instance_variable_get(:@response_format) || nil
     end
 
     private
@@ -89,7 +98,7 @@ module ValidateParams
     end
 
     def perform_validate_params
-      return unless request_action.present? && request_action == action_name.to_sym
+      return unless controller_action.present? && controller_action == action_name.to_sym
 
       errors = []
 
@@ -114,19 +123,19 @@ module ValidateParams
 
         case params_validation[:type].to_s
         when "Date"
-          if invalid_date?(parameter_value)
+          unless ValidateParams::Types::Date.valid?(parameter_value)
             errors << {
               message: build_error_message(error_param_name(params_validation[:field]), params_validation[:type])
             }
           end
         when "DateTime"
-          if invalid_datetime?(parameter_value)
+          unless ValidateParams::Types::DateTime.valid?(parameter_value)
             errors << {
               message: build_error_message(error_param_name(params_validation[:field]), params_validation[:type])
             }
           end
         when "Integer"
-          if invalid_integer?(parameter_value)
+          unless ValidateParams::Types::Integer.valid?(parameter_value)
             errors << {
               message: build_error_message(error_param_name(params_validation[:field]), params_validation[:type])
             }
@@ -153,35 +162,14 @@ module ValidateParams
 
       return if errors.empty?
 
-      if request.nil? || request.format.json?
-        render json: { success: false, errors: errors }, status: :bad_request
-      else
+      case response_format
+      when :html
         head :bad_request
+      else
+        render json: { success: false, errors: errors }, status: :bad_request
       end
     end
 
-    def invalid_date?(value)
-      return true unless /\d{4}-\d{2}-\d{2}/.match?(value)
-
-      parsed_date = begin
-                      Date.strptime(value, "%Y-%m-%d")
-                    rescue StandardError
-                      nil
-                    end
-      parsed_date.blank? || parsed_date.year > 9999
-    end
-
-    def invalid_datetime?(value)
-      Time.at(Integer(value))
-      false
-    rescue ArgumentError, TypeError
-      true
-    end
-
-    def invalid_integer?(value)
-      value.to_s !~ /\A[-+]?[0-9]+\z/
-    end
-
     class ParamBuilder
       def initialize(parent_field = nil)
         @parent_field = parent_field

data/lib/validate_params/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ValidateParams
-  VERSION = "0.5.2"
+  VERSION = "0.6.1"
 end

data/lib/validate_params.rb

@@ -1,12 +1,14 @@
 # frozen_string_literal: true
 
 require_relative "validate_params/version"
-require_relative "validate_params/params_validator"
+require_relative "validate_params/validatable"
+Dir[File.join(__dir__, 'validate_params/types', '*.rb')].each { |file| require file }
+Dir[File.join(__dir__, 'validate_params/validators', '*.rb')].each { |file| require file }
 
 module ValidateParams
   class Error < StandardError; end
 end
 
 ActiveSupport.on_load(:action_controller) do
-  include ValidateParams::ParamsValidator
+  include ValidateParams::Validatable
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validate-params
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.1
 platform: ruby
 authors:
 - dcherevatenko
@@ -96,7 +96,11 @@ files:
 - Rakefile
 - config/locales/en.yml
 - lib/validate_params.rb
-- lib/validate_params/params_validator.rb
+- lib/validate_params/types/date.rb
+- lib/validate_params/types/date_time.rb
+- lib/validate_params/types/integer.rb
+- lib/validate_params/validatable.rb
+- lib/validate_params/validators/date.rb
 - lib/validate_params/version.rb
 - sig/validate_params.rbs
 - validate_params.gemspec