module BrowseTagsHelper
+ # https://wiki.openstreetmap.org/wiki/Key:wikipedia#Secondary_Wikipedia_links
+ # https://wiki.openstreetmap.org/wiki/Key:wikidata#Secondary_Wikidata_links
+ SECONDARY_WIKI_PREFIXES = "architect|artist|brand|flag|genus|name:etymology|network|operator|species|subject".freeze
+
def format_key(key)
if url = wiki_link("key", key)
link_to h(key), url, :title => t("browse.tag_details.wiki_link.key", :key => key)
elsif url = wiki_link("tag", "#{key}=#{value}")
link_to h(value), url, :title => t("browse.tag_details.wiki_link.tag", :key => key, :value => value)
elsif email = email_link(key, value)
- link_to(h(email[:email]), email[:url], :title => t("browse.tag_details.email_link", :email => email[:email]))
+ mail_to(email, :title => t("browse.tag_details.email_link", :email => email))
elsif phones = telephone_links(key, value)
# similarly, telephone_links() returns an array of phone numbers
phones = phones.map do |p|
elsif colour_value = colour_preview(key, value)
tag.span("", :class => "colour-preview-box", :"data-colour" => colour_value, :title => t("browse.tag_details.colour_preview", :colour_value => colour_value)) + colour_value
else
- linkify h(value)
+ safe_join(value.split(";").map { |x| linkify(h(x)) }, ";")
end
end
return nil if %r{^https?://}.match?(value)
case key
- when "wikipedia"
+ when "wikipedia", /^(#{SECONDARY_WIKI_PREFIXES}):wikipedia/o
# This regex should match Wikipedia language codes, everything
# from de to zh-classical
lang = if value =~ /^([a-z-]{2,12}):(.+)$/i
:title => value
}]
# Key has to be one of the accepted wikidata-tags
- elsif key =~ /(architect|artist|brand|name:etymology|network|operator|subject):wikidata/ &&
+ elsif key =~ /(#{SECONDARY_WIKI_PREFIXES}):wikidata/o &&
# Value has to be a semicolon-separated list of wikidata-IDs (whitespaces allowed before and after semicolons)
value =~ /^[Qq][1-9][0-9]*(\s*;\s*[Qq][1-9][0-9]*)*$/
# Splitting at every semicolon to get a separate hash for each wikidata-ID
nil
end
- def email_link(_key, value)
+ def email_link(key, value)
+ # Avoid converting conditional tags into emails, since EMAIL_REGEXP is quite permissive
+ return nil unless %w[email contact:email].include? key
+
# Does the value look like an email? eg "someone@domain.tld"
# Uses Ruby built-in regexp to validate email.
# remove any leading and trailing whitespace
email = value.strip
- if email.match?(URI::MailTo::EMAIL_REGEXP)
- # add 'mailto:'' prefix
- return { :email => email, :url => "mailto:#{email}" }
- end
+ return email if email.match?(URI::MailTo::EMAIL_REGEXP)
nil
end
html = format_value("unknown", "unknown")
assert_dom_equal "unknown", html
+ html = format_value("addr:street", "Rue de l'Amigo")
+ assert_dom_equal "Rue de l'Amigo", html
+
html = format_value("phone", "+1234567890")
assert_dom_equal "<a href=\"tel:+1234567890\" title=\"Call +1234567890\">+1234567890</a>", html
html = format_value("colour", "#f00")
assert_dom_equal %(<span class="colour-preview-box" data-colour="#f00" title="Colour #f00 preview"></span>#f00), html
+
+ html = format_value("email", "foo@example.com")
+ assert_dom_equal "<a title=\"Email foo@example.com\" href=\"mailto:foo@example.com\">foo@example.com</a>", html
+
+ html = format_value("source", "https://example.com")
+ assert_dom_equal "<a href=\"https://example.com\" rel=\"nofollow\">https://example.com</a>", html
+
+ html = format_value("source", "https://example.com;hello;https://example.net")
+ assert_dom_equal "<a href=\"https://example.com\" rel=\"nofollow\">https://example.com</a>;hello;<a href=\"https://example.net\" rel=\"nofollow\">https://example.net</a>", html
end
def test_wiki_link
assert_equal "//www.wikidata.org/entity/Q24?uselang=en", links[0][:url]
assert_equal "Q24", links[0][:title]
+ links = wikidata_links("species:wikidata", "Q26899")
+ assert_equal "//www.wikidata.org/entity/Q26899?uselang=en", links[0][:url]
+ assert_equal "Q26899", links[0][:title]
+
# Another allowed key, this time with multiple values and I18n
I18n.with_locale "dsb" do
links = wikidata_links("brand:wikidata", "Q936;Q2013;Q1568346")
assert_equal "zh-classical:Test#Section", link[:title]
end
+ link = wikipedia_link("subject:wikipedia", "en:Catherine McAuley")
+ assert_equal "https://en.wikipedia.org/wiki/en:Catherine McAuley?uselang=en", link[:url]
+ assert_equal "en:Catherine McAuley", link[:title]
+
link = wikipedia_link("foo", "Test")
assert_nil link
end
assert_nil email
email = email_link("email", "x@example.com")
- assert_equal "x@example.com", email[:email]
- assert_equal "mailto:x@example.com", email[:url]
+ assert_equal "x@example.com", email
email = email_link("email", "other.email-with-hyphen@example.com")
- assert_equal "other.email-with-hyphen@example.com", email[:email]
- assert_equal "mailto:other.email-with-hyphen@example.com", email[:url]
+ assert_equal "other.email-with-hyphen@example.com", email
email = email_link("email", "user.name+tag+sorting@example.com")
- assert_equal "user.name+tag+sorting@example.com", email[:email]
- assert_equal "mailto:user.name+tag+sorting@example.com", email[:url]
+ assert_equal "user.name+tag+sorting@example.com", email
email = email_link("email", "dash-in@both-parts.com")
- assert_equal "dash-in@both-parts.com", email[:email]
- assert_equal "mailto:dash-in@both-parts.com", email[:url]
+ assert_equal "dash-in@both-parts.com", email
email = email_link("email", "example@s.example")
- assert_equal "example@s.example", email[:email]
- assert_equal "mailto:example@s.example", email[:url]
+ assert_equal "example@s.example", email
# Strips whitespace at ends
email = email_link("email", " test@email.com ")
- assert_equal "test@email.com", email[:email]
- assert_equal "mailto:test@email.com", email[:url]
+ assert_equal "test@email.com", email
+
+ email = email_link("contact:email", "example@example.com")
+ assert_equal "example@example.com", email
+
+ email = email_link("maxweight:conditional", "none@agricultural")
+ assert_nil email
end
def test_telephone_links
projects / rails.git / commitdiff