aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
Diffstat (limited to 'railties')
-rw-r--r--railties/CHANGELOG.md6
-rw-r--r--railties/lib/rails/application.rb8
-rw-r--r--railties/test/application/configuration_test.rb6
3 files changed, 10 insertions, 10 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index a42e942f9b..dc753dbeac 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,9 +1,9 @@
-* Add `Application#verifier` method to return a application's message verifier.
+* Add `Application#message_verifier` method to return a application's message verifier.
This verifier can be used to generate and verify signed messages in the application.
- message = Rails.application.verifier.generate('my sensible data')
- Rails.application.verifier.verify(message)
+ message = Rails.application.message_verifier.generate('my sensible data')
+ Rails.application.message_verifier.verify(message)
# => 'my sensible data'
See the `ActiveSupport::MessageVerifier` documentation to more information.
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 320da8f100..6ab13b18e0 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -162,13 +162,13 @@ module Rails
#
# This verify can be used to generate and verify signed messages in the application.
#
- # message = Rails.application.verifier.generate('my sensible data')
- # Rails.application.verifier.verify(message)
+ # message = Rails.application.message_verifier.generate('my sensible data')
+ # Rails.application.message_verifier.verify(message)
# # => 'my sensible data'
#
# See the +ActiveSupport::MessageVerifier+ documentation to more information.
- def verifier
- @verifier ||= begin
+ def message_verifier
+ @message_verifier ||= begin
if config.respond_to?(:message_verifier_salt)
salt = config.message_verifier_salt
end
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index e532190252..133055218a 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -276,13 +276,13 @@ module ApplicationTests
class ::OmgController < ActionController::Base
def index
- render text: Rails.application.verifier.generate("some_value")
+ render text: Rails.application.message_verifier.generate("some_value")
end
end
get "/"
- assert_equal 'some_value', Rails.application.verifier.verify(last_response.body)
+ assert_equal 'some_value', Rails.application.message_verifier.verify(last_response.body)
secret = app.key_generator.generate_key('application verifier')
verifier = ActiveSupport::MessageVerifier.new(secret)
@@ -298,7 +298,7 @@ module ApplicationTests
class ::OmgController < ActionController::Base
def index
- render text: Rails.application.verifier.generate("some_value")
+ render text: Rails.application.message_verifier.generate("some_value")
end
end