From fbdf4c5dfedbf0c95ab6736add4d1543528bc4de Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Tue, 9 Oct 2007 11:02:44 -0500
Subject: [PATCH] Fix Broken Test Was not picking up user-supplied alt text in
 [[filename|Alt text:pic]]. Fixed.

---
 lib/url_generator.rb | 29 ++++++++++++++++-------------
 test/test_helper.rb  | 13 ++++++-------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/lib/url_generator.rb b/lib/url_generator.rb
index 995742b7..dbc68dd3 100644
--- a/lib/url_generator.rb
+++ b/lib/url_generator.rb
@@ -9,7 +9,6 @@ class AbstractUrlGenerator
   # on the render mode in options and whether the page (file) exists
   # in the web.
   def make_link(name, web, text = nil, options = {})
-    text = CGI.escapeHTML(text || WikiWords.separate(name))
     mode = (options[:mode] || :show).to_sym
     link_type = (options[:link_type] || :show).to_sym
 
@@ -19,14 +18,20 @@ class AbstractUrlGenerator
       known_page = web.has_file?(name)
       description = web.description(name)
     end
+    if (text == name)
+      text = description || text
+    else
+      text = text || description
+    end
+    text = CGI.escapeHTML(CGI.unescapeHTML(text || WikiWords.separate(name)))
     
     case link_type
     when :show
       page_link(mode, name, text, web.address, known_page)
     when :file
-      file_link(mode, name, text, web.address, known_page, description)
+      file_link(mode, name, text, web.address, known_page)
     when :pic
-      pic_link(mode, name, text, web.address, known_page, description)
+      pic_link(mode, name, text, web.address, known_page)
     else
       raise "Unknown link type: #{link_type}"
     end
@@ -38,12 +43,11 @@ class UrlGenerator < AbstractUrlGenerator
 
   private
 
-  def file_link(mode, name, text, web_address, known_file, description)
-    title = CGI::escapeHTML(CGI::unescapeHTML( description || text))
+  def file_link(mode, name, text, web_address, known_file)
     case mode
     when :export
       if known_file
-        %{<a class="existingWikiWord" title="#{title}" href="#{CGI.escape(name)}.html">#{text}</a>}
+        %{<a class="existingWikiWord" title="#{text}" href="#{CGI.escape(name)}.html">#{text}</a>}
       else 
         %{<span class="newWikiWord">#{text}</span>}
       end
@@ -51,7 +55,7 @@ class UrlGenerator < AbstractUrlGenerator
       if known_file 
         href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file', 
             :id => name
-        %{<a class="existingWikiWord"  title="#{title}" href="#{href}">#{text}</a>}
+        %{<a class="existingWikiWord"  title="#{text}" href="#{href}">#{text}</a>}
       else 
         %{<span class="newWikiWord">#{text}</span>}
       end
@@ -59,7 +63,7 @@ class UrlGenerator < AbstractUrlGenerator
       href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file', 
           :id => name
       if known_file
-        %{<a class="existingWikiWord"  title="#{title}" href="#{href}">#{text}</a>}
+        %{<a class="existingWikiWord"  title="#{text}" href="#{href}">#{text}</a>}
       else 
         %{<span class="newWikiWord">#{text}<a href="#{href}">?</a></span>}
       end
@@ -95,18 +99,17 @@ class UrlGenerator < AbstractUrlGenerator
     end
   end
 
-  def pic_link(mode, name, text, web_address, known_pic, description)
-    alt_text = CGI::escapeHTML(CGI::unescapeHTML( description || text))
+  def pic_link(mode, name, text, web_address, known_pic)
     case mode
     when :export
       if known_pic 
-        %{<img alt="#{alt_text}" src="#{CGI.escape(name)}" />}
+        %{<img alt="#{text}" src="#{CGI.escape(name)}" />}
       else 
         %{<img alt="#{text}" src="no image" />}
       end
     when :publish
       if known_pic 
-        %{<img alt="#{alt_text}" src="#{CGI.escape(name)}" />}
+        %{<img alt="#{text}" src="#{CGI.escape(name)}" />}
       else 
         %{<span class="newWikiWord">#{text}</span>} 
       end
@@ -114,7 +117,7 @@ class UrlGenerator < AbstractUrlGenerator
       href = @controller.url_for :controller => 'file', :web => web_address, :action => 'file', 
           :id => name
       if known_pic 
-        %{<img alt="#{alt_text}" src="#{href}" />}
+        %{<img alt="#{text}" src="#{href}" />}
       else 
         %{<span class="newWikiWord">#{text}<a href="#{href}">?</a></span>} 
       end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index f69767a3..d8b08a70 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -102,8 +102,7 @@ class StubUrlGenerator < AbstractUrlGenerator
     super(:doesnt_need_controller)
   end
 
-  def file_link(mode, name, text, web_name, known_file, description)
-    title = CGI::escapeHTML(CGI::unescapeHTML( description || text))
+  def file_link(mode, name, text, web_name, known_file)
     link = CGI.escape(name)
     case mode
     when :export
@@ -143,18 +142,18 @@ class StubUrlGenerator < AbstractUrlGenerator
     end
   end
 
-  def pic_link(mode, name, text, web_name, known_pic, description)
-    alt_text = CGI::escapeHTML(CGI::unescapeHTML( description || text))
+  def pic_link(mode, name, text, web_name, known_pic)
     link = CGI.escape(name)
+    text = CGI.escapeHTML(CGI.unescapeHTML(text || :description))
     case mode.to_sym
     when :export
-      if known_pic then %{<img alt="#{alt_text}" src="#{link}" />}
+      if known_pic then %{<img alt="#{text}" src="#{link}" />}
       else %{<img alt="#{text}" src="no image" />} end
     when :publish
-      if known_pic then %{<img alt="#{alt_text}" src="#{link}" />}
+      if known_pic then %{<img alt="#{text}" src="#{link}" />}
       else %{<span class="newWikiWord">#{text}</span>} end
     else 
-      if known_pic then %{<img alt="#{alt_text}" src="../file/#{link}" />}
+      if known_pic then %{<img alt="#{text}" src="../file/#{link}" />}
       else %{<span class="newWikiWord">#{text}<a href="../file/#{link}">?</a></span>} end
     end
   end