sinatra-param 1.0.2 → 1.0.3

data/lib/sinatra/param.rb

@@ -15,7 +15,8 @@ module Sinatra
       return unless params.member?(name) or present?(options[:default]) or options[:required]
 
       begin
-        params[name] = coerce(params[name], type, options) || options[:default]
+        params[name] = coerce(params[name], type, options)
+        params[name] = options[:default] if params[name].nil? and options[:default]
         params[name] = options[:transform].to_proc.call(params[name]) if options[:transform]
         validate!(params[name], options)
       rescue

data/lib/sinatra/param/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Param
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
   end
 end

data/spec/dummy/app.rb

@@ -71,18 +71,26 @@ class App < Sinatra::Base
     params.to_json
   end
 
-  # transformations
   get '/default' do
     param :sort, String, default: "title"
     params.to_json
   end
 
+  get '/default/boolean/true' do
+    param :arg, Boolean, default: true
+    params.to_json
+  end
+
+  get '/default/boolean/false' do
+    param :arg, Boolean, default: false
+    params.to_json
+  end
+
   get '/transform' do
     param :order, String, transform: :upcase
     params.to_json
   end
 
-  # validations
   get '/validation/required' do
     param :arg, String, required: true
     params.to_json

data/spec/parameter_type_coercion_spec.rb

@@ -86,5 +86,34 @@ describe 'Parameter Types' do
         end
       end
     end
+
+    it 'coerces falsey booleans to false' do
+      %w(0 false f no n).each do |bool|
+        get('/coerce/boolean', arg: bool) do |response|
+          response.status.should == 200
+          JSON.parse(response.body)['arg'].should be_false
+          JSON.parse(response.body)['arg'].should_not be_nil
+        end
+      end
+    end
+
+    it 'coerces truthy booleans to true when default is false' do
+      %w(1 true t yes y).each do |bool|
+        get('/default/boolean/false', arg: bool) do |response|
+          response.status.should == 200
+          JSON.parse(response.body)['arg'].should be_true
+        end
+      end
+    end
+
+    it 'coerces falsey booleans to false when default is true' do
+      %w(0 false f no n).each do |bool|
+        get('/default/boolean/true', arg: bool) do |response|
+          response.status.should == 200
+          JSON.parse(response.body)['arg'].should be_false
+          JSON.parse(response.body)['arg'].should_not be_nil
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-21 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -140,8 +140,6 @@ files:
 - ./LICENSE
 - ./Rakefile
 - ./README.md
-- ./sinatra-param-1.0.0.gem
-- ./sinatra-param-1.0.1.gem
 - ./sinatra-param.gemspec
 - spec/dummy/app.rb
 - spec/parameter_sets_spec.rb