sinatra-param 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02fe2998b85c6052f32119c3e1e72e760e0bf538
-  data.tar.gz: 313e3983abc73ddf696f75f3a566fdaf5a1b6680
+  metadata.gz: ed6bc853522acf081f09e12f5c27bdaba38100c9
+  data.tar.gz: 319a7c7ef04009d6f709a9faf9209623d831f93f
 SHA512:
-  metadata.gz: 008d02adbb3f7aaeaea103da5ee486f72ac56fe05054dc713f74a5ed9e6ccdc82d5198c16c8c0803c93efadcbba5a779fcb30aee100614d9d88c22ae9c63907a
-  data.tar.gz: c980ebcc718992765de9a4b847c5ce90878ecc8854a6035ad6a9e036ad1452b2eca295f4f89116cc9e571f717fa0fc19ddbd25c9cda690a55bedc651349d5075
+  metadata.gz: 13ba305e660dec0f8173b474a1ae79e19d570fe977594d91878dacdccb003a636d39abe641aa4911c860fad866908af5cada37bad9da0ce8083dbd8ad858ab88
+  data.tar.gz: 6dc4d1d351e0261bacd12d2dc5873b82b04f105d3c2e25a64d280c6fb932da41c131bb9ccece3c0cd218caddaa4a1329051c292d7d3bbf2b9ae8c9dbcd93d1e9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-param (1.1.1)
+    sinatra-param (1.1.2)
       sinatra (~> 1.3)
 
 GEM

data/lib/sinatra/param/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Param
-    VERSION = '1.1.1'
+    VERSION = '1.1.2'
   end
 end

data/lib/sinatra/param.rb

@@ -56,18 +56,22 @@ module Sinatra
     private
 
     def coerce(param, type, options = {})
-      return nil if param.nil?
-      return param if (param.is_a?(type) rescue false)
-      return Integer(param) if type == Integer
-      return Float(param) if type == Float
-      return String(param) if type == String
-      return Time.parse(param) if type == Time
-      return Date.parse(param) if type == Date
-      return DateTime.parse(param) if type == DateTime
-      return Array(param.split(options[:delimiter] || ",")) if type == Array
-      return Hash[param.split(options[:delimiter] || ",").map{|c| c.split(options[:separator] || ":")}] if type == Hash
-      return (/(false|f|no|n|0)$/i === param.to_s ? false : (/(true|t|yes|y|1)$/i === param.to_s ? true : nil)) if type == TrueClass || type == FalseClass || type == Boolean
-      return nil
+      begin
+        return nil if param.nil?
+        return param if (param.is_a?(type) rescue false)
+        return Integer(param) if type == Integer
+        return Float(param) if type == Float
+        return String(param) if type == String
+        return Time.parse(param) if type == Time
+        return Date.parse(param) if type == Date
+        return DateTime.parse(param) if type == DateTime
+        return Array(param.split(options[:delimiter] || ",")) if type == Array
+        return Hash[param.split(options[:delimiter] || ",").map{|c| c.split(options[:separator] || ":")}] if type == Hash
+        return (/(false|f|no|n|0)$/i === param.to_s ? false : (/(true|t|yes|y|1)$/i === param.to_s ? true : nil)) if type == TrueClass || type == FalseClass || type == Boolean
+        return nil
+      rescue ArgumentError
+        raise InvalidParameterError, "'#{param}' is not a valid #{type}"
+      end
     end
 
     def validate!(param, options)

data/spec/parameter_type_coercion_spec.rb

@@ -17,6 +17,13 @@ describe 'Parameter Types' do
         JSON.parse(response.body)['arg'].should eq(1234)
       end
     end
+
+    it 'returns 400 on requests when integer is invalid' do
+      get('/coerce/integer', arg: '123abc') do |response|
+        response.status.should == 400
+        JSON.parse(response.body)['message'].should eq('Invalid Parameter: arg')
+      end
+    end
   end
 
   describe 'Float' do
@@ -26,6 +33,13 @@ describe 'Parameter Types' do
         JSON.parse(response.body)['arg'].should eq(1234.0)
       end
     end
+
+    it 'returns 400 on requests when float is invalid' do
+      get('/coerce/float', arg: '123abc') do |response|
+        response.status.should == 400
+        JSON.parse(response.body)['message'].should eq('Invalid Parameter: arg')
+      end
+    end
   end
 
   describe 'Time' do
@@ -35,6 +49,13 @@ describe 'Parameter Types' do
         JSON.parse(response.body)['arg'].should match(/2013-01-17 00:00:00/)
       end
     end
+
+    it 'returns 400 on requests when time is invalid' do
+      get('/coerce/time', arg: '123abc') do |response|
+        response.status.should == 400
+        JSON.parse(response.body)['message'].should eq('Invalid Parameter: arg')
+      end
+    end
   end
 
   describe 'Date' do
@@ -44,6 +65,13 @@ describe 'Parameter Types' do
         JSON.parse(response.body)['arg'].should eq('2013-01-17')
       end
     end
+
+    it 'returns 400 on requests when date is invalid' do
+      get('/coerce/date', arg: 'abc') do |response|
+        response.status.should == 400
+        JSON.parse(response.body)['message'].should eq('Invalid Parameter: arg')
+      end
+    end
   end
 
   describe 'DateTime' do
@@ -53,6 +81,13 @@ describe 'Parameter Types' do
         JSON.parse(response.body)['arg'].should eq('2013-01-17T00:00:00+00:00')
       end
     end
+
+    it 'returns 400 on requests when datetime is invalid' do
+      get('/coerce/datetime', arg: 'abc') do |response|
+        response.status.should == 400
+        JSON.parse(response.body)['message'].should eq('Invalid Parameter: arg')
+      end
+    end
   end
 
   describe 'Array' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-18 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -141,6 +141,7 @@ files:
 - ./Rakefile
 - ./README.md
 - ./sinatra-param-1.1.0.gem
+- ./sinatra-param-1.1.1.gem
 - ./sinatra-param.gemspec
 - spec/dummy/app.rb
 - spec/parameter_sets_spec.rb