File tree Expand file tree Collapse file tree 5 files changed +7
-7
lines changed Expand file tree Collapse file tree 5 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -95,9 +95,9 @@ def initialize
95
95
end
96
96
97
97
def call ( env )
98
- status , headers , body = @route_set . call ( env )
99
- headers . delete ( 'X-Cascade' ) unless cascade?
100
- [ status , headers , body ]
98
+ result = @route_set . call ( env )
99
+ result [ 1 ] . delete ( 'X-Cascade' ) unless cascade?
100
+ result
101
101
end
102
102
103
103
# Some requests may return a HTTP 404 error if grape cannot find a matching
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ module BaseHelper
64
64
attr_accessor :api
65
65
def params ( name , &block )
66
66
@named_params ||= { }
67
- @named_params . merge! name => block
67
+ @named_params [ name ] = block
68
68
end
69
69
70
70
def api_changed ( new_api )
Original file line number Diff line number Diff line change @@ -43,7 +43,7 @@ def requires(*attrs, &block)
43
43
orig_attrs = attrs . clone
44
44
45
45
opts = attrs . last . is_a? ( Hash ) ? attrs . pop . clone : { }
46
- opts . merge! ( presence : true )
46
+ opts [ :presence ] = true
47
47
48
48
if opts [ :using ]
49
49
require_required_and_optional_fields ( attrs . first , opts )
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ def params
17
17
def headers
18
18
@headers ||= env . dup . inject ( { } ) do |h , ( k , v ) |
19
19
if k . to_s . start_with? 'HTTP_'
20
- k = k [ 5 ..-1 ] . gsub ( '_' , '-' ) . downcase . gsub ( /^.|[-_\s ]./ ) { |x | x . upcase }
20
+ k = k [ 5 ..-1 ] . tr ( '_' , '-' ) . downcase . gsub ( /^.|[-_\s ]./ ) { |x | x . upcase }
21
21
h [ k ] = v
22
22
end
23
23
h
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ def available_media_types
68
68
available_media_types = [ ]
69
69
70
70
content_types . each do |extension , media_type |
71
- versions . reverse . each do |version |
71
+ versions . reverse_each do |version |
72
72
available_media_types += [ "application/vnd.#{ vendor } -#{ version } +#{ extension } " , "application/vnd.#{ vendor } -#{ version } " ]
73
73
end
74
74
available_media_types << "application/vnd.#{ vendor } +#{ extension } "
You can’t perform that action at this time.
0 commit comments