Merge pull request #510 from myitcv/lambda_based_default_params

Support lambda-based default values for params

.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   Excludes:
     - vendor/**
+    - bin/**
 
 LineLength:
   Enabled: false

CHANGELOG.md

@@ -1,6 +1,8 @@
 Next Release
 ============
 
+#### Features
+* [#510](https://github.com/intridea/grape/pull/510): Support lambda-based default values for params - [@myitcv](https://github.com/myitcv).
 * Your contribution here.
 
 #### Fixes

README.md

@@ -359,11 +359,17 @@ Optional parameters can have a default value.
 ```ruby
 params do
   optional :color, type: String, default: 'blue'
+  optional :random_number, type: Integer, default: -> { Random.rand(1..100) }
+  optional :non_random_number, type: Integer, default:  Random.rand(1..100) 
 end
 ```
 
 Parameters can be restricted to a specific set of values with the `:values` option.
 
+Default values are eagerly evaluated. Above `:non_random_number` will evaluate to the same
+number for each call to the endpoint of this `params` block. To have the default evaluate 
+at calltime use a lambda, like `:random_number` above.
+
 ```ruby
 params do
   requires :status, type: Symbol, values: [:not_started, :processing, :done]

lib/grape/validations/default.rb

@@ -7,7 +7,7 @@ def initialize(attrs, options, required, scope)
       end
 
       def validate_param!(attr_name, params)
-        params[attr_name] = @default unless params.has_key?(attr_name)
+        params[attr_name] = @default.is_a?(Proc) ? @default.call : @default unless params.has_key?(attr_name)
       end
 
       def validate!(params)

spec/grape/validations/default_spec.rb

@@ -32,6 +32,14 @@ class API < Grape::API
         get '/message' do
           { id: params[:id], type1: params[:type1], type2: params[:type2] }
         end
+
+        params do
+          optional :random, default: -> { Random.rand }
+          optional :not_random, default: Random.rand
+        end
+        get '/numbers' do
+          { random_number: params[:random], non_random_number: params[:non_random_number] }
+        end
       end
     end
   end
@@ -63,4 +71,16 @@ def app
     last_response.status.should == 200
     last_response.body.should == { id: '1', type1: 'default-type1', type2: 'default-type2' }.to_json
   end
+
+  it 'sets lambda based defaults at the time of call' do
+    get("/numbers")
+    last_response.status.should == 200
+    before = JSON.parse(last_response.body)
+    get("/numbers")
+    last_response.status.should == 200
+    after = JSON.parse(last_response.body)
+
+    before['non_random_number'].should == after['non_random_number']
+    before['random_number'].should_not == after['random_number']
+  end
 end