Use only_path instead of setting an explicit host

diff --git a/app/helpers/open_graph_helper.rb b/app/helpers/open_graph_helper.rb
index ac1a572196499f043f224c5a3b39873b72b0381e..ab7e230cbec768a7745192934bc5d7ebb40965b1 100644 (file)
--- a/app/helpers/open_graph_helper.rb
+++ b/app/helpers/open_graph_helper.rb
@@ -6,7 +6,7 @@ module OpenGraphHelper
       "og:type" => "website",
       "og:image" => image_url("osm_logo_256.png", :protocol => "http"),
       "og:image:secure_url" => image_url("osm_logo_256.png", :protocol => "https"),
-      "og:url" => url_for(:host => SERVER_URL),
+      "og:url" => url_for(:only_path => false),
       "og:description" => t("layouts.intro_text")
     }
 

diff --git a/app/views/diary_entry/rss.rss.builder b/app/views/diary_entry/rss.rss.builder
index 6d1b1def4e80733889915b82df64f40679bf6079..6ff2ed9f363b1305440851bc3cc61ed45d696c06 100644 (file)
--- a/app/views/diary_entry/rss.rss.builder
+++ b/app/views/diary_entry/rss.rss.builder
@@ -7,24 +7,24 @@ xml.rss("version" => "2.0",
   xml.channel do
     xml.title @title
     xml.description @description
-    xml.link url_for(:action => "list", :host => SERVER_URL)
+    xml.link url_for(:action => "list", :only_path => false)
     xml.image do
       xml.url image_url("mag_map-rss2.0.png")
       xml.title @title
       xml.width "100"
       xml.height "100"
-      xml.link url_for(:action => "list", :host => SERVER_URL)
+      xml.link url_for(:action => "list", :only_path => false)
     end
 
     @entries.each do |entry|
       xml.item do
         xml.title entry.title
-        xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
-        xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :host => SERVER_URL)
+        xml.link url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
+        xml.guid url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :only_path => false)
         xml.description entry.body.to_html
         xml.dc :creator, entry.user.display_name
         xml.pubDate entry.created_at.to_s(:rfc822)
-        xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :host => SERVER_URL)
+        xml.comments url_for(:action => "view", :id => entry.id, :display_name => entry.user.display_name, :anchor => "comments", :only_path => false)
 
         if entry.latitude && entry.longitude
           xml.geo :lat, entry.latitude.to_s

diff --git a/app/views/notes/_note.gpx.builder b/app/views/notes/_note.gpx.builder
index 9d8ede249d80a711c74b39794700b5bbf30ab014..f6bb39d27dc1347883785c5a76546fa42ecb12d2 100644 (file)
--- a/app/views/notes/_note.gpx.builder
+++ b/app/views/notes/_note.gpx.builder
@@ -6,7 +6,7 @@ xml.wpt("lon" => note.lon, "lat" => note.lat) do
     xml.cdata! render(:partial => "description", :object => note, :formats => [:html])
   end
 
-  xml.link("href" => browse_note_url(note, :host => SERVER_URL))
+  xml.link("href" => browse_note_url(note, :only_path => false))
 
   xml.extensions do
     xml.id note.id

diff --git a/app/views/notes/_note.json.jsonify b/app/views/notes/_note.json.jsonify
index 74ff5ccec621da2a1d38ba0ba129ce30b4c7f43a..5e3ac518e7840990e78654089f06f6433952441f 100644 (file)
--- a/app/views/notes/_note.json.jsonify
+++ b/app/views/notes/_note.json.jsonify
@@ -26,7 +26,7 @@ json.properties do
     if comment.author
       json.uid comment.author.id
       json.user comment.author.display_name
-      json.user_url user_url(:display_name => comment.author.display_name, :host => SERVER_URL)
+      json.user_url user_url(:display_name => comment.author.display_name, :only_path => false)
     end
 
     json.action comment.event

diff --git a/app/views/notes/_note.xml.builder b/app/views/notes/_note.xml.builder
index fb6738aaa1c6342a150f8c69670abe0b5987f3ca..adb4e6a5233350f7cb29b477ab283ee849886b3b 100644 (file)
--- a/app/views/notes/_note.xml.builder
+++ b/app/views/notes/_note.xml.builder
@@ -22,7 +22,7 @@ xml.note("lon" => note.lon, "lat" => note.lat) do
         if comment.author
           xml.uid comment.author.id
           xml.user comment.author.display_name
-          xml.user_url user_url(:display_name => comment.author.display_name, :host => SERVER_URL)
+          xml.user_url user_url(:display_name => comment.author.display_name, :only_path => false)
         end
 
         xml.action comment.event

diff --git a/test/controllers/notes_controller_test.rb b/test/controllers/notes_controller_test.rb
index 4b1d9f4ad68f424d88a3afee0cdf83807aecf3c6..ab63bbca2408a3938c9f4d58d9f6744c2a36c489 100644 (file)
--- a/test/controllers/notes_controller_test.rb
+++ b/test/controllers/notes_controller_test.rb
@@ -545,7 +545,7 @@ class NotesControllerTest < ActionController::TestCase
         assert_select "time", :count => 1
         assert_select "name", "Note: #{open_note.id}"
         assert_select "desc", :count => 1
-        assert_select "link[href='http://www.openstreetmap.org/note/#{open_note.id}']", :count => 1
+        assert_select "link[href='http://test.host/note/#{open_note.id}']", :count => 1
         assert_select "extensions", :count => 1 do
           assert_select "id", open_note.id.to_s
           assert_select "url", note_url(open_note, :format => "gpx")