Refactor the relation_for_nwr tests to use factories

[rails.git] / app / helpers / browse_helper.rb

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 494232744e3447feb079e31dd256db66fdf81413..ef7b3f554b8ffbb8dafb4eeb25799c6613a2ced1 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -69,8 +69,13 @@ module BrowseHelper
   def format_value(key, value)
     if wp = wikipedia_link(key, value)
       link_to h(wp[:title]), wp[:url], :title => t("browse.tag_details.wikipedia_link", :page => wp[:title])
   def format_value(key, value)
     if wp = wikipedia_link(key, value)
       link_to h(wp[:title]), wp[:url], :title => t("browse.tag_details.wikipedia_link", :page => wp[:title])

-    elsif wdt = wikidata_link(key, value)
-      link_to h(wdt[:title]), wdt[:url], :title => t("browse.tag_details.wikidata_link", :page => wdt[:title])
+    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 = wdt.map do |w|
+        link_to(w[:title], w[:url], :title => t("browse.tag_details.wikidata_link", :page => w[:title].strip))
+      end
+      safe_join(wdt, ";")

     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)


@@ -128,14 +133,14 @@ module BrowseHelper
       lang = if value =~ /^([a-z-]{2,12}):(.+)$/i
                # Value is <lang>:<title> so split it up
                # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315
       lang = if value =~ /^([a-z-]{2,12}):(.+)$/i
                # Value is <lang>:<title> so split it up
                # Note that value is always left as-is, see: https://trac.openstreetmap.org/ticket/4315

-               $1
+               Regexp.last_match(1)

              else
                # Value is <title> so default to English Wikipedia
                "en"
              end
     elsif key =~ /^wikipedia:(\S+)$/
       # Language is in the key, so assume value is the title
              else
                # Value is <title> so default to English Wikipedia
                "en"
              end
     elsif key =~ /^wikipedia:(\S+)$/
       # Language is in the key, so assume value is the title

-      lang = $1
+      lang = Regexp.last_match(1)

     else
       # Not a wikipedia key!
       return nil
     else
       # Not a wikipedia key!
       return nil


@@ -144,9 +149,9 @@ module BrowseHelper
     if value =~ /^([^#]*)#(.*)/
       # Contains a reference to a section of the wikipedia article
       # Must break it up to correctly build the url
     if value =~ /^([^#]*)#(.*)/
       # Contains a reference to a section of the wikipedia article
       # Must break it up to correctly build the url

-      value = $1
-      section = "#" + $2
-      encoded_section = "#" + URI.encode($2.gsub(/ +/, "_"), /[^A-Za-z0-9:_]/).tr("%", ".")
+      value = Regexp.last_match(1)
+      section = "#" + Regexp.last_match(2)
+      encoded_section = "#" + URI.encode(Regexp.last_match(2).gsub(/ +/, "_"), /[^A-Za-z0-9:_]/).tr("%", ".")

     else
       section = ""
       encoded_section = ""
     else
       section = ""
       encoded_section = ""


@@ -158,12 +163,21 @@ module BrowseHelper
     }
   end
 
     }
   end
 

-  def wikidata_link(key, value)
+  def wikidata_links(key, value)
+    # The simple wikidata-tag (this is limited to only one value)

     if key == "wikidata" && value =~ /^[Qq][1-9][0-9]*$/
     if key == "wikidata" && value =~ /^[Qq][1-9][0-9]*$/

-      return {
+      return [{

         :url => "//www.wikidata.org/wiki/#{value}?uselang=#{I18n.locale}",
         :title => value
         :url => "//www.wikidata.org/wiki/#{value}?uselang=#{I18n.locale}",
         :title => value

-      }
+      }]
+    # 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
+      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