grape 1.0.0 → 1.6.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (284) hide show
  1. checksums.yaml +5 -5
  2. data/CHANGELOG.md +346 -39
  3. data/LICENSE +1 -1
  4. data/README.md +658 -90
  5. data/UPGRADING.md +472 -17
  6. data/grape.gemspec +17 -6
  7. data/lib/grape/api/helpers.rb +2 -0
  8. data/lib/grape/api/instance.rb +279 -0
  9. data/lib/grape/api.rb +132 -176
  10. data/lib/grape/config.rb +34 -0
  11. data/lib/grape/content_types.rb +34 -0
  12. data/lib/grape/cookies.rb +4 -0
  13. data/lib/grape/dsl/api.rb +2 -0
  14. data/lib/grape/dsl/callbacks.rb +22 -0
  15. data/lib/grape/dsl/configuration.rb +2 -0
  16. data/lib/grape/dsl/desc.rb +44 -12
  17. data/lib/grape/dsl/headers.rb +2 -0
  18. data/lib/grape/dsl/helpers.rb +11 -6
  19. data/lib/grape/dsl/inside_route.rb +116 -36
  20. data/lib/grape/dsl/logger.rb +2 -0
  21. data/lib/grape/dsl/middleware.rb +12 -3
  22. data/lib/grape/dsl/parameters.rb +34 -16
  23. data/lib/grape/dsl/request_response.rb +13 -8
  24. data/lib/grape/dsl/routing.rb +19 -12
  25. data/lib/grape/dsl/settings.rb +22 -4
  26. data/lib/grape/dsl/validations.rb +24 -4
  27. data/lib/grape/eager_load.rb +20 -0
  28. data/lib/grape/endpoint.rb +66 -57
  29. data/lib/grape/error_formatter/base.rb +2 -0
  30. data/lib/grape/error_formatter/json.rb +6 -4
  31. data/lib/grape/error_formatter/txt.rb +10 -3
  32. data/lib/grape/error_formatter/xml.rb +6 -4
  33. data/lib/grape/error_formatter.rb +4 -2
  34. data/lib/grape/exceptions/base.rb +22 -14
  35. data/lib/grape/exceptions/empty_message_body.rb +11 -0
  36. data/lib/grape/exceptions/incompatible_option_values.rb +2 -1
  37. data/lib/grape/exceptions/invalid_accept_header.rb +2 -1
  38. data/lib/grape/exceptions/invalid_formatter.rb +2 -1
  39. data/lib/grape/exceptions/invalid_message_body.rb +2 -1
  40. data/lib/grape/exceptions/invalid_response.rb +11 -0
  41. data/lib/grape/exceptions/invalid_version_header.rb +2 -1
  42. data/lib/grape/exceptions/invalid_versioner_option.rb +2 -1
  43. data/lib/grape/exceptions/invalid_with_option_for_represent.rb +2 -1
  44. data/lib/grape/exceptions/method_not_allowed.rb +2 -1
  45. data/lib/grape/exceptions/missing_group_type.rb +2 -1
  46. data/lib/grape/exceptions/missing_mime_type.rb +2 -1
  47. data/lib/grape/exceptions/missing_option.rb +2 -1
  48. data/lib/grape/exceptions/missing_vendor_option.rb +2 -1
  49. data/lib/grape/exceptions/unknown_options.rb +2 -1
  50. data/lib/grape/exceptions/unknown_parameter.rb +2 -1
  51. data/lib/grape/exceptions/unknown_validator.rb +2 -1
  52. data/lib/grape/exceptions/unsupported_group_type.rb +2 -1
  53. data/lib/grape/exceptions/validation.rb +5 -4
  54. data/lib/grape/exceptions/validation_array_errors.rb +2 -0
  55. data/lib/grape/exceptions/validation_errors.rb +16 -13
  56. data/lib/grape/extensions/active_support/hash_with_indifferent_access.rb +4 -3
  57. data/lib/grape/extensions/deep_mergeable_hash.rb +2 -0
  58. data/lib/grape/extensions/deep_symbolize_hash.rb +2 -0
  59. data/lib/grape/extensions/hash.rb +2 -0
  60. data/lib/grape/extensions/hashie/mash.rb +2 -0
  61. data/lib/grape/formatter/json.rb +3 -0
  62. data/lib/grape/formatter/serializable_hash.rb +4 -1
  63. data/lib/grape/formatter/txt.rb +2 -0
  64. data/lib/grape/formatter/xml.rb +3 -0
  65. data/lib/grape/formatter.rb +5 -3
  66. data/lib/grape/http/headers.rb +50 -18
  67. data/lib/grape/locale/en.yml +3 -1
  68. data/lib/grape/middleware/auth/base.rb +7 -7
  69. data/lib/grape/middleware/auth/dsl.rb +2 -0
  70. data/lib/grape/middleware/auth/strategies.rb +2 -0
  71. data/lib/grape/middleware/auth/strategy_info.rb +2 -0
  72. data/lib/grape/middleware/base.rb +12 -7
  73. data/lib/grape/middleware/error.rb +75 -61
  74. data/lib/grape/middleware/filter.rb +2 -0
  75. data/lib/grape/middleware/formatter.rb +17 -13
  76. data/lib/grape/middleware/globals.rb +2 -0
  77. data/lib/grape/middleware/helpers.rb +12 -0
  78. data/lib/grape/middleware/stack.rb +15 -5
  79. data/lib/grape/middleware/versioner/accept_version_header.rb +5 -5
  80. data/lib/grape/middleware/versioner/header.rb +13 -9
  81. data/lib/grape/middleware/versioner/param.rb +4 -1
  82. data/lib/grape/middleware/versioner/parse_media_type_patch.rb +5 -1
  83. data/lib/grape/middleware/versioner/path.rb +5 -1
  84. data/lib/grape/middleware/versioner.rb +2 -0
  85. data/lib/grape/namespace.rb +15 -3
  86. data/lib/grape/parser/json.rb +3 -1
  87. data/lib/grape/parser/xml.rb +3 -1
  88. data/lib/grape/parser.rb +4 -2
  89. data/lib/grape/path.rb +16 -3
  90. data/lib/grape/presenters/presenter.rb +2 -0
  91. data/lib/grape/request.rb +19 -9
  92. data/lib/grape/router/attribute_translator.rb +41 -8
  93. data/lib/grape/router/pattern.rb +22 -18
  94. data/lib/grape/router/route.rb +16 -30
  95. data/lib/grape/router.rb +37 -28
  96. data/lib/grape/{serve_file → serve_stream}/file_body.rb +3 -1
  97. data/lib/grape/{serve_file → serve_stream}/sendfile_response.rb +3 -1
  98. data/lib/grape/{serve_file/file_response.rb → serve_stream/stream_response.rb} +10 -8
  99. data/lib/grape/util/base_inheritable.rb +43 -0
  100. data/lib/grape/util/cache.rb +20 -0
  101. data/lib/grape/util/endpoint_configuration.rb +8 -0
  102. data/lib/grape/util/env.rb +19 -17
  103. data/lib/grape/util/inheritable_setting.rb +3 -3
  104. data/lib/grape/util/inheritable_values.rb +7 -25
  105. data/lib/grape/util/json.rb +2 -0
  106. data/lib/grape/util/lazy_block.rb +27 -0
  107. data/lib/grape/util/lazy_object.rb +43 -0
  108. data/lib/grape/util/lazy_value.rb +99 -0
  109. data/lib/grape/util/registrable.rb +2 -0
  110. data/lib/grape/util/reverse_stackable_values.rb +10 -35
  111. data/lib/grape/util/stackable_values.rb +21 -34
  112. data/lib/grape/util/strict_hash_configuration.rb +2 -0
  113. data/lib/grape/util/xml.rb +2 -0
  114. data/lib/grape/validations/attributes_iterator.rb +16 -6
  115. data/lib/grape/validations/multiple_attributes_iterator.rb +13 -0
  116. data/lib/grape/validations/params_scope.rb +128 -66
  117. data/lib/grape/validations/single_attribute_iterator.rb +24 -0
  118. data/lib/grape/validations/types/array_coercer.rb +65 -0
  119. data/lib/grape/validations/types/build_coercer.rb +52 -46
  120. data/lib/grape/validations/types/custom_type_coercer.rb +30 -51
  121. data/lib/grape/validations/types/custom_type_collection_coercer.rb +56 -0
  122. data/lib/grape/validations/types/dry_type_coercer.rb +76 -0
  123. data/lib/grape/validations/types/file.rb +22 -18
  124. data/lib/grape/validations/types/invalid_value.rb +24 -0
  125. data/lib/grape/validations/types/json.rb +47 -39
  126. data/lib/grape/validations/types/multiple_type_coercer.rb +14 -33
  127. data/lib/grape/validations/types/primitive_coercer.rb +67 -0
  128. data/lib/grape/validations/types/set_coercer.rb +40 -0
  129. data/lib/grape/validations/types/variant_collection_coercer.rb +5 -13
  130. data/lib/grape/validations/types.rb +26 -38
  131. data/lib/grape/validations/validator_factory.rb +8 -11
  132. data/lib/grape/validations/validators/all_or_none.rb +8 -12
  133. data/lib/grape/validations/validators/allow_blank.rb +4 -2
  134. data/lib/grape/validations/validators/as.rb +12 -0
  135. data/lib/grape/validations/validators/at_least_one_of.rb +7 -12
  136. data/lib/grape/validations/validators/base.rb +23 -15
  137. data/lib/grape/validations/validators/coerce.rb +47 -28
  138. data/lib/grape/validations/validators/default.rb +7 -6
  139. data/lib/grape/validations/validators/exactly_one_of.rb +10 -22
  140. data/lib/grape/validations/validators/except_values.rb +4 -2
  141. data/lib/grape/validations/validators/multiple_params_base.rb +19 -10
  142. data/lib/grape/validations/validators/mutual_exclusion.rb +8 -17
  143. data/lib/grape/validations/validators/presence.rb +4 -1
  144. data/lib/grape/validations/validators/regexp.rb +5 -2
  145. data/lib/grape/validations/validators/same_as.rb +27 -0
  146. data/lib/grape/validations/validators/values.rb +29 -9
  147. data/lib/grape/validations.rb +2 -0
  148. data/lib/grape/version.rb +3 -1
  149. data/lib/grape.rb +107 -73
  150. data/spec/grape/api/custom_validations_spec.rb +6 -3
  151. data/spec/grape/api/deeply_included_options_spec.rb +2 -0
  152. data/spec/grape/api/defines_boolean_in_params_spec.rb +39 -0
  153. data/spec/grape/api/inherited_helpers_spec.rb +116 -0
  154. data/spec/grape/api/instance_spec.rb +104 -0
  155. data/spec/grape/api/invalid_format_spec.rb +2 -0
  156. data/spec/grape/api/namespace_parameters_in_route_spec.rb +2 -0
  157. data/spec/grape/api/nested_helpers_spec.rb +2 -0
  158. data/spec/grape/api/optional_parameters_in_route_spec.rb +2 -0
  159. data/spec/grape/api/parameters_modification_spec.rb +3 -1
  160. data/spec/grape/api/patch_method_helpers_spec.rb +2 -0
  161. data/spec/grape/api/recognize_path_spec.rb +2 -0
  162. data/spec/grape/api/required_parameters_in_route_spec.rb +2 -0
  163. data/spec/grape/api/required_parameters_with_invalid_method_spec.rb +2 -0
  164. data/spec/grape/api/routes_with_requirements_spec.rb +61 -0
  165. data/spec/grape/api/shared_helpers_exactly_one_of_spec.rb +49 -0
  166. data/spec/grape/api/shared_helpers_spec.rb +2 -0
  167. data/spec/grape/api_remount_spec.rb +473 -0
  168. data/spec/grape/api_spec.rb +775 -65
  169. data/spec/grape/config_spec.rb +19 -0
  170. data/spec/grape/dsl/callbacks_spec.rb +3 -1
  171. data/spec/grape/dsl/configuration_spec.rb +2 -0
  172. data/spec/grape/dsl/desc_spec.rb +42 -16
  173. data/spec/grape/dsl/headers_spec.rb +2 -0
  174. data/spec/grape/dsl/helpers_spec.rb +23 -2
  175. data/spec/grape/dsl/inside_route_spec.rb +185 -34
  176. data/spec/grape/dsl/logger_spec.rb +2 -0
  177. data/spec/grape/dsl/middleware_spec.rb +11 -1
  178. data/spec/grape/dsl/parameters_spec.rb +12 -9
  179. data/spec/grape/dsl/request_response_spec.rb +2 -0
  180. data/spec/grape/dsl/routing_spec.rb +13 -1
  181. data/spec/grape/dsl/settings_spec.rb +4 -2
  182. data/spec/grape/dsl/validations_spec.rb +2 -0
  183. data/spec/grape/endpoint/declared_spec.rb +848 -0
  184. data/spec/grape/endpoint_spec.rb +75 -515
  185. data/spec/grape/entity_spec.rb +19 -11
  186. data/spec/grape/exceptions/base_spec.rb +67 -0
  187. data/spec/grape/exceptions/body_parse_errors_spec.rb +2 -0
  188. data/spec/grape/exceptions/invalid_accept_header_spec.rb +2 -0
  189. data/spec/grape/exceptions/invalid_formatter_spec.rb +2 -1
  190. data/spec/grape/exceptions/invalid_response_spec.rb +13 -0
  191. data/spec/grape/exceptions/invalid_versioner_option_spec.rb +2 -1
  192. data/spec/grape/exceptions/missing_mime_type_spec.rb +2 -0
  193. data/spec/grape/exceptions/missing_option_spec.rb +2 -1
  194. data/spec/grape/exceptions/unknown_options_spec.rb +3 -2
  195. data/spec/grape/exceptions/unknown_validator_spec.rb +2 -1
  196. data/spec/grape/exceptions/validation_errors_spec.rb +17 -4
  197. data/spec/grape/exceptions/validation_spec.rb +3 -1
  198. data/spec/grape/extensions/param_builders/hash_spec.rb +2 -0
  199. data/spec/grape/extensions/param_builders/hash_with_indifferent_access_spec.rb +2 -0
  200. data/spec/grape/extensions/param_builders/hashie/mash_spec.rb +2 -0
  201. data/spec/grape/integration/global_namespace_function_spec.rb +2 -0
  202. data/spec/grape/integration/rack_sendfile_spec.rb +14 -8
  203. data/spec/grape/integration/rack_spec.rb +25 -7
  204. data/spec/grape/loading_spec.rb +2 -0
  205. data/spec/grape/middleware/auth/base_spec.rb +2 -0
  206. data/spec/grape/middleware/auth/dsl_spec.rb +6 -4
  207. data/spec/grape/middleware/auth/strategies_spec.rb +3 -1
  208. data/spec/grape/middleware/base_spec.rb +10 -0
  209. data/spec/grape/middleware/error_spec.rb +4 -3
  210. data/spec/grape/middleware/exception_spec.rb +205 -55
  211. data/spec/grape/middleware/formatter_spec.rb +130 -15
  212. data/spec/grape/middleware/globals_spec.rb +2 -0
  213. data/spec/grape/middleware/stack_spec.rb +15 -1
  214. data/spec/grape/middleware/versioner/accept_version_header_spec.rb +3 -1
  215. data/spec/grape/middleware/versioner/header_spec.rb +10 -2
  216. data/spec/grape/middleware/versioner/param_spec.rb +4 -2
  217. data/spec/grape/middleware/versioner/path_spec.rb +4 -2
  218. data/spec/grape/middleware/versioner_spec.rb +2 -0
  219. data/spec/grape/named_api_spec.rb +21 -0
  220. data/spec/grape/parser_spec.rb +7 -5
  221. data/spec/grape/path_spec.rb +9 -7
  222. data/spec/grape/presenters/presenter_spec.rb +2 -0
  223. data/spec/grape/request_spec.rb +26 -0
  224. data/spec/grape/util/inheritable_setting_spec.rb +4 -2
  225. data/spec/grape/util/inheritable_values_spec.rb +2 -0
  226. data/spec/grape/util/reverse_stackable_values_spec.rb +15 -13
  227. data/spec/grape/util/stackable_values_spec.rb +16 -14
  228. data/spec/grape/util/strict_hash_configuration_spec.rb +3 -1
  229. data/spec/grape/validations/attributes_iterator_spec.rb +2 -0
  230. data/spec/grape/validations/instance_behaivour_spec.rb +5 -3
  231. data/spec/grape/validations/multiple_attributes_iterator_spec.rb +41 -0
  232. data/spec/grape/validations/params_scope_spec.rb +364 -7
  233. data/spec/grape/validations/single_attribute_iterator_spec.rb +58 -0
  234. data/spec/grape/validations/types/array_coercer_spec.rb +35 -0
  235. data/spec/grape/validations/types/primitive_coercer_spec.rb +135 -0
  236. data/spec/grape/validations/types/set_coercer_spec.rb +34 -0
  237. data/spec/grape/validations/types_spec.rb +9 -36
  238. data/spec/grape/validations/validators/all_or_none_spec.rb +140 -30
  239. data/spec/grape/validations/validators/allow_blank_spec.rb +2 -0
  240. data/spec/grape/validations/validators/at_least_one_of_spec.rb +175 -29
  241. data/spec/grape/validations/validators/coerce_spec.rb +558 -133
  242. data/spec/grape/validations/validators/default_spec.rb +212 -0
  243. data/spec/grape/validations/validators/exactly_one_of_spec.rb +204 -38
  244. data/spec/grape/validations/validators/except_values_spec.rb +6 -3
  245. data/spec/grape/validations/validators/mutual_exclusion_spec.rb +186 -27
  246. data/spec/grape/validations/validators/presence_spec.rb +30 -0
  247. data/spec/grape/validations/validators/regexp_spec.rb +2 -0
  248. data/spec/grape/validations/validators/same_as_spec.rb +65 -0
  249. data/spec/grape/validations/validators/values_spec.rb +73 -19
  250. data/spec/grape/validations_spec.rb +403 -53
  251. data/spec/integration/eager_load/eager_load_spec.rb +15 -0
  252. data/spec/integration/multi_json/json_spec.rb +2 -0
  253. data/spec/integration/multi_xml/xml_spec.rb +2 -0
  254. data/spec/shared/versioning_examples.rb +78 -18
  255. data/spec/spec_helper.rb +13 -2
  256. data/spec/support/basic_auth_encode_helpers.rb +3 -1
  257. data/spec/support/chunks.rb +14 -0
  258. data/spec/support/content_type_helpers.rb +3 -1
  259. data/spec/support/eager_load.rb +19 -0
  260. data/spec/support/endpoint_faker.rb +2 -0
  261. data/spec/support/file_streamer.rb +2 -0
  262. data/spec/support/integer_helpers.rb +2 -0
  263. data/spec/support/versioned_helpers.rb +8 -8
  264. metadata +176 -130
  265. data/Appraisals +0 -32
  266. data/Dangerfile +0 -1
  267. data/Gemfile +0 -34
  268. data/Gemfile.lock +0 -229
  269. data/Guardfile +0 -10
  270. data/RELEASING.md +0 -111
  271. data/Rakefile +0 -70
  272. data/benchmark/simple.rb +0 -27
  273. data/benchmark/simple_with_type_coercer.rb +0 -22
  274. data/gemfiles/multi_json.gemfile +0 -36
  275. data/gemfiles/multi_xml.gemfile +0 -36
  276. data/gemfiles/rack_1.5.2.gemfile +0 -36
  277. data/gemfiles/rack_edge.gemfile +0 -36
  278. data/gemfiles/rails_3.gemfile +0 -37
  279. data/gemfiles/rails_4.gemfile +0 -36
  280. data/gemfiles/rails_5.gemfile +0 -36
  281. data/gemfiles/rails_edge.gemfile +0 -36
  282. data/lib/grape/extensions/deep_hash_with_indifferent_access.rb +0 -18
  283. data/lib/grape/util/content_types.rb +0 -26
  284. data/lib/grape/validations/types/virtus_collection_patch.rb +0 -16
@@ -1,3 +1,5 @@
1
+ # frozen_string_literal: true
2
+
1
3
  require 'spec_helper'
2
4
 
3
5
  describe Grape::Validations::ParamsScope do
@@ -30,7 +32,7 @@ describe Grape::Validations::ParamsScope do
30
32
  context 'when the default value is false' do
31
33
  before do
32
34
  subject.params do
33
- optional :bool, type: Virtus::Attribute::Boolean, default: false
35
+ optional :bool, type: Grape::API::Boolean, default: false
34
36
  end
35
37
  subject.get
36
38
  end
@@ -74,7 +76,7 @@ describe Grape::Validations::ParamsScope do
74
76
  end
75
77
 
76
78
  context 'setting description' do
77
- [:desc, :description].each do |description_type|
79
+ %i[desc description].each do |description_type|
78
80
  it "allows setting #{description_type}" do
79
81
  subject.params do
80
82
  requires :int, type: Integer, description_type => 'My very nice integer'
@@ -96,6 +98,7 @@ describe Grape::Validations::ParamsScope do
96
98
 
97
99
  def self.parse(value)
98
100
  raise if value == 'invalid'
101
+
99
102
  new(value)
100
103
  end
101
104
 
@@ -121,21 +124,102 @@ describe Grape::Validations::ParamsScope do
121
124
  end
122
125
  end
123
126
 
127
+ context 'param renaming' do
128
+ it do
129
+ subject.params do
130
+ requires :foo, as: :bar
131
+ optional :super, as: :hiper
132
+ end
133
+ subject.get('/renaming') { "#{declared(params)['bar']}-#{declared(params)['hiper']}" }
134
+ get '/renaming', foo: 'any', super: 'any2'
135
+
136
+ expect(last_response.status).to eq(200)
137
+ expect(last_response.body).to eq('any-any2')
138
+ end
139
+
140
+ it do
141
+ subject.params do
142
+ requires :foo, as: :bar, type: String, coerce_with: ->(c) { c.strip }
143
+ end
144
+ subject.get('/renaming-coerced') { "#{params['bar']}-#{params['foo']}" }
145
+ get '/renaming-coerced', foo: ' there we go '
146
+
147
+ expect(last_response.status).to eq(200)
148
+ expect(last_response.body).to eq('-there we go')
149
+ end
150
+
151
+ it do
152
+ subject.params do
153
+ requires :foo, as: :bar, allow_blank: false
154
+ end
155
+ subject.get('/renaming-not-blank') {}
156
+ get '/renaming-not-blank', foo: ''
157
+
158
+ expect(last_response.status).to eq(400)
159
+ expect(last_response.body).to eq('foo is empty')
160
+ end
161
+
162
+ it do
163
+ subject.params do
164
+ requires :foo, as: :bar, allow_blank: false
165
+ end
166
+ subject.get('/renaming-not-blank-with-value') {}
167
+ get '/renaming-not-blank-with-value', foo: 'any'
168
+
169
+ expect(last_response.status).to eq(200)
170
+ end
171
+
172
+ it do
173
+ subject.params do
174
+ requires :foo, as: :baz, type: Hash do
175
+ requires :bar, as: :qux
176
+ end
177
+ end
178
+ subject.get('/nested-renaming') { declared(params).to_json }
179
+ get '/nested-renaming', foo: { bar: 'any' }
180
+
181
+ expect(last_response.status).to eq(200)
182
+ expect(last_response.body).to eq('{"baz":{"qux":"any"}}')
183
+ end
184
+
185
+ it 'renaming can be defined before default' do
186
+ subject.params do
187
+ optional :foo, as: :bar, default: 'before'
188
+ end
189
+ subject.get('/rename-before-default') { declared(params)[:bar] }
190
+ get '/rename-before-default'
191
+
192
+ expect(last_response.status).to eq(200)
193
+ expect(last_response.body).to eq('before')
194
+ end
195
+
196
+ it 'renaming can be defined after default' do
197
+ subject.params do
198
+ optional :foo, default: 'after', as: :bar
199
+ end
200
+ subject.get('/rename-after-default') { declared(params)[:bar] }
201
+ get '/rename-after-default'
202
+
203
+ expect(last_response.status).to eq(200)
204
+ expect(last_response.body).to eq('after')
205
+ end
206
+ end
207
+
124
208
  context 'array without coerce type explicitly given' do
125
209
  it 'sets the type based on first element' do
126
210
  subject.params do
127
- requires :periods, type: Array, values: -> { %w(day month) }
211
+ requires :periods, type: Array, values: -> { %w[day month] }
128
212
  end
129
213
  subject.get('/required') { 'required works' }
130
214
 
131
- get '/required', periods: %w(day month)
215
+ get '/required', periods: %w[day month]
132
216
  expect(last_response.status).to eq(200)
133
217
  expect(last_response.body).to eq('required works')
134
218
  end
135
219
 
136
220
  it 'fails to call API without Array type' do
137
221
  subject.params do
138
- requires :periods, type: Array, values: -> { %w(day month) }
222
+ requires :periods, type: Array, values: -> { %w[day month] }
139
223
  end
140
224
  subject.get('/required') { 'required works' }
141
225
 
@@ -303,6 +387,18 @@ describe Grape::Validations::ParamsScope do
303
387
  get '/optional_type_array'
304
388
  end
305
389
 
390
+ it 'handles missing optional Array type' do
391
+ subject.params do
392
+ optional :a, type: Array do
393
+ requires :b
394
+ end
395
+ end
396
+ subject.get('/test') { declared(params).to_json }
397
+ get '/test'
398
+ expect(last_response.status).to eq(200)
399
+ expect(last_response.body).to eq('{"a":[]}')
400
+ end
401
+
306
402
  it 'errors with an unsupported type' do
307
403
  expect do
308
404
  subject.params do
@@ -418,6 +514,185 @@ describe Grape::Validations::ParamsScope do
418
514
  end.to raise_error(Grape::Exceptions::UnknownParameter)
419
515
  end
420
516
 
517
+ it 'does not raise an error if the dependent parameter is a Hash' do
518
+ expect do
519
+ subject.params do
520
+ optional :a, type: Hash do
521
+ requires :b
522
+ end
523
+ given :a do
524
+ requires :c
525
+ end
526
+ end
527
+ end.to_not raise_error
528
+ end
529
+
530
+ it 'does not raise an error if when using nested given' do
531
+ expect do
532
+ subject.params do
533
+ optional :a, type: Hash do
534
+ requires :b
535
+ end
536
+ given :a do
537
+ requires :c
538
+ given :c do
539
+ requires :d
540
+ end
541
+ end
542
+ end
543
+ end.to_not raise_error
544
+ end
545
+
546
+ it 'allows nested dependent parameters' do
547
+ subject.params do
548
+ optional :a
549
+ given a: ->(val) { val == 'a' } do
550
+ optional :b
551
+ given b: ->(val) { val == 'b' } do
552
+ optional :c
553
+ given c: ->(val) { val == 'c' } do
554
+ requires :d
555
+ end
556
+ end
557
+ end
558
+ end
559
+ subject.get('/') { declared(params).to_json }
560
+
561
+ get '/'
562
+ expect(last_response.status).to eq 200
563
+
564
+ get '/', a: 'a', b: 'b', c: 'c'
565
+ expect(last_response.status).to eq 400
566
+ expect(last_response.body).to eq 'd is missing'
567
+
568
+ get '/', a: 'a', b: 'b', c: 'c', d: 'd'
569
+ expect(last_response.status).to eq 200
570
+ expect(last_response.body).to eq({ a: 'a', b: 'b', c: 'c', d: 'd' }.to_json)
571
+ end
572
+
573
+ it 'allows renaming of dependent parameters' do
574
+ subject.params do
575
+ optional :a
576
+ given :a do
577
+ requires :b, as: :c
578
+ end
579
+ end
580
+
581
+ subject.get('/multiple') { declared(params).to_json }
582
+
583
+ get '/multiple', a: 'a', b: 'b'
584
+
585
+ body = JSON.parse(last_response.body)
586
+
587
+ expect(body.keys).to include('c')
588
+ expect(body.keys).to_not include('b')
589
+ end
590
+
591
+ it 'allows renaming of dependent on parameter' do
592
+ subject.params do
593
+ optional :a, as: :b
594
+ given a: ->(val) { val == 'x' } do
595
+ requires :c
596
+ end
597
+ end
598
+ subject.get('/') { declared(params) }
599
+
600
+ get '/', a: 'x'
601
+ expect(last_response.status).to eq 400
602
+ expect(last_response.body).to eq 'c is missing'
603
+
604
+ get '/', a: 'y'
605
+ expect(last_response.status).to eq 200
606
+ end
607
+
608
+ it 'does not raise if the dependent parameter is not the renamed one' do
609
+ expect do
610
+ subject.params do
611
+ optional :a, as: :b
612
+ given :a do
613
+ requires :c
614
+ end
615
+ end
616
+ end.not_to raise_error
617
+ end
618
+
619
+ it 'raises an error if the dependent parameter is the renamed one' do
620
+ expect do
621
+ subject.params do
622
+ optional :a, as: :b
623
+ given :b do
624
+ requires :c
625
+ end
626
+ end
627
+ end.to raise_error(Grape::Exceptions::UnknownParameter)
628
+ end
629
+
630
+ it 'does not validate nested requires when given is false' do
631
+ subject.params do
632
+ requires :a, type: String, allow_blank: false, values: %w[x y z]
633
+ given a: ->(val) { val == 'x' } do
634
+ requires :inner1, type: Hash, allow_blank: false do
635
+ requires :foo, type: Integer, allow_blank: false
636
+ end
637
+ end
638
+ given a: ->(val) { val == 'y' } do
639
+ requires :inner2, type: Hash, allow_blank: false do
640
+ requires :bar, type: Integer, allow_blank: false
641
+ requires :baz, type: Array, allow_blank: false do
642
+ requires :baz_category, type: String, allow_blank: false
643
+ end
644
+ end
645
+ end
646
+ given a: ->(val) { val == 'z' } do
647
+ requires :inner3, type: Array, allow_blank: false do
648
+ requires :bar, type: Integer, allow_blank: false
649
+ requires :baz, type: Array, allow_blank: false do
650
+ requires :baz_category, type: String, allow_blank: false
651
+ end
652
+ end
653
+ end
654
+ end
655
+ subject.get('/varying') { declared(params).to_json }
656
+
657
+ get '/varying', a: 'x', inner1: { foo: 1 }
658
+ expect(last_response.status).to eq(200)
659
+
660
+ get '/varying', a: 'y', inner2: { bar: 2, baz: [{ baz_category: 'barstools' }] }
661
+ expect(last_response.status).to eq(200)
662
+
663
+ get '/varying', a: 'y', inner2: { bar: 2, baz: [{ unrelated: 'yep' }] }
664
+ expect(last_response.status).to eq(400)
665
+
666
+ get '/varying', a: 'z', inner3: [{ bar: 3, baz: [{ baz_category: 'barstools' }] }]
667
+ expect(last_response.status).to eq(200)
668
+ end
669
+
670
+ it 'detect unmet nested dependency' do
671
+ subject.params do
672
+ requires :a, type: String, allow_blank: false, values: %w[x y z]
673
+ given a: ->(val) { val == 'z' } do
674
+ requires :inner3, type: Array, allow_blank: false do
675
+ requires :bar, type: String, allow_blank: false
676
+ given bar: ->(val) { val == 'b' } do
677
+ requires :baz, type: Array do
678
+ optional :baz_category, type: String
679
+ end
680
+ end
681
+ given bar: ->(val) { val == 'c' } do
682
+ requires :baz, type: Array do
683
+ requires :baz_category, type: String
684
+ end
685
+ end
686
+ end
687
+ end
688
+ end
689
+ subject.get('/nested-dependency') { declared(params).to_json }
690
+
691
+ get '/nested-dependency', a: 'z', inner3: [{ bar: 'c', baz: [{ unrelated: 'nope' }] }]
692
+ expect(last_response.status).to eq(400)
693
+ expect(last_response.body).to eq 'inner3[0][baz][0][baz_category] is missing'
694
+ end
695
+
421
696
  it 'includes the parameter within #declared(params)' do
422
697
  get '/test', a: true, b: true
423
698
 
@@ -473,7 +748,53 @@ describe Grape::Validations::ParamsScope do
473
748
  end
474
749
  end
475
750
 
751
+ context 'default value in given block' do
752
+ before do
753
+ subject.params do
754
+ optional :a, values: %w[a b]
755
+ given a: ->(val) { val == 'a' } do
756
+ optional :b, default: 'default'
757
+ end
758
+ end
759
+ subject.get('/') { params.to_json }
760
+ end
761
+
762
+ context 'when dependency meets' do
763
+ it 'sets default value for dependent parameter' do
764
+ get '/', a: 'a'
765
+ expect(last_response.body).to eq({ a: 'a', b: 'default' }.to_json)
766
+ end
767
+ end
768
+
769
+ context 'when dependency does not meet' do
770
+ it 'does not set default value for dependent parameter' do
771
+ get '/', a: 'b'
772
+ expect(last_response.body).to eq({ a: 'b' }.to_json)
773
+ end
774
+ end
775
+ end
776
+
476
777
  context 'when validations are dependent on a parameter within an array param' do
778
+ before do
779
+ subject.params do
780
+ requires :foos, type: Array do
781
+ optional :foo
782
+ given :foo do
783
+ requires :bar
784
+ end
785
+ end
786
+ end
787
+ subject.get('/test') { 'ok' }
788
+ end
789
+
790
+ it 'should pass none Hash params' do
791
+ get '/test', foos: ['']
792
+ expect(last_response.status).to eq(200)
793
+ expect(last_response.body).to eq('ok')
794
+ end
795
+ end
796
+
797
+ context 'when validations are dependent on a parameter within an array param within #declared(params).to_json' do
477
798
  before do
478
799
  subject.params do
479
800
  requires :foos, type: Array do
@@ -498,8 +819,8 @@ describe Grape::Validations::ParamsScope do
498
819
 
499
820
  context 'when validations are dependent on a parameter with specific value' do
500
821
  # build test cases from all combinations of declarations and options
501
- a_decls = %i(optional requires)
502
- a_options = [{}, { values: %w(x y z) }]
822
+ a_decls = %i[optional requires]
823
+ a_options = [{}, { values: %w[x y z] }]
503
824
  b_options = [{}, { type: String }, { allow_blank: false }, { type: String, allow_blank: false }]
504
825
  combinations = a_decls.product(a_options, b_options)
505
826
  combinations.each_with_index do |combination, i|
@@ -829,4 +1150,40 @@ describe Grape::Validations::ParamsScope do
829
1150
  end
830
1151
  end
831
1152
  end
1153
+
1154
+ context 'with exactly_one_of validation for optional parameters within an Hash param' do
1155
+ before do
1156
+ subject.params do
1157
+ optional :memo, type: Hash do
1158
+ optional :text, type: String
1159
+ optional :custom_body, type: Hash, coerce_with: JSON
1160
+ exactly_one_of :text, :custom_body
1161
+ end
1162
+ end
1163
+ subject.get('test')
1164
+ end
1165
+
1166
+ context 'when correct data is provided' do
1167
+ it 'returns a successful response' do
1168
+ get 'test', memo: {}
1169
+ expect(last_response.status).to eq(200)
1170
+
1171
+ get 'test', memo: { text: 'HOGEHOGE' }
1172
+ expect(last_response.status).to eq(200)
1173
+
1174
+ get 'test', memo: { custom_body: '{ "xxx": "yyy" }' }
1175
+ expect(last_response.status).to eq(200)
1176
+ end
1177
+ end
1178
+
1179
+ context 'when invalid data is provided' do
1180
+ it 'returns a failure response' do
1181
+ get 'test', memo: { text: 'HOGEHOGE', custom_body: '{ "xxx": "yyy" }' }
1182
+ expect(last_response.status).to eq(400)
1183
+
1184
+ get 'test', memo: '{ "custom_body": "HOGE" }'
1185
+ expect(last_response.status).to eq(400)
1186
+ end
1187
+ end
1188
+ end
832
1189
  end
@@ -0,0 +1,58 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ describe Grape::Validations::SingleAttributeIterator do
6
+ describe '#each' do
7
+ subject(:iterator) { described_class.new(validator, scope, params) }
8
+ let(:scope) { Grape::Validations::ParamsScope.new(api: Class.new(Grape::API)) }
9
+ let(:validator) { double(attrs: %i[first second]) }
10
+
11
+ context 'when params is a hash' do
12
+ let(:params) do
13
+ { first: 'string', second: 'string' }
14
+ end
15
+
16
+ it 'yields params and every single attribute from the list' do
17
+ expect { |b| iterator.each(&b) }
18
+ .to yield_successive_args([params, :first, false, false], [params, :second, false, false])
19
+ end
20
+ end
21
+
22
+ context 'when params is an array' do
23
+ let(:params) do
24
+ [{ first: 'string1', second: 'string1' }, { first: 'string2', second: 'string2' }]
25
+ end
26
+
27
+ it 'yields every single attribute from the list for each of the array elements' do
28
+ expect { |b| iterator.each(&b) }.to yield_successive_args(
29
+ [params[0], :first, false, false], [params[0], :second, false, false],
30
+ [params[1], :first, false, false], [params[1], :second, false, false]
31
+ )
32
+ end
33
+
34
+ context 'empty values' do
35
+ let(:params) { [{}, '', 10] }
36
+
37
+ it 'marks params with empty values' do
38
+ expect { |b| iterator.each(&b) }.to yield_successive_args(
39
+ [params[0], :first, true, false], [params[0], :second, true, false],
40
+ [params[1], :first, true, false], [params[1], :second, true, false],
41
+ [params[2], :first, false, false], [params[2], :second, false, false]
42
+ )
43
+ end
44
+ end
45
+
46
+ context 'when missing optional value' do
47
+ let(:params) { [Grape::DSL::Parameters::EmptyOptionalValue, 10] }
48
+
49
+ it 'marks params with skipped values' do
50
+ expect { |b| iterator.each(&b) }.to yield_successive_args(
51
+ [params[0], :first, false, true], [params[0], :second, false, true],
52
+ [params[1], :first, false, false], [params[1], :second, false, false]
53
+ )
54
+ end
55
+ end
56
+ end
57
+ end
58
+ end
@@ -0,0 +1,35 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ describe Grape::Validations::Types::ArrayCoercer do
6
+ subject { described_class.new(type) }
7
+
8
+ describe '#call' do
9
+ context 'an array of primitives' do
10
+ let(:type) { Array[String] }
11
+
12
+ it 'coerces elements in the array' do
13
+ expect(subject.call([10, 20])).to eq(%w[10 20])
14
+ end
15
+ end
16
+
17
+ context 'an array of arrays' do
18
+ let(:type) { Array[Array[Integer]] }
19
+
20
+ it 'coerces elements in the nested array' do
21
+ expect(subject.call([%w[10 20]])).to eq([[10, 20]])
22
+ expect(subject.call([['10'], ['20']])).to eq([[10], [20]])
23
+ end
24
+ end
25
+
26
+ context 'an array of sets' do
27
+ let(:type) { Array[Set[Integer]] }
28
+
29
+ it 'coerces elements in the nested set' do
30
+ expect(subject.call([%w[10 20]])).to eq([Set[10, 20]])
31
+ expect(subject.call([['10'], ['20']])).to eq([Set[10], Set[20]])
32
+ end
33
+ end
34
+ end
35
+ end
@@ -0,0 +1,135 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ describe Grape::Validations::Types::PrimitiveCoercer do
6
+ let(:strict) { false }
7
+
8
+ subject { described_class.new(type, strict) }
9
+
10
+ describe '#call' do
11
+ context 'BigDecimal' do
12
+ let(:type) { BigDecimal }
13
+
14
+ it 'coerces to BigDecimal' do
15
+ expect(subject.call(5)).to eq(BigDecimal('5'))
16
+ end
17
+
18
+ it 'coerces an empty string to nil' do
19
+ expect(subject.call('')).to be_nil
20
+ end
21
+ end
22
+
23
+ context 'Boolean' do
24
+ let(:type) { Grape::API::Boolean }
25
+
26
+ [true, 'true', 1].each do |val|
27
+ it "coerces '#{val}' to true" do
28
+ expect(subject.call(val)).to eq(true)
29
+ end
30
+ end
31
+
32
+ [false, 'false', 0].each do |val|
33
+ it "coerces '#{val}' to false" do
34
+ expect(subject.call(val)).to eq(false)
35
+ end
36
+ end
37
+
38
+ it 'returns an error when the given value cannot be coerced' do
39
+ expect(subject.call(123)).to be_instance_of(Grape::Validations::Types::InvalidValue)
40
+ end
41
+
42
+ it 'coerces an empty string to nil' do
43
+ expect(subject.call('')).to be_nil
44
+ end
45
+ end
46
+
47
+ context 'DateTime' do
48
+ let(:type) { DateTime }
49
+
50
+ it 'coerces an empty string to nil' do
51
+ expect(subject.call('')).to be_nil
52
+ end
53
+ end
54
+
55
+ context 'Float' do
56
+ let(:type) { Float }
57
+
58
+ it 'coerces an empty string to nil' do
59
+ expect(subject.call('')).to be_nil
60
+ end
61
+ end
62
+
63
+ context 'Integer' do
64
+ let(:type) { Integer }
65
+
66
+ it 'coerces an empty string to nil' do
67
+ expect(subject.call('')).to be_nil
68
+ end
69
+ end
70
+
71
+ context 'Numeric' do
72
+ let(:type) { Numeric }
73
+
74
+ it 'coerces an empty string to nil' do
75
+ expect(subject.call('')).to be_nil
76
+ end
77
+ end
78
+
79
+ context 'Time' do
80
+ let(:type) { Time }
81
+
82
+ it 'coerces an empty string to nil' do
83
+ expect(subject.call('')).to be_nil
84
+ end
85
+ end
86
+
87
+ context 'String' do
88
+ let(:type) { String }
89
+
90
+ it 'coerces to String' do
91
+ expect(subject.call(10)).to eq('10')
92
+ end
93
+
94
+ it 'does not coerce an empty string to nil' do
95
+ expect(subject.call('')).to eq('')
96
+ end
97
+ end
98
+
99
+ context 'Symbol' do
100
+ let(:type) { Symbol }
101
+
102
+ it 'coerces an empty string to nil' do
103
+ expect(subject.call('')).to be_nil
104
+ end
105
+ end
106
+
107
+ context 'the strict mode' do
108
+ let(:strict) { true }
109
+
110
+ context 'Boolean' do
111
+ let(:type) { Grape::API::Boolean }
112
+
113
+ it 'returns an error when the given value is not Boolean' do
114
+ expect(subject.call(1)).to be_instance_of(Grape::Validations::Types::InvalidValue)
115
+ end
116
+
117
+ it 'returns a value as it is when the given value is Boolean' do
118
+ expect(subject.call(true)).to eq(true)
119
+ end
120
+ end
121
+
122
+ context 'BigDecimal' do
123
+ let(:type) { BigDecimal }
124
+
125
+ it 'returns an error when the given value is not BigDecimal' do
126
+ expect(subject.call(1)).to be_instance_of(Grape::Validations::Types::InvalidValue)
127
+ end
128
+
129
+ it 'returns a value as it is when the given value is BigDecimal' do
130
+ expect(subject.call(BigDecimal('0'))).to eq(BigDecimal('0'))
131
+ end
132
+ end
133
+ end
134
+ end
135
+ end
@@ -0,0 +1,34 @@
1
+ # frozen_string_literal: true
2
+
3
+ require 'spec_helper'
4
+
5
+ describe Grape::Validations::Types::SetCoercer do
6
+ subject { described_class.new(type) }
7
+
8
+ describe '#call' do
9
+ context 'a set of primitives' do
10
+ let(:type) { Set[String] }
11
+
12
+ it 'coerces elements to the set' do
13
+ expect(subject.call([10, 20])).to eq(Set['10', '20'])
14
+ end
15
+ end
16
+
17
+ context 'a set of sets' do
18
+ let(:type) { Set[Set[Integer]] }
19
+
20
+ it 'coerces elements in the nested set' do
21
+ expect(subject.call([%w[10 20]])).to eq(Set[Set[10, 20]])
22
+ expect(subject.call([['10'], ['20']])).to eq(Set[Set[10], Set[20]])
23
+ end
24
+ end
25
+
26
+ context 'a set of sets of arrays' do
27
+ let(:type) { Set[Set[Array[Integer]]] }
28
+
29
+ it 'coerces elements in the nested set' do
30
+ expect(subject.call([[['10'], ['20']]])).to eq(Set[Set[Array[10], Array[20]]])
31
+ end
32
+ end
33
+ end
34
+ end