made to_url_key handle html entities

wagn · Nov 2, 2010 · b9c63f5 · b9c63f5
1 parent 60ed551
commit b9c63f5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/config/wagn_initializer.rb b/config/wagn_initializer.rb
@@ -107,9 +107,7 @@ def setup_multihost
             System.wagn_name = mapping.wagn_name
           end
           ActiveRecord::Base.connection.schema_search_path = ENV['WAGN']
-          if Card.cache
-            Card.cache.system_prefix = Wagn::Cache.system_prefix
-          end
+          #Card.cache.system_prefix = Wagn::Cache.system_prefix
         end
       end                 
 

diff --git a/lib/cardname.rb b/lib/cardname.rb
@@ -79,7 +79,7 @@ def junction?
   end  
 
   def to_url_key
-    gsub(/[^\*\w\s\+]/,' ').strip.gsub(/[\s\_]+/,'_')
+    decode_html.gsub(/[^\*\w\s\+]/,' ').strip.gsub(/[\s\_]+/,'_')
   end
 
   def to_key

diff --git a/spec/lib/cardname_spec.rb b/spec/lib/cardname_spec.rb
@@ -113,7 +113,7 @@
 
 
   describe "#to_url_key" do
-    cardnames = ["GrassCommons.org", 'Oh you @##', "Alice's Restaurant!"]
+    cardnames = ["GrassCommons.org", 'Oh you @##', "Alice's Restaurant!", "PB &amp; J", "Mañana"]
 
     cardnames.each do |name| 
       it "should have the same key as the name" do