Move routing API endpoint addresses to config file

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

diff --git a/app/helpers/browse_helper.rb b/app/helpers/browse_helper.rb
index 4027ddb2f8f79fb54aeccd968f157ca84d42c434..6c9e108dcb7c20860e5540fcf47f67d6a9fe9fad 100644 (file)
--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -1,3 +1,5 @@
+require "uri"
+

 module BrowseHelper
   def printable_name(object, version = false)
     if object.id.is_a?(Array)
 module BrowseHelper
   def printable_name(object, version = false)
     if object.id.is_a?(Array)


@@ -50,6 +52,10 @@ module BrowseHelper
     end
   end
 
     end
   end
 

+  def link_follow(object)
+    "nofollow" if object.tags.empty?
+  end
+

   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)
   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)


@@ -112,7 +118,7 @@ module BrowseHelper
 
   def wikipedia_link(key, value)
     # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL
 
   def wikipedia_link(key, value)
     # Some k/v's are wikipedia=http://en.wikipedia.org/wiki/Full%20URL

-    return nil if value =~ /^https?:\/\//
+    return nil if value =~ %r{^https?://}

 
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything
 
     if key == "wikipedia"
       # This regex should match Wikipedia language codes, everything


@@ -120,7 +126,7 @@ module BrowseHelper
       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
       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  = $1
+        lang = $1

       else
         # Value is <title> so default to English Wikipedia
         lang = "en"
       else
         # Value is <title> so default to English Wikipedia
         lang = "en"


@@ -133,17 +139,19 @@ module BrowseHelper
       return nil
     end
 
       return nil
     end
 

-    if value =~ /^([^#]*)(#.*)/
+    if value =~ /^([^#]*)#(.*)/

       # Contains a reference to a section of the wikipedia article
       # Must break it up to correctly build the url
       value = $1
       # Contains a reference to a section of the wikipedia article
       # Must break it up to correctly build the url
       value = $1

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

     else
       section = ""
     else
       section = ""

+      encoded_section = ""

     end
 
     {
     end
 
     {

-      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{section}",
+      :url => "http://#{lang}.wikipedia.org/wiki/#{value}?uselang=#{I18n.locale}#{encoded_section}",

       :title => value + section
     }
   end
       :title => value + section
     }
   end


@@ -160,7 +168,7 @@ module BrowseHelper
 
   def telephone_link(_key, value)
     # does it look like a phone number? eg "+1 (234) 567-8901 " ?
 
   def telephone_link(_key, value)
     # does it look like a phone number? eg "+1 (234) 567-8901 " ?

-    return nil unless value =~ /^\s*\+[\d\s\(\)\/\.-]{6,25}\s*$/
+    return nil unless value =~ %r{^\s*\+[\d\s\(\)/\.-]{6,25}\s*$}

 
     # remove all whitespace instead of encoding it http://tools.ietf.org/html/rfc3966#section-5.1.1
     # "+1 (234) 567-8901 " -> "+1(234)567-8901"
 
     # remove all whitespace instead of encoding it http://tools.ietf.org/html/rfc3966#section-5.1.1
     # "+1 (234) 567-8901 " -> "+1(234)567-8901"