rails_simple_params 1.4.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5d43833fa90c412a87b2c9fbb770b772fa4108bea779f48d26585b5f71cac96
-  data.tar.gz: 59780a29ba6d6e06cc69129d7c55ec0d7207213e00db452cfa547957b3df9f41
+  metadata.gz: ae4ae0e8760be9e443811dce2d53c49cdf6c53fc440a0753d183158fd5d6e2ca
+  data.tar.gz: 954ee1b768a922a8a800aec2918fbcd216ba8cba96cf0b04f4b42b666e28534e
 SHA512:
-  metadata.gz: e4dcec56bd8a60f7e86c66c44aee6e0f69e632fca2ab77c251421c68f254fbebf23c0d8eb909a2d014af9ca51a2348c24103f19613028c67a0d65522218a3ec6
-  data.tar.gz: 4d07862e2593a5ffb3567e7cf04203690186c5fba6aaab74bcc4c8b7d1d2f6c5cc8c5283990e2ee912fe7895b4b1c54b9e4d1eae5ba390f4ed62b375fc2c4c3e
+  metadata.gz: 685514c6ca2094a649edacd76419b69d8e01cd6a55e2c55fd9a2f09de126d376944ef2021ac796d28ee7c6e079ab8dfad6ac95a000cb01c179d324f0b4e3adf2
+  data.tar.gz: 96d9b8b0d0f051b0818b23182c642dd14c2d49c9587511d94f8b3d44faf4e03068b71ae23aea921fddfb2c86c447384534bac20fca329c47d4cfa6ece673a8d4

data/README.md

@@ -36,7 +36,30 @@ As usual, in your Gemfile...
   gem 'rails_simple_params'
 ```
 
-## Example
+### Migrating from `rails_param`
+
+Change any code you have rescuing `RailsParam::InvalidParameterError` to instead
+rescue `RailsSimpleParam::InvalidParameter` so you will continue to provide any
+customized HTTP `4xx` responses appropriate for your app.
+
+If you want to handle different types of validations separately — especially if
+you want to handle your own I18n translations for the default English error
+messages provided by this gem — you can rescue from any/all of the sub-classed
+exception classes:
+
+- `RailsSimpleParam::EmptyParameter`
+- `RailsSimpleParam::InvalidFormat`
+- `RailsSimpleParam::InvalidIdentity`
+- `RailsSimpleParam::InvalidOption`
+- `RailsSimpleParam::InvalidType`
+- `RailsSimpleParam::MissingParameter`
+- `RailsSimpleParam::OutOfRange`
+- `RailsSimpleParam::TooLarge`
+- `RailsSimpleParam::TooLong`
+- `RailsSimpleParam::TooShort`
+- `RailsSimpleParam::TooSmall`
+
+## Using this Gem
 
 ``` ruby
   # GET /search?q=example
@@ -48,6 +71,7 @@ As usual, in your Gemfile...
     param! :sort,       String, default: 'title'
     param! :order,      String, in: %w(asc desc), transform: :downcase, default: 'asc'
     param! :price,      String, format: /[<\=>]\s*\$\d+/
+    param! :results,    Integer, in: (10..100)
 
     # Access the parameters using the params object (e.g. `params[:q]`) as you usually do...
   end
@@ -66,27 +90,27 @@ are automatically stripped when converting to `BigDecimal`.
 - `String`
 - `Integer`
 - `Float`
-- `:boolean/TrueClass/FalseClass` _('1/0', 'true/false', 't/f', 'yes/no', 'y/n')_
-- `Array` _('1,2,3,4,5')_
-- `Hash` _('key1:value1,key2:value2')_
+- `:boolean/TrueClass/FalseClass` ('1/0', 'true/false', 't/f', 'yes/no', 'y/n')
+- `Array` (e.g. '1,2,3,4,5')
+- `Hash` (e.g. 'key1:value1,key2:value2')
 - `Date`, `Time`, & `DateTime`
-- `BigDecimal` _('$1,000,000')_
+- `BigDecimal` (e.g. '$100,000,000,000')
 
 ### Validations
 
 Encapsulate business logic in a consistent way with validations. If a parameter
 does not satisfy a particular condition, an exception
-(RailsSimpleParams::InvalidParameterError) is raised. You may use the
-[rescue_from][method-rescue-from] method in your controller to catch this kind
-of exception.
+(RailsSimpleParams::InvalidParameter or one of its subclasses) is raised. You
+may use the [rescue_from][method-rescue-from] method in your controller to catch
+this kind of exception.
 
-- `required`
 - `blank`
+- `format`
 - `is`
-- `in`, `within`, `range`
+- `in` (for arrays / ranges / sets)
 - `min` / `max`
 - `min_length` / `max_length`
-- `format`
+- `required`
 
 Customize exception message with option `:message`
 
@@ -97,11 +121,12 @@ param! :q, String, required: true, message: 'Query not specified'
 ### Defaults and Transformations
 
 Passing a `default` option will provide a default value for a parameter if none
-is passed. A `default` can be defined as either a default value or as a `Proc`:
+is passed. A `default` can be defined as either a default value or as a `Proc`
+(and `in` options can also be a `Proc`):
 
 ```ruby
-param! :attribution, String, default: "©"
-param! :year, Integer, default: lambda { Time.now.year }
+param! :attribution, String, default: '©'
+param! :year, Integer, in: lambda { (Time.now.year-5..Time.now.year+5) }, default: lambda { Time.now.year }
 ```
 
 Use the `transform` option to take even more of the business logic of parameter
@@ -155,8 +180,8 @@ end
 ## Many thanks to:
 
 - [Nicolas Blanco](http://twitter.com/nblanco_fr)
-- [Mattt Thompson (@mattt)](https://twitter.com/mattt)
-- [Vincent Ollivier (@vinc686)](https://twitter.com/vinc686)
+- [Mattt Thompson](https://twitter.com/mattt)
+- [Vincent Ollivier](https://twitter.com/vinc686)
 
 ## License
 

data/lib/rails_simple_params/coercion/array_param.rb

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class ArrayParam < VirtualParam
+    class ArrayParam < Base
       def coerce
         return param if param.is_a?(Array)
 

data/lib/rails_simple_params/coercion/{virtual_param.rb → base.rb}

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class VirtualParam
+    class Base
       attr_reader :param, :options, :type
 
       def initialize(param:, options: nil, type: nil)
@@ -13,14 +13,12 @@ module RailsSimpleParams
       end
 
       def coerce
-        nil
+        raise NotImplementedError, "you must implement #coerce in #{self.class.name}"
       end
 
       private
 
-      def argument_validation
-        nil
-      end
+      def argument_validation; end
     end
   end
 end

data/lib/rails_simple_params/coercion/big_decimal_param.rb

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class BigDecimalParam < VirtualParam
+    class BigDecimalParam < Base
       DEFAULT_PRECISION = 14
 
       def coerce

data/lib/rails_simple_params/coercion/boolean_param.rb

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class BooleanParam < VirtualParam
+    class BooleanParam < Base
       FALSEY = /^(false|f|no|n|0)$/i
       TRUTHY = /^(true|t|yes|y|1)$/i
 

data/lib/rails_simple_params/coercion/float_param.rb

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class FloatParam < VirtualParam
+    class FloatParam < Base
       def coerce
         return nil if param == '' # e.g. from an empty field in an HTML form
 

data/lib/rails_simple_params/coercion/hash_param.rb

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class HashParam < VirtualParam
+    class HashParam < Base
       def coerce
         return param if param.is_a?(ActionController::Parameters)
         raise ArgumentError unless param.respond_to?(:split)
@@ -13,7 +13,7 @@ module RailsSimpleParams
       private
 
       def argument_validation
-        raise ArgumentError unless type == Hash
+        raise InvalidConfiguration unless type == Hash
       end
     end
   end

data/lib/rails_simple_params/coercion/integer_param.rb

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class IntegerParam < VirtualParam
+    class IntegerParam < Base
       def coerce
         return nil if param == '' # e.g. from an empty field in an HTML form
 

data/lib/rails_simple_params/coercion/string_param.rb

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class StringParam < VirtualParam
+    class StringParam < Base
       def coerce
         String(param)
       end

data/lib/rails_simple_params/coercion/time_param.rb

@@ -2,7 +2,7 @@
 
 module RailsSimpleParams
   class Coercion
-    class TimeParam < VirtualParam
+    class TimeParam < Base
       def coerce
         return nil if param == '' # e.g. from an empty field in an HTML form
 
@@ -14,7 +14,7 @@ module RailsSimpleParams
       private
 
       def argument_validation
-        raise ArgumentError unless type.respond_to?(:parse)
+        raise InvalidConfiguration unless type.respond_to?(:parse)
       end
     end
   end

data/lib/rails_simple_params/coercion.rb

@@ -2,8 +2,6 @@
 
 module RailsSimpleParams
   class Coercion
-    attr_reader :coercion, :param
-
     PARAM_TYPE_MAPPING = {
       Integer => IntegerParam,
       Float => FloatParam,
@@ -19,25 +17,26 @@ module RailsSimpleParams
       boolean: BooleanParam
     }.freeze
 
-    TIME_TYPES = [Date, DateTime, Time].freeze
-    BOOLEAN_TYPES = [TrueClass, FalseClass, :boolean].freeze
+    attr_reader :coercion, :param
 
     def initialize(param, type, options)
       @param = param
       @coercion = klass_for(type).new(param: param, options: options, type: type)
     end
 
+    def coerce
+      return nil if param.nil?
+
+      coercion.coerce
+    end
+
+    private
+
     def klass_for(type)
       klass = PARAM_TYPE_MAPPING[type]
       return klass if klass
 
       raise TypeError
     end
-
-    def coerce
-      return nil if param.nil?
-
-      coercion.coerce
-    end
   end
 end

data/lib/rails_simple_params/config_check/array_param.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class ArrayParam < Base
+      private
+
+      def configuration_validation
+        reject :format
+        reject :in
+        reject :max
+        reject :max_length
+        reject :min
+        reject :min_length
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check/base.rb

@@ -0,0 +1,82 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class Base
+      attr_reader :param, :options, :type
+
+      def initialize(param:, type:, options: nil)
+        @param = param
+        @options = options
+        @type = type
+        configuration_validation
+      end
+
+      private
+
+      def allowed_list
+        return unless (allowed = options[:in])
+
+        allowed = allowed.call if allowed.respond_to?(:call)
+        allowed = [allowed.begin, allowed.end] if allowed.is_a?(Range) && type.is_a?(Numeric)
+        allowed
+      end
+
+      def configuration_validation
+        raise NotImplementedError, "you must implement #configuration_validation in #{self.class.name}"
+      end
+
+      def raise_error(message)
+        raise RailsSimpleParams::InvalidConfiguration.new(message, param:)
+      end
+
+      def reject(key, extra = nil)
+        return unless options.key? key
+
+        raise_error "#{type} param (#{param}) does not allow :#{key}#{extra}"
+      end
+
+      def validate_allowed_options(not_allowed, test_proc)
+        return unless (allowed = allowed_list)
+
+        raise_error ":in on #{param} is not a list" unless allowed.is_a?(Array) || allowed.is_a?(Range)
+
+        return if allowed.all? { |n| test_proc.call(n) }
+
+        raise_error "#{type} param (#{param}) does not allow #{not_allowed} :in options"
+      end
+
+      def validate_length(key)
+        return unless options.key? key
+        return if options[key].is_a? Integer
+
+        raise_error ":#{key} on #{param} must be an Integer"
+      end
+
+      def validate_lengths
+        validate_length :max_length
+        validate_length :min_length
+        return unless options.key?(:min_length) && options.key?(:max_length)
+        return if options[:min_length] < options[:max_length]
+
+        raise_error ":max_length on #{param} must be larger than :min_length"
+      end
+
+      def validate_limit(key)
+        return unless options.key? key
+        return if options[key].is_a? Numeric
+
+        raise_error ":#{key} on #{param} must be a number"
+      end
+
+      def validate_limits
+        validate_limit :max
+        validate_limit :min
+        return unless options.key?(:min) && options.key?(:max)
+        return if options[:min] < options[:max]
+
+        raise_error ":max on #{param} must be larger than :min"
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check/big_decimal_param.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class BigDecimalParam < Base
+      private
+
+      def configuration_validation
+        reject :format
+        reject :in, ' (use :min/:max)'
+        reject :max_length
+        reject :min_length
+        validate_limits
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check/boolean_param.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class BooleanParam < Base
+      private
+
+      def configuration_validation
+        reject :format
+        reject :in
+        reject :max
+        reject :max_length
+        reject :min
+        reject :min_length
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check/float_param.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class FloatParam < Base
+      private
+
+      def configuration_validation
+        reject :format
+        reject :max_length
+        reject :min_length
+        validate_limits
+        validate_allowed_options 'non-Numeric', ->(n) { n.is_a?(Numeric) }
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check/hash_param.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class HashParam < Base
+      private
+
+      def configuration_validation
+        reject :format
+        reject :in
+        reject :max
+        reject :max_length
+        reject :min
+        reject :min_length
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check/integer_param.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class IntegerParam < Base
+      private
+
+      def configuration_validation
+        reject :format
+        reject :max_length
+        reject :min_length
+        validate_limits
+        validate_allowed_options 'non-Integer', ->(n) { n.is_a?(Integer) }
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check/string_param.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class StringParam < Base
+      private
+
+      def configuration_validation
+        reject :max
+        reject :min
+        validate_lengths
+        validate_allowed_options 'non-String', ->(n) { n.is_a?(String) }
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check/time_param.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    class TimeParam < Base
+      private
+
+      def configuration_validation
+        reject :in
+        reject :max_length
+        reject :min_length
+      end
+    end
+  end
+end

data/lib/rails_simple_params/config_check.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class ConfigCheck
+    PARAM_TYPE_MAPPING = {
+      Integer => IntegerParam,
+      Float => FloatParam,
+      String => StringParam,
+      Array => ArrayParam,
+      Hash => HashParam,
+      BigDecimal => BigDecimalParam,
+      Date => TimeParam,
+      DateTime => TimeParam,
+      Time => TimeParam,
+      TrueClass => BooleanParam,
+      FalseClass => BooleanParam,
+      boolean: BooleanParam
+    }.freeze
+
+    def initialize(param, type, options)
+      klass_for(type).new(param: param, options: options, type: type)
+    end
+
+    private
+
+    def klass_for(type)
+      klass = PARAM_TYPE_MAPPING[type]
+      return klass if klass
+
+      raise TypeError
+    end
+  end
+end

data/lib/rails_simple_params/exceptions.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module RailsSimpleParams
+  class InvalidParameter < StandardError
+    attr_accessor :param, :options
+
+    def initialize(message, param: nil, options: {})
+      self.param = param
+      self.options = options
+      super(message)
+    end
+
+    def message
+      return options[:message] if options.is_a?(Hash) && options.key?(:message)
+
+      super
+    end
+  end
+
+  class EmptyParameter < InvalidParameter; end
+  class InvalidFormat < InvalidParameter; end
+  class InvalidIdentity < InvalidParameter; end
+  class InvalidOption < InvalidParameter; end
+  class InvalidType < InvalidParameter; end
+  class MissingParameter < InvalidParameter; end
+  class OutOfRange < InvalidParameter; end
+  class TooLarge < InvalidParameter; end
+  class TooLong < InvalidParameter; end
+  class TooShort < InvalidParameter; end
+  class TooSmall < InvalidParameter; end
+
+  class InvalidConfiguration < StandardError
+    attr_accessor :param
+
+    def initialize(message, param: nil)
+      self.param = param
+      super(message)
+    end
+  end
+end

data/lib/rails_simple_params/param_evaluator.rb

@@ -14,6 +14,7 @@ module RailsSimpleParams
       return unless params.include?(name) || check_param_presence?(options[:default]) || options[:required]
 
       parameter_name = @context ? "#{@context}[#{name}]" : name
+      check_config(parameter_name, type, options)
       coerced_value = coerce(parameter_name, params[name], type, options)
 
       parameter = RailsSimpleParams::Parameter.new(
@@ -28,8 +29,8 @@ module RailsSimpleParams
 
       # validate presence
       if params[name].nil? && options[:required]
-        raise InvalidParameterError.new(
-          "Parameter #{parameter_name} is required",
+        raise MissingParameter.new(
+          "#{parameter_name} is required",
           param: parameter_name,
           options: options
         )
@@ -49,6 +50,33 @@ module RailsSimpleParams
 
     private
 
+    def coerce(param_name, param, type, options = {})
+      return nil if param.nil?
+      return param if begin
+        param.is_a?(type)
+      rescue StandardError
+        false
+      end
+
+      Coercion.new(param, type, options).coerce
+    rescue ArgumentError, TypeError
+      raise InvalidType.new("'#{param}' is not a valid #{type}", param: param_name)
+    end
+
+    def check_config(param_name, type, options = {})
+      ConfigCheck.new(param_name, type, options)
+    end
+
+    def check_param_presence?(param)
+      !param.nil?
+    end
+
+    def recurse(element, context, index = nil)
+      raise InvalidConfiguration.new('no block given', param: element) unless block_given?
+
+      yield(ParamEvaluator.new(element, context), index)
+    end
+
     def recurse_on_parameter(parameter, &) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       return if parameter.value.nil?
 
@@ -65,29 +93,6 @@ module RailsSimpleParams
       end
     end
 
-    def recurse(element, context, index = nil)
-      raise InvalidParameterError, 'no block given' unless block_given?
-
-      yield(ParamEvaluator.new(element, context), index)
-    end
-
-    def check_param_presence?(param)
-      !param.nil?
-    end
-
-    def coerce(param_name, param, type, options = {})
-      return nil if param.nil?
-      return param if begin
-        param.is_a?(type)
-      rescue StandardError
-        false
-      end
-
-      Coercion.new(param, type, options).coerce
-    rescue ArgumentError, TypeError
-      raise InvalidParameterError.new("'#{param}' is not a valid #{type}", param: param_name)
-    end
-
     def validate!(param)
       param.validate
     end

data/lib/rails_simple_params/validator/blank.rb

@@ -19,7 +19,11 @@ module RailsSimpleParams
       private
 
       def error_message
-        "Parameter #{name} cannot be blank"
+        "#{name} cannot be blank"
+      end
+
+      def exception_class
+        EmptyParameter
       end
     end
   end

data/lib/rails_simple_params/validator/format.rb

@@ -13,9 +13,13 @@ module RailsSimpleParams
       private
 
       def error_message
-        return "Parameter #{name} must be a string if using the format validation" unless matches_string_or_time_types?
+        return "#{name} must be a string if using the format validation" unless matches_string_or_time_types?
 
-        "Parameter #{name} must match format #{options[:format]}" unless string_in_format?
+        "#{name} must match format #{options[:format]}" unless string_in_format?
+      end
+
+      def exception_class
+        matches_string_or_time_types? ? InvalidFormat : InvalidConfiguration
       end
 
       def matches_time_types?
@@ -27,7 +31,7 @@ module RailsSimpleParams
       end
 
       def string_in_format?
-        value =~ options[:format] && value.is_a?(String)
+        value.is_a?(String) && value =~ options[:format]
       end
     end
   end

data/lib/rails_simple_params/validator/in.rb

@@ -4,18 +4,23 @@ module RailsSimpleParams
   class Validator
     class In < Validator
       def valid_value?
-        value.nil? || case options[:in]
-                      when Range
-                        options[:in].include?(value)
-                      else
-                        Array(options[:in]).include?(value)
-                      end
+        value.nil? || inclusion_group.include?(value)
       end
 
       private
 
       def error_message
-        "Parameter #{parameter.name} must be within #{parameter.options[:in]}"
+        "#{parameter.name} must be #{inclusion_group.is_a?(Range) ? 'within' : 'one of'} #{inclusion_group}"
+      end
+
+      def exception_class
+        inclusion_group.is_a?(Range) ? OutOfRange : InvalidOption
+      end
+
+      def inclusion_group
+        return options[:in].call if options[:in].respond_to?(:call)
+
+        options[:in]
       end
     end
   end

data/lib/rails_simple_params/validator/is.rb

@@ -10,7 +10,11 @@ module RailsSimpleParams
       private
 
       def error_message
-        "Parameter #{name} must be #{options[:is]}"
+        "#{name} must be #{options[:is]}"
+      end
+
+      def exception_class
+        InvalidIdentity
       end
     end
   end

data/lib/rails_simple_params/validator/max.rb

@@ -10,7 +10,11 @@ module RailsSimpleParams
       private
 
       def error_message
-        "Parameter #{name} cannot be greater than #{options[:max]}"
+        "#{name} cannot be greater than #{options[:max]}"
+      end
+
+      def exception_class
+        TooLarge
       end
     end
   end

data/lib/rails_simple_params/validator/max_length.rb

@@ -10,7 +10,11 @@ module RailsSimpleParams
       private
 
       def error_message
-        "Parameter #{name} cannot have length greater than #{options[:max_length]}"
+        "#{name} cannot be longer than #{options[:max_length]} characters"
+      end
+
+      def exception_class
+        TooLong
       end
     end
   end

data/lib/rails_simple_params/validator/min.rb

@@ -10,7 +10,11 @@ module RailsSimpleParams
       private
 
       def error_message
-        "Parameter #{name} cannot be less than #{options[:min]}"
+        "#{name} cannot be less than #{options[:min]}"
+      end
+
+      def exception_class
+        TooSmall
       end
     end
   end

data/lib/rails_simple_params/validator/min_length.rb

@@ -10,7 +10,11 @@ module RailsSimpleParams
       private
 
       def error_message
-        "Parameter #{name} cannot have length less than #{options[:min_length]}"
+        "#{name} cannot be shorter than #{options[:min_length]} characters"
+      end
+
+      def exception_class
+        TooShort
       end
     end
   end

data/lib/rails_simple_params/validator/required.rb

@@ -10,7 +10,11 @@ module RailsSimpleParams
       end
 
       def error_message
-        "Parameter #{name} is required"
+        "#{name} is required"
+      end
+
+      def exception_class
+        MissingParameter
       end
     end
   end

data/lib/rails_simple_params/validator.rb

@@ -39,7 +39,7 @@ module RailsSimpleParams
     def valid!
       return if valid_value?
 
-      raise InvalidParameterError.new(
+      raise exception_class.new(
         error_message,
         param: name,
         options: options
@@ -57,6 +57,10 @@ module RailsSimpleParams
       nil
     end
 
+    def exception_class
+      InvalidParameter
+    end
+
     def valid_value?
       # Should be overwritten in subclass
       false

data/lib/rails_simple_params/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsSimpleParams
-  VERSION = '1.4.0'
+  VERSION = '2.0.0'
 end

data/lib/rails_simple_params.rb

@@ -1,8 +1,11 @@
 # frozen_string_literal: true
 
 require 'rails_simple_params/param'
+require 'rails_simple_params/config_check/base'
+Dir[File.join(__dir__, 'rails_simple_params/config_check', '*.rb')].each { |file| require file }
 Dir[File.join(__dir__, 'rails_simple_params/validator', '*.rb')].each { |file| require file }
-Dir[File.join(__dir__, 'rails_simple_params/coercion', '*.rb')].reverse_each { |file| require file }
+require 'rails_simple_params/coercion/base'
+Dir[File.join(__dir__, 'rails_simple_params/coercion', '*.rb')].each { |file| require file }
 Dir[File.join(__dir__, 'rails_simple_params', '*.rb')].each { |file| require file }
 
 ActiveSupport.on_load(:action_controller) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rails_simple_params
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Jeremy Weathers
 bindir: bin
 cert_chain: []
-date: 2025-04-13 00:00:00.000000000 Z
+date: 2025-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -177,6 +177,7 @@ files:
 - lib/rails_simple_params.rb
 - lib/rails_simple_params/coercion.rb
 - lib/rails_simple_params/coercion/array_param.rb
+- lib/rails_simple_params/coercion/base.rb
 - lib/rails_simple_params/coercion/big_decimal_param.rb
 - lib/rails_simple_params/coercion/boolean_param.rb
 - lib/rails_simple_params/coercion/float_param.rb
@@ -184,8 +185,17 @@ files:
 - lib/rails_simple_params/coercion/integer_param.rb
 - lib/rails_simple_params/coercion/string_param.rb
 - lib/rails_simple_params/coercion/time_param.rb
-- lib/rails_simple_params/coercion/virtual_param.rb
-- lib/rails_simple_params/invalid_parameter_error.rb
+- lib/rails_simple_params/config_check.rb
+- lib/rails_simple_params/config_check/array_param.rb
+- lib/rails_simple_params/config_check/base.rb
+- lib/rails_simple_params/config_check/big_decimal_param.rb
+- lib/rails_simple_params/config_check/boolean_param.rb
+- lib/rails_simple_params/config_check/float_param.rb
+- lib/rails_simple_params/config_check/hash_param.rb
+- lib/rails_simple_params/config_check/integer_param.rb
+- lib/rails_simple_params/config_check/string_param.rb
+- lib/rails_simple_params/config_check/time_param.rb
+- lib/rails_simple_params/exceptions.rb
 - lib/rails_simple_params/param.rb
 - lib/rails_simple_params/param_evaluator.rb
 - lib/rails_simple_params/parameter.rb

data/lib/rails_simple_params/invalid_parameter_error.rb

@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module RailsSimpleParams
-  class InvalidParameterError < StandardError
-    attr_accessor :param, :options
-
-    def initialize(message, param: nil, options: {})
-      self.param = param
-      self.options = options
-      super(message)
-    end
-
-    def message
-      return options[:message] if options.is_a?(Hash) && options.key?(:message)
-
-      super
-    end
-  end
-end