publify_core 9.0.0.pre5 → 9.2.0

data/app/assets/stylesheets/lightbox.css

@@ -44,14 +44,14 @@
   opacity: 1;
 }
 
-.ekko-lightbox .glyphicon-chevron-left {
+.ekko-lightbox .chevron-left {
   left: 0;
   float: left;
   padding-left: 15px;
   text-align: left;
 }
 
-.ekko-lightbox .glyphicon-chevron-right {
+.ekko-lightbox .chevron-right {
   right: 0;
   float: right;
   padding-right: 15px;
@@ -60,4 +60,4 @@
 
 .ekko-lightbox .modal-footer {
   text-align: left;
-}
+}

data/app/assets/stylesheets/publify_admin.css.scss

@@ -1,7 +1,6 @@
 /*
  *= require administration_structure
  *= require jquery-ui
- *= require widearea
  *= require tagmanager
  *= require sidebar_admin
  *= require datetimepicker

data/app/controllers/accounts_controller.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 class AccountsController < BaseController
 end

data/app/controllers/admin/base_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::BaseController < BaseController
   rescue_from CanCan::AccessDenied do |exception|
     redirect_to admin_dashboard_path, alert: exception.message
@@ -5,37 +7,21 @@ class Admin::BaseController < BaseController
 
   cattr_accessor :look_for_migrations
   @@look_for_migrations = true
-  layout 'administration'
+  layout "administration"
 
   before_action :login_required, except: [:login, :signup]
-  before_action :look_for_needed_db_updates, except: [:login, :signup]
 
   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)
-      flash[:error] = I18n.t('admin.base.not_allowed')
-      return(redirect_to action: 'index')
+      flash[:error] = I18n.t("admin.base.not_allowed")
+      return(redirect_to action: "index")
     end
     @record.destroy
-    flash[:notice] = I18n.t('admin.base.successfully_deleted', name: controller_name.humanize)
-    redirect_to action: 'index'
-  end
-
-  def look_for_needed_db_updates
-    migrator = Migrator.new
-    redirect_to admin_migrations_path if migrator.migrations_pending?
+    flash[:notice] = I18n.t("admin.base.successfully_deleted",
+                            name: controller_name.humanize)
+    redirect_to action: "index"
   end
 end

data/app/controllers/admin/content_controller.rb

@@ -1,13 +1,14 @@
-require 'base64'
+# frozen_string_literal: true
+
+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)
+    @search = params[:search] || {}
+    @articles = this_blog.articles.search_with(@search).page(params[:page]).
+      per(this_blog.admin_display_elements)
 
     if request.xhr?
       respond_to do |format|
@@ -21,14 +22,17 @@ class Admin::ContentController < Admin::BaseController
   def new
     @article = Article::Factory.new(this_blog, current_user).default
     load_resources
+    render layout: "editor"
   end
 
   def edit
     return unless access_granted?(params[:id])
+
     @article = Article.find(params[:id])
-    @article.text_filter ||= current_user.default_text_filter
+    @article.text_filter ||= default_text_filter
     @article.keywords = Tag.collection_to_string @article.tags
     load_resources
+    render layout: "editor"
   end
 
   def create
@@ -37,37 +41,50 @@ class Admin::ContentController < Admin::BaseController
 
     update_article_attributes
 
+    if @article.draft
+      @article.state = "draft"
+    elsif @article.draft?
+      @article.publish!
+    end
+
     if @article.save
-      flash[:success] = I18n.t('admin.content.create.success')
-      redirect_to action: 'index'
+      flash[:success] = I18n.t("admin.content.create.success")
+      redirect_to action: "index"
     else
       @article.keywords = Tag.collection_to_string @article.tags
       load_resources
-      render 'new'
+      render "new", layout: "editor"
     end
   end
 
   def update
     return unless access_granted?(params[:id])
+
     id = params[:article][:id] || params[:id]
     @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
 
     update_article_attributes
 
+    if @article.draft
+      @article.state = "draft"
+    elsif @article.draft?
+      @article.publish!
+    end
+
     if @article.save
       Article.where(parent_id: @article.id).map(&:destroy) unless @article.draft
-      flash[:success] = I18n.t('admin.content.update.success')
-      redirect_to action: 'index'
+      flash[:success] = I18n.t("admin.content.update.success")
+      redirect_to action: "index"
     else
       @article.keywords = Tag.collection_to_string @article.tags
       load_resources
-      render 'edit'
+      render "edit"
     end
   end
 
@@ -88,24 +105,26 @@ 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!
 
-    @article.published = false
     @article.author = current_user
     @article.save_attachments!(params[:attachments])
-    @article.state = 'draft' unless @article.state == 'withdrawn'
+    @article.state = "draft" unless @article.withdrawn?
     @article.text_filter ||= current_user.default_text_filter
 
     if @article.title.blank?
-      lastid = Article.order('id desc').first.id
-      @article.title = 'Draft article ' + lastid.to_s
+      lastid = Article.order("id desc").first.id
+      @article.title = "Draft article #{lastid}"
     end
 
     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?)
+      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.zone.now.to_time.to_i and
+         @article.parent_id.nil?)
       respond_to do |format|
         format.js
       end
@@ -114,15 +133,15 @@ class Admin::ContentController < Admin::BaseController
 
   protected
 
-  def get_fresh_or_existing_draft_for_article
-    if @article.published && @article.id
-      parent_id = @article.id
-      @article =
-        this_blog.articles.drafts.child_of(parent_id).first || this_blog.articles.build
-      @article.allow_comments = this_blog.default_allow_comments
-      @article.allow_pings = this_blog.default_allow_pings
-      @article.parent_id = parent_id
-    end
+  def fetch_fresh_or_existing_draft_for_article
+    return unless @article.published? && @article.id
+
+    parent_id = @article.id
+    @article =
+      this_blog.articles.drafts.child_of(parent_id).first || this_blog.articles.build
+    @article.allow_comments = this_blog.default_allow_comments
+    @article.allow_pings = this_blog.default_allow_pings
+    @article.parent_id = parent_id
   end
 
   attr_accessor :resources, :resource
@@ -131,42 +150,44 @@ class Admin::ContentController < Admin::BaseController
 
   def load_resources
     @post_types = PostType.all
-    @images = Resource.images_by_created_at.page(params[:page]).per(10)
-    @resources = Resource.without_images_by_filename
     @macros = TextFilterPlugin.macro_filters
   end
 
   def access_granted?(article_id)
     article = Article.find(article_id)
     if article.access_by? current_user
-      return true
+      true
     else
-      flash[:error] = I18n.t('admin.content.access_granted.error')
-      redirect_to action: 'index'
-      return false
+      flash[:error] = I18n.t("admin.content.access_granted.error")
+      redirect_to action: "index"
+      false
     end
   end
 
   def update_article_attributes
-    @article.attributes = update_params
+    @article.assign_attributes(update_params)
     @article.author = current_user
     @article.save_attachments!(params[:attachments])
-    @article.state = 'draft' if @article.draft
-    @article.text_filter ||= current_user.default_text_filter
+    @article.text_filter_name ||= default_text_filter
   end
 
   def update_params
-    params.require(:article).except(:id).permit!
+    params.
+      require(:article).
+      permit(:allow_comments,
+             :allow_pings,
+             :body,
+             :body_and_extended,
+             :draft,
+             :extended,
+             :permalink,
+             :published_at,
+             :text_filter_name,
+             :title,
+             :keywords)
   end
 
-  def get_layout
-    case action_name
-    when 'new', 'edit', 'create'
-      'editor'
-    when 'show', 'autosave'
-      nil
-    else
-      'administration'
-    end
+  def default_text_filter
+    current_user.text_filter || this_blog.text_filter
   end
 end

data/app/controllers/admin/dashboard_controller.rb

@@ -1,87 +1,33 @@
-require 'feedjira'
+# frozen_string_literal: true
 
 class Admin::DashboardController < Admin::BaseController
-  require 'open-uri'
-  require 'time'
-  require 'rexml/document'
+  require "open-uri"
+  require "time"
+  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 venue
-    @newposts_count = Article.published_since(current_user.last_sign_in_at).count
-    @newcomments_count = Feedback.published_since(current_user.last_sign_in_at).count
+    # Since last visit
+    last_sign_in = current_user.last_sign_in_at
+    @newposts_count = Article.published_since(last_sign_in).count
+    @newcomments_count = Feedback.created_since(last_sign_in).count
 
     # Today
-    @statposts = Article.published.where('published_at > ?', today).count
-    @statsdrafts = Article.drafts.where('created_at > ?', today).count
-    @statspages = Page.where('published_at > ?', today).count
-    @statuses = Note.where('published_at > ?', today).count
-    @statuserposts = Article.published.where('published_at > ?', today).where(user_id: current_user.id).count
-    @statcomments = Comment.where('created_at > ?', today).count
-    @presumedspam = Comment.presumed_spam.where('created_at > ?', today).count
-    @confirmed = Comment.ham.where('created_at > ?', today).count
-    @unconfirmed = Comment.unconfirmed.where('created_at > ?', today).count
+    @statposts = Article.published.where("published_at > ?", today).count
+    @statsdrafts = Article.drafts.where("created_at > ?", today).count
+    @statspages = Page.where("published_at > ?", today).count
+    @statuses = Note.where("published_at > ?", today).count
+    @statuserposts = Article.published.where("published_at > ?", today).
+      where(user_id: current_user.id).count
+    @statcomments = Comment.where("created_at > ?", today).count
+    @presumedspam = Comment.presumed_spam.where("created_at > ?", today).count
+    @confirmed = Comment.ham.where("created_at > ?", today).count
+    @unconfirmed = Comment.unconfirmed.where("created_at > ?", today).count
 
     @comments = Comment.last_published
-    @drafts = Article.drafts.where('user_id = ?', current_user.id).limit(5)
+    @drafts = Article.drafts.where("user_id = ?", current_user.id).limit(5)
 
     @statspam = Comment.spam.count
-    @inbound_links = inbound_links
-    @publify_links = publify_dev
-    publify_version
-  end
-
-  def publify_version
-    version = nil
-    begin
-      open(PUBLIFY_VERSION_URL) do |http|
-        publify_version = http.read[0..5]
-        version = publify_version.split('.')
-      end
-    rescue
-      return
-    end
-    if version[0].to_i > TYPO_MAJOR.to_i
-      flash[:error] = I18n.t('admin.dashboard.publify_version.error')
-    elsif version[1].to_i > TYPO_SUB.to_i
-      flash[:warning] = I18n.t('admin.dashboard.publify_version.warning')
-    elsif version[2].to_i > TYPO_MINOR.to_i
-      flash[:notice] = I18n.t('admin.dashboard.publify_version.notice')
-    end
-  end
-
-  private
-
-  def inbound_links
-    host = URI.parse(this_blog.base_url).host
-    return [] if Rails.env.development?
-    url = "http://www.google.com/search?q=link:#{host}&tbm=blg&output=rss"
-    fetch_rss(url).reverse.compact
-  end
-
-  def publify_dev
-    url = 'http://blog.publify.co/articles.rss'
-    fetch_rss(url)[0..2]
-  end
-
-  def fetch_rss(url)
-    open(url) do |http|
-      return parse_rss(http.read)
-    end
-  rescue
-    []
-  end
-
-  RssItem = Struct.new(:link, :title, :description, :description_link, :date, :author) do
-    def to_s
-      title
-    end
-  end
-
-  def parse_rss(body)
-    doc = Feedjira::Feed.parse(body)
-    doc.entries
   end
 end

data/app/controllers/admin/feedback_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Admin::FeedbackController < Admin::BaseController
   ONLY_DOMAIN = %w(unapproved presumed_ham presumed_spam ham spam).freeze
 
@@ -9,7 +11,7 @@ class Admin::FeedbackController < Admin::BaseController
       scoped_feedback = scoped_feedback.send(@only_param) if @only_param
     end
 
-    params.delete(:page) if params[:page].blank? || params[:page] == '0'
+    params.delete(:page) if params[:page].blank? || params[:page] == "0"
 
     @feedback = scoped_feedback.paginated(params[:page], this_blog.admin_display_elements)
   end
@@ -23,11 +25,11 @@ class Admin::FeedbackController < Admin::BaseController
 
     begin
       @record.destroy
-      flash[:success] = I18n.t('admin.feedback.destroy.success')
+      flash[:success] = I18n.t("admin.feedback.destroy.success")
     rescue ActiveRecord::RecordNotFound
-      flash[:error] = I18n.t('admin.feedback.destroy.error')
+      flash[:error] = I18n.t("admin.feedback.destroy.error")
     end
-    redirect_to action: 'article', id: @record.article.id
+    redirect_to action: "article", id: @record.article.id
   end
 
   def create
@@ -36,12 +38,13 @@ class Admin::FeedbackController < Admin::BaseController
     @comment.user_id = current_user.id
 
     if request.post? && @comment.save
-      # We should probably wave a spam filter over this, but for now, just mark it as published.
+      # We should probably wave a spam filter over this, but for now, just mark
+      # it as published.
       @comment.mark_as_ham
       @comment.save!
-      flash[:success] = I18n.t('admin.feedback.create.success')
+      flash[:success] = I18n.t("admin.feedback.create.success")
     end
-    redirect_to action: 'article', id: @article.id
+    redirect_to action: "article", id: @article.id
   end
 
   def edit
@@ -49,7 +52,7 @@ class Admin::FeedbackController < Admin::BaseController
     @article = @comment.article
     unless @article.access_by? current_user
       redirect_to admin_feedback_index_url
-      return
+      nil
     end
   end
 
@@ -61,34 +64,31 @@ class Admin::FeedbackController < Admin::BaseController
     end
     comment.attributes = comment_params
     if request.post? && comment.save
-      flash[:success] = I18n.t('admin.feedback.update.success')
-      redirect_to action: 'article', id: comment.article.id
+      flash[:success] = I18n.t("admin.feedback.update.success")
+      redirect_to action: "article", id: comment.article.id
     else
-      redirect_to action: 'edit', id: comment.id
+      redirect_to action: "edit", id: comment.id
     end
   end
 
   def article
     @article = this_blog.articles.find(params[:id])
-    @feedback = @article.comments.ham if params[:ham] && params[:spam].blank?
-    @feedback = @article.comments.spam if params[:spam] && params[:ham].blank?
-    @feedback ||= @article.comments
+    @feedback = @article.comments
+    @feedback = @feedback.ham if params[:ham] && params[:spam].blank?
+    @feedback = @feedback.spam if params[:spam] && params[:ham].blank?
   end
 
   def change_state
     return unless request.xhr?
 
     @feedback = Feedback.find(params[:id])
-    template = @feedback.change_state!
+    new_state = @feedback.change_state!
 
     respond_to do |format|
-      if params[:context] != 'listing'
-        @comments = Comment.last_published
-        page.replace_html('commentList', partial: 'admin/dashboard/comment')
-      elsif template == 'ham'
-        format.js { render 'ham' }
+      if new_state == "ham"
+        format.js { render "ham" }
       else
-        format.js { render 'spam' }
+        format.js { render "spam" }
       end
     end
   end
@@ -98,37 +98,46 @@ class Admin::FeedbackController < Admin::BaseController
     items = Feedback.find(ids)
     @unexpired = true
 
-    bulkop = (params[:bulkop_top] || {}).empty? ? params[:bulkop_bottom] : params[:bulkop_top]
+    bulkop = if (params[:bulkop_top] || {}).empty?
+               params[:bulkop_bottom]
+             else
+               params[:bulkop_top]
+             end
 
     case bulkop
-    when 'Delete Checked Items'
+    when "Delete Checked Items"
       count = 0
       ids.each do |id|
         count += Feedback.delete(id)
       end
-      flash[:success] = I18n.t('admin.feedback.bulkops.success_deleted', count: count)
-    when 'Mark Checked Items as Ham'
+      flash[:success] = I18n.t("admin.feedback.bulkops.success_deleted", count: count)
+    when "Mark Checked Items as Ham"
       update_feedback(items, :mark_as_ham!)
-      flash[:success] = I18n.t('admin.feedback.bulkops.success_mark_as_ham', count: ids.size)
-    when 'Mark Checked Items as Spam'
+      flash[:success] = I18n.t("admin.feedback.bulkops.success_mark_as_ham",
+                               count: ids.size)
+    when "Mark Checked Items as Spam"
       update_feedback(items, :mark_as_spam!)
-      flash[:success] = I18n.t('admin.feedback.bulkops.success_mark_as_spam', count: ids.size)
-    when 'Confirm Classification of Checked Items'
+      flash[:success] = I18n.t("admin.feedback.bulkops.success_mark_as_spam",
+                               count: ids.size)
+    when "Confirm Classification of Checked Items"
       update_feedback(items, :confirm_classification!)
-      flash[:success] = I18n.t('admin.feedback.bulkops.success_classification', count: ids.size)
-    when 'Delete all spam'
+      flash[:success] = I18n.t("admin.feedback.bulkops.success_classification",
+                               count: ids.size)
+    when "Delete all spam"
       if request.post?
-        Feedback.where('state = ?', 'spam').delete_all
-        flash[:success] = I18n.t('admin.feedback.bulkops.success_deleted_spam')
+        Feedback.where("state = ?", "spam").delete_all
+        flash[:success] = I18n.t("admin.feedback.bulkops.success_deleted_spam")
       end
     else
-      flash[:error] = I18n.t('admin.feedback.bulkops.error')
+      flash[:error] = I18n.t("admin.feedback.bulkops.error")
     end
 
     if params[:article_id]
-      redirect_to action: 'article', id: params[:article_id], confirmed: params[:confirmed], published: params[:published]
+      redirect_to action: "article", id: params[:article_id], confirmed: params[:confirmed],
+                  published: params[:published]
     else
-      redirect_to action: 'index', page: params[:page], search: params[:search], confirmed: params[:confirmed], published: params[:published]
+      redirect_to action: "index", page: params[:page], search: params[:search],
+                  confirmed: params[:confirmed], published: params[:published]
     end
   end