kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Add :country_code option to sms_to 

`phone_to` supports a `:country_code` option, so add a `:country_code`
option to `sms_to` for consistency.
This commit is contained in:
Jonathan Hefner 2021-02-26 12:37:35 -06:00
parent 432bc68a2c
commit b9eb9fee64
3 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actionview/CHANGELOG.md
View File

@ -1,3 +1,7 @@
* Add `:country_code` option to `sms_to` for consistency with `phone_to`.
*Jonathan Hefner*
* Deprecate `render` locals to be assigned to instance variables.
*Petrik de Heus*

21
actionview/lib/action_view/helpers/url_helper.rb
View File

@ -598,15 +598,24 @@ module ActionView
# If +name+ is not specified, +phone_number+ will be used as the name of
# the link.
#
# A +country_code+ option is supported, which prepends a plus sign and the
# given country code to the linked phone number. For example,
# <tt>country_code: "01"</tt> will prepend <tt>+01</tt> to the linked
# phone number.
#
# Additional HTML attributes for the link can be passed via +html_options+.
#
# ==== Options
# * <tt>:country_code</tt> - Prepend the country code to the phone number.
# * <tt>:body</tt> - Preset the body of the message.
#
# ==== Examples
# sms_to "5155555785"
# # => <a href="sms:5155555785;">5155555785</a>
#
# sms_to "5155555785", country_code: "01"
# # => <a href="sms:+015155555785;">5155555785</a>
#
# sms_to "5155555785", "Text me"
# # => <a href="sms:5155555785;">Text me</a>
#
@ -625,14 +634,14 @@ module ActionView
html_options, name = name, nil if name.is_a?(Hash)
html_options = (html_options || {}).stringify_keys
extras = %w{ body }.map! { |item|
option = html_options.delete(item).presence || next
"#{item.dasherize}=#{ERB::Util.url_encode(option)}"
}.compact
extras = extras.empty? ? "" : "?&" + extras.join("&")
country_code = html_options.delete("country_code").presence
country_code = country_code ? "+#{ERB::Util.url_encode(country_code)}" : ""
body = html_options.delete("body").presence
body = body ? "?&body=#{ERB::Util.url_encode(body)}" : ""
encoded_phone_number = ERB::Util.url_encode(phone_number)
html_options["href"] = "sms:#{encoded_phone_number};#{extras}"
html_options["href"] = "sms:#{country_code}#{encoded_phone_number};#{body}"
content_tag("a", name || phone_number, html_options, &block)
end

12
actionview/test/template/url_helper_test.rb
View File

@ -768,18 +768,18 @@ class UrlHelperTest < ActiveSupport::TestCase
def test_sms_to_with_options
assert_dom_equal(
%{<a class="simple-class" href="sms:15155555785;?&body=Hello%20from%20Jim">Text me</a>},
sms_to("15155555785", "Text me", class: "simple-class", body: "Hello from Jim")
%{<a class="simple-class" href="sms:+015155555785;?&body=Hello%20from%20Jim">Text me</a>},
sms_to("5155555785", "Text me", class: "simple-class", country_code: "01", body: "Hello from Jim")
)
assert_dom_equal(
%{<a class="simple-class" href="sms:15155555785;?&body=Hello%20from%20Jim">15155555785</a>},
sms_to("15155555785", class: "simple-class", body: "Hello from Jim")
%{<a class="simple-class" href="sms:+015155555785;?&body=Hello%20from%20Jim">5155555785</a>},
sms_to("5155555785", class: "simple-class", country_code: "01", body: "Hello from Jim")
)
assert_dom_equal(
%{<a href="sms:15155555785;?&body=This%20is%20the%20body%20of%20the%20message.">Text me</a>},
sms_to("15155555785", "Text me", body: "This is the body of the message.")
%{<a href="sms:5155555785;?&body=This%20is%20the%20body%20of%20the%20message.">Text me</a>},
sms_to("5155555785", "Text me", body: "This is the body of the message.")
)
end