publify_core 9.0.0.pre5 → 9.2.0

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

@@ -0,0 +1,4 @@
+<p class="auth">
+<%= t('.posted_by') %> <%= author_link(article) %>
+<%= display_date_and_time article.published_at %>
+</p>

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

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

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

@@ -1,5 +1,5 @@
 <% if controller.action_name == 'redirect' %>
-  <%= render 'articles/full_article_content', { :article => article } %>
+  <%= render 'articles/full_article_content', article: article %>
 <% else %>
-  <%= render 'articles/article_excerpt', { :article => article } %>
+  <%= render 'articles/article_excerpt', article: article %>
 <% end %>

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

@@ -1,13 +1,15 @@
-<% if article.excerpt? %>
-  <%= article.excerpt %>
-  <div class="extended">
-    <p><%= link_to_permalink article, t(".continue_reading") %></p>
-  </div>
-<% else %>
-  <%= raw article.html(:body) %>
-  <% if article.extended? %>
+<% cache article do %>
+  <% if article.excerpt? %>
+    <%= article.excerpt %>
     <div class="extended">
-      <p><%= link_to_permalink article, t(".continue_reading") %></p>
+      <p><%= link_to_permalink article, t('.continue_reading') %></p>
     </div>
+  <% else %>
+    <%= raw article.html(:body) %>
+    <% if article.extended? %>
+      <div class="extended">
+        <p><%= link_to_permalink article, t('.continue_reading') %></p>
+      </div>
+    <% end %>
   <% end %>
 <% end %>

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

@@ -1,10 +1,12 @@
-<p class="meta">
+<% cache article do %>
+  <p class="meta">
   <% if article.tags.any? %>
-    <%= t(".tags") %>
+    <%= t('.tags') %>
     <%= tag_links article %>
   <% end %>
 
   <%= 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_errors.html.erb

@@ -1,2 +1,2 @@
 <p><%= t('.message') %></p>
-<%= error_messages_for("comment") %>
+<%= error_messages_for('comment') %>

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

@@ -6,28 +6,28 @@
     <a name="respond"></a>
     <table cellpadding="4" cellspacing="0" class="frm-tbl">
       <tr>
-        <td><p><label for="comment_author"><%= t(".your_name")%></label></p></td>
+        <td><p><label for="comment_author"><%= t('.your_name') %></label></p></td>
         <td>
-          <%= text_field "comment", "author", size: 20 %>
+          <%= text_field 'comment', 'author', size: 20 %>
           <small>
             <%= link_to '#', onclick: "$('.optional_field').fadeToggle();return false" do %>
-              (<%= t(".leave_url_email") %> &#187;)
+              (<%= t('.leave_url_email') %> &#187;)
             <% end %>
           </small>
         </td>
       </tr>
       <tr class="optional_field" style="display: none">
-        <td><p><label for="comment_url"><%= t(".your_blog")%></label></p></td>
-        <td> <%= text_field "comment", "url" %></td>
+        <td><p><label for="comment_url"><%= t('.your_blog') %></label></p></td>
+        <td> <%= text_field 'comment', 'url' %></td>
       </tr>
       <tr class="optional_field" style="display: none">
-        <td><p><label for="comment_email"><%= t(".your_email")%></label></p></td>
-        <td> <%= text_field "comment", "email" %></td>
+        <td><p><label for="comment_email"><%= t('.your_email') %></label></p></td>
+        <td> <%= text_field 'comment', 'email' %></td>
       </tr>
       <tr>
-        <td><p><label for="comment_body"><%= t(".your_message")%></label></p></td>
+        <td><p><label for="comment_body"><%= t('.your_message') %></label></p></td>
         <td valign="top" colspan="2">
-          <%= text_area "comment", "body" %>
+          <%= text_area 'comment', 'body' %>
         </td>
       </tr>
       <% if this_blog.use_recaptcha %>
@@ -38,9 +38,9 @@
       <% end %>
       <tr>
         <td colspan="2" id="frm-btns">
-          <%= markup_help_popup TextFilter.find_by_name(this_blog.comment_text_filter), t(".comment_markup_help") %>
-          <a href="#" onclick="$.post('<%= @article.preview_comment_url %>', $('#comment_form').serialize());return false"><%= t(".preview_comment")%></a>
-          <input type="submit" name="submit" id="form-submit-button" value="submit" class="button">
+          <%= markup_help_popup TextFilter.make_filter(this_blog.comment_text_filter), t('.comment_markup_help') %>
+          <a href="#" onclick="$.post('<%= @article.preview_comment_url %>', $('#comment_form').serialize());return false"><%= t('.preview_comment') %></a>
+          <input type="submit" name="submit" id="form-submit-button" value="submit" class="button" />
         </td>
       </tr>
     </table>

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/_comment_preview.html.erb

@@ -1,4 +1,4 @@
 <%= avatar_tag(email: comment.email, url: comment.url) %>
-<cite><strong><%=h @comment[:author] %></strong></cite>
-<%= t(".is_about_to_say")%>:<br>
-<%= @comment.html %>
+<cite><strong><%= h comment[:author] %></strong></cite>
+<%= t('.is_about_to_say') %>:<br />
+<%= comment.html %>

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/_password_form.html.erb

@@ -1,10 +1,10 @@
 <div id='content-<%= article.id %>'>
   <p>This post is password protected. Please fill in your password or login to view the content</p>
-  <%= form_for(article, {:remote => true,
-                      :url => { :controller => 'articles', :action => 'check_password'},
-                      :update => "content-#{article.id}"}) do |f| %>
+  <%= form_for(article, remote: true,
+                        url: { controller: 'articles', action: 'check_password' },
+                        update: "content-#{article.id}") do |f| %>
     <%= password_field(:article, :password) %>
-    <input type='hidden' name='article[id]' value='<%= article.id %>'>
+    <input type='hidden' name='article[id]' value='<%= article.id %>' />
     <%= submit_tag(t('.submit') + '!', name: 'check_password') %>
   <% end %>
 </div>

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

@@ -1,6 +1,6 @@
 <li id="trackback-<%= trackback.id %>"<%= onhover_show_admin_tools(:trackback, trackback.id) %>>
   <a name="trackback-<%= trackback.id %>"></a>
-  <%= t(".from")%> <strong><%= trackback.blog_name %></strong><br>
-  <a href="<%= trackback.url %>" rel="nofollow"><%=h trackback.title %></a><br>
+  <%= t('.from') %> <strong><%= trackback.blog_name %></strong><br />
+  <a href="<%= trackback.url %>" rel="nofollow"><%= h trackback.title %></a><br />
   <%= trackback.excerpt %>
 </li>

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

@@ -1,25 +1,15 @@
 <% if @articles.empty? %>
-    <div class="post">
-    <p><%= t(".no_articles_found")%></p>
+  <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,10 @@
-atom_feed do |feed|
-  render "shared/atom_header", {:feed => feed, :items => @feedback}
+# frozen_string_literal: true
 
-  @feedback.each do |item|
-    render "shared/atom_item_#{item.type.downcase}", {:feed => feed, :item => item}
+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
   end
 end
-

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

@@ -1,21 +1,21 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-xml.instruct! 'xml-stylesheet', :type=>"text/css", :href => url_for("/stylesheets/rss.css")
+# frozen_string_literal: true
+
+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
+        "xmlns:atom" => "http://www.w3.org/2005/Atom" 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.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,9 @@
-atom_feed(:language => this_blog.lang.split("_").first) do |feed|
-  render "shared/atom_header", {:feed => feed, :items => @articles}
+# frozen_string_literal: true
+
+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,20 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"UTF-8"
-xml.instruct! 'xml-stylesheet', :type=>"text/css", :href => url_for("/stylesheets/rss.css")
+# frozen_string_literal: true
+
+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
+        "xmlns:atom" => "http://www.w3.org/2005/Atom" 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.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/live_search.html.erb

@@ -1,10 +1,10 @@
 <% if !@search.to_s.blank? %>
-  <h3>Searched for <em>"<%=h @search %>"</em></h3>
+  <h3>Searched for <em>"<%= h @search %>"</em></h3>
   <ul>
   <% for article in @articles.to_a %>
-    <li><%= link_to_permalink article,h(article.title) %></li>
+    <li><%= link_to_permalink article, h(article.title) %></li>
   <% end %>
-	</ul>
+  </ul>
 <% else %>
   &nbsp;
 <% end %>

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

@@ -1,23 +1,14 @@
-<!--
-<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 %>
+  <%= link_to(t('.edit'), { controller: 'admin/content', action: 'edit', id: @article.id }, { class: 'admintools', style: 'display: none', id: 'admin_article' }) %>
+  <% cache @article do %>
+    <h2><%= link_to_permalink @article, @article.title %></h2>
+    <%= render 'articles/article_author', article: @article %>
+    <% if @article.password.blank? %>
+      <%= render 'articles/full_article_content', article: @article %>
+    <% else %>
+      <%= render 'articles/password_form', article: @article %>
+    <% end %>
+  <% end %>
 </div>
 
 <%= render 'article_links', article: @article %>
@@ -26,36 +17,27 @@
   <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" %>
+  <%= render 'articles/comment_list' %>
 <% end %>
 
-<% if @article.allow_pings? %>
-  <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 %>
+<% if @article.published_trackbacks.any? %>
+  <a name="trackbacks"></a><h4 class="blueblk"><%= t('.trackbacks') %></h4>
+  <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 %>
+  <a href="<%= @article.feed_url('rss') %>" title="RSS Feed"><%= t('.rss_feed') %></a>
   </small>
 </p>
 
 <% unless @article.comments_closed? %>
   <%= render 'comment_form' %>
 <% else %>
-  <p><%= t(".comments_are_disabled")%></p>
+  <p><%= t('.comments_are_disabled') %></p>
 <% end %>

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

@@ -1,8 +1,8 @@
 <% for article in @articles %>
  <div class="post">
-   <h2><%= link_to_permalink article,article.title %></h2>
-   <%= article.html(:body).gsub(/<\/?[^>]*>/, "").slice(0..300) %>...
+   <h2><%= link_to_permalink article, article.title %></h2>
+   <%= article.html(:body).gsub(%r{</?[^>]*>}, '').slice(0..300) %>...
   </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,6 @@
-xml.instruct! :xml, :version=>"1.0", :encoding=>"iso-8859-1"
+# frozen_string_literal: true
+
+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/articles/view_page.html.erb

@@ -1,3 +1,3 @@
-<div id="viewpage" >
-  <%= html @page %>
+<div id="viewpage">
+  <%= raw html @page %>
 </div>

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

@@ -1,40 +1,30 @@
 <div class="post">
   <h2><%= @author.nickname %></h2>
   <%= display_user_avatar(@author, 'thumb', 'alignright') %>
-
   <%= author_description @author %>
-
-  <h2><%= t(".contact_information") %></h2>
+  <h2><%= t('.contact_information') %></h2>
   <ul>
-    <%= display_profile_item @author.url, t(".web_site") %>
-    <%= display_profile_item @author.msn, t(".msn") %>
-    <%= display_profile_item @author.yahoo, t(".yahoo") %>
-    <%= display_profile_item @author.jabber, t(".jabber") %>
-    <%= display_profile_item @author.aim, t(".aim") %>
-    <%= display_profile_item @author.twitter, t(".twitter") %>
+    <%= display_profile_item @author.url, t('.web_site') %>
+    <%= display_profile_item @author.msn, t('.msn') %>
+    <%= display_profile_item @author.yahoo, t('.yahoo') %>
+    <%= display_profile_item @author.jabber, t('.jabber') %>
+    <%= display_profile_item @author.aim, t('.aim') %>
+    <%= display_profile_item @author.twitter, t('.twitter') %>
   </ul>
 </div>
 
 <% 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 %>