actionpack 7.1.0.rc2 → 7.1.0
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of actionpack might be problematic. Click here for more details.
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c629ea5d973a0c87d194d595ae9441a3e0f1d274e3a8f8d36a1166227b9df997
|
4
|
+
data.tar.gz: 15a763f5513a74282a0f4ad9e2a740bbd04d4db42802823ef7792ca48907f85b
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 17b16cd68d184266d827e228d83ae4ae20dc10c9369c87f22589f17308da8ea3e7bf61a4b268826a1f35999c1c81699aae97ec38c706e4533260e0b41cf5f831
|
7
|
+
data.tar.gz: 77ecb360825692d5ce8731eb02d6575fe4dbb5cb3e8d3eeb2d873889b15468675e64bb7de0a1c15a1bc70f61c917cd6fc700f39b68257eb2804594d8e88271da
|
data/CHANGELOG.md
CHANGED
@@ -424,7 +424,9 @@ module ActionController
|
|
424
424
|
|
425
425
|
module ControllerMethods
|
426
426
|
# Authenticate using an HTTP Bearer token, or otherwise render an HTTP
|
427
|
-
# header requesting the client to send a Bearer token.
|
427
|
+
# header requesting the client to send a Bearer token. For the authentication
|
428
|
+
# to be considered successful, +login_procedure+ should return a non-nil
|
429
|
+
# value. Typically, the authenticated user is returned.
|
428
430
|
#
|
429
431
|
# See ActionController::HttpAuthentication::Token for example usage.
|
430
432
|
def authenticate_or_request_with_http_token(realm = "Application", message = nil, &login_procedure)
|
@@ -432,8 +434,8 @@ module ActionController
|
|
432
434
|
end
|
433
435
|
|
434
436
|
# Authenticate using an HTTP Bearer token.
|
435
|
-
# Returns the return value of
|
436
|
-
# token is found. Returns
|
437
|
+
# Returns the return value of +login_procedure+ if a
|
438
|
+
# token is found. Returns +nil+ if no token is found.
|
437
439
|
#
|
438
440
|
# See ActionController::HttpAuthentication::Token for example usage.
|
439
441
|
def authenticate_with_http_token(&login_procedure)
|
@@ -450,8 +452,8 @@ module ActionController
|
|
450
452
|
# If token Authorization header is present, call the login
|
451
453
|
# procedure with the present token and options.
|
452
454
|
#
|
453
|
-
# Returns the return value of
|
454
|
-
# token is found. Returns
|
455
|
+
# Returns the return value of +login_procedure+ if a
|
456
|
+
# token is found. Returns +nil+ if no token is found.
|
455
457
|
#
|
456
458
|
# ==== Parameters
|
457
459
|
#
|
@@ -144,6 +144,31 @@ module ActionController
|
|
144
144
|
|
145
145
|
cattr_accessor :action_on_unpermitted_parameters, instance_accessor: false
|
146
146
|
|
147
|
+
##
|
148
|
+
# :method: deep_merge
|
149
|
+
#
|
150
|
+
# :call-seq:
|
151
|
+
# deep_merge(other_hash, &block)
|
152
|
+
#
|
153
|
+
# Returns a new +ActionController::Parameters+ instance with +self+ and +other_hash+ merged recursively.
|
154
|
+
#
|
155
|
+
# Like with <tt>Hash#merge</tt> in the standard library, a block can be provided
|
156
|
+
# to merge values.
|
157
|
+
#
|
158
|
+
#--
|
159
|
+
# Implemented by ActiveSupport::DeepMergeable#deep_merge.
|
160
|
+
|
161
|
+
##
|
162
|
+
# :method: deep_merge!
|
163
|
+
#
|
164
|
+
# :call-seq:
|
165
|
+
# deep_merge!(other_hash, &block)
|
166
|
+
#
|
167
|
+
# Same as +#deep_merge+, but modifies +self+.
|
168
|
+
#
|
169
|
+
#--
|
170
|
+
# Implemented by ActiveSupport::DeepMergeable#deep_merge!.
|
171
|
+
|
147
172
|
##
|
148
173
|
# :method: as_json
|
149
174
|
#
|
@@ -866,28 +891,7 @@ module ActionController
|
|
866
891
|
self
|
867
892
|
end
|
868
893
|
|
869
|
-
|
870
|
-
# :method: deep_merge
|
871
|
-
# :call-seq: deep_merge(other_hash, &block)
|
872
|
-
#
|
873
|
-
# Returns a new +ActionController::Parameters+ instance with +self+ and +other_hash+ merged recursively.
|
874
|
-
#
|
875
|
-
# Like with +Hash#merge+ in the standard library, a block can be provided
|
876
|
-
# to merge values.
|
877
|
-
#
|
878
|
-
#--
|
879
|
-
# Implemented by ActiveSupport::DeepMergeable#deep_merge.
|
880
|
-
|
881
|
-
##
|
882
|
-
# :method: deep_merge!
|
883
|
-
# :call-seq: deep_merge!(other_hash, &block)
|
884
|
-
#
|
885
|
-
# Same as +#deep_merge+, but modifies +self+.
|
886
|
-
#
|
887
|
-
#--
|
888
|
-
# Implemented by ActiveSupport::DeepMergeable#deep_merge!.
|
889
|
-
|
890
|
-
def deep_merge?(other_hash) # :nodoc
|
894
|
+
def deep_merge?(other_hash) # :nodoc:
|
891
895
|
other_hash.is_a?(ActiveSupport::DeepMergeable)
|
892
896
|
end
|
893
897
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: actionpack
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 7.1.0
|
4
|
+
version: 7.1.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- David Heinemeier Hansson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2023-10-
|
11
|
+
date: 2023-10-05 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: activesupport
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - '='
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: 7.1.0
|
19
|
+
version: 7.1.0
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - '='
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: 7.1.0
|
26
|
+
version: 7.1.0
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: nokogiri
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
@@ -114,28 +114,28 @@ dependencies:
|
|
114
114
|
requirements:
|
115
115
|
- - '='
|
116
116
|
- !ruby/object:Gem::Version
|
117
|
-
version: 7.1.0
|
117
|
+
version: 7.1.0
|
118
118
|
type: :runtime
|
119
119
|
prerelease: false
|
120
120
|
version_requirements: !ruby/object:Gem::Requirement
|
121
121
|
requirements:
|
122
122
|
- - '='
|
123
123
|
- !ruby/object:Gem::Version
|
124
|
-
version: 7.1.0
|
124
|
+
version: 7.1.0
|
125
125
|
- !ruby/object:Gem::Dependency
|
126
126
|
name: activemodel
|
127
127
|
requirement: !ruby/object:Gem::Requirement
|
128
128
|
requirements:
|
129
129
|
- - '='
|
130
130
|
- !ruby/object:Gem::Version
|
131
|
-
version: 7.1.0
|
131
|
+
version: 7.1.0
|
132
132
|
type: :development
|
133
133
|
prerelease: false
|
134
134
|
version_requirements: !ruby/object:Gem::Requirement
|
135
135
|
requirements:
|
136
136
|
- - '='
|
137
137
|
- !ruby/object:Gem::Version
|
138
|
-
version: 7.1.0
|
138
|
+
version: 7.1.0
|
139
139
|
description: Web apps on Rails. Simple, battle-tested conventions for building and
|
140
140
|
testing MVC web applications. Works with any Rack-compatible server.
|
141
141
|
email: david@loudthinking.com
|
@@ -332,10 +332,10 @@ licenses:
|
|
332
332
|
- MIT
|
333
333
|
metadata:
|
334
334
|
bug_tracker_uri: https://github.com/rails/rails/issues
|
335
|
-
changelog_uri: https://github.com/rails/rails/blob/v7.1.0
|
336
|
-
documentation_uri: https://api.rubyonrails.org/v7.1.0
|
335
|
+
changelog_uri: https://github.com/rails/rails/blob/v7.1.0/actionpack/CHANGELOG.md
|
336
|
+
documentation_uri: https://api.rubyonrails.org/v7.1.0/
|
337
337
|
mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
|
338
|
-
source_code_uri: https://github.com/rails/rails/tree/v7.1.0
|
338
|
+
source_code_uri: https://github.com/rails/rails/tree/v7.1.0/actionpack
|
339
339
|
rubygems_mfa_required: 'true'
|
340
340
|
post_install_message:
|
341
341
|
rdoc_options: []
|
@@ -348,9 +348,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
348
348
|
version: 2.7.0
|
349
349
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
350
350
|
requirements:
|
351
|
-
- - "
|
351
|
+
- - ">="
|
352
352
|
- !ruby/object:Gem::Version
|
353
|
-
version:
|
353
|
+
version: '0'
|
354
354
|
requirements:
|
355
355
|
- none
|
356
356
|
rubygems_version: 3.4.18
|