0
@@ -1,7 +1,7 @@
0
 class Site < ActiveRecord::Base
0
   @@theme_path = Pathname.new(RAILS_ROOT) + 'themes'
0
   cattr_reader :theme_path
0
-  PERMALINK_OPTIONS = { 'year' => '\d{4}', 'month' => '\d{1,2}', 'day' => '\d{1,2}', 'permalink' => '[a-z0-9-]+', 'id' => '\d+' }
0
+  PERMALINK_OPTIONS = { 'year' => '\d{4}', 'month' => '\d{1,2}', 'day' => '\d{1,2}', 'permalink' => '[\w\-]+', 'id' => '\d+' }
0
   PERMALINK_VAR     = /^:([a-z]+)$/
0
 
0
   cattr_accessor :multi_sites_enabled

0
@@ -64,7 +64,6 @@ context "Dispatcher" do
0
     assert_dispatch :error, sections(:home), '200', '9', '1', 'foo', %w(200 9 1 foo)
0
     assert_dispatch :error, sections(:home), '2006', '239', '1', 'foo', %w(2006 239 1 foo)
0
     assert_dispatch :error, sections(:home), '2006', '9', '123', 'foo', %w(2006 9 123 foo)
0
-    assert_dispatch :error, sections(:home), '2006', '9', '1', 'a_b', %w(2006 9 1 a_b)
0
     assert_dispatch :error, sections(:home), '2006', '9', '1', 'foo', 'boo', %w(2006 9 1 foo boo)
0
     assert_dispatch :error, sections(:home), '2006', '9', '1', 'foo', 'comment', %w(2006 9 1 foo comment)
0
   end
0
@@ -80,25 +79,29 @@ end
0
 context "Dispatcher Permalink Recognition" do
0
   fixtures :sites
0
 
0
-  specify "should recognize permalinks" do
0
+  def setup
0
     @site = sites(:first)
0
-    
0
-    options = {:year => '2006', :month => '9', :day => '1', :permalink => 'foo'}
0
-    assert_equal [options, false, nil], Mephisto::Dispatcher.recognize_permalink(@site, %w(2006 9 1 foo))
0
-    
0
+  end
0
+
0
+  specify "should recognize permalinks with default permalink style" do
0
+    options = {:year => '2006', :month => '9', :day => '1', :permalink => 'foo-bar_baz'}
0
+    assert_equal [options, false, nil], Mephisto::Dispatcher.recognize_permalink(@site, %w(2006 9 1 foo-bar_baz))
0
+  end
0
+  
0
+  specify "should recognize permalinks with custom style" do
0
     @site.permalink_style = 'entries/:id/:permalink'
0
     @site.permalink_regex(true)
0
-    options = {:id => '5', :permalink => 'foo-bar-baz'}
0
-    assert_equal [options, false, nil], Mephisto::Dispatcher.recognize_permalink(@site, %w(entries 5 foo-bar-baz))
0
+    options = {:id => '5', :permalink => 'foo-bar_baz'}
0
+    assert_equal [options, false, nil], Mephisto::Dispatcher.recognize_permalink(@site, %w(entries 5 foo-bar_baz))
0
   end
0
 
0
-  specify "should recognize permalinks with comment" do
0
-    @site = sites(:first)
0
-    
0
+  specify "should recognize permalinks with comment and default permalink style" do
0
     options = {:year => '2006', :month => '9', :day => '1', :permalink => 'foo'}
0
     assert_equal [options, true, nil], Mephisto::Dispatcher.recognize_permalink(@site, %w(2006 9 1 foo comments))
0
     assert_equal [options, true, '5'], Mephisto::Dispatcher.recognize_permalink(@site, %w(2006 9 1 foo comments 5))
0
-    
0
+  end
0
+  
0
+  specify "should recognize permalinks with comment and custom style" do
0
     @site.permalink_style = 'entries/:id/:permalink'
0
     @site.permalink_regex(true)
0
     options = {:id => '5', :permalink => 'foo-bar-baz'}
0
@@ -111,7 +114,6 @@ context "Dispatcher Permalink Recognition" do
0
     assert_nil Mephisto::Dispatcher.recognize_permalink(sites(:first), %w(200 9 1 foo))
0
     assert_nil Mephisto::Dispatcher.recognize_permalink(sites(:first), %w(2006 239 1 foo))
0
     assert_nil Mephisto::Dispatcher.recognize_permalink(sites(:first), %w(2006 9 123 foo))
0
-    assert_nil Mephisto::Dispatcher.recognize_permalink(sites(:first), %w(2006 9 1 a_b))
0
     assert_nil Mephisto::Dispatcher.recognize_permalink(sites(:first), %w(2006 9 1 foo boo))
0
     assert_nil Mephisto::Dispatcher.recognize_permalink(sites(:first), %w(2006 9 1 foo comment))
0
   end

0
@@ -52,10 +52,10 @@ context "Site Permalink Regular Expression" do
0
   end
0
 
0
   specify "should create permalink regex" do
0
-    assert_equal Regexp.new(%(^(\\d{4})\\/(\\d{1,2})\\/(\\d{1,2})\\/([a-z0-9-]+)(\/comments(\/(\\d+))?)?$)), @site.permalink_regex
0
+    assert_equal Regexp.new(%(^(\\d{4})\\/(\\d{1,2})\\/(\\d{1,2})\\/([\\w\\-]+)(\/comments(\/(\\d+))?)?$)), @site.permalink_regex
0
     
0
     @site.permalink_style = "articles/:id/:permalink"
0
-    assert_equal Regexp.new(%(^articles\\/(\\d+)\\/([a-z0-9-]+)(\/comments(\/(\\d+))?)?$)), @site.permalink_regex(true)
0
+    assert_equal Regexp.new(%(^articles\\/(\\d+)\\/([\\w\\-]+)(\/comments(\/(\\d+))?)?$)), @site.permalink_regex(true)
0
   end
0
 end
0