typo 5.0.1 → 5.0.2

data/app/views/admin/settings/index.html.erb

@@ -0,0 +1,81 @@
+	<% @page_heading = _('General settings') %>
+
+  <% content_for('tasks') do -%>
+	<%= subtab _("General settings"), "current", {:controller => "settings"} %>
+	<%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
+	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
+	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
+	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
+	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
+	<%= subtab _("Empty Fragment Cache"), "", {:controller => '/admin/cache', :action => 'sweep'} if this_blog.cache_option == 'caches_action_with_params'  %>
+	<%= subtab _("Rebuild cached HTML"), "", {:controller => '/admin/cache', :action => 'sweep_html'} if this_blog.cache_option == 'caches_page' %>
+  <% end -%> 
+
+	<% form_tag :action => 'index' do %>
+
+<div class="admin">
+  <fieldset id="gensettings" class="set" style="margin-top:10px;">
+		<legend><%= _("General options")%></legend>
+    <ul>
+			<li>
+				<label for="blog_name" class="float"><%= _("Blog name")%>:</label>
+				<input name="setting[blog_name]" id="blog_name" type="text" value="<%=h this_blog.blog_name %>" size="<%= this_blog.blog_name.length %>" />
+			</li>
+			<li>
+				<label class="float" for="blog_subtitle"><%= _("Blog subtitle")%>:</label>
+				<input name="setting[blog_subtitle]" id="blog_subtitle" type="text" value="<%=h this_blog.blog_subtitle %>" size="<%= this_blog.blog_subtitle.length%>" />
+		    </li>
+			<li>
+				<label class="float" for="base_url"><%= _("Blog URL")%>:</label>
+				<input name="setting[base_url]" id="base_url" type="text" value="<%=h this_blog.base_url %>" size="<%= this_blog.base_url.length %> " />
+			</li>
+			<li>
+				<label class="float" for="lang"><%= _("Language")%>:</label>
+				<select name="setting[lang]">
+					<%= fetch_langs %>
+				</select>
+			</li>
+      <li><%= _("This option let you choose between the simple admin interface or the complete one, displaying much more options and therefore more complicated to use. For advanced users only!") %></li>
+			<li>
+				<label class="float" for="display_advanced">Choose interface:</label>
+				<input type="radio" name="setting[display_advanced]" value="0" id="display_advanced_0" <%= 'checked="checked"' if this_blog.display_advanced == 0 %>/>
+				<label for="display_advanced_0"><%= _("Use simple interface (default)")%></label>
+				<span class="float">
+					<input type="radio" name="setting[display_advanced]" value="1" id="display_advanced_1" <%= 'checked="checked"' if this_blog.display_advanced == 1 %>/>
+					<label for="display_advanced_1"><%= _("Use complete admin")%></label>
+				</span>
+			</li>
+			<li><%= _("By default, Typo generates static HTML pages for your posts. However, if you plan to publish posts in the futur, you may want to use semi dynamic caching") %>.</li>
+			<li>
+				<label class="float" for="caches_page">Choose caching methode:</label>
+				<input type="radio" name="setting[cache_option]" value="caches_page" id="cache_option_0" <%= 'checked="checked"' if this_blog.cache_option == 'caches_page' %>/>
+				<label for="cache_option_0"><%= _("Use static HTML page caching ")%></label>
+				<span class="float">
+					<input type="radio" name="setting[cache_option]" value="caches_action_with_params" id="cache_option_1" <%= 'checked="checked"' if this_blog.cache_option == 'caches_action_with_params' %>/>
+					<label for="cache_option_1"><%= _("Use semi static caching (default)")%></label>
+				</span>
+			</li>
+		</ul>
+  </fieldset>
+
+  <fieldset id="seo" class="set" style="margin-top:10px;">
+    <legend><%= _("Search Engine Optimisation")%></legend>
+    <ul>
+      <li>
+        <label class="float"><%= _("Show blog name")%>:</label>
+        <input type="radio" name="setting[title_prefix]" value="1" id="blog_title_prefix_1" <%= 'checked="checked"' if this_blog.title_prefix == 1 %>/>
+        <label for="blog_title_prefix_1"><%= _("At the beginning of page title")%></label>
+        <span class="float">
+          <input type="radio" name="setting[title_prefix]" value="2" id="blog_title_prefix_2" <%= 'checked="checked"' if this_blog.title_prefix == 2 %>/>
+          <label for="blog_title_prefix_2"><%= _("At the end of page title")%></label>
+        </span>
+        <span class="float">
+          <input type="radio" name="setting[title_prefix]" value="0" id="blog_title_prefix_0" <%= 'checked="checked"' if this_blog.title_prefix == 0 %>/>
+          <label for="blog_title_prefix_0"><%= _("Don't show blog name in page title")%></label>
+        </span>
+      </li>
+    </ul>
+  </fieldset>
+<%= render :partial => 'submit' %>
+</div>
+  <% end %>

data/app/views/admin/settings/podcast.html.erb

@@ -0,0 +1,53 @@
+<% @page_heading = _('Podcast') %>
+
+<% content_for('tasks') do -%>
+  <%= subtab _("General settings"), "", {:controller => "settings"} %>
+  <%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
+	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
+	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
+	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
+	<%= subtab _("Podcasts"), "current", { :controller => 'settings', :action => 'podcast' } %>
+<% end -%> 
+
+<% form_tag :action => 'podcast' do %>
+
+<div class="admin">
+  <fieldset id="resources" class="set">
+    <ul>
+      <li><%= _("The below settings act as defaults when you choose to publish an enclosure with iTunes metadata")%>.</li>
+      <li>
+        <label for="itunes_author" class="float"><%= _("Author")%>:</label>
+        <input name="setting[itunes_author]" size="25" id="itunes_author" type="text" value="<%= this_blog.itunes_author %>" />
+      </li>
+      <li>
+        <label for="itunes_subtitle" class="float"><%= _("Subtitle")%>: <span class="mandatory">*</span></label>
+        <input name="setting[itunes_subtitle]" size="25" id="itunes_subtitle" type="text" value="<%= this_blog.itunes_subtitle %>" />
+      </li>
+      <li>
+        <label class="float" for="itunes_summary"><%= _("Summary")%>: <span class="mandatory">*</span></label>
+        <textarea name="setting[itunes_summary]" cols="40" rows="3"><%=h this_blog.itunes_summary %></textarea>
+        <span class="float mandatory">* <%= _("Setting for channel")%></span>
+      </li>
+      <li>
+        <label class="float" for="itunes_email"><%= _("Email")%>: <span class="mandatory">**</span></label>
+        <input name="setting[itunes_email]" size="25" id="itunes_email" type="text" value="<%= this_blog.itunes_email %>" />
+      </li>
+      <li>
+        <label class="float" for="itunes_name"><%= _("Optional Name")%>: <span class="mandatory">**</span></label>
+        <input name="setting[itunes_name]" size="25" id="itunes_name" type="text" value="<%= this_blog.itunes_name %>" />
+        <span class="float mandatory">** <%= _("Not published by Apple")%></span>
+      </li>
+      <li>
+        <label class="float" for="itunes_copyright"><%= _("Copyright Information")%>:</label>
+        <input name="setting[itunes_copyright]" size="25" id="itunes_copyright" type="text" value="<%= this_blog.itunes_copyright %>" />
+      </li>
+      <li class="checkbox">
+        <label class="float" for="itunes_explicit"><%= _("Explicit")%>:</label>
+        <input name="setting[itunes_explicit]" id="itunes_explicit" type="checkbox"  value="1" <%= 'checked="checked"' if this_blog.itunes_explicit%> />
+        <input name="setting[itunes_explicit]" type="hidden" value="0" />
+      </li>
+    </ul>
+  </fieldset>
+<%= render :partial => 'submit' %>
+</div>
+  <% end %>

data/app/views/admin/settings/read.html.erb

@@ -0,0 +1,38 @@
+	<% @page_heading = _('Read') %>
+
+  <% content_for('tasks') do -%>
+	<%= subtab _("General settings"), "", {:controller => 'settings'} %>
+	<%= subtab _("Read"), "current", { :controller => 'settings', :action => 'read' } %>
+	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
+	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
+	<%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
+	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>	
+  <% end -%> 
+
+	<% form_tag :action => 'read' do %>
+
+<div class="admin">
+	<fieldset id="read" class="set">
+		<ul>
+			<li>
+				<label for="limit_article_display" class="float"><%= _("Display")%> </label>
+				<input name="setting[limit_article_display]" size="4" id="limit_article_display" type="text" value="<%= this_blog.limit_article_display %>" />
+				<%= _("articles on my homepage by default")%>
+			</li>
+			<li>
+			    <label for="limit_rss_display" class="float"><%= _("Display")%> </label>
+			    <input name="setting[limit_rss_display]" size="4" id="limit_rss_display" type="text" value="<%= this_blog.limit_rss_display %>" />
+				<%= _("articles in my news feed by default")%>.
+			</li>
+			<li class="checkbox">
+				<label class="float" for="show_extended_on_rss"><%= _("Show full article on feed")%>:</label>
+			    <input name="setting[show_extended_on_rss]" id="show_extended_on_rss" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.show_extended_on_rss%> />
+			    <input name="setting[show_extended_on_rss]" type="hidden" value="0" />
+			</li>
+		</ul>
+	</fieldset>
+
+	<%= render :partial => 'submit' %>
+
+</div>
+  <% end %>

data/app/views/admin/settings/spam.html.erb

@@ -0,0 +1,51 @@
+	<% @page_heading = _('Spam') %>
+
+  <% content_for('tasks') do -%>
+	<%= subtab _("General settings"), "", {:controller => "settings"} %>
+	<%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
+	<%= subtab _("Write"), "", { :controller => 'settings', :action => 'write' } %>
+	<%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>			
+	<%= subtab _("Spam"), "current", { :controller => 'settings', :action => 'spam' } %>
+	<%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
+  <% end -%> 
+
+	<% form_tag :action => 'spam' do %>
+
+<div class="admin">
+	<fieldset id="spam" class="set">
+		<ul>
+			<li><%= _("Enabling spam protection will make typo compare the IP address of posters as well as the contents of their posts against local and remote blacklists. Good defense against spam bots")%>.</li>
+			<li class="checkbox">
+				<label for="sp_global" class="float"><%= _("Enable spam protection")%>:</label>
+				<input name="setting[sp_global]" id="sp_global" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_global%> /><input name="setting[sp_global]" type="hidden" value="0" />
+			</li>
+			<li><%= _("Typo can (optionally) use the %s spam-filtering service.  You need to register with Akismet and receive an API key before you can use their service.  If you have an Akismet key, enter it here", '<a href="http://akismet.com">Akismet</a>')%> .
+			</li>
+			<li>
+				<label class="float" for="sp_akismet_key"><%= _("Akismet Key")%>:</label>
+				<input name="setting[sp_akismet_key]" id="sp_akismet_key" type="text" value="<%=h this_blog.sp_akismet_key %>" />
+			</li>
+      <li>
+          <%= _("You can optionally disable non-Ajax comments. Typo will always use Ajax for comment submission if Javascript is enabled, so non-Ajax comments are either from spammers or users without Javascript.")%>
+      </li>
+      <li class="checkbox">
+          <label for="sp_allow_non_ajax_comments" class="float"><%= _("Allow non-ajax comments") %>:</label>
+          <input name="setting[sp_allow_non_ajax_comments]" id="sp_allow_non_ajax_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_allow_non_ajax_comments%> />
+          <input name="setting[sp_allow_non_ajax_comments]" type="hidden" value="0" />
+      </li>
+      <li>
+          <label for="sp_article_auto_close" class="float"><%= _("Disable comments after")%></label>
+          <input name="setting[sp_article_auto_close]" size="4" id="sp_article_auto_close" type="text" value="<%= this_blog.sp_article_auto_close %>" /> <%= _("days") %>
+          <span class="float"><%= _("Set to 0 to never disable comments")%></span>
+      </li>
+      <li>
+          <p><%= _("Typo will automatically reject comments and trackbacks which contain over a certain amount of links in them")%>.</p>
+          <label class="float" for="sp_url_limit"><%= _("Max Links")%>:</label>
+          <input name="setting[sp_url_limit]" size="4" id="sp_url_limit" type="text" value="<%= this_blog.sp_url_limit %>" />
+          <span class="float"><%= _("Set to 0 to never reject comments")%></span>
+      </li>
+		</ul>
+	</fieldset>
+<%= render :partial => 'submit' %>
+</div>
+  <% end %>

data/app/views/admin/settings/write.html.erb

@@ -0,0 +1,71 @@
+	<% @page_heading = _('Write') %>
+
+  <% content_for('tasks') do -%>
+	  <%= subtab _("General settings"), "", {:controller => "settings"} %>
+	  <%= subtab _("Read"), "", { :controller => 'settings', :action => 'read' } %>
+	  <%= subtab _("Write"), "current", { :controller => 'settings', :action => 'write' } %>
+	  <%= subtab _("Feedback"), "", { :controller => 'settings', :action => 'feedback' } %>
+	  <%= subtab _("Spam"), "", { :controller => 'settings', :action => 'spam' } %>
+	  <%= subtab _("Podcasts"), "", { :controller => 'settings', :action => 'podcast' } %>
+  <% end -%> 
+
+	<% form_tag :action => 'write' do %>
+
+<div class="admin">
+	<fieldset id="write" class="set">
+		<legend><%= _("Write")%></legend>
+		<ul>
+			<li>
+				<label class="float"><%= _("Editor")%>:</label>
+				<input type="radio" name="setting[editor]" value="2" id="editor_2" <%= 'checked="checked"' if this_blog.editor == 2 %>/>
+				<label for="editor_2"><%= _("Use visual rich editor")%></label>
+				<span class="float">
+					<input type="radio" name="setting[editor]" value="1" id="editor_1" <%= 'checked="checked"' if this_blog.editor == 1 %>/>
+					<label for="editor_1"><%= _("Use simple editor with live preview (default)")%></label>
+				</span>
+				<span class="float">
+					<input type="radio" name="setting[editor]" value="0" id="editor_0" <%= 'checked="checked"' if this_blog.editor == 0 %>/>
+				    <label for="editor_0"><%= _("Use simple editor without live preview")%></label>
+				</span>
+		  	</li>
+		    <li>
+            <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
+            <select name="setting[text_filter]" id="text_filter">
+              <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.text_filter) %>
+            </select>
+        </li>
+        <li>
+            <label for="comment_text_filter" class="float"><%= _("Comments filter")%>:</label>
+            <select name="setting[comment_text_filter]" id="comment_text_filter">
+            <%= options_for_select text_filter_options, TextFilter.find_by_name(this_blog.comment_text_filter) %>
+            </select>
+        </li>
+		</ul>
+	</fieldset>
+	
+	<fieldset id="publish" class="set">
+      <legend><%= _("Publish")%></legend>
+      <ul>
+          <li>
+              <%= _("When publishing articles, Typo can send trackbacks to websites that you link to. This should be disabled for private blogs as it will leak non-public information to sites that you're discussing. For public blogs, there's no real point in disabling this.")%>
+          </li>
+          <li class="checkbox">
+            <label class="float" for="send_outbound_pings"><%= _("Send trackbacks")%>:</label>
+            <input name="setting[send_outbound_pings]" id="send_outbound_pings" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.send_outbound_pings%> />
+           <input name="setting[send_outbound_pings]" type="hidden" value="0" />
+          </li>
+          <li>
+              <label class="float" for="ping_urls"><%= _("URLs to ping automatically")%>:</label>
+              <textarea name="setting[ping_urls]" id="ping_urls" rows="5" cols="50"><%=h this_blog.ping_urls %></textarea>
+          </li>
+          <li>
+              <label class="float" for="geourl_location"><%= _("Latitude, Longitude")%>:</label>
+              <input name="setting[geourl_location]" size="20" id="geourl_location" type="text" value="<%= this_blog.geourl_location %>" />
+              <span class="float"><%= _("Display")%> <a href="http://geourl.org"><%= _("your lattitude and longitude")%></a> (<%= _("exemple")%> <tt>47.774,-122.201</tt>)</span>
+          </li>
+
+      </ul>
+  </fieldset>
+<%= render :partial => 'submit' %>
+</div>
+  <% end %>

data/app/views/admin/sidebar/index.html.erb

@@ -1,9 +1,7 @@
 <% @page_heading = 'Sidebar' %>
 <% content_for('tasks') do %>
     <%= subtab _("Sidebar"), "current", {:controller=>"sidebar", :action=>"index"} %>
-    <%= subtab _("Choose theme"), "", {:controller=>"themes", :action=>"index"} %>	
-		<%= subtab _("Theme editor"), "", {:controller=>"themes", :action=>"editor"} %>
-    <%= subtab(_("Text Filters"), "", {:controller=>"textfilters", :action=>"list"}) if this_blog.display_advanced == 1 %>
+    <%= subtab(_("Text Filters"), "", {:controller=>"textfilters", :action=>"list"}) %>
 <% end %>
   <p class="paginate l">You can download and install sidebar plugins from our official <a href="http://svn.typosphere.org/typo/plugins/">plugin repository</a> running script/plugins install http://svn.typosphere.org/typo/plugins/myplugin, or upload them in the vendors/plugin directory.</p>
 

data/app/views/admin/textfilters/list.html.erb

@@ -2,8 +2,6 @@
 
   <% content_for('tasks') do %>
 	<%= subtab _("Sidebar"), "", {:controller=>"sidebar", :action=>"index"} %>
-	<%= subtab _("Choose theme"), "", {:controller=>"themes", :action=>"index"} %>
-	<%= subtab _("Theme editor"), "", {:controller=>"themes", :action=>"editor"} %>
 	<%= subtab _("Text Filters"), "current", {:controller=>"textfilters", :action=>"list"} %>
   <% end %> 
 

data/app/views/admin/themes/editor.html.erb

@@ -1,9 +1,7 @@
 <% @page_heading = _('Theme editor') %>
 <% content_for('tasks') do %>
-	<%= subtab _("Sidebar"), "", {:controller=>"sidebar", :action=>"index"} %>
 	<%= subtab _("Choose themes"), "", {:controller=>"themes", :action=>"index"} %>
 	<%= subtab _("Theme editor"), "current", {:controller=>"themes", :action=>"editor"} %>
-	<%= subtab _("Text Filters"), "", {:controller=>"textfilters", :action=>"list"} if (this_blog.display_advanced == 1) %>
 <% end %> 
 
 <div id="theme_list">	

data/app/views/admin/themes/index.html.erb

@@ -1,9 +1,7 @@
 <% @page_heading = _('Choose a theme') %>
 <% content_for('tasks') do %>
-    <%= subtab _("Sidebar"), "", {:controller=>"sidebar", :action=>"index"} %>
     <%= subtab _("Choose theme"), "current", {:controller=>"themes", :action=>"index"} %>
     <%= subtab _("Theme editor"), "", {:controller=>"themes", :action=>"editor"} %>
-    <%= subtab(_("Text Filters"), "", {:controller=>"textfilters", :action=>"list"}) if (this_blog.display_advanced == 1) %>
 <% end %>
 
 <p class="paginate l">

data/app/views/layouts/administration.html.erb

@@ -19,9 +19,10 @@
             <%= content_tag :li, (link_to _("Write"), {:controller=>"content", :action => 'new'}, :class=>class_write) %>
             <%= content_tag :li, (link_to _("Manage"), {:controller=>"content", :action => 'index'}, :class=>class_manage) %>
             <%= content_tag :li, (link_to _("Feedback"), {:controller=>"feedback", :action => 'index'}, :class=>class_feedback) %>
-            <%= content_tag :li, (link_to _("Presentation"), {:controller=>"sidebar", :action => 'index'}, :class=>class_presentation) %>
+            <%= content_tag :li, (link_to _("Themes"), {:controller=>"themes", :action => 'index'}, :class=>class_themes) %>
+            <%= content_tag :li, (link_to _("Plugins"), {:controller=>"sidebar", :action => 'index'}, :class=>class_plugins) %>
             <%= content_tag :li, (link_to _("Users"), {:controller=>"users", :action => 'index'}, :class=>class_users) %>
-            <%= content_tag :li, (link_to _("Settings"), {:controller=>"general", :action => 'index'}, :class=>class_admin) %>
+            <%= content_tag :li, (link_to _("Settings"), {:controller=>"settings", :action => 'index'}, :class=>class_admin) %>
 			<li><%= current_user_notice %></li>
 			<%= tab _('your blog'), :controller => "/articles" %>
           </ul>

data/config/environments/development.rb

@@ -8,7 +8,7 @@ config.whiny_nils        = true
 
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = true
+config.action_controller.perform_caching             = false
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false

data/db/schema_version

@@ -1 +1 @@
-53
+62

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.0.1"
+PKG_VERSION = "5.0.2"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'
@@ -31,7 +31,7 @@ spec = Gem::Specification.new do |s|
   s.executables = ['typo']
   
   s.add_dependency("rails", ">= 2.0.2")
-  s.add_dependency("mongrel", ">= 1.1.1")
+  s.add_dependency("mongrel", ">= 1.1.3")
   s.add_dependency("mongrel_cluster", ">= 0.2.0")
   s.add_dependency("sqlite3-ruby", ">= 1.1.0")
   s.add_dependency("rails-app-installer", ">= 0.2.0")
@@ -39,6 +39,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency("rcov", ">= 0.8.1")
   s.add_dependency("flexmock", ">= 0.8.0")  
   s.add_dependency("rspec", ">= 1.1.1")
+  s.add_dependency("ruby-debug", ">= 0.10.0")
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/lib/typo_version.rb

@@ -1 +1 @@
-TYPO_VERSION = '5.0.1'
+TYPO_VERSION = '5.0.2'

data/spec/controllers/accounts_controller_spec.rb

@@ -156,9 +156,9 @@ describe 'POST signup with 0 existing users' do
     assigns[:user].should == @user
   end
 
-  it 'redirects to /admin/general' do
+  it 'redirects to /admin/settings' do
     post 'signup', params
-    response.should redirect_to(:controller => 'admin/general', :action => 'index')
+    response.should redirect_to(:controller => 'admin/settings', :action => 'index')
   end
 
   it 'session gets a user' do

data/spec/models/configuration_spec.rb

@@ -43,9 +43,9 @@ describe 'Given a new blog' do
     end
   end
 
-  it '#text_filter and #comment_text_filter should be blank' do
-    @blog.text_filter.should == ''
-    @blog.comment_text_filter.should == ''
+  it '#text_filter and #comment_text_filter should be markdown smartypants' do
+    @blog.text_filter.should == 'markdown smartypants'
+    @blog.comment_text_filter.should == 'markdown smartypants'
   end
 
   it '#limit_article_display and #limit_rss_display should be 10' do

data/test/fixtures/blogs.yml

@@ -8,7 +8,7 @@ default:
     itunes_owner: ""
     blog_name: test blog
     title_prefix: 1
-    limit_article_display: 10
+    limit_article_display: 2
     sp_url_limit: 3
     use_gravatar: false
     itunes_email: ""

data/test/functional/admin/{general_controller_test.rb → settings_controller_test.rb}

@@ -1,14 +1,14 @@
 require File.dirname(__FILE__) + '/../../test_helper'
-require 'admin/general_controller'
+require 'admin/settings_controller'
 
 # Re-raise errors caught by the controller.
-class Admin::GeneralController; def rescue_action(e) raise e end; end
+class Admin::SettingsController; def rescue_action(e) raise e end; end
 
-class Admin::GeneralControllerTest < Test::Unit::TestCase
+class Admin::SettingsControllerTest < Test::Unit::TestCase
   fixtures :users
 
   def setup
-    @controller = Admin::GeneralController.new
+    @controller = Admin::SettingsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
     @request.session = { :user_id => users(:tobi).id }
@@ -21,6 +21,6 @@ class Admin::GeneralControllerTest < Test::Unit::TestCase
 
   def test_redirect
     get :redirect
-    assert_response :redirect, :controller => 'admin/general', :action => 'index'
+    assert_response :redirect, :controller => 'admin/settings', :action => 'index'
   end
-end
+end

data/test/functional/articles_controller_test.rb

@@ -56,6 +56,13 @@ class ArticlesControllerTest < Test::Unit::TestCase
     assert_template "index"
   end
 
+  # index with page
+  def test_index_with_page
+    get :index, :page => 2
+    assert_response :success
+    assert_template "index"
+  end
+
   # Archives page
   def test_archives
     get :archives

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: typo
 version: !ruby/object:Gem::Version 
-  version: 5.0.1
+  version: 5.0.2
 platform: ruby
 authors: 
 - "Fr\xC3\xA9d\xC3\xA9ric de Villamil"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-31 00:00:00 +01:00
+date: 2008-01-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,7 +28,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 1.1.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: mongrel_cluster
@@ -93,6 +93,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.10.0
+    version: 
 description: 
 email: frederic@de-villamil.com
 executables: 
@@ -111,7 +120,6 @@ files:
 - app/controllers
 - app/controllers/accounts_controller.rb
 - app/controllers/admin
-- app/controllers/admin/advanced_controller.rb
 - app/controllers/admin/base_controller.rb
 - app/controllers/admin/blacklist_controller.rb
 - app/controllers/admin/cache_controller.rb
@@ -124,6 +132,7 @@ files:
 - app/controllers/admin/pages_controller.rb
 - app/controllers/admin/profiles_controller.rb
 - app/controllers/admin/resources_controller.rb
+- app/controllers/admin/settings_controller.rb
 - app/controllers/admin/sidebar_controller.rb
 - app/controllers/admin/textfilters_controller.rb
 - app/controllers/admin/themes_controller.rb
@@ -157,6 +166,7 @@ files:
 - app/helpers/admin/general_helper.rb
 - app/helpers/admin/pages_helper.rb
 - app/helpers/admin/resources_helper.rb
+- app/helpers/admin/settings_helper.rb
 - app/helpers/admin/sidebar_helper.rb
 - app/helpers/admin/textfilters_helper.rb
 - app/helpers/admin/themes_helper.rb
@@ -272,7 +282,6 @@ files:
 - app/views/admin/feedback/_item.html.erb
 - app/views/admin/feedback/list.html.erb
 - app/views/admin/general
-- app/views/admin/general/index.html.erb
 - app/views/admin/general/update_database.html.erb
 - app/views/admin/pages
 - app/views/admin/pages/_form.html.erb
@@ -295,6 +304,14 @@ files:
 - app/views/admin/resources/destroy.html.erb
 - app/views/admin/resources/list.html.erb
 - app/views/admin/resources/new.html.erb
+- app/views/admin/settings
+- app/views/admin/settings/_submit.html.erb
+- app/views/admin/settings/feedback.html.erb
+- app/views/admin/settings/index.html.erb
+- app/views/admin/settings/podcast.html.erb
+- app/views/admin/settings/read.html.erb
+- app/views/admin/settings/spam.html.erb
+- app/views/admin/settings/write.html.erb
 - app/views/admin/shared
 - app/views/admin/shared/_edit.html.erb
 - app/views/admin/sidebar
@@ -909,17 +926,16 @@ files:
 - test/functional
 - test/functional/accounts_controller_test.rb
 - test/functional/admin
-- test/functional/admin/advanced_controller_test.rb
 - test/functional/admin/article_preview_test.rb
 - test/functional/admin/blacklist_controller_test.rb
 - test/functional/admin/categories_controller_test.rb
 - test/functional/admin/comments_controller_test.rb
 - test/functional/admin/content_controller_test.rb
 - test/functional/admin/feedback_controller_test.rb
-- test/functional/admin/general_controller_test.rb
 - test/functional/admin/pages_controller_test.rb
 - test/functional/admin/profiles_controller_test.rb
 - test/functional/admin/resources_controller_test.rb
+- test/functional/admin/settings_controller_test.rb
 - test/functional/admin/textfilters_controller_test.rb
 - test/functional/admin/themes_controller_test.rb
 - test/functional/admin/trackbacks_controller_test.rb

data/app/controllers/admin/advanced_controller.rb

@@ -1,20 +0,0 @@
-class Admin::AdvancedController < Admin::BaseController
-  def index
-    if this_blog.base_url.blank?
-      this_blog.base_url = blog_base_url
-    end
-  end
-
-  def update
-    if request.post?
-      Blog.transaction do
-        params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
-        this_blog.save
-        flash[:notice] = _('config updated.')
-      end
-      redirect_to :action => 'index'
-    end
-  end
-
-  private
-end