publify_core 9.0.1 → 9.1.0

data/app/models/blog.rb

@@ -5,7 +5,7 @@
 # Once upon a time, there were plans to make publify handle multiple blogs,
 # but it never happened and publify is now firmly single-blog.
 #
-class Blog < ActiveRecord::Base
+class Blog < ApplicationRecord
   include ConfigManager
   include Rails.application.routes.url_helpers
 
@@ -73,16 +73,16 @@ class Blog < ActiveRecord::Base
   setting :meta_keywords, :string, ''
   setting :google_analytics, :string, ''
   setting :rss_description, :boolean, false
-  setting :rss_description_text, :string, <<EOS.strip_heredoc
+  setting :rss_description_text, :string, <<-HTML.strip_heredoc
     <hr />
     <p><small>Original article written by %author% and published on <a href='%blog_url%'>%blog_name%</a>
     | <a href='%permalink_url%'>direct link to this article</a>
     | If you are reading this article anywhere other than on <a href='%blog_url%'>%blog_name%</a>,
       it has been illegally reproduced and without proper authorization.</small></p>
-EOS
+  HTML
   setting :permalink_format, :string, '/%year%/%month%/%day%/%title%'
   setting :robots, :string, 'User-agent: *\nAllow: /\nDisallow: /admin\n'
-  setting :humans, :string, <<EOS.strip_heredoc
+  setting :humans, :string, <<-TEXT.strip_heredoc
     /* TEAM */
     Your title: Your name.
     Site: email, link to a contact form, etc.
@@ -90,7 +90,7 @@ EOS
 
     /* SITE */
     Software: Publify [http://publify.co] #{PublifyCore::VERSION}
-EOS
+  TEXT
   setting :index_categories, :boolean, true # deprecated but still needed for backward compatibility
   setting :unindex_categories, :boolean, false
   setting :index_tags, :boolean, true # deprecated but still needed for backward compatibility
@@ -179,9 +179,7 @@ EOS
                                              host: host_with_port,
                                              script_name: root_path)
         cache_key = merged_opts.values.prepend('blog-urlfor-withbaseurl').join('-')
-        unless Rails.cache.exist?(cache_key)
-          Rails.cache.write(cache_key, super(merged_opts))
-        end
+        Rails.cache.write(cache_key, super(merged_opts)) unless Rails.cache.exist?(cache_key)
         Rails.cache.read(cache_key)
       else
         raise "Invalid URL in url_for: #{options.inspect}"
@@ -219,13 +217,9 @@ EOS
   end
 
   def permalink_has_identifier
-    unless permalink_format =~ /(%title%)/
-      errors.add(:base, I18n.t('errors.permalink_need_a_title'))
-    end
+    errors.add(:base, I18n.t('errors.permalink_need_a_title')) unless permalink_format =~ /(%title%)/
 
-    if permalink_format =~ /\.(atom|rss)$/
-      errors.add(:permalink_format, I18n.t('errors.cant_end_with_rss_or_atom'))
-    end
+    errors.add(:permalink_format, I18n.t('errors.cant_end_with_rss_or_atom')) if permalink_format =~ /\.(atom|rss)$/
   end
 
   def root_path
@@ -258,9 +252,7 @@ EOS
 
   def split_base_url
     unless @split_base_url
-      unless base_url =~ /(https?):\/\/([^\/]*)(.*)/
-        raise "Invalid base_url: #{base_url}"
-      end
+      raise "Invalid base_url: #{base_url}" unless base_url =~ %r{(https?)://([^/]*)(.*)}
       @split_base_url = { protocol: Regexp.last_match[1], host_with_port: Regexp.last_match[2], root_path: Regexp.last_match[3].gsub(%r{/$}, '') }
     end
     @split_base_url

data/app/models/content.rb

@@ -1,7 +1,7 @@
 require 'set'
 require 'uri'
 
-class Content < ActiveRecord::Base
+class Content < ApplicationRecord
   include ContentBase
 
   belongs_to :text_filter, optional: true
@@ -18,11 +18,7 @@ class Content < ActiveRecord::Base
 
   scope :user_id, ->(user_id) { where('user_id = ?', user_id) }
   scope :published, -> { where(state: 'published'). order(default_order) }
-  scope :published_at, ->(time_params) {
-    published.
-    where(published_at: PublifyTime.delta(*time_params)).
-    order('published_at DESC')
-  }
+  scope :published_at, ->(time_params) { published.where(published_at: PublifyTime.delta(*time_params)) }
   scope :not_published, -> { where.not(state: 'published') }
   scope :drafts, -> { where(state: 'draft').order('created_at DESC') }
   scope :no_draft, -> { where.not(state: 'draft').order('published_at DESC') }
@@ -93,17 +89,11 @@ class Content < ActiveRecord::Base
   def self.search_with(params)
     params ||= {}
     scoped = unscoped
-    if params[:searchstring].present?
-      scoped = scoped.searchstring(params[:searchstring])
-    end
+    scoped = scoped.searchstring(params[:searchstring]) if params[:searchstring].present?
 
-    if params[:published_at].present? && /(\d\d\d\d)-(\d\d)/ =~ params[:published_at]
-      scoped = scoped.published_at_like(params[:published_at])
-    end
+    scoped = scoped.published_at_like(params[:published_at]) if params[:published_at].present? && /(\d\d\d\d)-(\d\d)/ =~ params[:published_at]
 
-    if params[:user_id].present? && params[:user_id].to_i > 0
-      scoped = scoped.user_id(params[:user_id])
-    end
+    scoped = scoped.user_id(params[:user_id]) if params[:user_id].present? && params[:user_id].to_i > 0
 
     if params[:published].present?
       scoped = scoped.published if params[:published].to_s == '1'
@@ -117,7 +107,7 @@ class Content < ActiveRecord::Base
     self[:whiteboard] ||= {}
   end
 
-  def get_rss_description
+  def rss_description
     return '' unless blog.rss_description
 
     rss_desc = blog.rss_description_text

data/app/models/feedback.rb

@@ -3,7 +3,7 @@
 require 'aasm'
 require 'akismet'
 
-class Feedback < ActiveRecord::Base
+class Feedback < ApplicationRecord
   self.table_name = 'feedback'
 
   belongs_to :text_filter, optional: true
@@ -68,6 +68,7 @@ class Feedback < ActiveRecord::Base
     end
   end
 
+  # FIXME: Inline this method
   def self.paginated(page, per_page)
     page(page).per(per_page)
   end

data/app/models/meta_sidebar.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 class MetaSidebar < Sidebar
   description "This widget just displays links to Publify main site, this blog's admin and RSS."
 

data/app/models/note.rb

@@ -113,8 +113,7 @@ class Note < Content
       action: 'show',
       permalink: permalink,
       anchor: anchor,
-      only_path: only_path
-    )
+      only_path: only_path)
   end
 
   def short_link
@@ -123,7 +122,7 @@ class Note < Content
   end
 
   def prefix
-    blog.shortener_url.sub(/^https?\:\/\//, '')
+    blog.shortener_url.sub(%r{^https?://}, '')
   end
 
   def published?

data/app/models/page.rb

@@ -26,8 +26,7 @@ class Page < Content
       action: 'view_page',
       name: name,
       anchor: anchor,
-      only_path: only_path
-    )
+      only_path: only_path)
   end
 
   def publish!

data/app/models/ping.rb

@@ -1,3 +1,3 @@
-class Ping < ActiveRecord::Base
+class Ping < ApplicationRecord
   belongs_to :article
 end

data/app/models/post_type.rb

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-class PostType < ActiveRecord::Base
+class PostType < ApplicationRecord
   validates :name, uniqueness: true
   validates :name, presence: true
   validate :name_is_not_read

data/app/models/redirect.rb

@@ -1,4 +1,4 @@
-class Redirect < ActiveRecord::Base
+class Redirect < ApplicationRecord
   belongs_to :contents, optional: true, touch: true
   belongs_to :blog
 
@@ -8,7 +8,8 @@ class Redirect < ActiveRecord::Base
 
   def full_to_path
     path = to_path
-    return path if path =~ /^(https?):\/\/([^\/]*)(.*)/
+    # FIXME: Unify HTTP URI matchers
+    return path if path =~ %r{^(https?)://([^/]*)(.*)}
     url_root = blog.root_path
     path = File.join(url_root, path) unless url_root.nil? || path[0, url_root.length] == url_root
     path

data/app/models/redirection.rb

@@ -1,4 +1,4 @@
-class Redirection < ActiveRecord::Base
+class Redirection < ApplicationRecord
   belongs_to :content
   belongs_to :redirect
 end

data/app/models/resource.rb

@@ -1,7 +1,7 @@
 require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 
-class Resource < ActiveRecord::Base
+class Resource < ApplicationRecord
   belongs_to :blog
   belongs_to :content, optional: true
 

data/app/models/sidebar.rb

@@ -1,7 +1,7 @@
 require 'sidebar_field'
 
 # This class cannot be autoloaded since other sidebar classes depend on it.
-class Sidebar < ActiveRecord::Base
+class Sidebar < ApplicationRecord
   serialize :config, Hash
 
   belongs_to :blog

data/app/models/static_sidebar.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 class StaticSidebar < Sidebar
   DEFAULT_TEXT = '
 <ul>

data/app/models/tag.rb

@@ -1,4 +1,4 @@
-class Tag < ActiveRecord::Base
+class Tag < ApplicationRecord
   belongs_to :blog
   has_and_belongs_to_many :contents, order: 'created_at DESC'
 

data/app/models/text_filter.rb

@@ -1,6 +1,6 @@
 require 'net/http'
 
-class TextFilter < ActiveRecord::Base
+class TextFilter < ApplicationRecord
   serialize :filters, Array
   serialize :params, Hash
 

data/app/models/trigger.rb

@@ -1,4 +1,4 @@
-class Trigger < ActiveRecord::Base
+class Trigger < ApplicationRecord
   belongs_to :pending_item, polymorphic: true
 
   class << self
@@ -9,7 +9,7 @@ class Trigger < ActiveRecord::Base
     end
 
     def fire
-      where('due_at <= ?', Time.now).destroy_all
+      where('due_at <= ?', Time.zone.now).destroy_all
       true
     end
 

data/app/models/user.rb

@@ -2,7 +2,7 @@ require 'digest/sha1'
 
 # Publify user.
 # TODO: Should belong to a blog
-class User < ActiveRecord::Base
+class User < ApplicationRecord
   ADMIN = 'admin'.freeze
   PUBLISHER = 'publisher'.freeze
   CONTRIBUTOR = 'contributor'.freeze

data/app/services/title_builder.rb

@@ -18,10 +18,10 @@ class TitleBuilder
 
   def substitute_time(s, 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 = s.gsub('%currentdate%', Time.zone.now.strftime(settings.date_format))
+    s = s.gsub('%currenttime%', Time.zone.now.strftime(settings.time_format))
+    s = s.gsub('%currentmonth%', Time.zone.now.strftime('%B'))
+    s = s.gsub('%currentyear%', Time.zone.now.year.to_s)
     s
   end
 
@@ -34,13 +34,9 @@ class TitleBuilder
     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(', '))
-    end
+    s = s.gsub('%categories%', item.categories.map(&:name).join(', ')) if s =~ /%categories%/ && item.respond_to?(:categories)
 
-    if s =~ /%tags%/ && item.respond_to?(:tags)
-      s = s.gsub('%tags%', item.tags.map(&:display_name).join(', '))
-    end
+    s = s.gsub('%tags%', item.tags.map(&:display_name).join(', ')) if s =~ /%tags%/ && item.respond_to?(:tags)
 
     s
   end
@@ -70,7 +66,7 @@ class TitleBuilder
     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)

data/app/uploaders/resource_uploader.rb

@@ -34,9 +34,7 @@ class ResourceUploader < CarrierWave::Uploader::Base
   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
+      raise CarrierWave::IntegrityError, 'has MIME type mismatch' if magic_type != new_file.content_type
     end
   end
 

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

@@ -25,7 +25,7 @@
 <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">

data/app/views/admin/content/autosave.js.erb

@@ -1,5 +1,5 @@
 $('#autosave').html('<%= hidden_field_tag('article[id]', @article.id) %>');
 $('#preview_link').replaceWith('<%= link_to('Preview', {:controller => '/articles', :action => 'preview', :id => @article.id}, {:target => 'new', :class => 'btn btn-default'}); %>');
 <% if @article.state.to_s.downcase == "draft" %>
-  $("#article_published_at").val(<% Time.now() %>);
-<% end %>
+  $("#article_published_at").val(<% Time.zone.now() %>);
+<% end %>

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

@@ -18,7 +18,7 @@
       <span class='pull-right'>
         <%= link_to(t('.cancel'), {action: 'index'}, {class: 'btn btn-default'}) %>
         <!-- Button trigger modal -->
-        <button class="btn btn-success" data-toggle="modal" data-target="#publish">
+        <button class="btn btn-success" data-toggle="modal" type="button" data-target="#publish">
           <%= controller.action_name == "new" ? t(".publish") : t(".save") %>
         </button>
       </span>
@@ -34,7 +34,7 @@
   <div class='row'>
     <div class='col-md-2' id='quicktags-block'>
       <div id='quicktags' class='pull-right'>
-        <script type="text/javascript">edToolbar('page_body', '<%= @page.text_filter %>');</script>
+        <script type="text/javascript">edToolbar('page_body', '<%= @page.text_filter.name %>');</script>
       </div>
     </div>
 
@@ -69,11 +69,11 @@
             <fieldset>
               <legend><%= t(".publish_settings") %></legend>
               <div class='control-group'>
-                <%= t(".status") %>: <strong><%= (@page.published?) ? t(".published") : t(".offline") %></strong>
+                <%= t(".status") %>: <strong><%= @page.state  %></strong>
                 <%= toggle_element('status') %>
                 <div id='status' class='collapse'>
                   <label for="page_published" class='checkbox'>
-                    <%= check_box 'page', 'published?'  %>
+                    <%= check_box 'page', 'state', {}, 'published', ''  %>
                     <%= t(".online")%>
                   </label>
                   <p><span class='btn btn-default btn-mini'><%= toggle_element 'status', "OK" %></span></p>
@@ -82,8 +82,8 @@
               <div class='control-group'>
                 <%= t(".article_filter") %>: <strong><%= @page.text_filter.description %></strong> <%= toggle_element 'text_filter' %>
                 <div id='text_filter' class='collapse'>
-                  <select name="page[text_filter]" id="text_filter" class='form-control'>
-                  <%= options_for_select text_filter_options, @page.text_filter %>
+                  <select name="page[text_filter_id]" id="text_filter" class='form-control'>
+                  <%= options_for_select text_filter_options_with_id, @page.text_filter.id %>
                 </select>
                 <p><span class='btn btn-mini btn-default'><%= toggle_element 'text_filter', "OK" %></span></p>
                 </div>

data/app/views/admin/seo/_general.html.erb

@@ -33,7 +33,7 @@
         </label>
       </div>
       <small class='help-block'><%= t('.this_will_display') %></small>
-      <%= Article.first.get_rss_description if Article.first %>
+      <%= Article.first.rss_description if Article.first %>
     </div>
   </div>
   <div class='form-group'>

data/app/views/admin/seo/_permalinks.html.erb

@@ -12,12 +12,12 @@
           <%= radio_button(:setting, :permalink_format, '/%year%/%month%/%day%/%title%') %>
           <%= t(".date_and_title") %>
         </label>
-        <small class='help-block'><%= "#{this_blog.base_url}/#{Time.now.strftime('%Y/%m/%d')}/sample-article" %></small>
+        <small class='help-block'><%= "#{this_blog.base_url}/#{Time.zone.now.strftime('%Y/%m/%d')}/sample-article" %></small>
         <label for="setting_permalink_format_yearmonthtitle">
           <%= radio_button(:setting, :permalink_format, '/%year%/%month%/%title%') %>
           <%= t(".month_and_title") %>
         </label>
-        <small class='help-block'><%= "#{this_blog.base_url}/#{Time.now.strftime('%Y/%m')}/sample-article" %></small>
+        <small class='help-block'><%= "#{this_blog.base_url}/#{Time.zone.now.strftime('%Y/%m')}/sample-article" %></small>
         <label for="setting_permalink_format_title">
           <%= radio_button(:setting, :permalink_format, '/%title%') %> <%= t(".title_only") %>
         </label>

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

@@ -87,9 +87,9 @@
     </div>
   <% end %>
   <div class='form-group'>
-    <label class='control-label col-sm-2' for="text_filter"><%= t('.article_filter') %></label>
+    <label class='control-label col-sm-2' for="text_filter_id"><%= t('.article_filter') %></label>
     <div class='col-sm-5'>
-      <select name="user[text_filter_id]" id="text_filter" class='form-control'>
+      <select name="user[text_filter_id]" id="text_filter_id" class='form-control'>
         <%= options_for_select text_filter_options_with_id, user.text_filter.id %>
       </select>
     </div>

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

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