publify_core 9.0.0.pre6 → 9.2.1

data/app/services/title_builder.rb

@@ -1,80 +1,87 @@
+# frozen_string_literal: true
+
 class TitleBuilder
   def initialize(template)
     @template = template
   end
 
   def build(item, settings, parameters)
-    s = @template
-
-    s = substitute_parameters(s, parameters)
-    s = substitute_settings(s, settings)
-    s = substitute_item(s, item)
-    s = substitute_time(s, settings)
+    str = @template
 
-    s
+    str = substitute_parameters(str, parameters)
+    str = substitute_settings(str, settings)
+    str = substitute_item(str, item)
+    substitute_time(str, settings)
   end
 
   private
 
-  def substitute_time(s, settings)
+  def substitute_time(str, settings)
     # Other
-    s = s.gsub('%currentdate%', Time.now.strftime(settings.date_format))
-    s = s.gsub('%currenttime%', Time.now.strftime(settings.time_format))
-    s = s.gsub('%currentmonth%', Time.now.strftime('%B'))
-    s = s.gsub('%currentyear%', Time.now.year.to_s)
-    s
+    str = str.gsub("%currentdate%", Time.zone.now.strftime(settings.date_format))
+    str = str.gsub("%currenttime%", Time.zone.now.strftime(settings.time_format))
+    str = str.gsub("%currentmonth%", Time.zone.now.strftime("%B"))
+    str.gsub("%currentyear%", Time.zone.now.year.to_s)
   end
 
-  def substitute_item(s, item)
+  def substitute_item(str, item)
     # Tags for item
-    s = s.gsub('%title%', item.title) if s =~ /%title/ && item.respond_to?(:title)
-    s = s.gsub('%excerpt%', item.excerpt_text) if s =~ /%excerpt%/ && item.respond_to?(:excerpt_text)
-    s = s.gsub('%description%', item.description) if s =~ /%description%/ && item.respond_to?(:description)
-    s = s.gsub('%name%', item.name) if s =~ /%name%/ && item.respond_to?(:name)
-    s = s.gsub('%author%', item.name) if s =~ /%author%/ && item.respond_to?(:name)
-    s = s.gsub('%body%', item.body) if s =~ /%body%/ && item.respond_to?(:body)
-
-    if s =~ /%categories%/ && item.respond_to?(:categories)
-      s = s.gsub('%categories%', item.categories.map(&:name).join(', '))
+    if str.include?("%title") && item.respond_to?(:title)
+      str = str.gsub("%title%", item.title)
+    end
+    if str.include?("%excerpt%") && item.respond_to?(:excerpt_text)
+      str = str.gsub("%excerpt%", item.excerpt_text)
+    end
+    if str.include?("%description%") && item.respond_to?(:description)
+      str = str.gsub("%description%", item.description)
+    end
+    str = str.gsub("%name%", item.name) if str.include?("%name%") && item.respond_to?(:name)
+    if str.include?("%author%") && item.respond_to?(:name)
+      str = str.gsub("%author%", item.name)
     end
+    str = str.gsub("%body%", item.body) if str.include?("%body%") && item.respond_to?(:body)
 
-    if s =~ /%tags%/ && item.respond_to?(:tags)
-      s = s.gsub('%tags%', item.tags.map(&:display_name).join(', '))
+    if str.include?("%categories%") && item.respond_to?(:categories)
+      str = str.gsub("%categories%", item.categories.map(&:name).join(", "))
     end
 
-    s
+    if str.include?("%tags%") && item.respond_to?(:tags)
+      str = str.gsub("%tags%", item.tags.map(&:display_name).join(", "))
+    end
+
+    str
   end
 
-  def substitute_settings(s, settings)
+  def substitute_settings(str, settings)
     # Tags for settings
-    s = s.gsub('%blog_name%', settings.blog_name)
-    s = s.gsub('%blog_subtitle%', settings.blog_subtitle)
-    s = s.gsub('%meta_keywords%', settings.meta_keywords)
-
-    s
+    str = str.gsub("%blog_name%", settings.blog_name)
+    str = str.gsub("%blog_subtitle%", settings.blog_subtitle)
+    str.gsub("%meta_keywords%", settings.meta_keywords)
   end
 
-  def substitute_parameters(s, parameters)
-    s = s.gsub('%date%', parse_date(s, parameters)) if s =~ /%date%/
-    s = s.gsub('%search%', parameters[:q]) if parameters[:q]
-    s = s.gsub('%page%', parse_page(s, parameters)) if s =~ /%page%/
+  def substitute_parameters(str, parameters)
+    str = str.gsub("%date%", parse_date(str, parameters)) if /%date%/.match?(str)
+    str = str.gsub("%search%", parameters[:q]) if parameters[:q]
+    str = str.gsub("%page%", parse_page(str, parameters)) if /%page%/.match?(str)
 
-    s
+    str
   end
 
   def parse_date(string, params)
-    return '' unless params[:year]
+    return "" unless params[:year]
 
-    format = ''
-    format << '%A %d ' if params[:day]
-    format << '%B ' if params[:month]
-    format << '%Y' if params[:year]
+    format = +""
+    format << "%A %d " if params[:day]
+    format << "%B " if params[:month]
+    format << "%Y" if params[:year]
 
-    string.gsub('%date%', Time.mktime(*params.values_at(:year, :month, :day)).strftime(format))
+    string.gsub("%date%", Time.zone.local(*params.values_at(:year, :month, :day)).
+      strftime(format))
   end
 
   def parse_page(_string, params)
-    return '' unless params[:page]
-    "#{I18n.t('articles.index.page')} #{params[:page]}"
+    return "" unless params[:page]
+
+    "#{I18n.t("articles.index.page")} #{params[:page]}"
   end
 end

data/app/uploaders/resource_uploader.rb

@@ -1,5 +1,10 @@
+# frozen_string_literal: true
+
+require "mimemagic"
+
 class ResourceUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
+  before :cache, :check_image_content_type!
 
   def store_dir
     "files/#{model.class.to_s.underscore}/#{model.id}"
@@ -24,7 +29,35 @@ class ResourceUploader < CarrierWave::Uploader::Base
   end
 
   def image?(new_file)
-    mime_magic_content_type = new_file.send :mime_magic_content_type
-    mime_magic_content_type && mime_magic_content_type.include?('image')
+    content_type = new_file.content_type
+    content_type&.include?("image")
+  end
+
+  def check_image_content_type!(new_file)
+    if image?(new_file)
+      magic_type = mime_magic_content_type(new_file)
+      if magic_type != new_file.content_type
+        raise CarrierWave::IntegrityError, "has MIME type mismatch"
+      end
+    end
+  end
+
+  private
+
+  # NOTE: This method was adapted from MagicMimeBlacklist#extract_content_type
+  # from CarrierWave 1.0.0 and SanitizedFile#mime_magic_content_type from CarrierWave 0.11.2
+  def mime_magic_content_type(new_file)
+    content_type = nil
+
+    File.open(new_file.path) do |fd|
+      content_type = MimeMagic.by_magic(fd).try(:type)
+    end
+
+    content_type
+  end
+
+  # NOTE: This method was copied from MagicMimeBlacklist from CarrierWave 1.0.0.
+  def filemagic
+    @filemagic ||= FileMagic.new(FileMagic::MAGIC_MIME_TYPE)
   end
 end

data/app/views/accounts/confirm.html.erb

@@ -1,8 +1,7 @@
 <p><%= t('.success') %></p>
-<p><%= t(".login", login: current_user.login) %></p>
-<p><%= t(".password", password: session[:tmppass]) %></p>
-<div class='alert alert-warning'><%= t(".dont_lose_the_mail_sent", email: current_user.email) %></div>
+<p><%= t('.login', login: current_user.login) %></p>
+<div class='alert alert-warning'><%= t('.dont_lose_the_mail_sent', email: current_user.email) %></div>
 
 <% content_for :account_links do %>
-  <%= raw t(".proceed_to", link: link_to(t(".admin"), controller: 'admin/dashboard')) %>
+  <%= raw t('.proceed_to', link: link_to(t('.admin'), controller: 'admin/dashboard')) %>
 <% end %>

data/app/views/admin/content/_article_list.html.erb

@@ -1,6 +1,6 @@
 <% if @articles.empty? %>
   <tr>
-    <td colspan="7">
+    <td colspan="6">
       <%= t('.no_articles') %>
     </td>
   </tr>
@@ -8,19 +8,34 @@
 <% for article in @articles %>
   <tr>
     <td>
-      <% if article.published %>
-        <%= link_to_permalink(article, article.title, nil, 'published')%>
+      <% if article.published? %>
+        <%= link_to_permalink(article, article.title, nil, 'published') %>
       <% else %>
-        <%= link_to(article.title, {controller: '/articles', action: "preview", id: article.id}, {class: 'unpublished', target: '_new'}) %>
+        <%= link_to(article.title, { controller: '/articles', action: 'preview', id: article.id }, { class: 'unpublished', target: '_new' }) %>
       <% end %>
-      <%= show_actions article %>
     </td>
     <td>
-      <%= author_link(article)%><br>
-      <small><%= l(article.published_at || article.created_at) %></small>
+      <%= author_link(article) %>
+    </td>
+    <td>
+      <%= l(article.created_at) %>
     </td>
     <td>
-      <%= (article.allow_comments?) ? link_to("#{article.comments.ham.size.to_s} <i class='glyphicon glyphicon-comment'></i>".html_safe, controller: '/admin/feedback', id: article.id, action: 'article') : '-' %></td>
+      <%= l(article.published_at) if article.published_at %>
+    </td>
+    <td>
+      <% if article.allow_comments? %>
+        <%= link_to("#{article.comments.ham.size} #{t(".feedback")}".html_safe, controller: '/admin/feedback', id: article.id, action: 'article') %>
+      <% else %>
+        -
+      <% end %>
+    </td>
+    <td>
+      <%= article.text_filter&.name %>
+    </td>
+    <td>
+      <%= show_actions article %>
+    </td>
   </tr>
 <% end %>
-<%= display_pagination(@articles, 5, 'first', 'last')%>
+<%= display_pagination(@articles, 5, 'first', 'last') %>

data/app/views/admin/content/_form.html.erb

@@ -5,151 +5,171 @@
 <div class="row save-bar">
   <div class="col-md-8 col-md-offset-2" id="save-bar">
     <div class="pull-right">
-      <%= link_to(t('.cancel'), {action: 'index'}, {class: 'btn btn-default'}) %>
+      <%= link_to(t('.cancel'), { action: 'index' }, { class: 'btn btn-default' }) %>
       <span id="preview_link">
-        <%= link_to(t('.preview'), {controller: '/articles', action: 'preview', id: @article.id}, {target: 'new', class: 'btn btn-default'}) if @article.id %>
+        <%= link_to(t('.preview'), { controller: '/articles', action: 'preview', id: @article.id }, { target: 'new', class: 'btn btn-default' }) if @article.id %>
       </span>
-      <input id="save_draft" type="submit" value="<%= t('.save_as_draft') %>" name="article[draft]" class="btn btn-default">
-      <span class="btn btn-success" data-toggle="modal" data-target="#publishOptions">
+      <input id="save_draft" type="submit" value="<%= t('.save_as_draft') %>" name="article[draft]" class="btn btn-default" />
+      <!-- Button trigger modal -->
+      <button class="btn btn-success" data-toggle="modal" type="button" data-target="#publishOptions">
         <%= controller.action_name == 'new' ? t('.publish') : t('.save') %>
-      </span>
+      </button>
     </div>
   </div>
 </div>
+
 <div class="row">
   <div class="col-md-8 col-md-offset-2" id="error-message-article">
     <%= render 'shared/flash', flash: flash %>
     <%= error_messages_for 'article' %>
   </div>
 </div>
+
 <div class="row">
   <div class="col-md-2" id="quicktags-block">
     <div id="quicktags" class="pull-right">
-      <script type="text/javascript">edToolbar('article_body_and_extended', '<%= @article.text_filter %>');</script>
+      <script type="text/javascript">edToolbar('article_body_and_extended', '<%= @article.text_filter_name %>');</script>
     </div>
   </div>
   <div class="col-md-8">
     <%= text_field 'article', 'title', class: 'form-control', placeholder: t('.title') %>
     <div id="editor">
-      <%= text_area('article', 'body_and_extended', {class: 'form-control ', style: 'height: 360px', placeholder: t('.type_your_post'), :"data-widearea" => "enable"}) %>
+      <%= text_area('article', 'body_and_extended', class: 'form-control ', style: 'height: 360px', placeholder: t('.type_your_post')) %>
     </div>
   </div>
 </div>
-<div class="modal fade" id="publishOptions" tabindex="-1" role="dialog" aria-labelledby="publishOptions" aria-hidden="true">
+
+<!-- Modal -->
+<div class="modal fade" id="publishOptions" tabindex="-1" role="dialog" aria-labelledby="publishTitle" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h2 class="modal-title" id="myModalLabel"><%= t('.publish') %>
-          <%= submit_tag(t('.publish'), class: 'btn btn-success pull-right') %>&nbsp;
+        <h2 class="modal-title" id="publishTitle">
+          <%= t('.publish') %>
+          <%= submit_tag(t('.publish'), class: 'btn btn-success pull-right') %>
         </h2>
       </div>
       <div class="modal-body">
         <div class="well">
           <h4><%= t('.tags') %></h4>
           <div class="form-group">
-            <%= text_field 'article', 'keywords', {autocomplete: 'off', class: 'form-control tm-input'} %>
+            <%= text_field 'article', 'keywords', autocomplete: 'off', class: 'form-control tm-input' %>
           </div>
-          <p class="alert alert-warning"><%=t('.tags_explanation_html') %></p>
+          <p class="alert alert-warning"><%= t('.tags_explanation_html') %></p>
         </div>
+
         <% post_types = @post_types || [] %>
         <% if post_types.size.zero? %>
           <%= hidden_field_tag 'article[post_type]', 'read' %>
         <% else %>
           <div class="well">
             <h4><%= t('.article_type') %></h4>
-            <%= select :article, :post_type, post_types.map{|pt| [pt.name, pt.permalink]}, {include_blank: t('.default')} %>
+            <%= select :article, :post_type, post_types.map { |pt| [pt.name, pt.permalink] }, include_blank: t('.default') %>
           </div>
         <% end %>
+
         <div class="well">
           <fieldset>
             <legend><%= t('.publish_settings') %></legend>
             <div class='control-group'>
               <p>
-                <%= t('.permalink') %>:
-                <%= toggle_element('permalink') %>
+              <%= t('.permalink') %>:
+              <%= toggle_element('permalink') %>
               </p>
               <div id="permalink" class="collapse">
                 <div class="form-group">
-                  <%= text_field 'article', 'permalink', {autocomplete: 'off', class: 'form-control'} %>
+                  <%= text_field 'article', 'permalink', autocomplete: 'off', class: 'form-control' %>
                 </div>
                 <p>
-                  <span class="btn btn-mini btn-default">
-                    <%= toggle_element('permalink', t('.ok')) %>
-                  </span>
+                <span class="btn btn-mini btn-default">
+                  <%= toggle_element('permalink', t('.ok')) %>
+                </span>
                 </p>
               </div>
             </div>
             <div class="control-group">
               <p>
-                <%= t('.status') %>: <strong><%= @article.state.to_s.downcase %></strong>
-                <%= toggle_element('status') %>
+              <%= t('.status') %>: <strong><%= @article.state.to_s.downcase %></strong>
+              <%= toggle_element('status') %>
               </p>
               <div id="status" class="collapse">
                 <label for="article_published" class="checkbox">
-                  <%= check_box 'article', 'published'  %>
+                  <%= check_box 'article', 'published?' %>
                   <%= t('.published') %>
                 </label>
                 <p>
-                  <span class="btn btn-mini btn-default">
-                    <%= toggle_element('status', t('.ok')) %>
-                  </span>
+                <span class="btn btn-mini btn-default">
+                  <%= toggle_element 'status', t('.ok') %>
+                </span>
                 </p>
               </div>
             </div>
             <div class="control-group">
               <p>
-                <%= t('.allowed_comments_and_trackbacks_html', allow_comment: content_tag(:strong, t('.allow_comments_status', count: @article.allow_comments ? 1 : 0)), allow_trackback: content_tag(:strong, t('.allow_pings_status', count: @article.allow_pings ? 1 : 0))) %>
-                <%= toggle_element('conversation') %>
+              <%= t('.allowed_comments_html', allow_comment: content_tag(:strong, @article.allow_comments? ? t('.allow_comments_status.enabled') : t('.allow_comments_status.disabled'))) %>
+              <%= toggle_element('conversation') %>
               </p>
               <div id="conversation" class="collapse">
-                <label for="article_allow_pings" class='checkbox'>
-                  <%= check_box 'article', 'allow_pings' %>
-                  <%= t('.allow_trackbacks') %>
-                </label>
                 <label for="article_allow_comments" class="checkbox">
                   <%= check_box 'article', 'allow_comments' %>
                   <%= t('.allow_comments') %>
                 </label>
                 <p>
-                  <span class="btn btn-mini btn-default">
-                    <%= toggle_element('conversation', t('.ok')) %>
-                  </span>
+                <span class="btn btn-mini btn-default">
+                  <%= toggle_element('conversation', t('.ok')) %>
+                </span>
                 </p>
               </div>
             </div>
             <div class="control-group">
               <p>
-                <%= t('.published') %>
-                <strong>
-                  <% if @article.published %>
-                    <%= display_date_and_time(@article.published_at) %>
-                  <% else %>
-                    <%= t('.now') %>
-                  <% end %>
-                </strong>
-                <%= toggle_element('publish') %>
+              <%= t('.published') %>
+              <strong>
+                <% if @article.published_at.present? %>
+                  <%= display_date_and_time(@article.published_at) %>
+                <% else %>
+                  <%= t('.now') %>
+                <% end %>
+              </strong>
+              <%= toggle_element('publish') %>
               </p>
               <div id="publish" class="collapse">
                 <%= text_field 'article', 'published_at' %>
                 <p>
-                  <span class="btn btn-mini btn-default">
-                    <%= toggle_element('publish', t('.ok')) %>
-                  </span>
+                <span class="btn btn-mini btn-default">
+                  <%= toggle_element('publish', t('.ok')) %>
+                </span>
                 </p>
               </div>
             </div>
             <div class="control-group">
               <p>
-                <%= t('.visibility') %>: <strong><%= @article.password.blank? ? t('.public') : t('.protected') %></strong>
-                <%= toggle_element('visibility') %>
+              <%= t('.visibility') %>: <strong><%= @article.password.blank? ? t('.public') : t('.protected') %></strong>
+              <%= toggle_element('visibility') %>
               </p>
               <div id="visibility" class="collapse">
                 <label for="article_password"><%= t('.password') %></label>
                 <%= text_field 'article', 'password', class: 'form-control' %>
                 <p>
-                  <span class="btn btn-mini btn-default">
-                    <%= toggle_element('visibility', t('.ok')) %>
-                  </span>
+                <span class="btn btn-mini btn-default">
+                  <%= toggle_element('visibility', t('.ok')) %>
+                </span>
+                </p>
+              </div>
+            </div>
+            <div class="control-group">
+              <p>
+              <%= t('.article_filter') %>: <strong><%= @article.text_filter.description %></strong>
+              <%= toggle_element 'text_filter' %>
+              </p>
+              <div id="text_filter" class="collapse">
+                <select name="article[text_filter_name]" id="text_filter_name" class='form-control'>
+                  <%= options_for_select text_filter_options, @article.text_filter_name %>
+                </select>
+                <p>
+                <span class="btn btn-mini btn-default">
+                  <%= toggle_element 'text_filter', 'OK' %>
+                </span>
                 </p>
               </div>
             </div>