diff options
author | Eugene Kenny <elkenny@gmail.com> | 2017-12-17 00:49:02 +0000 |
---|---|---|
committer | Eugene Kenny <elkenny@gmail.com> | 2017-12-17 00:49:02 +0000 |
commit | b9e7c676ca13e286a371dc1b4996d2c15c0461e8 (patch) | |
tree | 0e948db08809dbeedabd5b3540970137d7feada6 /activesupport/lib | |
parent | 28d2968533c860e7e4a836d0440cf6b3b11ad11f (diff) | |
download | rails-b9e7c676ca13e286a371dc1b4996d2c15c0461e8.tar.gz rails-b9e7c676ca13e286a371dc1b4996d2c15c0461e8.tar.bz2 rails-b9e7c676ca13e286a371dc1b4996d2c15c0461e8.zip |
Don't include ellipsis in truncated digest output
Using `truncate` to limit the length of the digest has the unwanted side
effect of adding an ellipsis when the input is longer than the limit.
Also:
- Don't instantiate a new object for every digest
- Rename the configuration option to `hash_digest_class`
- Update the CHANGELOG entry to describe how to use the feature
Diffstat (limited to 'activesupport/lib')
-rw-r--r-- | activesupport/lib/active_support/digest.rb | 10 | ||||
-rw-r--r-- | activesupport/lib/active_support/railtie.rb | 4 |
2 files changed, 3 insertions, 11 deletions
diff --git a/activesupport/lib/active_support/digest.rb b/activesupport/lib/active_support/digest.rb index d77eeb072b..fba10fbdcf 100644 --- a/activesupport/lib/active_support/digest.rb +++ b/activesupport/lib/active_support/digest.rb @@ -13,16 +13,8 @@ module ActiveSupport end def hexdigest(arg) - new.hexdigest(arg) + hash_digest_class.hexdigest(arg)[0...32] end end - - def initialize(digest_class: nil) - @digest_class = digest_class || self.class.hash_digest_class - end - - def hexdigest(arg) - @digest_class.hexdigest(arg).truncate(32) - end end end diff --git a/activesupport/lib/active_support/railtie.rb b/activesupport/lib/active_support/railtie.rb index 3488721df9..91872e29c8 100644 --- a/activesupport/lib/active_support/railtie.rb +++ b/activesupport/lib/active_support/railtie.rb @@ -68,9 +68,9 @@ module ActiveSupport end initializer "active_support.set_hash_digest_class" do |app| - if app.config.active_support.respond_to?(:use_hash_digest_class) && app.config.active_support.use_hash_digest_class + if app.config.active_support.respond_to?(:hash_digest_class) && app.config.active_support.hash_digest_class ActiveSupport::Digest.hash_digest_class = - app.config.active_support.use_hash_digest_class + app.config.active_support.hash_digest_class end end end |