typo 4.0.3 → 4.1

data/app/models/tag.rb

@@ -50,7 +50,7 @@ class Tag < ActiveRecord::Base
   end
 
   def self.to_prefix
-    'tags'
+    'tag'
   end
 
   def published_articles
@@ -60,4 +60,15 @@ class Tag < ActiveRecord::Base
   def permalink
     self.name
   end
+  
+  def permalink_url(anchor=nil, only_path=true)
+    blog = Blog.find(1) # remove me...
+    
+    blog.url_for(
+      :controller => '/articles',
+      :action => 'tag',
+      :id => permalink
+    )
+  end
+  
 end

data/app/models/text_filter.rb

@@ -1,55 +1,51 @@
 require 'net/http'
-require_dependency 'textfilter_controller'
 
-class TextFilter < ActiveRecord::Base
+class TextFilter < CachedModel
   serialize :filters
   serialize :params
 
   def self.available_filters
-    objects = []
-    ObjectSpace.each_object(Class) do |o|
-      if TextFilterPlugin > o and o.to_s =~ /Controller/
-        objects.push o
-      end
-    end
-
-    objects
+    TextFilterPlugin.filter_map.values
   end
 
+  TYPEMAP={TextFilterPlugin::Markup => "markup",
+           TextFilterPlugin::MacroPre => "macropre",
+           TextFilterPlugin::MacroPost => "macropost",
+           TextFilterPlugin::PostProcess => "postprocess",
+           TextFilterPlugin => "other"}
+
   def self.available_filter_types
     filters=available_filters
-    types={"macropre" => [],
-           "macropost" => [],
-           "markup" => [],
-           "postprocess" => [],
-           "other" => []}
+    @cached_filter_types ||= {}
 
-    typemap={TextFilterPlugin::Markup => "markup",
-             TextFilterPlugin::MacroPre => "macropre",
-             TextFilterPlugin::MacroPost => "macropost",
-             TextFilterPlugin::PostProcess => "postprocess",
-             TextFilterPlugin => "other"}
+    unless @cached_filter_types[filters]
+      types={"macropre" => [],
+             "macropost" => [],
+             "markup" => [],
+             "postprocess" => [],
+             "other" => []}
 
-    filters.each { |filter| types[typemap[filter.superclass]].push(filter) }
+      filters.each { |filter| types[TYPEMAP[filter.superclass]].push(filter) }
 
-    types
+      @cached_filter_types[filters] = types
+    end
+
+    @cached_filter_types[filters]
   end
 
   def self.filters_map
-    available_filters.inject({}) { |map,filter| map[filter.short_name] = filter; map }
+    TextFilterPlugin.filter_map
   end
 
-  def self.filter_text(text, controller, content, filters, filterparams={}, filter_html=false)
-
+  def self.filter_text(blog, text, content, filters, filterparams={})
     map=TextFilter.filters_map
-    filters = [:htmlfilter, filters].flatten if filter_html
 
     filters.each do |filter|
       next if filter == nil
       begin
-        filter_controller = map[filter.to_s]
-        next unless filter_controller
-        text = filter_controller.filtertext(controller, content, text, :filterparams => filterparams)
+        filter_class = map[filter.to_s]
+        next unless filter_class
+        text = filter_class.filtertext(blog, content, text, :filterparams => filterparams)
       rescue => err
         logger.error "Filter #{filter} failed: #{err}"
       end
@@ -58,20 +54,19 @@ class TextFilter < ActiveRecord::Base
     text
   end
 
-  def self.filter_text_by_name(text, controller, filtername, filter_html=false)
+  def self.filter_text_by_name(blog, text, filtername)
     f = TextFilter.find_by_name(filtername)
-    f.filter_text_for_controller text, controller, nil, filter_html
+    f.filter_text_for_content blog, text, nil
   end
 
-  def filter_text_for_controller(text, controller, content, filter_html=false)
-    self.class.filter_text(
-      text, controller, content,
-      [:macropre, markup, :macropost, filters].flatten, params,
-      filter_html)
+  def filter_text_for_content(blog, text, content)
+    self.class.filter_text(blog, text, content,
+      [:macropre, markup, :macropost, filters].flatten, params)
   end
 
-  def filter(text,filter_html=false)
-    self.class.filter(text,self.filters,self.params,filter_html)
+  def filter(text)
+    typo_deprecated "What does this do?"
+    self.class.filter(text,self.filters,self.params)
   end
 
   def help
@@ -93,7 +88,6 @@ class TextFilter < ActiveRecord::Base
 
   def commenthelp
     filter_map = TextFilter.filters_map
-    filter_types = TextFilter.available_filter_types
 
     help = [filter_map[markup]]
     filters.each { |f| help.push(filter_map[f.to_s]) }

data/app/models/theme.rb

@@ -16,10 +16,19 @@ class Theme
     File.read("#{path}/about.markdown") rescue "### #{name}"
   end
 
+  # Find a theme, given the theme name
+  def self.find(name)
+    self.new(name,theme_path(name))
+  end
+
   def self.themes_root
     RAILS_ROOT + "/themes"
   end
 
+  def self.theme_path(name)
+    themes_root + "/" + name
+  end
+
   def self.theme_from_path(path)
     name = path.scan(/[-\w]+$/i).flatten.first
     self.new(name, path)

data/app/models/trackback.rb

@@ -2,9 +2,7 @@ require_dependency 'spam_protection'
 
 class Trackback < Feedback
   belongs_to :article
-
   content_fields :excerpt
-
   validates_presence_of :title, :excerpt, :url
 
   def initialize(*args, &block)
@@ -16,9 +14,7 @@ class Trackback < Feedback
   before_create :process_trackback
 
   def make_nofollow
-    self.blog_name = blog_name.strip_html
-    self.title     = title.strip_html
-    self.excerpt   = excerpt.strip_html
+    typo_deprecated 'Do it via postprocessing.'
   end
 
   def process_trackback

data/app/models/user.rb

@@ -1,10 +1,11 @@
 require 'digest/sha1'
 
 # this model expects a certain database layout and its based on the name/login pattern.
-class User < ActiveRecord::Base
-  has_and_belongs_to_many :notify_contents, :class_name => 'Content',
-    :join_table => 'notifications', :foreign_key => 'notify_user_id',
-    :association_foreign_key => 'notify_content_id', :uniq => true
+class User < CachedModel
+  has_many :notifications, :foreign_key => 'notify_user_id'
+  has_many :notify_contents, :through => :notifications,
+    :source => 'notify_content',
+    :uniq => true
 
   has_many :articles, :order => 'created_at DESC' do
     def published
@@ -22,7 +23,8 @@ class User < ActiveRecord::Base
   #   @user = User.authenticate('bob', 'bobpass')
   #
   def self.authenticate(login, pass)
-    find_first(["login = ? AND password = ?", login, sha1(pass)])
+    find(:first,
+         :conditions => ["login = ? AND password = ?", login, sha1(pass)])
   end
 
   def self.authenticate?(login, pass)

data/app/views/accounts/login.rhtml

@@ -1,24 +1,28 @@
-<%= start_form_tag :action=> "login" %>
+<% form_tag :action=> "login" do %>
 
 
 <div title="Account login" id="loginform">
-  
-    <h3>Please login</h3>  
-    
-    <div class="form">
-      <% if @flash[:notice] %>
-        <h4><%= @flash[:notice] %></h4>
-      <% end %>    
-    <label for="user_login">Login:</label><br/>
-    <input type="text" name="user_login" id="user_login" size="20" value=""/><br/>
 
-    <label for="user_password">Password:</label><br/>
-    <input type="password" name="user_password" id="user_password" size="30"/>
+    <h3>Typo</h3>
 
-    <br/>
-    <input type="submit" name="login" value="Login &#187;" class="primary" />
+    <div class="form admin">
+      <% if flash[:notice] %>
+        <h4><%= flash[:notice] %></h4>
+      <% end %>
+      <ul>
+        <li>
+          <label for="user_login" class="block"><%= _('Username')%>:</label>
+          <input type="text" name="user_login" id="user_login" size="20" value=""/>
+        </li>
+        <li>
+          <label for="user_password" class="block"><%= _('Password') %>:</label>
+          <input type="password" name="user_password" id="user_password" size="30"/>
+        </li>
+      </ul>
+      <input type="submit" name="login" value= "<%= _('Login') %> &#187;" class="primary" />
+      <p><%= link_to "&laquo; " + _('Back to the blog'), { :controller => '/articles' } %></p>
     </div>
 </div>
 
-<%= end_form_tag %>
+<% end %>
 

data/app/views/accounts/logout.rhtml

@@ -1,12 +1,12 @@
-<h3>Logoff</h3>
+<h3><%= _("Logoff")%></h3>
 <div class="memo">
 
     <p>
-      You are now logged out of the system.
-      <%= link_to "Do you want to go to your blog?", :controller => "articles" %>
+      <%= _("You are now logged out of the system") %>.
+      <%= link_to _("Do you want to go to your blog?"), :controller => "articles" %>
     </p>
 
-    <%= link_to "&#171; login", :action => "login" %><br />
+    <%= link_to "&#171; " + _('Login'), :action => "login" %><br />
 
 </div>
 

data/app/views/accounts/signup.rhtml

@@ -1,26 +1,26 @@
-<%= start_form_tag :action=> "signup" %>
+<% form_tag :action=> "signup" do %>
 
 <%= error_messages_for 'user' %><br/>
 
 <div title="Account signup" id="loginform">
-  <h3>Signup</h3>  
+  <h3><%= _('Signup') %></h3>
   <div  class="form">
-  <label for="user_login">Desired login:</label><br/>
+  <label for="user_login"><%= _("Desired login") %>:</label><br/>
   <%= text_field "user", "login", :size => 20 %><br/>
 
-  <label for="user_login">Display name:</label><br/>
+  <label for="user_login"><%= _("Display name")%>:</label><br/>
   <%= text_field "user", "name", :size => 30 %><br/>
 
-  <label for="user_login">Email:</label><br/>
+  <label for="user_login"><%= _("Email")%>:</label><br/>
   <%= text_field "user", "email", :size => 30 %><br/>
 
-  <label for="user_password">Choose password:</label><br/>
+  <label for="user_password"><%= _("Choose password")%>:</label><br/>
   <%= password_field "user", "password", :size => 30 %><br/>
-  <label for="user_password_confirmation">Confirm password:</label><br/>
+  <label for="user_password_confirmation"><%= _("Confirm password")%>:</label><br/>
   <%= password_field "user", "password_confirmation", :size => 30 %><br/>
-  <input type="submit" value="Signup &#187;" class="primary" />
+  <input type="submit" value="<%= _('Signup') %>" class="primary" />
   </div>
 </div>
 
-<%= end_form_tag %>
+<% end %>
 

data/app/views/admin/base/_recent_comments.rhtml

@@ -1,9 +1,9 @@
-<h2>Recent comments</h2>
+<h2><%= _("Recent comments")%></h2>
 <ul class="recent">
 <% for comment in Comment.find(:all, :limit => 5, :order => 'id DESC' ) %>
   <li>
     <h4><%= truncate(comment.author, 20) %></h4>
-    <div><%= link_to truncate(comment.body, 20), :controller => "comments", :action => "show", :id => comment.id, :article_id => comment.article_id %></div>
+    <div><%= link_to truncate(comment.body, 20), :controller => "/admin/comments", :action => "show", :id => comment.id, :article_id => comment.article_id %></div>
     <p class="right"><%= time_ago_in_words(comment.created_at) %> ago</p>
   </li>
 <% end %>

data/app/views/admin/base/_recent_trackbacks.rhtml

@@ -1,8 +1,8 @@
-<h2>Recent trackbacks</h2>
+<h2><%=_("Recent trackbacks")%></h2>
 <ul class="recent">
 <% for trackback in Trackback.find(:all, :limit => 5, :order => 'id DESC' ) %>
   <li>
-    <%= link_to truncate(trackback.excerpt, 20), :controller => "trackbacks", :action => "show", :id => trackback.id, :article_id => trackback.article_id %><br />
+    <%= link_to truncate(trackback.excerpt, 20), :controller => "/admin/trackbacks", :action => "show", :id => trackback.id, :article_id => trackback.article_id %><br />
     by <%= truncate(trackback.blog_name, 20) %><br />
     <%= time_ago_in_words(trackback.created_at) %> ago
   </li>

data/app/views/admin/blacklist/_blacklist_patterns.rhtml

@@ -1,9 +1,9 @@
 <table cellspacing="1" cellpadding="0">
 <tr>
-  <th>Pattern</th>
-  <th>Type</th>
-  <th>Edit</th>
-  <th>Delete</th>
+  <th><%= _("Pattern") %></th>
+  <th><%= _("Type") %></th>
+  <th><%= _("Edit") %></th>
+  <th><%= _("Delete")%></th>
 </tr>
 <% for blacklist_pattern in @blacklist_patterns -%>
 <tr <%= alternate_class -%>>  

data/app/views/admin/blacklist/_form.rhtml

@@ -1,14 +1,14 @@
 <%= error_messages_for 'blacklist_pattern' %>
 <!--[form:blacklist_pattern]-->
 <p>
-  <label for="blacklist_pattern_pattern">Pattern:</label> 
+  <label for="blacklist_pattern_pattern"><%= _("Pattern")%>:</label> 
   <%= text_field 'blacklist_pattern', 'pattern'  %>
 </p>
 <p>
   <% if @controller.action_name == "new" %>
-  <label for="blacklist_pattern_type">Type:</label> 
+  <label for="blacklist_pattern_type"><%= _("Type")%>:</label> 
   <select name="blacklist_pattern[type]">
-  <%= options_for_select [ ['String', 'StringPattern'], ['Regex', 'RegexPattern' ] ]  %>
+  <%= options_for_select [ [_('String'), 'StringPattern'], [_('Regex'), 'RegexPattern' ] ]  %>
 </select>
 <% end %>
 </p>

data/app/views/admin/blacklist/_quick_post.rhtml

@@ -1,16 +1,17 @@
-<%= start_form_tag :action=>"new" %>
+<% form_tag :action=>"new" do %>
 
 <p>
-  <label for="blacklist_pattern_pattern">Pattern:</label> 
+  <label for="blacklist_pattern_pattern"><%= _("Pattern")%>:</label>
   <%= text_field 'blacklist_pattern', 'pattern'  %>
 </p>
 <p>
-  <label for="blacklist_pattern_type">Type:</label> 
+  <label for="blacklist_pattern_type"><%= _("Type")%>:</label>
   <select name="blacklist_pattern[type]">
-  <%= options_for_select [ ['String', 'StringPattern'], ['Regex', 'RegexPattern' ] ]  %>
+  <%= options_for_select [ [_('String'), 'StringPattern'], [_('Regex'), 'RegexPattern' ] ]  %>
 </select>
 
 <div id="operations">
-  <%= save("Add pattern") %> or <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" >Cancel</a>
+  <%= save(_("Add pattern")) %> <%= _("or")%> <a href="#" onclick="new Effect.BlindUp('quick-post', {duration: 0.4}); return false;" ><%= _("Cancel")%></a>
 </div>
-<%= end_form_tag %>
+</p>
+<% end %>

data/app/views/admin/blacklist/destroy.rhtml

@@ -1,10 +1,10 @@
-  <% @page_heading = 'Blacklist Patterns' %>
+  <% @page_heading = _('Blacklist Patterns') %>
 
   <% content_for('tasks') do %>
-    <%= task_show 'Show this pattern', @blacklist_pattern.id %>
+    <%= task_show _('Show this pattern'), @blacklist_pattern.id %>
   <% end %>
 
-  <p>Are you sure you want to delete this item?</p>
-  <%= start_form_tag :action => "destroy", :id => @blacklist_pattern.id %>
+  <p><%= _("Are you sure you want to delete this item?")%></p>
+  <% form_tag :action => "destroy", :id => @blacklist_pattern.id do %>
   <%= confirm_delete %>
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/blacklist/edit.rhtml

@@ -1,14 +1,14 @@
-  <% @page_heading = 'Blacklist Patterns' %>
+  <% @page_heading = _('Blacklist Patterns') %>
 
-  <%= start_form_tag :action=>"edit", :id => @blacklist_pattern.id %>
-  
-  <h3>Editing pattern</h3>
-  <div class="form">	
+  <% form_tag :action=>"edit", :id => @blacklist_pattern.id do %>
+
+  <h3><%= _("Editing pattern")%></h3>
+  <div class="form">
     <%= render_partial "form" %>
   </div>
 
   <div id="operations">
-    <%= save %> or <%= cancel %>  
+    <%= save %> or <%= cancel %>
   </div>
 
-  <%= end_form_tag %>
+  <% end %>

data/app/views/admin/blacklist/list.rhtml

@@ -1,7 +1,7 @@
-  <% @page_heading = 'Blacklist Patterns' %>
+  <% @page_heading = _('Blacklist Patterns') %>
 
   <% content_for('tasks') do %>
-    <%= task_quickpost('Create new Blacklist') %>
+    <%= task_quickpost(_('Create new Blacklist')) %>
   <% end %>
 
   <div id="quick-post" style="display:none;position:absolute;">

data/app/views/admin/cache/list.rhtml

@@ -1,8 +1,8 @@
-  <% @page_heading = 'Cache' %>
+  <% @page_heading = _('Cache') %>
 
   <% content_for('tasks') do %>
     <%= task_sweep 'Empty Page Cache' %>
   <% end %> 
   <div id="users">	
-    <p>There are <%= @page_cache_size %> entries in the page cache</p>
+    <p> <%= _("There are %d entries in the page cache", @page_cache_size) %></p>
   </div>