publify_core 9.0.1 → 9.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1a1cf89cac6e217d23be79402f8ea4fab3ef6d88
-  data.tar.gz: 1c7a95fab11db0e9c95a10b21094f59d959b7d8b
+SHA256:
+  metadata.gz: 2e15ef90fced3ea3b247dbf4606d8259c2b7afdc6c145d68850e7ff0afe0f5ad
+  data.tar.gz: ffeca171cf4dfc01482e7f58f6cd3df5946ad20c1dc9710f057a7a74e1f901b9
 SHA512:
-  metadata.gz: f41c5ddd206410b9c6fbe1a9849a811e0fc074c9092924c1725e0a03f498807eb84e2c43b4f52d527497901d58bbda91b3293d5c492b6cd7077c2bc3aef18f82
-  data.tar.gz: a56f839f4b1cff29318ffcd76fe6c1f4e680474534bd54d9ae184e28b4c1fe7e24400f2ce2ec46010cd382dfeae22080a5ddb0324dca648fcca5a8b9fcba654d
+  metadata.gz: de5fcf4b3a26d1272b120d1555b59f60101df6840ef8130f73c3d3b923e7df6be7fb91eb749e4d5806175bd6e7078468c732849fd61e309b7cc7ddcf1975be60
+  data.tar.gz: 35f8119af5a47cdad82825bca01a7f95519d4b2ef0791ae8b43ab3f8dfe46e2b583d74c8421d9bd13112e390f9dbcd5ba16846fc80e3c80a7ceeccbf18073fc0

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 9.1.0 / 2018-04-19
+
+* Upgrade to Rails 5.1 (mvz)
+* Fix a bunch of issues (e-tobi)
+
 ## 9.0.1
 
 * Remove link_to_author setting: author email is no longer shown. Whoever

data/app/controllers/admin/base_controller.rb

@@ -11,17 +11,6 @@ class Admin::BaseController < BaseController
 
   private
 
-  def update_settings_with!(settings_param)
-    Blog.transaction do
-      settings_param.each { |k, v| this_blog.send("#{k}=", v) }
-      if this_blog.save
-        flash[:success] = I18n.t('admin.settings.update.success')
-      else
-        flash[:error] = I18n.t('admin.settings.update.error', messages: this_blog.errors.full_messages.join(', '))
-      end
-    end
-  end
-
   def destroy_a(klass_to_destroy)
     @record = klass_to_destroy.find(params[:id])
     if @record.respond_to?(:access_by?) && !@record.access_by?(current_user)

data/app/controllers/admin/content_controller.rb

@@ -3,8 +3,6 @@ require 'base64'
 module Admin; end
 
 class Admin::ContentController < Admin::BaseController
-  layout :get_layout
-
   def index
     @search = params[:search] ? params[:search] : {}
     @articles = this_blog.articles.search_with(@search).page(params[:page]).per(this_blog.admin_display_elements)
@@ -21,6 +19,7 @@ class Admin::ContentController < Admin::BaseController
   def new
     @article = Article::Factory.new(this_blog, current_user).default
     load_resources
+    render layout: 'editor'
   end
 
   def edit
@@ -29,6 +28,7 @@ class Admin::ContentController < Admin::BaseController
     @article.text_filter ||= current_user.default_text_filter
     @article.keywords = Tag.collection_to_string @article.tags
     load_resources
+    render layout: 'editor'
   end
 
   def create
@@ -49,7 +49,7 @@ class Admin::ContentController < Admin::BaseController
     else
       @article.keywords = Tag.collection_to_string @article.tags
       load_resources
-      render 'new'
+      render 'new', layout: 'editor'
     end
   end
 
@@ -59,7 +59,7 @@ class Admin::ContentController < Admin::BaseController
     @article = Article.find(id)
 
     if params[:article][:draft]
-      get_fresh_or_existing_draft_for_article
+      fetch_fresh_or_existing_draft_for_article
     else
       @article = Article.find(@article.parent_id) unless @article.parent_id.nil?
     end
@@ -100,7 +100,7 @@ class Admin::ContentController < Admin::BaseController
     article_factory = Article::Factory.new(this_blog, current_user)
     @article = article_factory.get_or_build_from(id)
 
-    get_fresh_or_existing_draft_for_article
+    fetch_fresh_or_existing_draft_for_article
 
     @article.attributes = params[:article].permit!
 
@@ -116,7 +116,7 @@ class Admin::ContentController < Admin::BaseController
 
     if @article.save
       flash[:success] = I18n.t('admin.content.autosave.success')
-      @must_update_calendar = (params[:article][:published_at] and params[:article][:published_at].to_time.to_i < Time.now.to_time.to_i and @article.parent_id.nil?)
+      @must_update_calendar = (params[:article][:published_at] and params[:article][:published_at].to_time.to_i < Time.zone.now.to_time.to_i and @article.parent_id.nil?)
       respond_to do |format|
         format.js
       end
@@ -125,7 +125,7 @@ class Admin::ContentController < Admin::BaseController
 
   protected
 
-  def get_fresh_or_existing_draft_for_article
+  def fetch_fresh_or_existing_draft_for_article
     return unless @article.published? && @article.id
 
     parent_id = @article.id
@@ -177,15 +177,4 @@ class Admin::ContentController < Admin::BaseController
              :title,
              :keywords)
   end
-
-  def get_layout
-    case action_name
-    when 'new', 'edit', 'create'
-      'editor'
-    when 'show', 'autosave'
-      nil
-    else
-      'administration'
-    end
-  end
 end

data/app/controllers/admin/dashboard_controller.rb

@@ -6,8 +6,7 @@ class Admin::DashboardController < Admin::BaseController
   require 'rexml/document'
 
   def index
-    t = Time.new
-    today = t.strftime('%Y-%m-%d 00:00')
+    today = Time.zone.now.strftime('%Y-%m-%d 00:00')
 
     # Since last visit
     last_sign_in = current_user.last_sign_in_at

data/app/controllers/admin/feedback_controller.rb

@@ -83,6 +83,7 @@ class Admin::FeedbackController < Admin::BaseController
     template = @feedback.change_state!
 
     respond_to do |format|
+      # TODO: Make this special case not necessary
       if params[:context] != 'listing'
         @comments = Comment.last_published
         page.replace_html('commentList', partial: 'admin/dashboard/comment')

data/app/controllers/admin/notes_controller.rb

@@ -23,7 +23,7 @@ class Admin::NotesController < Admin::BaseController
     note.state = 'published'
     note.attributes = params[:note].permit!
     note.text_filter ||= current_user.default_text_filter
-    note.published_at ||= Time.now
+    note.published_at ||= Time.zone.now
     if note.save
       if params[:push_to_twitter] && note.twitter_id.blank?
         unless note.send_to_twitter

data/app/controllers/admin/pages_controller.rb

@@ -1,12 +1,8 @@
-# coding: utf-8
-
 require 'base64'
 
 class Admin::PagesController < Admin::BaseController
   before_action :set_macro, only: [:new, :edit]
-  before_action :set_page, only: [:show, :edit, :update, :destroy]
-
-  layout :get_layout
+  before_action :set_page, only: [:edit, :update, :destroy]
 
   def index
     @search = params[:search] ? params[:search] : {}
@@ -18,22 +14,24 @@ class Admin::PagesController < Admin::BaseController
     @page.text_filter ||= default_textfilter
     @page.user_id = current_user.id
     @page.state = 'published'
+    render layout: 'editor'
   end
 
   def edit
     @page.text_filter ||= default_textfilter
+    render layout: 'editor'
   end
 
   def create
     @page = Page.new(page_params)
-    @page.published_at = Time.now
+    @page.published_at = Time.zone.now
     @page.blog = this_blog
     @page.user_id = current_user.id
 
     if @page.save
       redirect_to admin_pages_url, notice: I18n.t('admin.pages.new.success')
     else
-      render :new
+      render :new, layout: 'editor'
     end
   end
 
@@ -60,17 +58,6 @@ class Admin::PagesController < Admin::BaseController
     @macros = TextFilterPlugin.macro_filters
   end
 
-  def get_layout
-    case action_name
-    when 'new', 'edit', 'create'
-      'editor'
-    when 'show'
-      nil
-    else
-      'administration'
-    end
-  end
-
   # Use callbacks to share common setup or constraints between actions.
   def set_page
     @page = Page.find(params[:id])
@@ -78,6 +65,6 @@ class Admin::PagesController < Admin::BaseController
 
   # Never trust parameters from the scary internet, only allow the white list through.
   def page_params
-    params.require(:page).permit(:title, :body, :name, :state, :text_filter)
+    params.require(:page).permit(:title, :body, :name, :state, :text_filter_id)
   end
 end

data/app/controllers/admin/profiles_controller.rb

@@ -7,7 +7,7 @@ class Admin::ProfilesController < Admin::BaseController
   def update
     @user.resource = upload_avatar if params[:user][:filename]
 
-    if @user.update(user_params)
+    if @user.update(update_params)
       redirect_to admin_profiles_url, notice: I18n.t('admin.profiles.index.success')
     else
       render :index
@@ -25,7 +25,7 @@ class Admin::ProfilesController < Admin::BaseController
              'text/plain'
            end
 
-    Resource.create(upload: file, mime: mime, created_at: Time.now)
+    Resource.create(upload: file, mime: mime, created_at: Time.zone.now)
   end
 
   # Use callbacks to share common setup or constraints between actions.
@@ -37,11 +37,19 @@ class Admin::ProfilesController < Admin::BaseController
   def user_params
     params.require(:user).permit(:login, :password, :password_confirmation,
                                  :email, :firstname, :lastname, :nickname,
-                                 :display_name, :notify_via_email,
+                                 :name, :notify_via_email,
                                  :notify_on_new_articles, :notify_on_comments,
                                  :text_filter_id, :state,
                                  :twitter_account, :twitter_oauth_token,
                                  :twitter_oauth_token_secret, :description,
                                  :url, :msn, :yahoo, :jabber, :aim, :twitter)
   end
+
+  def update_params
+    if user_params[:password].blank? && user_params[:password_confirmation].blank?
+      user_params.except(:password_confirmation, :password)
+    else
+      user_params
+    end
+  end
 end

data/app/controllers/admin/seo_controller.rb

@@ -12,9 +12,7 @@ class Admin::SeoController < Admin::BaseController
   end
 
   def update
-    if settings_params[:permalink_format] == 'custom'
-      settings_params[:permalink_format] = settings_params[:custom_permalink]
-    end
+    settings_params[:permalink_format] = settings_params[:custom_permalink] if settings_params[:permalink_format] == 'custom'
     if @setting.update_attributes(settings_params)
       flash[:success] = I18n.t('admin.settings.update.success')
       redirect_to admin_seo_path(section: @section)

data/app/controllers/admin/sidebar_controller.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 class Admin::SidebarController < Admin::BaseController
   def index
     @available = SidebarRegistry.available_sidebars

data/app/controllers/admin/users_controller.rb

@@ -46,9 +46,9 @@ class Admin::UsersController < Admin::BaseController
   def user_params
     params.require(:user).permit(:login, :password, :password_confirmation,
                                  :email, :firstname, :lastname, :nickname,
-                                 :display_name, :notify_via_email,
+                                 :name, :notify_via_email,
                                  :notify_on_new_articles, :notify_on_comments,
-                                 :profile, :text_filter, :state,
+                                 :profile, :text_filter_id, :state,
                                  :twitter_account, :twitter_oauth_token,
                                  :twitter_oauth_token_secret, :description,
                                  :url, :msn, :yahoo, :jabber, :aim, :twitter)

data/app/controllers/comments_controller.rb

@@ -1,5 +1,5 @@
 class CommentsController < BaseController
-  before_action :get_article, only: [:create, :preview]
+  before_action :set_article, only: [:create, :preview]
 
   def create
     options = new_comment_defaults.merge comment_params.to_h
@@ -10,12 +10,10 @@ class CommentsController < BaseController
       @comment.user_id = current_user.id if current_user.id == session[:user_id]
     end
 
-    set_cookies_for @comment
+    remember_author_info_for @comment
 
     partial = '/articles/comment_failed'
-    if recaptcha_ok_for?(@comment) && @comment.save
-      partial = '/articles/comment'
-    end
+    partial = '/articles/comment' if recaptcha_ok_for?(@comment) && @comment.save
     respond_to do |format|
       format.js { render partial }
       format.html { redirect_to URI.parse(@article.permalink_url).path }
@@ -49,15 +47,13 @@ class CommentsController < BaseController
       permalink: @article.permalink_url }.stringify_keys
   end
 
-  def set_cookies_for(comment)
+  def remember_author_info_for(comment)
     add_to_cookies(:author, comment.author)
     add_to_cookies(:url, comment.url)
-    if comment.email.present?
-      add_to_cookies(:gravatar_id, Digest::MD5.hexdigest(comment.email.strip))
-    end
+    add_to_cookies(:gravatar_id, Digest::MD5.hexdigest(comment.email.strip)) if comment.email.present?
   end
 
-  def get_article
+  def set_article
     @article = Article.find(params[:article_id])
   end
 

data/app/controllers/setup_controller.rb

@@ -2,8 +2,7 @@ class SetupController < BaseController
   before_action :check_config
   layout 'accounts'
 
-  def index
-  end
+  def index; end
 
   def create
     this_blog.blog_name = params[:setting][:blog_name]

data/app/helpers/admin/base_helper.rb

@@ -64,8 +64,7 @@ module Admin::BaseHelper
       content_tag(:span, '', class: 'glyphicon glyphicon-trash'),
       { action: 'destroy', id: item.id },
       { class: 'btn btn-danger btn-xs btn-action', method: :delete,
-        data: { confirm: confirm_text } }
-    )
+        data: { confirm: confirm_text } })
   end
 
   def button_to_short_url(item)

data/app/helpers/base_helper.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 # Methods added to this helper will be available to all templates in the application.
 require 'digest/sha1'
 
@@ -9,8 +7,8 @@ module BaseHelper
   # Need to rewrite this one, quick hack to test my changes.
   attr_reader :page_title
 
-  def render_sidebars(*sidebars)
-    rendered_sidebars = (sidebars.blank? ? Sidebar.order(:active_position) : sidebars).map do |sb|
+  def render_sidebars
+    rendered_sidebars = Sidebar.order(:active_position).map do |sb|
       @sidebar = sb
       sb.parse_request(content_array, params)
       render_sidebar(sb)
@@ -123,21 +121,6 @@ module BaseHelper
     image_tag(status.user.twitter_profile_image, class: 'alignleft', alt: status.user.nickname)
   end
 
-  def google_analytics
-    unless this_blog.google_analytics.empty?
-      <<-HTML
-      <script type="text/javascript">
-      var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-      document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-      </script>
-      <script type="text/javascript">
-      var pageTracker = _gat._getTracker("#{this_blog.google_analytics}");
-      pageTracker._trackPageview();
-      </script>
-      HTML
-    end
-  end
-
   def page_header_includes
     content_array.map(&:whiteboard).map do |w|
       w.select { |k, _v| k =~ /^page_header_/ }.map do |_, v|

data/app/helpers/xml_helper.rb

@@ -8,7 +8,7 @@ module XmlHelper
     times.push article_published.updated_at if article_published
 
     if times.empty?
-      Time.at(0).xmlschema
+      Time.zone.at(0).xmlschema
     else
       times.max.xmlschema
     end

data/app/models/article.rb

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 require 'aasm'
 require 'uri'
 require 'net/http'
@@ -26,9 +24,7 @@ class Article < Content
   after_save :keywords_to_tags, :shorten_url
 
   scope :child_of, ->(article_id) { where(parent_id: article_id) }
-  scope :published_since, ->(time) {
-    published.where('published_at > ?', time).order(default_order)
-  }
+  scope :published_since, ->(time) { published.where('published_at > ?', time) }
   scope :withdrawn, -> { where(state: 'withdrawn').order(default_order) }
   scope :pending, -> { where(state: 'publication_pending'). order(default_order) }
 
@@ -103,9 +99,7 @@ class Article < Content
   def self.search_with(params)
     params ||= {}
     scoped = super(params)
-    if %w(no_draft drafts published withdrawn pending).include?(params[:state])
-      scoped = scoped.send(params[:state])
-    end
+    scoped = scoped.send(params[:state]) if %w(no_draft drafts published withdrawn pending).include?(params[:state])
 
     scoped.order('created_at DESC')
   end
@@ -119,7 +113,7 @@ class Article < Content
 
   def save_attachments!(files)
     files ||= {}
-    files.values.each { |f| save_attachment!(f) }
+    files.each_value { |f| save_attachment!(f) }
   end
 
   def save_attachment!(file)
@@ -206,9 +200,7 @@ class Article < Content
   def html_urls
     urls = []
     html.gsub(/<a\s+[^>]*>/) do |tag|
-      if tag =~ /\bhref=(["']?)([^ >"]+)\1/
-        urls.push(Regexp.last_match[2].strip)
-      end
+      urls.push(Regexp.last_match[2].strip) if tag =~ /\bhref=(["']?)([^ >"]+)\1/
     end
     urls.uniq
   end