sinatra-validations 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5932041f8855fbbbe9b79f215035e2c9b813ba2
-  data.tar.gz: 5d3f34f375e466c8debcd7cdf08bae5517bfb110
+  metadata.gz: 1e6130bb489a8c9e2cc9ae99c18a0b3b12dc8b37
+  data.tar.gz: 21fad3aafdfd111b05db808c452b313cf9121383
 SHA512:
-  metadata.gz: 9bd9fb4381f522980c740be4013450979863ab5d40cda0d385a322961a51d59ef4fe08bbeb79b5bc34f14492674e5b5f798b2388b0d182f085b5e7babc6a9672
-  data.tar.gz: 958a94a3a734292fecfa12b21b29ae32ce7c8fdbc79a4301fae739975777309f04fe0857a4bbbeac1c069226d0690d5f8f8aa1d5ecfd2f836de3d904ab3e652e
+  metadata.gz: 14bf5a2348ff73a40909e0007f070e359907fc974f146a38f561635c938580e0dbb7da25ba5d69b778761d38fa6f55badb8a0a768170adee89362e67ea04db0a
+  data.tar.gz: 1923be00285f6e8d90e161308cd722d8653b0abe0a3d452b2966100e02db29babd8a8106399e13305fdfd665d084d5c9f0f3768fbe80f75d826d6647ae59ec41

data/lib/sinatra/validations.rb

@@ -6,7 +6,7 @@ module Sinatra
 
     InvalidParameter = Class.new(RuntimeError)
 
-    def validate(parameters, name, options = {})
+    def validate(parameters, key, options = {})
       default  = options[:default]
       type     = options[:type]
       cast     = true
@@ -15,46 +15,46 @@ module Sinatra
         cast = options[:cast]
       end
 
-      param = parameters[name]
+      param = parameters[key]
 
       if !param
         if options.key?(:default)
-          return param = parameters[name] = default
+          return param = parameters[key] = default
         end
 
-        raise InvalidParameter.new("Missing required parameter #{name}")
+        raise InvalidParameter.new("Missing required parameter #{key}")
       end
 
       if cast
         if type == Integer
-          param = parameters[name] = cast_into_integer(param)
+          param = parameters[key] = cast_into_integer(param, key)
         elsif type == String
-          param = parameters[name] = cast_into_string(param)
+          param = parameters[key] = cast_into_string(param, key)
         else
-          raise InvalidParameter.new("Unsupported casting for #{name}")
+          raise InvalidParameter.new("Unsupported casting for #{key}")
         end
       end
 
       if type && !param.is_a?(type)
-        raise InvalidParameter.new("Wrong type for #{name}. Expected #{type}, got #{param.class}")
+        raise InvalidParameter.new("Wrong type for #{key}. Expected #{type}, got #{param.class}")
       end
     end
 
     private
 
-    def cast_into_integer(param)
+    def cast_into_integer(param, key)
       begin
         Integer(param)
       rescue
-        raise InvalidParameter.new("Unable to convert #{name} into Integer")
+        raise InvalidParameter.new("Unable to convert #{key} into Integer")
       end
     end
 
-    def cast_into_string(param)
+    def cast_into_string(param, key)
       begin
         String(param)
       rescue
-        raise InvalidParameter.new("Unable to convert #{name} into String")
+        raise InvalidParameter.new("Unable to convert #{key} into String")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-validations
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Pedro Gimenez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra