typo 5.3 → 5.4

data/app/helpers/articles_helper.rb

@@ -3,7 +3,7 @@ module ArticlesHelper
     if params[:action] == 'search'
       url_for(:only_path => false,:format => :atom, :q => params[:q])
     else
-      super
+      @auto_discovery_url_atom
     end
   end
 
@@ -11,7 +11,7 @@ module ArticlesHelper
     if params[:action] == 'search'
       url_for(:only_path => false,:format => :rss, :q => params[:q])
     else
-      super
+      @auto_discovery_url_rss
     end
   end
 end

data/app/helpers/authors_helper.rb

@@ -1,3 +1,8 @@
 module AuthorsHelper
 
+  def display_profile_item(item, show_item, item_desc)
+    content_tag :li do
+      "#{item_desc} #{item}"
+    end if show_item
+  end
 end

data/app/models/article.rb

@@ -41,12 +41,14 @@ class Article < Content
   has_many :categories, \
     :through => :categorizations, \
     :include => :categorizations, \
+    :select => 'categories.*', \
     :uniq => true, \
-    :order => 'categorizations.is_primary DESC, categories.position '
+    :order => 'categorizations.is_primary DESC'
 
   has_and_belongs_to_many :tags, :foreign_key => 'article_id'
 
   named_scope :category, lambda {|category_id| {:conditions => ['categorizations.category_id = ?', category_id], :include => 'categorizations'}}
+  named_scope :drafts, :conditions => ['state = ?', 'draft']
 
 
   belongs_to :user
@@ -182,11 +184,11 @@ class Article < Content
   end
 
   def comment_url
-    blog.url_for("comments?article_id=#{self.id}")
+    blog.url_for("comments?article_id=#{self.id}", :only_path => true)
   end
 
   def preview_comment_url
-    blog.url_for("comments/preview?article_id=#{self.id}")
+    blog.url_for("comments/preview?article_id=#{self.id}", :only_path => true)
   end
 
   def feed_url(format = :rss20)
@@ -370,11 +372,6 @@ class Article < Content
     self[:body]
   end
 
-  def body_html
-    typo_deprecated "Use html(:body)"
-    html(:body)
-  end
-
   def extended=(newval)
     if self[:extended] != newval
       changed if published?
@@ -383,11 +380,6 @@ class Article < Content
     self[:extended]
   end
 
-  def extended_html
-    typo_deprecated "Use html(:extended)"
-    html(:extended)
-  end
-
   def self.html_map(field=nil)
     html_map = { :body => true, :extended => true }
     if field
@@ -446,7 +438,9 @@ class Article < Content
   end
 
   def rss_comments(xml)
-    xml.comments(permalink_url + "#comments")
+    iri = permalink_url
+    uri = Addressable::URI.parse(iri).normalize
+    xml.comments(uri + "#comments")
   end
 
   def link_to_author?
@@ -481,27 +475,19 @@ class Article < Content
     end
   end
 
-  def atom_content(xml)
+  def atom_content(entry)
     if self.user && self.user.name
       rss_desc = "<hr /><p><small>#{_('Original article writen by')} #{self.user.name} #{_('and published on')} <a href='#{blog.base_url}'>#{blog.blog_name}</a> | <a href='#{self.permalink_url}'>#{_('direct link to this article')}</a> | #{_('If you are reading this article elsewhere than')} <a href='#{blog.base_url}'>#{blog.blog_name}</a>, #{_('it has been illegally reproduced and without proper authorization')}.</small></p>"
     else
       rss_desc = ""
     end
     
-    # This HTMLEntities is use to convert bad entities on dabase. We can check 
-    # some bad data insert by FCKEditor. We can found to &eacute; by exemple.
-    # If we doesn't change that, the atom feed is invalid
-    coder = HTMLEntities.new
-    post = coder.decode(html(blog.show_extended_on_rss ? :all : :body))
-    content = blog.rss_description ? post + rss_desc : post
-
-    xml.summary "type" => "xhtml" do
-      xml.div(:xmlns => "http://www.w3.org/1999/xhtml") {xml << coder.decode(html(:body)) }
-    end
+    entry.summary html(:body), "type" => "html"
     if blog.show_extended_on_rss
-      xml.content(:type => "xhtml") do
-        xml.div(:xmlns => 'http://www.w3.org/1999/xhtml') { xml << content }
-      end
+      post = html(:all)
+      content = blog.rss_description ? post + rss_desc : post
+
+      entry.content(content, :type => "html")
     end
   end
 

data/app/models/blog.rb

@@ -15,7 +15,7 @@ end
 #
 # Typo decides which Blog object to use by searching for a Blog base_url that
 # matches the base_url computed for each request.
-class Blog < CachedModel
+class Blog < ActiveRecord::Base
   include ConfigManager
   extend ActiveSupport::Memoizable
 
@@ -62,7 +62,7 @@ class Blog < CachedModel
   setting :default_moderate_comments,  :boolean, false
   setting :link_to_author,             :boolean, false
   setting :show_extended_on_rss,       :boolean, true
-  setting :theme,                      :string, 'typographic'
+  setting :theme,                      :string, 'true-blue-3'
   setting :use_gravatar,               :boolean, false
   setting :global_pings_disable,       :boolean, false
   setting :ping_urls,                  :string, "http://blogsearch.google.com/ping/RPC2\nhttp://rpc.technorati.com/rpc/ping\nhttp://ping.blo.gs/\nhttp://rpc.weblogs.com/RPC2"
@@ -82,6 +82,7 @@ class Blog < CachedModel
   setting :robots,                     :string, ''
   setting :index_categories,           :boolean, true
   setting :index_tags,                 :boolean, true
+  setting :admin_display_elements,     :integer, 10
   #deprecation warning for plugins removal
   setting :deprecation_warning,        :integer, 1
 
@@ -184,39 +185,6 @@ class Blog < CachedModel
     "#{base_url}/files/#{filename}"
   end
 
-  # The base server URL.
-  def server_url
-    base_url
-  end
-
-  # Deprecated
-  typo_deprecate :canonical_server_url => :base_url
-
-  def [](key)  # :nodoc:
-    typo_deprecated "Use blog.#{key}"
-    self.send(key)
-  end
-
-  def []=(key, value)  # :nodoc:
-    typo_deprecated "Use blog.#{key}="
-    self.send("#{key}=", value)
-  end
-
-  def has_key?(key)  # :nodoc:
-    typo_deprecated "Why?"
-    self.class.fields.has_key?(key.to_s)
-  end
-
-  def find_already_published(content_type)  # :nodoc:
-    typo_deprecated "Use #{content_type}.find_already_published"
-    content_type.to_s.camelize.constantize.find_already_published
-  end
-
-  def current_theme_path  # :nodoc:
-    typo_deprecated "use current_theme.path"
-    Theme.themes_root + "/" + theme
-  end
-
   def requested_article(params)
     Article.find_by_params_hash(params)
   end
@@ -234,12 +202,12 @@ class Blog < CachedModel
 
   def permalink_has_identifier
     unless permalink_format =~ /(%year%|%month%|%day%|%title%)/
-      errors.add(:permalink_format, _('You need a Format of permalink with an identifier : %%month%%, %%year%%, %%day%%, %%title%%'))
+      errors.add(:permalink_format, _("You need a permalink format with an identifier : %%month%%, %%year%%, %%day%%, %%title%%"))
     end
 
-    # A permalink can be finish by .atom or .rss. it's reserved to feed
+    # A permalink cannot end in .atom or .rss. it's reserved for the feeds
     if permalink_format =~ /\.(atom|rss)$/
-      errors.add(:permalink_format, _("Can't finish by .rss or .atom. It's reserved to be use by feed"))
+      errors.add(:permalink_format, _("Can't end in .rss or .atom. These are reserved to be used for feed URLs"))
     end
   end
 

data/app/models/category.rb

@@ -13,6 +13,8 @@ class Category < ActiveRecord::Base
     :conditions => { :published => true },
     :order      => "published_at DESC"
 
+  default_scope :order => 'position ASC'
+
   module Finders
     def find_all_with_article_counters(maxcount=nil)
       self.find_by_sql([%{
@@ -27,12 +29,6 @@ class Category < ActiveRecord::Base
       }, true]).each {|item| item.article_counter = item.article_counter.to_i }
     end
 
-    def find(*args)
-      with_scope :find => {:order => 'position ASC'} do
-        super
-      end
-    end
-
     def find_by_permalink(permalink, options = {})
       with_scope(:find => options) do
         find(:first, :conditions => {:permalink => permalink}) or

data/app/models/content.rb

@@ -21,15 +21,29 @@ class Content < ActiveRecord::Base
 
   has_many :triggers, :as => :pending_item, :dependent => :delete_all
 
-  named_scope :published_at_like, lambda {|date_at| {:conditions => ['published_at LIKE ? ', "%#{date_at}%"]}}
+  named_scope :published_at_like, lambda {|date_at| {:conditions => {
+    :published_at => (
+      if date_at =~ /\d{4}-\d{2}-\d{2}/
+        DateTime.strptime(date_at, '%Y-%m-%d').beginning_of_day..DateTime.strptime(date_at, '%Y-%m-%d').end_of_day
+      elsif date_at =~ /\d{4}-\d{2}/
+        DateTime.strptime(date_at, '%Y-%m').beginning_of_month..DateTime.strptime(date_at, '%Y-%m').end_of_month
+      elsif date_at =~ /\d{4}/
+        DateTime.strptime(date_at, '%Y').beginning_of_year..DateTime.strptime(date_at, '%Y').end_of_year
+      else
+        date_at
+      end
+    )}
+  }
+  }
   named_scope :user_id, lambda {|user_id| {:conditions => ['user_id = ?', user_id]}}
   named_scope :published, {:conditions => ['published = ?', true]}
+  named_scope :order, lambda {|order_by| {:order => order_by}}
   named_scope :not_published, {:conditions => ['published = ?', false]}
   named_scope :draft, {:conditions => ['state = ?', 'draft']}
   named_scope :no_draft, {:conditions => ['state <> ?', 'draft'], :order => 'created_at DESC'}
   named_scope :searchstring, lambda {|search_string|
-    tokens = search_string.split.collect {|c| "%#{c.downcase}%"}
-    {:conditions => [(['state = ? AND (LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)']*tokens.size).join(' AND '),
+    tokens = search_string.split(' ').collect {|c| "%#{c.downcase}%"}
+    {:conditions => ['state = ? AND ' + (['(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)']*tokens.size).join(' AND '),
                         "published", *tokens.collect{ |token| [token] * 3 }.flatten]}
   }
 
@@ -66,7 +80,6 @@ class Content < ActiveRecord::Base
         end
         unless self.method_defined?("#{field}_html")
           define_method("#{field}_html") do
-            typo_deprecated "Use html(:#{field})"
             html(field.to_sym)
           end
         end
@@ -191,7 +204,7 @@ class Content < ActiveRecord::Base
     elsif self.class.html_map(field)
       generate_html(field)
     else
-      raise "Unknown field: #{field.inspect} in article.html"
+      raise "Unknown field: #{field.inspect} in content.html"
     end
   end
 
@@ -301,7 +314,8 @@ class Content < ActiveRecord::Base
       rss_groupings(xml)
       rss_enclosure(xml)
       rss_trackback(xml)
-      xml.link permalink_url
+      # TODO: Perhaps permalink_url should produce valid URI's instead of IRI's
+      xml.link Addressable::URI.parse(permalink_url).normalize
     end
   end
 
@@ -309,7 +323,7 @@ class Content < ActiveRecord::Base
   end
 
   def rss_description(xml)
-    if self.user && self.user.name
+    if respond_to?(:user) && self.user && self.user.name
       rss_desc = "<hr /><p><small>#{_('Original article writen by')} #{self.user.name} #{_('and published on')} <a href='#{blog.base_url}'>#{blog.blog_name}</a> | <a href='#{self.permalink_url}'>#{_('direct link to this article')}</a> | #{_('If you are reading this article elsewhere than')} <a href='#{blog.base_url}'>#{blog.blog_name}</a>, #{_('it has been illegally reproduced and without proper authorization')}.</small></p>"
     else
       rss_desc = ""
@@ -333,17 +347,8 @@ class Content < ActiveRecord::Base
   def atom_enclosures(xml)
   end
 
-  def atom_content(xml)
-    xml.content(:type => 'xhtml') do
-      xml.div(:xmlns => 'http://www.w3.org/1999/xhtml') { xml << html(:all) }
-    end
-  end
-
-
-  # deprecated
-  def full_html
-    typo_deprecated "use .html instead"
-    html
+  def atom_content(entry)
+    entry.content(html(:all), :type => 'html')
   end
 end
 
@@ -354,6 +359,7 @@ class Object
 end
 
 class ContentTextHelpers
+  include ActionView::Helpers::UrlHelper
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::SanitizeHelper
   include ActionView::Helpers::TextHelper

data/app/models/page.rb

@@ -16,8 +16,6 @@ class Page < Content
     eval(list_function.join('.'))
   end
 
-  typo_deprecate :location => :permalink_url
-  
   def permalink_url(anchor=nil, only_path=true)
     blog.url_for(
       :controller => '/articles',

data/app/models/page_cache.rb

@@ -13,27 +13,24 @@ class PageCache
 
   # Delete all file save in path_cache by page_cache system
   def self.sweep_all
-    logger.debug "PageCache - sweep_all called by #{caller[1].inspect}"
-    begin
+    if ActiveRecord::Base.connection.table_exists?(:cache_informations)
       CacheInformation.all.each{|c| c.destroy}
-    rescue
+    else
       logger.debug "PageCache - OOOOPS table is missing"
     end
+    self.sweep_theme_cache
   end
 
 
   def self.sweep_theme_cache
-    logger.debug "PageCache - sweep_theme_cache called by #{caller[1].inspect}"
-    self.zap_pages(%{images/theme stylesheets/theme javascripts/theme})
+    self.zap_pages(%w{images/theme/* stylesheets/theme/* javascripts/theme/*})
   end
 
   def self.zap_pages(paths)
-    logger.debug "PageCache - About to zap: #{paths.inspect}"
     srcs = paths.inject([]) { |o,v|
       o + Dir.glob(public_path + "/#{v}")
     }
     return true if srcs.empty?
-    logger.debug "PageCache - About to delete: #{srcs.inspect}"
     trash = RAILS_ROOT + "/tmp/typodel.#{UUID.random_create}"
     FileUtils.makedirs(trash)
     FileUtils.mv(srcs, trash, :force => true)

data/app/models/sidebar.rb

@@ -23,11 +23,11 @@ class Sidebar < ActiveRecord::Base
     end
 
     def input_html(sidebar)
-      text_field_tag(input_name(sidebar), sidebar.config[key], options)
+      text_field_tag(input_name(sidebar), sidebar.config[key], { :class => 'small large'})
     end
 
     def line_html(sidebar)
-      label_html(sidebar) +  "<br />" + input_html(sidebar) + "<br />"
+      content_tag(:p, label_html(sidebar) +  "<br />" + input_html(sidebar), :class => 'input_text_title')
     end
 
     def input_name(sidebar)
@@ -48,8 +48,8 @@ class Sidebar < ActiveRecord::Base
 
     class TextAreaField < self
       def input_html(sidebar)
-        html_options = { "rows" => "10", "cols" => "30", "style" => "width:255px"}.update(options.stringify_keys)
-        text_area_tag(input_name(sidebar), h(sidebar.config[key]), html_options)
+        html_options = { "rows" => "10", "class" => "large small" }.update(options.stringify_keys)
+        text_area_tag(input_name(sidebar), sidebar.config[key], html_options)
       end
     end
 
@@ -74,8 +74,8 @@ class Sidebar < ActiveRecord::Base
 
     class CheckBoxField < self
       def input_html(sidebar)
-        check_box_tag(input_name(sidebar), 1, sidebar.config[key], options)+
-        hidden_field_tag(input_name(sidebar),0)
+        hidden_field_tag(input_name(sidebar),0)+
+        check_box_tag(input_name(sidebar), 1, sidebar.config[key], options)
       end
 
       def line_html(sidebar)

data/app/models/text_filter.rb

@@ -1,6 +1,6 @@
 require 'net/http'
 
-class TextFilter < CachedModel
+class TextFilter < ActiveRecord::Base
   serialize :filters
   serialize :params
 
@@ -70,11 +70,6 @@ class TextFilter < CachedModel
       [:macropre, markup, :macropost, filters].flatten, params)
   end
 
-  def filter(text)
-    typo_deprecated "What does this do?"
-    self.class.filter(text,self.filters,self.params)
-  end
-
   def help
     filter_map = TextFilter.filters_map
     filter_types = TextFilter.available_filter_types

data/app/models/theme.rb

@@ -8,8 +8,13 @@ class Theme
     @name, @path = name, path
   end
 
-  def layout
-    "../../themes/#{name}/layouts/default.html.erb"
+  def layout(action=:default)
+    if action.to_s == 'view_page'
+      if File.exists? "#{RAILS_ROOT}/themes/#{name}/layouts/pages.html.erb"
+        return "#{RAILS_ROOT}/themes/#{name}/layouts/pages.html.erb"
+      end
+    end
+    "#{RAILS_ROOT}/themes/#{name}/layouts/default.html.erb"
   end
 
   def description

data/app/models/trackback.rb

@@ -15,10 +15,6 @@ class Trackback < Feedback
 
   before_create :process_trackback
 
-  def make_nofollow
-    typo_deprecated 'Do it via postprocessing.'
-  end
-
   def process_trackback
     if excerpt.length >= 251
       # this limits excerpt to 250 chars, including the trailing "..."
@@ -61,7 +57,7 @@ class Trackback < Feedback
   end
 
   def atom_title(xml)
-    xml.title "Trackback from #{blog_name}: #{title} on #{article.title}", :type => 'text/html'
+    xml.title "Trackback from #{blog_name}: #{title} on #{article.title}", :type => 'html'
   end
 
   def rss_title(xml)