publify_core 9.0.0.pre6 → 9.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4ddb8abe1bcadcc8e3361b43640b49c27d19d88
-  data.tar.gz: 9aaf729490e771bb1c0550f141a21b6f8a70a8e8
+  metadata.gz: 1f81670a189d8b1a57d349dc688c93340d586128
+  data.tar.gz: 5fd4da9990342b133e045b7a797564407dbf915d
 SHA512:
-  metadata.gz: 7b86a3b54ba1aff46aaeaa761027dcebd04b3cc0421ee3368a128e09a76fea8e5b4449b867a7118c23ade55bcaf007f7a919540762d74ea238a167bff38d2407
-  data.tar.gz: 351d77f8f08da235ca634570e2ccdcbb8c7a627f29ce2b2f986f1abe182a49bd9b3746d6a27434527948c688d3376063e906fa3934640a96375a792eb9686c53
+  metadata.gz: a69c04c575796c90ac2df1c7d7de537c328f6633e93e94833896efb27c355239c8a5d211bd9b3fb4938c45d847cf38323fca36ed4a1b17a96ec082bb2b6415a2
+  data.tar.gz: 0f4331c8fdb2fdc2c1bc2f1b61ed7cc0918bf195a1afe1f794adbb1f8d40e18b5cc077ef4e19a534702ea66448b6bda267629c4ea8f7939b72005bca7ff0b84f

data/CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## 9.0.0
+
+* Replace page caching with fragment caching
+* Replace home-grown state machine with aasm
+* Remove automigration. Users should run db:migrate themselves
+* Let first-run users pick their own password instead of generating one
+
+* Dependencies
+  - Update dependencies
+  - Drop support for Ruby 2.1
+
+* Removing of old/outdated functionality
+  - Remove support for feedburner
+  - Drop old redirects
+  - Remove RSD end point
+
+* Feedback
+  - Stop sending trackbacks and pingbacks
+  - Stop accepting trackbacks
+
+* Improve Atom/RSS feeds
+  - Fix URLs used for resources
+  - Fix URL/alternate links to not just point to the site root
+  - Unify comment and trackback feeds into feedback feed
+  - Add caching for feeds
+  - Fix atom entry publication date
+  - Fix ordering of feedback feed by using created_at
+
+* Bug fixes
+  - Fix user resource image display when using Fog
+  - Fix sending of welcome email
+  - Fix Tag page description
+  - Handle setting published_at to blank
+  - Handle preview of articles without publication date
+  - Include CSRF meta tag so remote forms work
+  - Fix sidebar field rendering in admin
+  - Fix formatting of settings forms in admin
+
+* Code improvements
+  - Performance improvements
+  - Improve tags controller
+  - Clean up archives and authors page code
+  - Unify content models more to improve performance when mixing models
+
 ## 9.0.0.pre6 / 2016-12-23
 
 * Remove now-broken caching of theme assets

data/README.md

@@ -0,0 +1,9 @@
+# PublifyCore
+
+This is the core of the Publify blogging system.
+
+See [the main Publify repository](https://github.com/publify/publify/) for more details.
+
+## License
+
+See MIT-LICENSE for details.

data/app/controllers/admin/base_controller.rb

@@ -8,7 +8,6 @@ class Admin::BaseController < BaseController
   layout 'administration'
 
   before_action :login_required, except: [:login, :signup]
-  before_action :look_for_needed_db_updates, except: [:login, :signup]
 
   private
 
@@ -33,9 +32,4 @@ class Admin::BaseController < BaseController
     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?
-  end
 end

data/app/controllers/admin/content_controller.rb

@@ -37,6 +37,12 @@ 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'
@@ -60,6 +66,12 @@ class Admin::ContentController < Admin::BaseController
 
     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')
@@ -92,10 +104,9 @@ class Admin::ContentController < Admin::BaseController
 
     @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?
@@ -115,14 +126,14 @@ 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
+    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,8 +142,6 @@ 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
 
@@ -148,15 +157,25 @@ class Admin::ContentController < Admin::BaseController
   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
   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,
+             :title,
+             :keywords)
   end
 
   def get_layout

data/app/controllers/admin/dashboard_controller.rb

@@ -9,9 +9,10 @@ class Admin::DashboardController < Admin::BaseController
     t = Time.new
     today = t.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
@@ -29,7 +30,6 @@ class Admin::DashboardController < Admin::BaseController
 
     @statspam = Comment.spam.count
     @inbound_links = inbound_links
-    @publify_links = publify_dev
     publify_version
   end
 
@@ -61,11 +61,6 @@ class Admin::DashboardController < Admin::BaseController
     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)

data/app/controllers/admin/feedback_controller.rb

@@ -75,6 +75,7 @@ class Admin::FeedbackController < Admin::BaseController
     @feedback ||= @article.comments
   end
 
+  # TODO: Replace with actions that move to a specified state
   def change_state
     return unless request.xhr?
 

data/app/controllers/admin/notes_controller.rb

@@ -20,7 +20,7 @@ class Admin::NotesController < Admin::BaseController
   def create
     note = new_note
 
-    note.published = true
+    note.state = 'published'
     note.attributes = params[:note].permit!
     note.text_filter ||= current_user.default_text_filter
     note.published_at ||= Time.now

data/app/controllers/admin/pages_controller.rb

@@ -1,8 +1,8 @@
 # coding: utf-8
+
 require 'base64'
 
 class Admin::PagesController < Admin::BaseController
-  before_action :set_images, only: [:new, :edit]
   before_action :set_macro, only: [:new, :edit]
   before_action :set_page, only: [:show, :edit, :update, :destroy]
 
@@ -16,8 +16,8 @@ class Admin::PagesController < Admin::BaseController
   def new
     @page = Page.new
     @page.text_filter ||= default_textfilter
-    @page.published = true
     @page.user_id = current_user.id
+    @page.state = 'published'
   end
 
   def edit
@@ -60,10 +60,6 @@ class Admin::PagesController < Admin::BaseController
     @macros = TextFilterPlugin.macro_filters
   end
 
-  def set_images
-    @images = Resource.images.by_created_at.page(1).per(10)
-  end
-
   def get_layout
     case action_name
     when 'new', 'edit', 'create'
@@ -82,6 +78,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, :published, :text_filter)
+    params.require(:page).permit(:title, :body, :name, :state, :text_filter)
   end
 end

data/app/controllers/admin/sidebar_controller.rb

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

data/app/controllers/admin/tags_controller.rb

@@ -22,6 +22,7 @@ class Admin::TagsController < Admin::BaseController
   def update
     old_name = @tag.name
     if @tag.update(tag_params)
+      # TODO: Check whether these redirects are useful or ignored.
       Redirect.create(from_path: "/tag/#{old_name}", to_path: @tag.permalink_url(nil, true))
       redirect_to admin_tags_url, notice: I18n.t('admin.tags.edit.success')
     else

data/app/controllers/articles_controller.rb

@@ -8,31 +8,24 @@ class ArticlesController < ContentController
   helper :'admin/base'
 
   def index
-    conditions = this_blog.statuses_in_timeline ? ['type in (?, ?)', 'Article', 'Note'] : ['type = ?', 'Article']
+    wanted_types = this_blog.statuses_in_timeline ? ['Article', 'Note'] : ['Article']
 
     limit = this_blog.per_page(params[:format])
-    @articles = if params[:year].blank?
-                  this_blog.contents.published.where(conditions).page(params[:page]).per(limit)
-                else
-                  this_blog.contents.published_at(params.values_at(:year, :month, :day)).where(conditions).page(params[:page]).per(limit)
-                end
-
-    @page_title = this_blog.home_title_template
-    @description = this_blog.home_desc_template
-    if params[:year]
-      @page_title = this_blog.archives_title_template
-      @description = this_blog.archives_desc_template
-    elsif params[:page]
-      @page_title = this_blog.paginated_title_template
-      @description = this_blog.paginated_desc_template
-    end
-    @page_title = @page_title.to_title(@articles, this_blog, params)
-    @description = @description.to_title(@articles, this_blog, params)
-
-    @keywords = this_blog.meta_keywords
+    articles_base = if params[:year].blank?
+                      this_blog.contents.published
+                    else
+                      this_blog.contents.published_at(params.values_at(:year, :month, :day))
+                    end
+    @articles = articles_base.includes(:user, :resources, :tags, :text_filter).
+      where(type: wanted_types).page(params[:page]).per(limit)
 
     respond_to do |format|
-      format.html { render_paginated_index }
+      format.html do
+        set_index_title_and_description(this_blog, params)
+        @keywords = this_blog.meta_keywords
+
+        render_paginated_index
+      end
       format.atom do
         render_articles_feed('atom')
       end
@@ -50,8 +43,8 @@ class ArticlesController < ContentController
     @description = this_blog.search_desc_template.to_title(@articles, this_blog, params)
     respond_to do |format|
       format.html { render 'search' }
-      format.rss { render 'index_rss_feed', layout: false }
-      format.atom { render 'index_atom_feed', layout: false }
+      format.rss { render_articles_feed 'rss' }
+      format.atom { render_articles_feed 'atom' }
     end
   end
 
@@ -91,15 +84,15 @@ class ArticlesController < ContentController
       return redirect_to URI.parse(@article.permalink_url).path, status: 301 if @article
     end
 
-    r = Redirect.find_by(from_path: from)
-    return redirect_to r.full_to_path, status: 301 if r # Let redirection made outside of the blog on purpose (deal with it, Brakeman!)
-
-    render 'errors/404', status: 404
+    r = Redirect.find_by!(from_path: from)
+    # TODO: If linked to article, directly redirect to the article.
+    # Let redirection made outside of the blog on purpose (deal with it, Brakeman!)
+    redirect_to r.full_to_path, status: 301 if r
   end
 
   def archives
     limit = this_blog.limit_archives_display
-    @articles = this_blog.published_articles.page(params[:page]).per(limit)
+    @articles = this_blog.published_articles.includes(:tags).page(params[:page]).per(limit)
     @page_title = this_blog.archives_title_template.to_title(@articles, this_blog, params)
     @keywords = this_blog.meta_keywords
     @description = this_blog.archives_desc_template.to_title(@articles, this_blog, params)
@@ -115,13 +108,10 @@ class ArticlesController < ContentController
   end
 
   def view_page
-    if (@page = Page.find_by(name: Array(params[:name]).join('/'))) && @page.published?
-      @page_title = @page.title
-      @description = this_blog.meta_description
-      @keywords = this_blog.meta_keywords
-    else
-      render 'errors/404', status: 404
-    end
+    @page = Page.published.find_by!(name: Array(params[:name]).join('/'))
+    @page_title = @page.title
+    @description = this_blog.meta_description
+    @keywords = this_blog.meta_keywords
   end
 
   # TODO: Move to TextfilterController?
@@ -131,6 +121,20 @@ class ArticlesController < ContentController
 
   private
 
+  def set_index_title_and_description(blog, parameters)
+    @page_title = blog.home_title_template
+    @description = blog.home_desc_template
+    if parameters[:year]
+      @page_title = blog.archives_title_template
+      @description = blog.archives_desc_template
+    elsif parameters[:page]
+      @page_title = blog.paginated_title_template
+      @description = blog.paginated_desc_template
+    end
+    @page_title = @page_title.to_title(@articles, blog, parameters)
+    @description = @description.to_title(@articles, blog, parameters)
+  end
+
   def verify_config
     if !this_blog.configured?
       redirect_to controller: 'setup', action: 'index'
@@ -143,15 +147,16 @@ class ArticlesController < ContentController
 
   # See an article We need define @article before
   def show_article
-    @comment = Comment.new
-    @page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
-    @description = this_blog.article_desc_template.to_title(@article, this_blog, params)
-    groupings = @article.tags
-    @keywords = groupings.map(&:name).join(', ')
-
     auto_discovery_feed
     respond_to do |format|
-      format.html { render "articles/#{@article.post_type}" }
+      format.html do
+        @comment = Comment.new
+        @page_title = this_blog.article_title_template.to_title(@article, this_blog, params)
+        @description = this_blog.article_desc_template.to_title(@article, this_blog, params)
+
+        @keywords = @article.tags.map(&:name).join(', ')
+        render "articles/#{@article.post_type}"
+      end
       format.atom { render_feedback_feed('atom') }
       format.rss { render_feedback_feed('rss') }
       format.xml { render_feedback_feed('atom') }
@@ -161,26 +166,16 @@ class ArticlesController < ContentController
   end
 
   def render_articles_feed(format)
-    if this_blog.feedburner_url.empty? || request.env['HTTP_USER_AGENT'] =~ /FeedBurner/i
-      render "index_#{format}_feed", layout: false
-    else
-      redirect_to "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
-    end
+    render_cached_xml("index_#{format}_feed", @articles)
   end
 
   def render_feedback_feed(format)
-    @feedback = @article.published_feedback
-    render "feedback_#{format}_feed", layout: false
+    render_cached_xml("feedback_#{format}_feed", @article)
   end
 
   def render_paginated_index
     return error! if @articles.empty?
-    if this_blog.feedburner_url.empty?
-      auto_discovery_feed(only_path: false)
-    else
-      @auto_discovery_url_rss = "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
-      @auto_discovery_url_atom = "http://feeds2.feedburner.com/#{this_blog.feedburner_url}"
-    end
+    auto_discovery_feed(only_path: false)
     render 'index'
   end