sinatra-param 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f56711fb7a3deeffa2be390d4653e939c0c0bd9
-  data.tar.gz: 4cee9c0eece1a97c04565ce6b3b9929921c94cda
+  metadata.gz: 0bfb3b1d56f4f3f6121fc255807db2ab2955c821
+  data.tar.gz: 1ee2431a66db098230a2547154caaec38657e3ab
 SHA512:
-  metadata.gz: 595865db457636cf6005697a18694de4609d4fe632812fc2cc45377e14711efa54ca540bdf67348171db01e7c34a3d0aaee8f36a20db87ba942cce66051ae564
-  data.tar.gz: 7a15f035edd7e388bc2a5fe65d07b55f4be43f8f7e2f82628bd54c77ddc3dbc252b87e49645830fc871fbfd6eb48c16f7bd4c0184f63192884d2c1b7e28cec88
+  metadata.gz: 9c9c46a5f50f40bf28163357db2875f0156bccb5887f907c84a0ebfb889ecb84b0715cc3db5f3ed7c102717a14cdce4eadb49165fe63d23b011818cebfde18c9
+  data.tar.gz: 8857b062e3ac962278f880d8e922cd9686c525b5ee43318150aee043d223df21fc4667f81cf5640e1a7f0b9b5a48cf0aeba92a0a3cdcbe9c8b93085f38576cd5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sinatra-param (1.2.1)
+    sinatra-param (1.2.2)
       sinatra (~> 1.3)
 
 GEM
@@ -10,7 +10,7 @@ GEM
     diff-lcs (1.2.4)
     multi_json (1.7.2)
     rack (1.5.2)
-    rack-protection (1.5.2)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -27,7 +27,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.4.4)
+    sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
       tilt (~> 1.3, >= 1.3.4)

data/coverage/index.html

@@ -14,7 +14,7 @@
       <img src="./assets/0.7.1/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2014-04-05T12:42:49-07:00">2014-04-05T12:42:49-07:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2014-04-08T11:42:12-07:00">2014-04-08T11:42:12-07:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
@@ -213,7 +213,7 @@
         <li class="covered" data-hits="74" data-linenumber="21">
           <span class="hits">74</span>
           
-          <code class="ruby">        params[name] = (options[:default].call if options[:default].is_a?(Proc)) || options[:default] if params[name].nil? and options[:default]</code>
+          <code class="ruby">        params[name] = (options[:default].call if options[:default].respond_to?(:call)) || options[:default] if params[name].nil? and options[:default]</code>
         </li>
       
         <li class="covered" data-hits="74" data-linenumber="22">

data/lib/sinatra/param.rb

@@ -18,8 +18,8 @@ module Sinatra
 
       begin
         params[name] = coerce(params[name], type, options)
-        params[name] = (options[:default].call if options[:default].is_a?(Proc)) || options[:default] if params[name].nil? and options[:default]
-        params[name] = options[:transform].to_proc.call(params[name]) if options[:transform]
+        params[name] = (options[:default].call if options[:default].respond_to?(:call)) || options[:default] if params[name].nil? and options[:default]
+        params[name] = options[:transform].to_proc.call(params[name]) if params[name] and options[:transform]
         validate!(params[name], options)
       rescue InvalidParameterError => exception
         if options[:raise] or (settings.raise_sinatra_param_exceptions rescue false)

data/lib/sinatra/param/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Param
-    VERSION = '1.2.1'
+    VERSION = '1.2.2'
   end
 end

data/spec/dummy/app.rb

@@ -100,6 +100,11 @@ class App < Sinatra::Base
     params.to_json
   end
 
+  get '/transform/required' do
+    param :order, String, required: true, transform: :upcase
+    params.to_json
+  end
+
   get '/validation/required' do
     param :arg, String, required: true
     params.to_json

data/spec/parameter_transformations_spec.rb

@@ -24,5 +24,12 @@ describe 'Parameter Transformations' do
         JSON.parse(response.body)['order'].should == 'ASC'
       end
     end
+
+    it 'skips transformations when the value is nil' do
+      get('/transform/required') do |response|
+        response.status.should == 400
+        JSON.parse(response.body)['message'].should eq('Invalid Parameter: order')
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-param
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-05 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -144,6 +144,7 @@ files:
 - ./sinatra-param-1.1.1.gem
 - ./sinatra-param-1.1.2.gem
 - ./sinatra-param-1.2.0.gem
+- ./sinatra-param-1.2.1.gem
 - ./sinatra-param.gemspec
 - spec/dummy/app.rb
 - spec/parameter_raise_spec.rb