publify_core 9.0.0.pre6 → 9.0.0

data/app/views/articles/_article_links.html.erb

@@ -1,4 +1,5 @@
-<p class="meta">
+<% cache article do %>
+  <p class="meta">
   <% if article.tags.any? %>
     <%= t(".tags") %>
     <%= tag_links article %>
@@ -7,4 +8,5 @@
   <%= link_to(t('.comments', count: article.published_comments.size), article.permalink_url('comments', true)) if article.allow_comments? %>
 
   <%= link_to(t('.trackbacks', count: article.published_trackbacks.size), article.permalink_url('trackbacks', true)) if article.allow_pings? %>
-</p>
+  </p>
+<% end %>

data/app/views/articles/_comment_list.html.erb

@@ -1,5 +1,5 @@
-<ol id="commentList" class="comments">
-  <% if @article.published_comments.any? %>
-    <%= render @article.published_comments %>
-  <% end %>
-</ol>
+<% cache @article do %>
+  <ol id="commentList" class="comments">
+    <%= render @article.published_comments, partial: 'articles/comment' %>
+  </ol>
+<% end %>

data/app/views/articles/_full_article_content.html.erb

@@ -1,2 +1,4 @@
-<%= raw article.html(:body) %>
-<%= raw article.html(:extended) %>
+<% cache article do %>
+  <%= raw article.html(:body) %>
+  <%= raw article.html(:extended) %>
+<% end %>

data/app/views/articles/archives.html.erb

@@ -1,25 +1,15 @@
 <% if @articles.empty? %>
-    <div class="post">
+  <div class="post">
     <p><%= t(".no_articles_found")%></p>
   </div>
-<% else
-currentmonth = 0
-currentyear = 0
-for article in @articles
-  if (article.published_at.month != currentmonth || article.published_at.year != currentyear)
-    currentmonth = article.published_at.month
-    currentyear = article.published_at.year %>
-  <h3 class="archivemonth">
-      <%= l(article.published_at, format: :letters_month_with_year) %>
-    </h3>
-  <% end %>
-    <div class="archivepost">
-      <%= article.published_at.mday %> -
-      <%= link_to_permalink(article,h(article.title)) %>
-      <% if !article.tags.empty? %> <%= t(".posted_in") %>
-        <%= safe_join(article.tags.collect {|t| link_to_permalink t,t.display_name }, ", ") %>
+<% else %>
+  <%= cache [@articles, params[:page]] do %>
+    <% @articles.group_by(&:publication_month).each do |_month, articles| %>
+      <h3 class="archivemonth">
+        <%= l(articles.first.published_at, format: :letters_month_with_year) %>
+      </h3>
+      <%= render partial: 'archives_article', collection: articles, as: :article %>
     <% end %>
-    </div>
-  <% end %>
   <% end %>
-  +<%= paginate @articles, next_label: "#{t("pagination.next_page")} &raquo;", previous_label: "&laquo; #{t('pagination.previous_page')}" %>
+<% end %>
+<%= paginate @articles %>

data/app/views/articles/feedback_atom_feed.atom.builder

@@ -1,8 +1,8 @@
-atom_feed do |feed|
-  render "shared/atom_header", {:feed => feed, :items => @feedback}
+atom_feed root_url: @article.permalink_url do |feed|
+  feedback = @article.published_feedback
+  render 'shared/atom_header', feed: feed, items: feedback
 
-  @feedback.each do |item|
-    render "shared/atom_item_#{item.type.downcase}", {:feed => feed, :item => item}
+  feedback.each do |item|
+    render "shared/atom_item_#{item.type.downcase}", feed: feed, item: item
   end
 end
-

data/app/views/articles/feedback_rss_feed.rss.builder

@@ -1,21 +1,20 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-xml.instruct! 'xml-stylesheet', :type=>"text/css", :href => url_for("/stylesheets/rss.css")
+xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
+xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
 
-xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
-        "xmlns:atom" => "http://www.w3.org/2005/Atom",
-        "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
+xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
+        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
+        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
   xml.channel do
     xml.title feed_title
-    xml.link this_blog.base_url
-    xml.atom :link, :href => request.url, :rel => 'self', :type => 'application/rss+xml'
-    xml.language this_blog.lang.gsub("_", "-").downcase
-    xml.ttl "40"
+    xml.link @article.permalink_url
+    xml.atom :link, href: request.url, rel: 'self', type: 'application/rss+xml'
+    xml.language this_blog.lang.tr('_', '-').downcase
+    xml.ttl '40'
     xml.description this_blog.blog_subtitle
 
-    @feedback.each do |item|
-      render "shared/rss_item_#{item.type.downcase}", {:feed => xml, :item => item}
+    feedback = @article.published_feedback
+    feedback.each do |item|
+      render "shared/rss_item_#{item.type.downcase}", feed: xml, item: item
     end
   end
 end
-
-

data/app/views/articles/index_atom_feed.atom.builder

@@ -1,8 +1,7 @@
-atom_feed(:language => this_blog.lang.split("_").first) do |feed|
-  render "shared/atom_header", {:feed => feed, :items => @articles}
+atom_feed(language: this_blog.lang.split('_').first, root_url: this_blog.base_url) do |feed|
+  render 'shared/atom_header', feed: feed, items: @articles
 
   @articles.each do |item|
-    render "shared/atom_item_article", {:feed => feed, :item => item}
+    render 'shared/atom_item_article', feed: feed, item: item
   end
 end
-

data/app/views/articles/index_rss_feed.rss.builder

@@ -1,20 +1,19 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-xml.instruct! 'xml-stylesheet', :type=>"text/css", :href => url_for("/stylesheets/rss.css")
+xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
+xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
 
-xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
-        "xmlns:atom" => "http://www.w3.org/2005/Atom",
-        "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
+xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
+        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
+        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
   xml.channel do
     xml.title feed_title
     xml.link this_blog.base_url
-    xml.atom :link, :href => request.url, :rel => 'self', :type => 'application/rss+xml'
-    xml.language this_blog.lang.gsub("_", "-").downcase
-    xml.ttl "40"
+    xml.atom :link, href: request.url, rel: 'self', type: 'application/rss+xml'
+    xml.language this_blog.lang.tr('_', '-').downcase
+    xml.ttl '40'
     xml.description this_blog.blog_subtitle
 
     @articles.each do |item|
-      render "shared/rss_item_article", {:xm => xml, :item => item}
+      render 'shared/rss_item_article', xm: xml, item: item
     end
   end
 end
-

data/app/views/articles/read.html.erb

@@ -1,20 +1,3 @@
-<!--
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-       xmlns:trackback="http://madskills.com/public/xml/rss/module/trackback/"
-       xmlns:dc="http://purl.org/dc/elements/1.1/">
-<rdf:Description
-    rdf:about=""
-<% if @article.allow_pings? %>
-    trackback:ping="<%= @article.trackback_url %>"
-<% end %>
-    dc:title="<%=h @article.title.gsub(/-+/, '-') %>"
-    dc:identifier="<%= @article.permalink_url %>"
-    dc:description="<%=h (html(@article).strip_html[0..255]).gsub(/-+/, '-') %>"
-    dc:creator="<%= h @article.author %>"
-    dc:date="<%= @article.updated_at.xmlschema %>">
-</rdf:RDF>
--->
-
 <div class="post"<%= onhover_show_admin_tools(:article) %>>
   <%= link_to(t(".edit"), { controller: "admin/content", action: "edit", id: @article.id }, class: "admintools", style: "display: none", id: "admin_article") %>
   <%= render @article %>
@@ -26,31 +9,22 @@
   <a name="comments"></a><h4 class="blueblk"><%= t('.comments') %></h4>
   <% unless @article.comments_closed? %>
     <p class="postmetadata alt">
-      <small><a href="#respond"><%= t(".leave_a_response")%></a></small>
+    <small><a href="#respond"><%= t(".leave_a_response")%></a></small>
     </p>
   <% end %>
   <%= render "articles/comment_list" %>
 <% end %>
 
-<% if @article.allow_pings? %>
+<% if @article.published_trackbacks.any? %>
   <a name="trackbacks"></a><h4 class="blueblk"><%= t(".trackbacks")%></h4>
-  <p>
-    <%= t(".use_the_following_link_to_trackback")%>:<br>
-    <span class="light-bg"><%= @article.trackback_url %></span>
-    </p>
-    <% unless @article.published_trackbacks.blank? %>
-      <ol id="trackbackList" class="trackback-list">
-        <%= render(partial: "trackback", collection: @article.published_trackbacks) %>
-      </ol>
-    <% end %>
+  <ol id="trackbackList" class="trackback-list">
+    <%= render(partial: "trackback", collection: @article.published_trackbacks) %>
+  </ol>
 <% end %>
 
 <p class="postmetadata alt">
   <small>
   <a href="<%= @article.feed_url('rss') %>" title="RSS Feed"><%= t(".rss_feed")%></a>
-<% if @article.allow_pings? %>
-  <a href="<%= @article.trackback_url %>" ><%= t(".trackback_uri")%></a>
-<% end %>
   </small>
 </p>
 

data/app/views/articles/search.html.erb

@@ -5,4 +5,4 @@
   </div>
 <% end %>
 
-<%= paginate @articles, :next_label => "#{t(".next_page")} &raquo;", :previous_label => "&laquo; #{t('.previous_page')}" %>
+<%= paginate @articles %>

data/app/views/articles/trackback.xml.builder

@@ -1,4 +1,4 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"iso-8859-1"
+xml.instruct! :xml, version: '1.0', encoding: 'iso-8859-1'
 xml.response do
   xml.error(@error_message.blank? ? 0 : 1)
   xml.message(@error_message) if @error_message

data/app/views/authors/show.html.erb

@@ -1,9 +1,7 @@
 <div class="post">
   <h2><%= @author.nickname %></h2>
   <%= display_user_avatar(@author, 'thumb', 'alignright') %>
-
   <%= author_description @author %>
-
   <h2><%= t(".contact_information") %></h2>
   <ul>
     <%= display_profile_item @author.url, t(".web_site") %>
@@ -17,24 +15,16 @@
 
 <% if @articles.empty? %>
   <div class="post">
-  <p><%= t(".this_author_has_not_published_any_article_yet")%></p>
-</div>
-<% else
-currentmonth = 0
-currentyear = 0
-for article in @articles
-  if (article.published_at.month != currentmonth || article.published_at.year != currentyear)
-    currentmonth = article.published_at.month
-    currentyear = article.published_at.year %>
-  <h3 class="archivemonth"><%= l(article.published_at, format: :letters_month_with_year) %></h3>
-  <% end %>
-    <div class="archivepost">
-      <%= article.published_at.mday %> -
-      <%= link_to_permalink(article,h(article.title)) %>
-      <% if !article.tags.empty? %> <%= t(".posted_in") %>
-        <%= article.tags.collect {|c| link_to_permalink c,c.name }.join(", ") %>
+    <p><%= t(".this_author_has_not_published_any_article_yet")%></p>
+  </div>
+<% else %>
+  <%= cache [@articles, params[:page]] do %>
+    <% @articles.group_by(&:publication_month).each do |_month, articles| %>
+      <h3 class="archivemonth">
+        <%= l(articles.first.published_at, format: :letters_month_with_year) %>
+      </h3>
+      <%= render partial: 'articles/archives_article', collection: articles, as: :article %>
     <% end %>
-    </div>
   <% end %>
-    <%= paginate @articles, :next_label => "#{t(".next_page")} &raquo;", :previous_label => "&laquo; #{t('.previous_page')}" %>
-  <%  end %>
+  <%= paginate @articles %>
+<%  end %>

data/app/views/authors/show_atom_feed.atom.builder

@@ -1,8 +1,7 @@
-atom_feed do |feed|
-  render "shared/atom_header", {:feed => feed, :items => @articles}
+atom_feed root_url: author_url(@author) do |feed|
+  render 'shared/atom_header', feed: feed, items: @articles
 
   @articles.each do |item|
-    render "shared/atom_item_article", {:feed => feed, :item => item}
+    render 'shared/atom_item_article', feed: feed, item: item
   end
 end
-

data/app/views/authors/show_rss_feed.rss.builder

@@ -1,20 +1,19 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-xml.instruct! 'xml-stylesheet', :type=>"text/css", :href => url_for("/stylesheets/rss.css")
+xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
+xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
 
-xml.rss "version" => "2.0", "xmlns:dc" => "http://purl.org/dc/elements/1.1/",
-        "xmlns:atom" => "http://www.w3.org/2005/Atom",
-        "xmlns:trackback" => "http://madskills.com/public/xml/rss/module/trackback/" do
+xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
+        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
+        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
   xml.channel do
     xml.title feed_title
     xml.link this_blog.base_url
-    xml.atom :link, :href => request.url, :rel => 'self', :type => 'application/rss+xml'
-    xml.language this_blog.lang.gsub("_", "-").downcase
-    xml.ttl "40"
+    xml.atom :link, href: request.url, rel: 'self', type: 'application/rss+xml'
+    xml.language this_blog.lang.tr('_', '-').downcase
+    xml.ttl '40'
     xml.description this_blog.blog_subtitle
 
     @articles.each do |item|
-      render "shared/rss_item_article", {:xm => xml, :item => item}
+      render 'shared/rss_item_article', xm: xml, item: item
     end
   end
 end
-

data/app/views/comments/_comment.html.erb

@@ -1,16 +1,17 @@
-<li id="comment-<%= comment.id %>" <%= 'class="author_comment"' if comment.user %> <%= onhover_show_admin_tools(:comment, comment.id) %>>
-  <p class="author">
-  <%= avatar_tag(:email => comment.email, :url => comment.url) %>
-  <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong></cite>
-  <%= t(".said")%> <%= display_date_and_time comment.created_at %>:
-  </p>
-  <div class="content">
-    <%= raw nofollowify_links comment.generate_html(:body) %>
-    <% unless comment.published %>
-      <div class="spamwarning">
-        <%= t(".this_comment_has_been_flagged_for_moderator_approval")%>
-      </div>
-    <% end %>
-  </div>
-</li>
-
+<% cache comment do %>
+  <li id="comment-<%= comment.id %>" <%= 'class="author_comment"' if comment.user %> <%= onhover_show_admin_tools(:comment, comment.id) %>>
+    <p class="author">
+    <%= avatar_tag(:email => comment.email, :url => comment.url) %>
+    <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong></cite>
+    <%= t(".said")%> <%= display_date_and_time comment.created_at %>:
+    </p>
+    <div class="content">
+      <%= raw nofollowify_links comment.generate_html(:body) %>
+      <% unless comment.published? %>
+        <div class="spamwarning">
+          <%= t(".this_comment_has_been_flagged_for_moderator_approval")%>
+        </div>
+      <% end %>
+    </div>
+  </li>
+<% end %>

data/app/views/feedback/index.atom.builder

@@ -0,0 +1,7 @@
+atom_feed root_url: this_blog.base_url do |feed|
+  render 'shared/atom_header', feed: feed, items: @feedback
+
+  @feedback.each do |item|
+    render "shared/atom_item_#{item.type.downcase}", feed: feed, item: item
+  end
+end

data/app/views/feedback/index.rss.builder

@@ -0,0 +1,19 @@
+xml.instruct! :xml, version: '1.0', encoding: 'UTF-8'
+xml.instruct! 'xml-stylesheet', type: 'text/css', href: url_for('/stylesheets/rss.css')
+
+xml.rss 'version' => '2.0', 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/',
+        'xmlns:atom' => 'http://www.w3.org/2005/Atom',
+        'xmlns:trackback' => 'http://madskills.com/public/xml/rss/module/trackback/' do
+  xml.channel do
+    xml.title feed_title
+    xml.link this_blog.base_url
+    xml.atom :link, href: request.url, rel: 'self', type: 'application/rss+xml'
+    xml.language this_blog.lang.tr('_', '-').downcase
+    xml.ttl '40'
+    xml.description this_blog.blog_subtitle
+
+    @feedback.each do |item|
+      render "shared/rss_item_#{item.type.downcase}", feed: xml, item: item
+    end
+  end
+end

data/app/views/notes/_note.html.erb

@@ -1,15 +1,16 @@
-<article class='status'>
-  <%= author_picture note %>
-  <div class='p-name entry-title e-content entry-content article'><%= raw note.html(:body) %></div>
-  <footer>
-    <small>
-      <%= link_to_permalink(note, display_date_and_time(note.published_at)) %> |
-      <%= link_to note.redirect.from_url, note.redirect.from_url %> |
-      <%= author_link note %>
-      <% unless note.twitter_id.blank? %>
-        <%=  " | #{link_to(t(".view_on_twitter"), note.twitter_url, {class: 'u-syndication', rel: 'syndication'})}" %>
-    <% end %>
-    </small>
-  </footer>
-</article>
-
+<% cache [note, note.user] do %>
+  <article class='status'>
+    <%= author_picture note %>
+    <div class='p-name entry-title e-content entry-content article'><%= raw note.html(:body) %></div>
+    <footer>
+      <small>
+        <%= link_to_permalink(note, display_date_and_time(note.published_at)) %> |
+        <%= link_to note.redirect.from_url, note.redirect.from_url %> |
+        <%= author_link note %>
+        <% unless note.twitter_id.blank? %>
+          <%=  " | #{link_to(t(".view_on_twitter"), note.twitter_url, {class: 'u-syndication', rel: 'syndication'})}" %>
+        <% end %>
+      </small>
+    </footer>
+  </article>
+<% end %>

data/app/views/notes/index.html.erb

@@ -12,4 +12,4 @@
   <% end %>
 </div>
 
-<%= paginate @notes, :next_label => "#{t(".next_page")} &raquo;", :previous_label => "&laquo; #{t('.previous_page')}" %>
+<%= paginate @notes %>

data/app/views/notification_mailer/_mail_footer.html.erb

@@ -1,5 +1,3 @@
-</div>
-
 <p><em>This is being sent to <%=h @user.name %> because you asked to be notified via email whenever
 new content is posted to  <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a>
 To unsubscribe, go to

data/app/views/notification_mailer/_mail_header.html.erb

@@ -1 +1,3 @@
 <div style="margin:1em;padding:4px;background:#eee;border:1px solid black">
+  <%= yield %>
+</div>