publify_core 9.0.0 → 9.2.2

data/app/controllers/admin/notes_controller.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Admin::NotesController < Admin::BaseController
-  layout 'administration'
+  layout "administration"
 
   before_action :load_existing_notes, only: [:index, :edit]
   before_action :find_note, only: [:edit, :update, :show, :destroy]
@@ -10,7 +12,7 @@ class Admin::NotesController < Admin::BaseController
 
   def show
     unless @note.access_by?(current_user)
-      flash[:error] = I18n.t('admin.base.not_allowed')
+      flash[:error] = I18n.t("admin.base.not_allowed")
       redirect_to admin_notes_url
     end
   end
@@ -20,18 +22,18 @@ class Admin::NotesController < Admin::BaseController
   def create
     note = new_note
 
-    note.state = 'published'
+    note.state = "published"
     note.attributes = params[:note].permit!
-    note.text_filter ||= current_user.default_text_filter
-    note.published_at ||= Time.now
+    note.text_filter ||= default_text_filter
+    note.published_at ||= Time.zone.now
     if note.save
       if params[:push_to_twitter] && note.twitter_id.blank?
         unless note.send_to_twitter
-          flash[:error] = I18n.t('errors.problem_sending_to_twitter')
-          flash[:error] += " : #{note.errors.full_messages.join(' ')}"
+          flash[:error] = I18n.t("errors.problem_sending_to_twitter")
+          flash[:error] += " : #{note.errors.full_messages.join(" ")}"
         end
       end
-      flash[:notice] = I18n.t('notice.note_successfully_created')
+      flash[:notice] = I18n.t("notice.note_successfully_created")
     else
       flash[:error] = note.errors.full_messages
     end
@@ -46,7 +48,7 @@ class Admin::NotesController < Admin::BaseController
 
   def destroy
     @note.destroy
-    flash[:notice] = I18n.t('admin.base.successfully_deleted', name: 'note')
+    flash[:notice] = I18n.t("admin.base.successfully_deleted", name: "note")
     redirect_to admin_notes_url
   end
 
@@ -62,6 +64,10 @@ class Admin::NotesController < Admin::BaseController
 
   def new_note
     this_blog.notes.build(author: current_user,
-                          text_filter: current_user.text_filter)
+                          text_filter_name: default_text_filter)
+  end
+
+  def default_text_filter
+    current_user.text_filter_name || this_blog.text_filter
   end
 end

data/app/controllers/admin/pages_controller.rb

@@ -1,46 +1,47 @@
-# coding: utf-8
+# frozen_string_literal: true
 
-require 'base64'
+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] : {}
-    @pages = Page.search_with(@search).page(params[:page]).per(this_blog.admin_display_elements)
+    @search = params[:search] || {}
+    @pages = Page.search_with(@search).page(params[:page]).
+      per(this_blog.admin_display_elements)
   end
 
   def new
     @page = Page.new
-    @page.text_filter ||= default_textfilter
+    @page.text_filter_name ||= default_text_filter
     @page.user_id = current_user.id
-    @page.state = 'published'
+    @page.state = "published"
+    render layout: "editor"
   end
 
   def edit
-    @page.text_filter ||= default_textfilter
+    @page.text_filter_name ||= default_text_filter
+    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')
+      redirect_to admin_pages_url, notice: I18n.t("admin.pages.new.success")
     else
-      render :new
+      render :new, layout: "editor"
     end
   end
 
   def update
-    @page.text_filter ||= default_textfilter
+    @page.text_filter_name ||= default_text_filter
     if @page.update(page_params)
-      redirect_to admin_pages_url, notice: I18n.t('admin.pages.edit.success')
+      redirect_to admin_pages_url, notice: I18n.t("admin.pages.edit.success")
     else
       render :edit
     end
@@ -52,25 +53,14 @@ class Admin::PagesController < Admin::BaseController
 
   private
 
-  def default_textfilter
-    current_user.text_filter || blog.text_filter
+  def default_text_filter
+    current_user.text_filter_name || this_blog.text_filter
   end
 
   def set_macro
     @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 +68,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_name)
   end
 end

data/app/controllers/admin/post_types_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::PostTypesController < Admin::BaseController
   before_action :set_post_type, only: [:edit, :update, :destroy]
 
@@ -14,7 +16,7 @@ class Admin::PostTypesController < Admin::BaseController
     @post_type = PostType.new(post_type_params)
 
     if @post_type.save
-      redirect_to admin_post_types_url, notice: 'Post type was successfully created.'
+      redirect_to admin_post_types_url, notice: "Post type was successfully created."
     else
       render :index
     end
@@ -22,7 +24,7 @@ class Admin::PostTypesController < Admin::BaseController
 
   def update
     if @post_type.update(post_type_params)
-      redirect_to admin_post_types_url, notice: 'Post type was successfully updated.'
+      redirect_to admin_post_types_url, notice: "Post type was successfully updated."
     else
       render :edit
     end
@@ -32,13 +34,13 @@ class Admin::PostTypesController < Admin::BaseController
     # Reset all Articles from the PostType we're destroying to the default PostType
     # Wrap it in a transaction for safety
     @post_type.transaction do
-      Article.where('post_type = ?', @post_type.permalink).each do |article|
-        article.post_type = 'read'
+      Article.where("post_type = ?", @post_type.permalink).each do |article|
+        article.post_type = "read"
         article.save
       end
       @post_type.destroy
     end
-    redirect_to admin_post_types_url, notice: 'Post was successfully destroyed.'
+    redirect_to admin_post_types_url, notice: "Post was successfully destroyed."
   end
 
   private

data/app/controllers/admin/profiles_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This controller handles updating your own user data.
 class Admin::ProfilesController < Admin::BaseController
   before_action :set_user, only: [:index, :update]
@@ -7,8 +9,8 @@ class Admin::ProfilesController < Admin::BaseController
   def update
     @user.resource = upload_avatar if params[:user][:filename]
 
-    if @user.update(user_params)
-      redirect_to admin_profiles_url, notice: I18n.t('admin.profiles.index.success')
+    if @user.update(update_params)
+      redirect_to admin_profiles_url, notice: I18n.t("admin.profiles.index.success")
     else
       render :index
     end
@@ -22,10 +24,10 @@ class Admin::ProfilesController < Admin::BaseController
     mime = if file.content_type
              file.content_type.chomp
            else
-             'text/plain'
+             "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 +39,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/redirects_controller.rb

@@ -1,20 +1,24 @@
+# frozen_string_literal: true
+
 class Admin::RedirectsController < Admin::BaseController
   before_action :set_redirect, only: [:edit, :update, :destroy]
 
   def index
-    @redirects = Redirect.where(content_id: nil).order('id desc').page(params[:page]).per(this_blog.admin_display_elements)
+    @redirects = Redirect.where(content_id: nil).order("id desc").page(params[:page]).
+      per(this_blog.admin_display_elements)
     @redirect = Redirect.new
   end
 
   def edit
-    @redirects = Redirect.where(content_id: nil).order('id desc').page(params[:page]).per(this_blog.admin_display_elements)
+    @redirects = Redirect.where(content_id: nil).order("id desc").page(params[:page]).
+      per(this_blog.admin_display_elements)
   end
 
   def create
     @redirect = this_blog.redirects.build(redirect_params)
 
     if @redirect.save
-      redirect_to admin_redirects_url, notice: 'Redirect was successfully created.'
+      redirect_to admin_redirects_url, notice: "Redirect was successfully created."
     else
       render :index
     end
@@ -22,7 +26,7 @@ class Admin::RedirectsController < Admin::BaseController
 
   def update
     if @redirect.update(redirect_params)
-      redirect_to admin_redirects_url, notice: 'Redirect was successfully updated.'
+      redirect_to admin_redirects_url, notice: "Redirect was successfully updated."
     else
       render :edit
     end
@@ -30,7 +34,7 @@ class Admin::RedirectsController < Admin::BaseController
 
   def destroy
     @redirect.destroy
-    redirect_to admin_redirects_url, notice: I18n.t('admin.redirects.destroy.success')
+    redirect_to admin_redirects_url, notice: I18n.t("admin.redirects.destroy.success")
   end
 
   private

data/app/controllers/admin/resources_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::ResourcesController < Admin::BaseController
   def upload
     file = params[:upload]
@@ -6,9 +8,9 @@ class Admin::ResourcesController < Admin::BaseController
     @up.mime = @up.upload.content_type
 
     if @up.save
-      flash[:success] = I18n.t('admin.resources.upload.success')
+      flash[:success] = I18n.t("admin.resources.upload.success")
     else
-      flash[:warning] = I18n.t('admin.resources.upload.warning')
+      flash[:warning] = I18n.t("admin.resources.upload.warning")
     end
 
     redirect_to admin_resources_url
@@ -16,13 +18,14 @@ class Admin::ResourcesController < Admin::BaseController
 
   def index
     @r = Resource.new
-    @resources = Resource.order('created_at DESC').page(params[:page]).per(this_blog.admin_display_elements)
+    @resources = Resource.order("created_at DESC").page(params[:page]).
+      per(this_blog.admin_display_elements)
   end
 
   def destroy
     @record = Resource.find(params[:id])
     @record.destroy
-    flash[:notice] = I18n.t('admin.resources.destroy.notice')
+    flash[:notice] = I18n.t("admin.resources.destroy.notice")
     redirect_to admin_resources_url
   end
 end

data/app/controllers/admin/seo_controller.rb

@@ -1,26 +1,28 @@
+# frozen_string_literal: true
+
 class Admin::SeoController < Admin::BaseController
   before_action :set_setting
   before_action :set_section
 
   def show
-    if @setting.permalink_format != '/%year%/%month%/%day%/%title%' &&
-        @setting.permalink_format != '/%year%/%month%/%title%' &&
-        @setting.permalink_format != '/%title%'
+    if @setting.permalink_format != "/%year%/%month%/%day%/%title%" &&
+        @setting.permalink_format != "/%year%/%month%/%title%" &&
+        @setting.permalink_format != "/%title%"
       @setting.custom_permalink = @setting.permalink_format
-      @setting.permalink_format = 'custom'
+      @setting.permalink_format = "custom"
     end
   end
 
   def update
-    if settings_params[:permalink_format] == 'custom'
+    if settings_params[:permalink_format] == "custom"
       settings_params[:permalink_format] = settings_params[:custom_permalink]
     end
-    if @setting.update_attributes(settings_params)
-      flash[:success] = I18n.t('admin.settings.update.success')
+    if @setting.update(settings_params)
+      flash[:success] = I18n.t("admin.settings.update.success")
       redirect_to admin_seo_path(section: @section)
     else
-      flash[:error] = I18n.t('admin.settings.update.error',
-                             messages: this_blog.errors.full_messages.join(', '))
+      flash[:error] = I18n.t("admin.settings.update.error",
+                             messages: this_blog.errors.full_messages.join(", "))
       render :show
     end
   end
@@ -35,7 +37,7 @@ class Admin::SeoController < Admin::BaseController
 
   def set_section
     section = params[:section]
-    @section = VALID_SECTIONS.include?(section) ? section : 'general'
+    @section = VALID_SECTIONS.include?(section) ? section : "general"
   end
 
   def set_setting

data/app/controllers/admin/settings_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::SettingsController < Admin::BaseController
   def index
     this_blog.base_url = blog_base_url if this_blog.base_url.blank?
@@ -18,13 +20,13 @@ class Admin::SettingsController < Admin::BaseController
 
   def update
     load_settings
-    if @setting.update_attributes(settings_params)
+    if @setting.update(settings_params)
       load_lang
-      flash[:success] = I18n.t('admin.settings.update.success')
+      flash[:success] = I18n.t("admin.settings.update.success")
       redirect_to action: action_param
     else
-      flash[:error] = I18n.t('admin.settings.update.error',
-                             messages: this_blog.errors.full_messages.join(', '))
+      flash[:error] = I18n.t("admin.settings.update.error",
+                             messages: this_blog.errors.full_messages.join(", "))
       render action_param
     end
   end
@@ -41,7 +43,7 @@ class Admin::SettingsController < Admin::BaseController
     @action_param ||=
       begin
         value = params[:from]
-        VALID_ACTIONS.include?(value) ? value : 'index'
+        VALID_ACTIONS.include?(value) ? value : "index"
       end
   end
 

data/app/controllers/admin/sidebar_controller.rb

@@ -1,4 +1,4 @@
-# coding: utf-8
+# frozen_string_literal: true
 
 class Admin::SidebarController < Admin::BaseController
   def index
@@ -10,7 +10,7 @@ class Admin::SidebarController < Admin::BaseController
   def update
     @sidebar = Sidebar.where(id: params[:id]).first
     @old_s_index = @sidebar.staged_position || @sidebar.active_position
-    @sidebar.update_attributes params[:configure][@sidebar.id.to_s].permit!
+    @sidebar.update params[:configure][@sidebar.id.to_s].permit!
     respond_to do |format|
       format.js
       format.html do
@@ -21,7 +21,7 @@ class Admin::SidebarController < Admin::BaseController
 
   def destroy
     @sidebar = Sidebar.where(id: params[:id]).first
-    @sidebar && @sidebar.destroy
+    @sidebar&.destroy
     respond_to do |format|
       format.html { return redirect_to(admin_sidebar_index_path) }
       format.js
@@ -45,11 +45,12 @@ class Admin::SidebarController < Admin::BaseController
         # IT'S OVER NINE THOUSAND! considering we'll never reach 9K Sidebar
         # instances or Sidebar specializations
         sidebar = if sidebar_id >= 9000
-                    SidebarRegistry.available_sidebars[sidebar_id - 9000].new(blog: this_blog)
+                    SidebarRegistry.available_sidebars[sidebar_id - 9000].
+                      new(blog: this_blog)
                   else
                     Sidebar.valid.find(sidebar_id)
                   end
-        sidebar.update_attributes(staged_position: staged_index)
+        sidebar.update(staged_position: staged_index)
       end
     end