Skip to content

Commit b1a8bad

Browse files
When parameters where in the path and in a validation, they were twice in the params hash (once with symbol key, once with string key)
1 parent 1145b78 commit b1a8bad

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

lib/grape/validations.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ def document_attribute(names, opts)
137137
@last_description[:params] ||= {}
138138

139139
Array(names).each do |name|
140-
@last_description[:params][name.to_sym] ||= {}
141-
@last_description[:params][name.to_sym].merge!(opts)
140+
@last_description[:params][name.to_s] ||= {}
141+
@last_description[:params][name.to_s].merge!(opts)
142142
end
143143
end
144144
end

spec/grape/api_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,7 @@ def three
938938
subject.routes.map { |route|
939939
{ :description => route.route_description, :params => route.route_params }
940940
}.should eq [
941-
{ :description => "method", :params => { :ns_param => { :required => true, :desc => "namespace parameter" }, :method_param => { :required => false, :desc => "method parameter" } } }
941+
{ :description => "method", :params => { "ns_param" => { :required => true, :desc => "namespace parameter" }, "method_param" => { :required => false, :desc => "method parameter" } } }
942942
]
943943
end
944944
it "should merge the parameters of nested namespaces" do
@@ -964,7 +964,7 @@ def three
964964
subject.routes.map { |route|
965965
{ :description => route.route_description, :params => route.route_params }
966966
}.should eq [
967-
{ :description => "method", :params => { :ns_param => { :required => true, :desc => "ns param 2" }, :ns1_param => { :required => true, :desc => "ns1 param" }, :ns2_param => { :required => true, :desc => "ns2 param" }, :method_param => { :required => false, :desc => "method param" } } }
967+
{ :description => "method", :params => { "ns_param" => { :required => true, :desc => "ns param 2" }, "ns1_param" => { :required => true, :desc => "ns1 param" }, "ns2_param" => { :required => true, :desc => "ns2 param" }, "method_param" => { :required => false, :desc => "method param" } } }
968968
]
969969
end
970970
it "should not symbolize params" do

0 commit comments

Comments
 (0)