Skip to content

Commit

Permalink
Remove deprecated image_alt helper
Browse files Browse the repository at this point in the history
  • Loading branch information
rafaelfranca committed Jan 17, 2019
1 parent e70d3df commit 60c8a03
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 43 deletions.
4 changes: 4 additions & 0 deletions actionview/CHANGELOG.md
@@ -1,3 +1,7 @@
* Remove deprecated `image_alt` helper.

*Rafael Mendonça França*

* Fix the need of `#protect_against_forgery?` method defined in
`ActionView::Base` subclasses. This prevents the use of forms and buttons.

Expand Down
23 changes: 0 additions & 23 deletions actionview/lib/action_view/helpers/asset_tag_helper.rb
Expand Up @@ -355,29 +355,6 @@ def image_tag(source, options = {})
tag("img", options)
end

# Returns a string suitable for an HTML image tag alt attribute.
# The +src+ argument is meant to be an image file path.
# The method removes the basename of the file path and the digest,
# if any. It also removes hyphens and underscores from file names and
# replaces them with spaces, returning a space-separated, titleized
# string.
#
# ==== Examples
#
# image_alt('rails.png')
# # => Rails
#
# image_alt('hyphenated-file-name.png')
# # => Hyphenated file name
#
# image_alt('underscored_file_name.png')
# # => Underscored file name
def image_alt(src)
ActiveSupport::Deprecation.warn("image_alt is deprecated and will be removed from Rails 6.0. You must explicitly set alt text on images.")

File.basename(src, ".*").sub(/-[[:xdigit:]]{32,64}\z/, "").tr("-_", " ").capitalize
end

# Returns an HTML video tag for the +sources+. If +sources+ is a string,
# a single video tag will be returned. If +sources+ is an array, a video
# tag with nested source tags for each source will be returned. The
Expand Down
20 changes: 0 additions & 20 deletions actionview/test/template/asset_tag_helper_test.rb
Expand Up @@ -512,26 +512,6 @@ def test_url_to_image_alias_for_image_url
UrlToImageToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
end

def test_image_alt
[nil, "/", "/foo/bar/", "foo/bar/"].each do |prefix|
assert_deprecated do
assert_equal "Rails", image_alt("#{prefix}rails.png")
end
assert_deprecated do
assert_equal "Rails", image_alt("#{prefix}rails-9c0a079bdd7701d7e729bd956823d153.png")
end
assert_deprecated do
assert_equal "Rails", image_alt("#{prefix}rails-f56ef62bc41b040664e801a38f068082a75d506d9048307e8096737463503d0b.png")
end
assert_deprecated do
assert_equal "Long file name with hyphens", image_alt("#{prefix}long-file-name-with-hyphens.png")
end
assert_deprecated do
assert_equal "Long file name with underscores", image_alt("#{prefix}long_file_name_with_underscores.png")
end
end
end

def test_image_tag
ImageLinkToTag.each { |method, tag| assert_dom_equal(tag, eval(method)) }
end
Expand Down

0 comments on commit 60c8a03

Please sign in to comment.