Added fixes for rubocop complaints

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 096f74e2f42a17dd332a8e85190857a93a174aa6..8a0721c584f55cb65a4b3e0cc4775071b524a744 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -72,9 +72,9 @@ module BrowseHelper
     elsif wdt = wikidata_links(key, value)
       # IMPORTANT: Note that wikidata_links() returns an array of hashes, unlike for example wikipedia_link(),
       # which just returns one such hash.
     elsif wdt = wikidata_links(key, value)
       # IMPORTANT: Note that wikidata_links() returns an array of hashes, unlike for example wikipedia_link(),
       # which just returns one such hash.

-      wdt.map{|w|
-        link_to(w[:title], w[:url], :title => t('browse.tag_details.wikidata_link', :page => w[:title].strip))
-      }.join(";").html_safe
+      wdt.map do |w|
+        link_to(w[:title], w[:url], :title => t("browse.tag_details.wikidata_link", :page => w[:title].strip))
+      end.join(";").html_safe

     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 url = telephone_link(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)
     elsif url = telephone_link(key, value)


@@ -169,16 +169,14 @@ module BrowseHelper
         :url => "//www.wikidata.org/wiki/#{value}?uselang=#{I18n.locale}",
         :title => value
       }]
         :url => "//www.wikidata.org/wiki/#{value}?uselang=#{I18n.locale}",
         :title => value
       }]

-    elsif (
-      # Key has to be one of the accepted wikidata-tags
-      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 =~ /^[Qq][1-9][0-9]*(\s*;\s*[Qq][1-9][0-9]*)*$/
-    )
+    # Key has to be one of the accepted wikidata-tags
+    elsif 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 =~ /^[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|
-        id = {:title => id, :url => "//www.wikidata.org/wiki/#{id.strip}?uselang=#{I18n.locale}" }
-      }
+      return value.split(";").map do |id|
+        { :title => id, :url => "//www.wikidata.org/wiki/#{id.strip}?uselang=#{I18n.locale}" }
+      end

     end
     nil
   end
     end
     nil
   end

diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb
index 19b2905162632036819a6ed1dc785d28a61b5d4a..130bf8590b9bec552e0e41f48d4314e01c43861f 100644 (file)
--- a/test/helpers/browse_helper_test.rb
+++ b/test/helpers/browse_helper_test.rb
@@ -206,7 +206,7 @@ class BrowseHelperTest < ActionView::TestCase
     assert_equal "Q1568346", links[2][:title]
     I18n.locale = "en"
 
     assert_equal "Q1568346", links[2][:title]
     I18n.locale = "en"
 

-    # and now with whitespaces…
+    # and now with whitespaces...

     links = wikidata_links("subject:wikidata", "Q6542248 ;\tQ180\n ;\rQ364\t\n\r ;\nQ4006")
     assert_equal 4, links.length
     assert_equal "//www.wikidata.org/wiki/Q6542248?uselang=en", links[0][:url]
     links = wikidata_links("subject:wikidata", "Q6542248 ;\tQ180\n ;\rQ364\t\n\r ;\nQ4006")
     assert_equal 4, links.length
     assert_equal "//www.wikidata.org/wiki/Q6542248?uselang=en", links[0][:url]