rails_param 0.10.2 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a75a7469730b59de76372987ffe4a28f4ebfc5f4b2956a0052af6b70c32bf9
-  data.tar.gz: fe6a7b5bf1dd8ba1615243c07dfb215d4714b4236674146333ecf42ce2539f6f
+  metadata.gz: 597be5889d0a852cb2be5b0c828adf8e84b741cbe215ee75e2a5dd47359faff8
+  data.tar.gz: 2169c1ab2013a2a6daef049abc3ee75d8237811debdbf73920abcec7b089985b
 SHA512:
-  metadata.gz: f0af1329f2b47c1267b87dc3c850760e223c85177202b0a1d2b4c6d2fdb6e8fdaff055b3500182862f3be52ac760679673a879329b4f2fd1b9a1b61155fbfd12
-  data.tar.gz: b1483e1c051a615a6517e93d6209194d1da6911f277acf46163485a8be15b88a1ca6258bf64ae3cc52a9cc732861c02733dc710183da49f6ec020a1abfde3011
+  metadata.gz: f1385cb2140b91b545a820056797f7fe9af681df0e059a03955717945ec75c53b722bca571ce740ef322c09a0ac28e0cef3334d224348308c99d39272054827b
+  data.tar.gz: e53ab6824b887a24933ae452f71af269ef8d33776221007f49d0055d175b1dc74bcce475f7a41347f0fa84ecda55ea92afbbacdd6f192ab00998fb1f7fdadc64

data/lib/rails_param/param.rb

@@ -28,13 +28,11 @@ module RailsParam
         params[name] = coerce(params[name], type, options)
 
         # set default
-        if options[:default].respond_to?(:call)
-          params[name] = options[:default].call
-        elsif params[name].nil? && check_param_presence?(options[:default])
-          params[name] = options[:default]
+        if params[name].nil? && check_param_presence?(options[:default])
+          params[name] = options[:default].respond_to?(:call) ? options[:default].call : options[:default]
         end
 
-        # apply tranformation
+        # apply transformation
         if params.include?(name) && options[:transform]
           params[name] = options[:transform].to_proc.call(params[name])
         end
@@ -100,7 +98,7 @@ module RailsParam
         return nil if param.nil?
         return param if (param.is_a?(type) rescue false)
         if (param.is_a?(Array) && type != Array) || ((param.is_a?(Hash) || param.is_a?(ActionController::Parameters)) && type != Hash)
-          raise InvalidParameterError, "'#{param}' is not a valid #{type}"
+          raise ArgumentError
         end
         return param if (param.is_a?(ActionController::Parameters) && type == Hash rescue false)
         return Integer(param) if type == Integer
@@ -113,6 +111,7 @@ module RailsParam
             return type.parse(param)
           end
         end
+        raise ArgumentError if (type == Array || type == Hash) && !param.respond_to?(:split)
         return Array(param.split(options[:delimiter] || ",")) if type == Array
         return Hash[param.split(options[:delimiter] || ",").map { |c| c.split(options[:separator] || ":") }] if type == Hash
         if type == TrueClass || type == FalseClass || type == :boolean
@@ -123,10 +122,10 @@ module RailsParam
         end
         if type == BigDecimal
           param = param.delete('$,').strip.to_f if param.is_a?(String)
-          return BigDecimal.new(param, (options[:precision] || DEFAULT_PRECISION))
+          return BigDecimal(param, (options[:precision] || DEFAULT_PRECISION))
         end
         return nil
-      rescue ArgumentError
+      rescue ArgumentError, TypeError
         raise InvalidParameterError, "'#{param}' is not a valid #{type}"
       end
     end
@@ -140,7 +139,7 @@ module RailsParam
             raise InvalidParameterError, "Parameter #{param_name} cannot be blank" if !value && case param
                                                                                     when String
                                                                                       !(/\S/ === param)
-                                                                                    when Array, Hash
+                                                                                    when Array, Hash, ActionController::Parameters
                                                                                       param.empty?
                                                                                     else
                                                                                       param.nil?
@@ -165,6 +164,8 @@ module RailsParam
             raise InvalidParameterError, "Parameter #{param_name} cannot have length less than #{value}" unless param.nil? || value <= param.length
           when :max_length
             raise InvalidParameterError, "Parameter #{param_name} cannot have length greater than #{value}" unless param.nil? || value >= param.length
+          when :custom
+            value.call(param)
         end
       end
     end

data/lib/rails_param/version.rb

@@ -1,3 +1,3 @@
 module RailsParam #:nodoc
-  VERSION = "0.10.2"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_param
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0
 platform: ruby
 authors:
 - Nicolas Blanco
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Parameter Validation and Type Coercion for Rails