typo 4.0.3 → 4.1

data/app/helpers/admin/base_helper.rb

@@ -1,4 +1,5 @@
 module Admin::BaseHelper
+  include ActionView::Helpers::DateHelper
 
   def state_class(item)
     item.state.memento.underscore.sub(/.*\//, '')
@@ -21,7 +22,7 @@ module Admin::BaseHelper
       output << "<a href=\"#{value}\">#{key}</a>"
     end if @tasks
 
-    output.join("<br/>\n")
+    output.join("<br />\n")
   end
 
   def current_user_notice
@@ -34,7 +35,7 @@ module Admin::BaseHelper
 
   def tab(label, options = {})
     if controller.controller_name =~ /#{options[:controller].split('/').last}/
-      content_tag :li, link_to(label, options, {"class"=> "active"}), {"class"=> "active"}
+      content_tag :li, link_to(label, options, {"class"=> ""}), {"class"=> ""}
     else
       content_tag :li, link_to(label, options)
     end
@@ -53,15 +54,15 @@ module Admin::BaseHelper
   end
 
   def link_to_show(record)
-    link_to image_tag('go'), :action => 'show', :id => record.id
+    link_to image_tag('go.png'), :action => 'show', :id => record.id
   end
 
   def link_to_edit(record)
-    link_to image_tag('go'), :action => 'edit', :id => record.id
+    link_to image_tag('edit.png', :alt => "edit", :title => "Edit content"), :action => 'edit', :id => record.id
   end
 
   def link_to_destroy(record)
-    link_to image_tag('delete'), :action => 'destroy', :id => record.id
+    link_to image_tag('delete.png', :alt => "delete", :title => "Delete content"), :action => 'destroy', :id => record.id
   end
 
   def text_filter_options
@@ -125,4 +126,8 @@ module Admin::BaseHelper
   def task_edit_resource_mime(title,id)
     link_to_function(title, toggle_effect('edit-resource-mime-' + id.to_s, 'Effect.BlindUp', "duration:0.4", "Effect.BlindDown", "duration:0.4"))
   end
+
+  def time_delta_from_now_in_words(timestamp)
+    distance_of_time_in_words_to_now(timestamp) + ((Time.now < timestamp) ? ' from now' : ' ago')
+  end
 end

data/app/helpers/admin/content_helper.rb

@@ -1,2 +1,8 @@
 module Admin::ContentHelper
+  include ArticlesHelper
+
+  def contents
+    [@article]
+  end
+
 end

data/app/helpers/admin/feedback_helper.rb

@@ -1,6 +1,6 @@
 module Admin::FeedbackHelper
   def link_to_article_edit(article)
-    link_to truncate(article.title, 60), :controller => 'content', :action => 'edit', :id => article.id
+    link_to truncate(article.title, 60), :controller => '/admin/content', :action => 'edit', :id => article.id
   end
 
   def task_showmod(title)

data/app/helpers/admin/pages_helper.rb

@@ -1,2 +1,7 @@
 module Admin::PagesHelper
+  include ArticlesHelper
+  
+  def contents
+    [@page]
+  end
 end

data/app/helpers/application_helper.rb

@@ -2,58 +2,42 @@
 require 'digest/sha1'
 
 module ApplicationHelper
-  def server_url_for(options = {})
-    url_for options.update(:only_path => false)
-  end
-
+  # Override the default ActionController#url_for.
   def url_for(options = { })
-    if options[:controller] && options[:controller] =~ /^\/?$/
-      options[:controller] = '/articles'
-    end
+    # this_blog.url_for doesn't do relative URLs.
+#    if options.kind_of? Hash
+#      unless options[:controller]
+#        options[:controller] = params[:controller]
+#      end
+#    end
+
+#    this_blog.url_for(options)
     super(options)
   end
 
-  def config_value(name)
-    this_blog[name]
-  end
-
-  def config
-    this_blog
-  end
-
-  def item_link(title, item, anchor=nil)
-    link_to title, item.location(anchor)
-  end
-
-  alias_method :article_link,     :item_link
-  alias_method :page_link,        :item_link
-  alias_method :comment_url_link, :item_link
-
-  def url_of(item, only_path=true, anchor=nil)
-    item.location(anchor, only_path)
-  end
-
-  alias_method :trackback_url, :url_of
-  alias_method :comment_url,   :url_of
-  alias_method :article_url,   :url_of
-  alias_method :page_url,      :url_of
-
+  # Basic english pluralizer.
+  # Axe?
   def pluralize(size, word)
     case size
-    when 0 then "no #{word}s"
+    when 0 then "no #{word.pluralize}"
     when 1 then "1 #{word}"
-    else        "#{size} #{word}s"
+    else        "#{size} #{word.pluralize}"
     end
   end
 
+  # Produce a link to the permalink_url of 'item'.
+  def link_to_permalink(item, title, anchor=nil)
+    anchor = "##{anchor}" if anchor
+    "<a href=\"#{item.permalink_url}#{anchor}\">#{title}</a>"
+  end
+
+  # The '5 comments' link from the bottom of articles
   def comments_link(article)
-    article_link(pluralize(article.published_comments.size, "comment"),
-                 article, 'comments')
+    link_to_permalink(article,pluralize(article.published_comments.size, 'comment'),'comments')
   end
 
   def trackbacks_link(article)
-    article_link(pluralize(article.published_trackbacks.size, "trackback"),
-                 article, 'trackbacks')
+    link_to_permalink(article,pluralize(article.published_trackbacks.size, 'trackback'),'trackbacks')
   end
 
   def check_cache(aggregator, *args)
@@ -62,8 +46,12 @@ module ApplicationHelper
   end
 
   def js_distance_of_time_in_words_to_now(date)
-    time = date.utc.strftime("%a, %d %b %Y %H:%M:%S GMT")
-    "<span class=\"typo_date\" title=\"#{time}\">#{time}</span>"
+    if date
+      time = date.utc.strftime("%a, %d %b %Y %H:%M:%S GMT") 
+    else
+      time = Time.now
+    end
+      "<span class=\"typo_date\" title=\"#{time}\">#{time}</span>" 
   end
 
   def meta_tag(name, value)
@@ -83,27 +71,72 @@ module ApplicationHelper
     "$('#{domid}').style.display == 'none' ? new #{false_effect}('#{domid}', {#{false_opts}}) : new #{true_effect}('#{domid}', {#{true_opts}}); return false;"
   end
 
+  def markup_help_popup(markup, text)
+    if markup and markup.commenthelp.size > 1
+      "<a href=\"#{url_for :controller => '/articles', :action => 'markup_help', :id => markup.id}\" onclick=\"return popup(this, 'Typo Markup Help')\">#{text}</a>"
+    else
+      ''
+    end
+  end
+
+  # Deprecated helpers
+  def server_url_for(options={})
+    typo_deprecated "Use url_for instead"
+    url_for(options)
+  end
+
+  def config_value(name)
+    typo_deprecated "Use this_blog.#{name} instead."
+    this_blog.send(name)
+  end
+
+  def config
+    typo_deprecated "Use this_blog.configname instead of config[:configname]"
+    raise "Unimplemented"
+  end
+
+  def item_link(title, item, anchor=nil)
+    typo_deprecated "Use link_to_permalink instead of item_link"
+    link_to_permalink(item, title, anchor)
+  end
+
+  alias_method :article_link,     :item_link
+  alias_method :page_link,        :item_link
+  alias_method :comment_url_link, :item_link
+
+  def url_of(item, only_path=true, anchor=nil)
+    typo_deprecated "Use item.permalink_url instead"
+    item.permalink_url
+  end
+
+  alias_method :trackback_url, :url_of
+  alias_method :comment_url,   :url_of
+  alias_method :article_url,   :url_of
+  alias_method :page_url,      :url_of
+
+  def html(content, what = :all, deprecated = false)
+    if deprecated
+      msg = "use html(#{content.class.to_s.underscore}" + ((what == :all) ? "" : ", #{what.inspect}") + ")"
+      typo_deprecated(msg)
+    end
+
+    content.html(what)
+  end
+
   def article_html(article, what = :all)
-    article.html(@controller, what)
+    html(article, what, true)
   end
 
   def comment_html(comment)
-    comment.html(@controller, :body)
+    html(comment, :body, true)
   end
 
   def page_html(page)
-    page.html(@controller,:body)
+    html(page, :body, true)
   end
 
   def strip_html(text)
+    typo_deprecated "use text.strip_html"
     text.strip_html
   end
-
-  def markup_help_popup(markup, text)
-    if markup and markup.commenthelp.size > 1
-      "<a href=\"#{url_for :controller => '/articles', :action => 'markup_help', :id => markup.id}\" onClick=\"return popup(this, 'Typo Markup Help')\">#{text}</a>"
-    else
-      ''
-    end
-  end
 end

data/app/helpers/articles_helper.rb

@@ -1,11 +1,13 @@
 module ArticlesHelper
+  include SidebarHelper
+
   def admin_tools_for(model)
     type = model.class.to_s.downcase
     tag = []
     tag << content_tag("div",
       link_to_remote('nuke', {
           :url => { :action => "nuke_#{type}", :id => model },
-          :complete => visual_effect(:puff, "#{type}-#{model.id}", :duration => 0.6),
+          :complete => visual_effect(:puff, "#{type}-I#{model.id}", :duration => 0.6),
           :confirm => "Are you sure you want to delete this #{type}?"
         }, :class => "admintools") <<
       link_to('edit', {
@@ -17,13 +19,13 @@ module ArticlesHelper
     tag.join(" | ")
   end
 
-  def onhover_show_admin_tools(type, id = nil)
-    tag = []
-    tag << %{ onmouseover="if (getCookie('is_admin') == 'yes') { Element.show('admin_#{[type, id].compact.join('_')}'); }" }
-    tag << %{ onmouseout="Element.hide('admin_#{[type, id].compact.join('_')}');" }
-    tag
+  def onhover_show_admin_tools(type, id = nil) 
+    tag = [] 
+    tag << %{ onmouseover="if (getCookie('is_admin') == 'yes') { Element.show('admin_#{[type, id].compact.join('_')}'); }" } 
+    tag << %{ onmouseout="Element.hide('admin_#{[type, id].compact.join('_')}');" } 
+    tag 
   end
-
+  
   def render_errors(obj)
     return "" unless obj
     tag = String.new
@@ -42,28 +44,37 @@ module ArticlesHelper
   end
 
   def page_title
+    blog_name = this_blog.blog_name || "Typo"
     if @page_title
       # this is where the page title prefix (string) should go
-      (this_blog.title_prefix ? "#{this_blog.blog_name || "Typo"} : " : '') + @page_title
+      (this_blog.title_prefix == 1 ? blog_name + " : " : '') + @page_title + (this_blog.title_prefix == 2 ? " : " + blog_name : '')
     else
-      this_blog.blog_name || "Typo"
+      blog_name
     end
   end
 
   def page_header
-    page_header_includes = contents.collect { |c| c.whiteboard }.collect { |w| w.select {|k,v| k =~ /^page_header_/}.collect {|(k,v)| v} }.flatten.uniq
+    page_header_includes = contents.collect { |c| c.whiteboard }.collect do |w|
+      w.select {|k,v| k =~ /^page_header_/}.collect do |(k,v)|
+        v = v.chomp
+        # trim the same number of spaces from the beginning of each line
+        # this way plugins can indent nicely without making ugly source output
+        spaces = /\A[ \t]*/.match(v)[0].gsub(/\t/, "  ")
+        v.gsub!(/^#{spaces}/, '  ') # add 2 spaces to line up with the assumed position of the surrounding tags
+      end
+    end.flatten.uniq
     (
     <<-HTML
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
   #{ meta_tag 'ICBM', this_blog.geourl_location unless this_blog.geourl_location.empty? }
-  <link rel="EditURI" type="application/rsd+xml" title="RSD" href="#{ server_url_for :controller => 'xml', :action => 'rsd' }" />
+  <link rel="EditURI" type="application/rsd+xml" title="RSD" href="#{ url_for :controller => 'xml', :action => 'rsd' }" />
   <link rel="alternate" type="application/atom+xml" title="Atom" href="#{ @auto_discovery_url_atom }" />
   <link rel="alternate" type="application/rss+xml" title="RSS" href="#{ @auto_discovery_url_rss }" />
   #{ javascript_include_tag "cookies" }
   #{ javascript_include_tag "prototype" }
   #{ javascript_include_tag "effects" }
   #{ javascript_include_tag "typo" }
-  #{ page_header_includes.join("\n") }
+#{ page_header_includes.join("\n") }
   <script type="text/javascript">#{ @content_for_script }</script>
     HTML
     ).chomp
@@ -79,17 +90,11 @@ module ArticlesHelper
   end
 
   def category_links(article)
-    "Posted in " + article.categories.collect { |c| link_to h(c.name),
-    { :controller => "/articles", :action => "category", :id => c.permalink },
-      :rel => "tag"
-    }.join(", ")
+    "Posted in " + article.categories.map { |c| link_to h(c.name), c.permalink_url, :rel => 'tag'}.join(", ")
   end
 
   def tag_links(article)
-    "Tags " + article.tags.collect { |tag| link_to tag.display_name,
-      { :controller => "/articles", :action => "tag", :id => tag.name },
-      :rel => "tag"
-    }.sort.join(", ")
+    "Tags " + article.tags.map { |tag| link_to tag.display_name, tag.permalink_url, :rel => "tag"}.sort.join(", ")
   end
 
   def author_link(article)
@@ -104,21 +109,16 @@ module ArticlesHelper
 
   def next_link(article)
     n = article.next
-    return  n ? article_link("#{n.title} &raquo;", n) : ''
+    return  n ? n.link_to_permalink("#{n.title} &raquo;") : ''
   end
 
   def prev_link(article)
     p = article.previous
-    return p ? article_link("&laquo; #{p.title}", p) : ''
+    return p ? n.link_to_permalink("&laquo; #{p.title}") : ''
   end
 
-  def render_sidebars
-    # ugly ugly hack to fix the extremely verbose sidebar logging
-    options = { :controller => SidebarController,
-                :action => 'display_plugins',
-                :params => {:contents => contents,
-                            :request_params => params} }
-    render_component(options)
+  def render_to_string(*args, &block)
+    controller.send(:render_to_string, *args, &block)
   end
 
   # Generate the image tag for a commenters gravatar based on their email address

data/app/helpers/mail_helper.rb

@@ -1,6 +1,7 @@
 module MailHelper
-  def article_url(controller, article, only_path = true, anchor = nil)
-    controller.url_for :controller=>"/articles", :action =>"permalink", :year => article.created_at.year, :month => sprintf("%.2d", article.created_at.month), :day => sprintf("%.2d", article.created_at.day), :title => article.permalink, :anchor => anchor
+  # Mutter... ActionMailer doesn't do fragment caching.
+  def html(content, what=:all)
+    content.html(what)
   end
 end
 

data/app/helpers/sidebar_helper.rb

@@ -1,22 +1,31 @@
 module SidebarHelper
-  def render_sidebar(sidebar)
-    begin
-      # another ugly ugly hack like in articles_helper.rb
-      options = { :layout => false,
-                  :controller => sidebar.sidebar_controller,
-                  :action=>'index',
-                  :params => params.merge({:sidebar => sidebar}) }
-
-      render_component(options)
-    rescue => e
-      content_tag :p, e.message, :class => 'error'
+  def render_sidebars
+    this_blog.sidebars.inject('') do |acc, sb|
+      @sidebar = sb
+      sb.parse_request(contents, params)
+      controller.response.lifetime = sb.lifetime if sb.lifetime
+      acc + render_sidebar(sb)
     end
   end
 
-  def page_header
-    javascript_include_tag("cookies") +
-      javascript_include_tag("prototype") +
-      javascript_include_tag("effects") +
-      javascript_include_tag("type")
+  def render_sidebar(sidebar)
+    if sidebar.view_root
+      # Allow themes to override sidebar views
+      view_root = File.expand_path(sidebar.view_root)
+      rails_root = File.expand_path(RAILS_ROOT)
+      if view_root =~ /^#{Regexp.escape(rails_root)}/
+        new_root = view_root[rails_root.size..-1]
+        new_root.sub! %r{^/?vendor/}, ""
+        new_root.sub! %r{/views}, ""
+        new_root = File.join(this_blog.current_theme.path, "views", new_root)
+        view_root = new_root if File.exists?(File.join(new_root, "content.rhtml"))
+      end
+      render_to_string(:file => "#{view_root}/content.rhtml",
+                       :locals => sidebar.to_locals_hash)
+    else
+      render_to_string(:partial => sidebar.content_partial,
+                       :locals => sidebar.to_locals_hash)
+    end
   end
+
 end

data/app/helpers/xml_helper.rb

@@ -7,22 +7,10 @@ module XmlHelper
     h(post.title)
   end
 
-  def item_link(item)
-    item.location(nil, false)
-  end
-
-  alias_method :post_link,      :item_link
-  alias_method :comment_link,   :item_link
-  alias_method :trackback_link, :item_link
-
   def blog_title
     this_blog.blog_name || "Unnamed blog"
   end
 
-  def tag_link(tag)
-    url_for :controller => "/articles", :action => 'tag', :id => tag.name, :only_path => false
-  end
-
   def collection_lastmod(collection)
     article_updated = collection.articles.find(:first, :order => 'updated_at DESC')
     article_published = collection.articles.find(:first, :order => 'published_at DESC')
@@ -37,8 +25,4 @@ module XmlHelper
       times.max.xmlschema
     end
   end
-
-  def category_link(category)
-    url_for :controller => "/articles", :action => 'category', :id => category.permalink, :only_path => false
-  end
 end