cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added fixes for rubocop complaints

Browse source
This commit is contained in:
Florian Schäfer 2015-03-08 20:39:51 +01:00
parent 10cde3bb92
commit 3251cdf5d6
2 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

22
app/helpers/browse_helper.rb
View file

@ -72,9 +72,9 @@ module BrowseHelper
elsif wdt = wikidata_links(key, value) elsif wdt = wikidata_links(key, value)
# IMPORTANT: Note that wikidata_links() returns an array of hashes, unlike for example wikipedia_link(), # IMPORTANT: Note that wikidata_links() returns an array of hashes, unlike for example wikipedia_link(),
# which just returns one such hash. # which just returns one such hash.
wdt.map{|w| wdt.map do |w|
link_to(w[:title], w[:url], :title => t('browse.tag_details.wikidata_link', :page => w[:title].strip)) link_to(w[:title], w[:url], :title => t("browse.tag_details.wikidata_link", :page => w[:title].strip))
}.join(";").html_safe end.join(";").html_safe
elsif url = wiki_link("tag", "#{key}=#{value}") elsif url = wiki_link("tag", "#{key}=#{value}")
link_to h(value), url, :title => t("browse.tag_details.wiki_link.tag", :key => key, :value => value) link_to h(value), url, :title => t("browse.tag_details.wiki_link.tag", :key => key, :value => value)
elsif url = telephone_link(key, value) elsif url = telephone_link(key, value)
@ -169,16 +169,14 @@ module BrowseHelper
:url => "//www.wikidata.org/wiki/#{value}?uselang=#{I18n.locale}", :url => "//www.wikidata.org/wiki/#{value}?uselang=#{I18n.locale}",
:title => value :title => value
}] }]
elsif ( # Key has to be one of the accepted wikidata-tags
# Key has to be one of the accepted wikidata-tags elsif key =~ /(architect|artist|brand|operator|subject):wikidata/ &&
key =~ /(architect|artist|brand|operator|subject):wikidata/ && # Value has to be a semicolon-separated list of wikidata-IDs (whitespaces allowed before and after semicolons)
# 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]*)*$/
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 # Splitting at every semicolon to get a separate hash for each wikidata-ID
return value.split(";").map { |id| return value.split(";").map do |id|
id = {:title => id, :url => "//www.wikidata.org/wiki/#{id.strip}?uselang=#{I18n.locale}" } { :title => id, :url => "//www.wikidata.org/wiki/#{id.strip}?uselang=#{I18n.locale}" }
} end
end end
nil nil
end end

2
test/helpers/browse_helper_test.rb
View file

@ -206,7 +206,7 @@ class BrowseHelperTest < ActionView::TestCase
assert_equal "Q1568346", links[2][:title] assert_equal "Q1568346", links[2][:title]
I18n.locale = "en" I18n.locale = "en"
# and now with whitespaces… # and now with whitespaces...
links = wikidata_links("subject:wikidata", "Q6542248 ;\tQ180\n ;\rQ364\t\n\r ;\nQ4006") links = wikidata_links("subject:wikidata", "Q6542248 ;\tQ180\n ;\rQ364\t\n\r ;\nQ4006")
assert_equal 4, links.length assert_equal 4, links.length
assert_equal "//www.wikidata.org/wiki/Q6542248?uselang=en", links[0][:url] assert_equal "//www.wikidata.org/wiki/Q6542248?uselang=en", links[0][:url]