publify_core 9.0.0.pre6 → 9.0.0

data/app/controllers/comments_controller.rb

@@ -1,4 +1,4 @@
-class CommentsController < FeedbackController
+class CommentsController < BaseController
   before_action :get_article, only: [:create, :preview]
 
   def create
@@ -43,7 +43,6 @@ class CommentsController < FeedbackController
   def new_comment_defaults
     { ip: request.remote_ip,
       author: 'Anonymous',
-      published: true,
       user: @current_user,
       user_agent: request.env['HTTP_USER_AGENT'],
       referrer: request.env['HTTP_REFERER'],
@@ -53,7 +52,7 @@ class CommentsController < FeedbackController
   def set_cookies_for(comment)
     add_to_cookies(:author, comment.author)
     add_to_cookies(:url, comment.url)
-    unless comment.email.blank?
+    if comment.email.present?
       add_to_cookies(:gravatar_id, Digest::MD5.hexdigest(comment.email.strip))
     end
   end

data/app/controllers/content_controller.rb

@@ -1,21 +1,5 @@
 class ContentController < BaseController
-  class ExpiryFilter
-    def before(_controller)
-      @request_time = Time.now
-    end
-
-    def after(controller)
-      future_article =
-        this_blog.articles.where('published = ? AND published_at > ?', true, @request_time).
-          order('published_at ASC').first
-      if future_article
-        delta = future_article.published_at - Time.now
-        controller.response.lifetime = delta <= 0 ? 0 : delta
-      end
-    end
-  end
-
-  protected
+  private
 
   # TODO: Make this work for all content.
   def auto_discovery_feed(options = {})
@@ -28,4 +12,11 @@ class ContentController < BaseController
   def theme_layout
     this_blog.current_theme.layout(action_name)
   end
+
+  def render_cached_xml(template, object)
+    feed = cache([controller_name, template, object]) do
+      render_to_string template, layout: false
+    end
+    render xml: feed
+  end
 end

data/app/controllers/feedback_controller.rb

@@ -1,45 +1,11 @@
 class FeedbackController < BaseController
-  before_action :get_article, only: [:create]
-
-  # Used only by comments. Maybe need move to comments controller
-  # or use it in our code with send some feed about trackback
-  #
-  # Redirect to article with good anchor with /comments?article_id=xxx ou
-  # /trackacks?article_id=xxx
-  #
-  # If no article_id params, so no page found. TODO: See all
-  # comments/trackbacks with paginate ?
-  #
-  # If /comments.rss|atom or /trabacks.atom|rss see a feed about all comments
-  # or trackback
-  #
-  # If article_id params in feed see only this comment|feedback on this
-  # article.
-  #
-  # TODO: It's usefull but use anywhere. Create some extension in xml_sidebar
-  # to define this feed.
   def index
-    @page_title = self.class.name.to_s.sub(/Controller$/, '')
+    @feedback = Feedback.ham.
+      newest_first.
+      limit(this_blog.per_page(params[:format]))
     respond_to do |format|
-      format.html do
-        if params[:article_id]
-          article = Article.find(params[:article_id])
-          redirect_to "#{URI.parse(article.permalink_url).path}\##{@page_title.underscore}"
-        else
-          render plain: 'this space left blank'
-        end
-      end
-      feedbacks = Feedback.from(controller_name, params[:article_id]).limit(this_blog.per_page(params[:format]))
-      format.atom { render_feed 'atom', feedbacks }
-      format.rss { render_feed 'rss', feedbacks }
+      format.atom { render 'index', format: 'atom' }
+      format.rss { render 'index', format: 'rss' }
     end
   end
-
-  protected
-
-  def render_feed(format, collection)
-    ivar_name = "@#{self.class.to_s.sub(/Controller$/, '').underscore}"
-    instance_variable_set(ivar_name, collection)
-    render "index_#{format}_feed"
-  end
 end

data/app/controllers/notes_controller.rb

@@ -15,9 +15,7 @@ class NotesController < ContentController
   end
 
   def show
-    @note = Note.published.find_by permalink: CGI.escape(params[:permalink])
-
-    return render 'errors/404', status: 404 unless @note
+    @note = Note.published.find_by! permalink: CGI.escape(params[:permalink])
 
     if @note.in_reply_to_message.present?
       @reply = JSON.parse(@note.in_reply_to_message)

data/app/controllers/setup_controller.rb

@@ -1,30 +1,25 @@
 class SetupController < BaseController
-  before_action :check_config, only: 'index'
+  before_action :check_config
   layout 'accounts'
 
   def index
-    return unless request.post?
+  end
 
+  def create
     this_blog.blog_name = params[:setting][:blog_name]
     this_blog.base_url = blog_base_url
 
     @user = User.new(login: 'admin',
                      email: params[:setting][:email],
+                     password: params[:setting][:password],
                      nickname: 'Publify Admin')
-    @user.generate_password!
     @user.name = @user.login
 
-    unless this_blog.valid? && @user.valid?
+    unless this_blog.save && @user.save
       redirect_to setup_url
       return
     end
 
-    return unless this_blog.save
-
-    session[:tmppass] = @user.password
-
-    return unless @user.save
-
     sign_in @user
 
     if User.count == 1
@@ -32,24 +27,25 @@ class SetupController < BaseController
       create_first_page @user
     end
 
+    EmailNotify.send_user_create_notification(@user)
+
     redirect_to confirm_accounts_url
   end
 
   private
 
   def create_first_post(user)
-    this_blog.articles.create(title: I18n.t('setup.article.title'),
-                              author: user.login,
-                              body: I18n.t('setup.article.body'),
-                              allow_comments: 1,
-                              allow_pings: 1,
-                              published: 1,
-                              user: user)
+    this_blog.articles.build(title: I18n.t('setup.article.title'),
+                             author: user.login,
+                             body: I18n.t('setup.article.body'),
+                             allow_comments: 1,
+                             allow_pings: 1,
+                             user: user).publish!
   end
 
   def create_first_page(user)
     this_blog.pages.create(name: 'about',
-                           published: true,
+                           state: 'published',
                            title: I18n.t('setup.page.about'),
                            user: user,
                            body: I18n.t('setup.page.body'))

data/app/controllers/tags_controller.rb

@@ -6,38 +6,36 @@ class TagsController < ContentController
     @tags = Tag.page(params[:page]).per(100)
     @page_title = controller_name.capitalize
     @keywords = ''
-    @description = "#{self.class.to_s.sub(/Controller$/, '')} for #{this_blog.blog_name}"
+    @description = "Tags for #{this_blog.blog_name}"
   end
 
   def show
-    @grouping = Tag.find_by(name: params[:id])
-    if @grouping.nil?
-      @articles = []
-    else
-      @page_title = this_blog.tag_title_template.to_title(@grouping, this_blog, params)
-      @description = @grouping.description.to_s
-      @keywords = ''
-      @keywords << @grouping.keywords unless @grouping.keywords.blank?
-      @keywords << this_blog.meta_keywords unless this_blog.meta_keywords.blank?
-      @articles = @grouping.articles.published.page(params[:page]).per(10)
-    end
+    @tag = Tag.find_by!(name: params[:id])
+
+    @articles = @tag.
+      contents.includes(:blog, :user, :tags, :resources, :text_filter).
+      published.page(params[:page]).per(10)
+
     respond_to do |format|
       format.html do
         if @articles.empty?
-          render 'errors/404', status: 404
+          raise ActiveRecord::RecordNotFound
         else
+          @page_title = this_blog.tag_title_template.to_title(@tag, this_blog, params).strip
+          @description = this_blog.tag_desc_template.to_title(@tag, this_blog, params).strip
+          @keywords = this_blog.meta_keywords
           render template_name(params[:id])
         end
       end
 
       format.atom do
         @articles = @articles[0, this_blog.limit_rss_display]
-        render 'articles/index_atom_feed', layout: false
+        render_cached_xml 'articles/index_atom_feed', @articles
       end
 
       format.rss do
         @articles = @articles[0, this_blog.limit_rss_display]
-        render 'articles/index_rss_feed', layout: false
+        render_cached_xml 'articles/index_rss_feed', @articles
       end
     end
   end

data/app/controllers/theme_controller.rb

@@ -24,17 +24,19 @@ class ThemeController < ContentController
   private
 
   def render_theme_item(type, file, mime = nil)
-    mime ||= mime_for(file)
-    if file.split(%r{[\\/]}).include?('..')
-      return (render 'errors/404', status: 404, formats: ['html'])
-    end
+    return render_not_found if file.split(%r{[\\/]}).include?('..')
 
     src = this_blog.current_theme.path + "/#{type}/#{file}"
-    return (render plain: 'Not Found', status: 404) unless File.exist? src
+    return render_not_found unless File.exist? src
 
+    mime ||= mime_for(file)
     send_file(src, type: mime, disposition: 'inline', stream: true)
   end
 
+  def render_not_found
+    render plain: 'Not Found', status: 404
+  end
+
   def mime_for(filename)
     case filename.downcase
     when /\.js$/

data/app/controllers/xml_controller.rb

@@ -1,66 +1,18 @@
 class XmlController < BaseController
-  NORMALIZED_FORMAT_FOR = { 'atom' => 'atom', 'rss' => 'rss',
-                            'atom10' => 'atom', 'atom03' => 'atom', 'rss20' => 'rss',
-                            'googlesitemap' => 'googlesitemap', 'rsd' => 'rsd' }.freeze
+  def sitemap
+    @items = []
+    @blog = this_blog
 
-  ACCEPTED_TYPE = %w(feed comments article tag author trackbacks sitemap).freeze
+    @feed_title = this_blog.blog_name
+    @link = this_blog.base_url
+    @self_url = request.url
 
-  def feed
-    @format = 'rss'
-    if params[:format]
-      @format = NORMALIZED_FORMAT_FOR[params[:format]]
-      return render(plain: 'Unsupported format', status: 404) unless @format
-    end
-
-    # TODO: Move redirects into config/routes.rb, if possible
-    param_type = ACCEPTED_TYPE.dup.delete(params[:type])
-    param_id = params[:id] # .present? && params[:id].to_i # Think about a way to secure that to a valid tag/author for int value ...
-
-    case param_type
-    when 'feed'
-      redirect_to controller: 'articles', action: 'index', format: @format, status: :moved_permanently
-    when 'comments'
-      redirect_to admin_comments_url(format: @format), status: :moved_permanently
-    when 'article'
-      redirect_to this_blog.articles.find(param_id).feed_url(@format), status: :moved_permanently
-    when 'tag', 'author'
-      redirect_to send("#{param_type}_url", param_id, format: @format), status: :moved_permanently
-    when 'trackbacks'
-      redirect_to trackbacks_url(format: @format), status: :moved_permanently
-    when 'sitemap'
-      @items = []
-      @blog = this_blog
-
-      @feed_title = this_blog.blog_name
-      @link = this_blog.base_url
-      @self_url = request.url
+    @items += Article.find_already_published(1000)
+    @items += Page.find_already_published(1000)
+    @items += Tag.find_all_with_content_counters unless this_blog.unindex_tags
 
-      @items += Article.find_already_published(1000)
-      @items += Page.find_already_published(1000)
-      @items += Tag.find_all_with_article_counters unless this_blog.unindex_tags
-
-      respond_to do |format|
-        format.googlesitemap
-      end
-    else
-      return render(plain: 'Unsupported feed type', status: 404)
+    respond_to do |format|
+      format.googlesitemap
     end
   end
-
-  # TODO: Move redirects into config/routes.rb, if possible
-  def articlerss
-    redirect_to(URI.parse(Article.find(params[:id]).feed_url('rss')).path, status: :moved_permanently)
-  end
-
-  def commentrss
-    redirect_to admin_comments_url(format: 'rss'), status: :moved_permanently
-  end
-
-  def trackbackrss
-    redirect_to trackbacks_url(format: 'rss'), status: :moved_permanently
-  end
-
-  def rsd
-    render 'rsd', formats: [:rsd], handlers: [:builder]
-  end
 end

data/app/helpers/authors_helper.rb

@@ -2,7 +2,7 @@ module AuthorsHelper
   include BlogHelper
 
   def display_profile_item(item, item_desc)
-    return unless item.present?
+    return if item.blank?
     item = link_to(item, item) if is_url?(item)
     content_tag :li do
       safe_join([item_desc, item], ' ')
@@ -16,7 +16,7 @@ module AuthorsHelper
   end
 
   def author_description(user)
-    return unless user.description.present?
+    return if user.description.blank?
 
     content_tag(:div, user.description, id: 'author-description')
   end

data/app/helpers/base_helper.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 # Methods added to this helper will be available to all templates in the application.
 require 'digest/sha1'
 
@@ -38,7 +39,12 @@ module BaseHelper
     options = {}
     options[:class] = style if style
     options[:rel] = 'nofollow' if nofollow
-    link_to title, item.permalink_url(anchor, only_path), options
+    url = item.permalink_url(anchor, only_path)
+    if url
+      link_to title, url, options
+    else
+      title
+    end
   end
 
   def avatar_tag(options = {})
@@ -52,7 +58,7 @@ module BaseHelper
   end
 
   def meta_tag(name, value)
-    tag :meta, name: name, content: value unless value.blank?
+    tag :meta, name: name, content: value if value.present?
   end
 
   def markup_help_popup(markup, text)
@@ -98,7 +104,7 @@ module BaseHelper
                       user.resource.upload.avatar.url
                     end
       return if avatar_path.nil?
-      avatar_url = File.join(this_blog.base_url, avatar_path)
+      avatar_url = this_blog.file_url(avatar_path)
     elsif user.twitter_profile_image.present?
       avatar_url = user.twitter_profile_image
     end
@@ -168,6 +174,7 @@ module BaseHelper
   end
 
   def display_date_and_time(timestamp)
+    return if timestamp.blank?
     if this_blog.date_format == 'setting_date_format_distance_of_time_in_words'
       timeago_tag timestamp, date_only: false
     else
@@ -177,7 +184,7 @@ module BaseHelper
 
   def show_meta_keyword
     return unless this_blog.use_meta_keyword
-    meta_tag 'keywords', @keywords unless @keywords.blank?
+    meta_tag 'keywords', @keywords if @keywords.present?
   end
 
   def stop_index_robots?(blog)

data/app/helpers/xml_helper.rb

@@ -1,7 +1,7 @@
 module XmlHelper
   def collection_lastmod(collection)
-    article_updated = collection.articles.order(updated_at: :desc).first
-    article_published = collection.articles.order(published_at: :desc).first
+    article_updated = collection.contents.order(updated_at: :desc).first
+    article_published = collection.contents.order(published_at: :desc).first
 
     times = []
     times.push article_updated.updated_at if article_updated

data/app/jobs/application_job.rb

@@ -0,0 +1,2 @@
+class ApplicationJob < ActiveJob::Base
+end

data/app/models/archives_sidebar.rb

@@ -6,16 +6,12 @@ class ArchivesSidebar < Sidebar
 
   attr_accessor :archives
 
-  def self.date_func
+  def self.date_funcs
     @date_func ||=
-      begin
-        if Content.connection.is_a?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)
-          "strftime('%Y', published_at) as year, strftime('%m', published_at) as month"
-        else
-          'extract(year from published_at) as year,extract(month from published_at) as month'
-        end
-      rescue NameError
-        'extract(year from published_at) as year,extract(month from published_at) as month'
+      if Content.connection.class.name =~ /SQLite3Adapter/
+        ["strftime('%Y', published_at) as year", "strftime('%m', published_at) as month"]
+      else
+        ['extract(year from published_at) as year', 'extract(month from published_at) as month']
       end
   end
 
@@ -25,9 +21,10 @@ class ArchivesSidebar < Sidebar
     # Unfortunately, there's no universally-supported way to do this
     # across all three of our supported DBs.  So, we resort to a bit of
     # DB-specific code.
-    date_func = self.class.date_func
+    date_funcs = self.class.date_funcs
 
-    article_counts = Content.find_by_sql(["select count(*) as count, #{date_func} from contents where type='Article' and published = ? and published_at < ? group by year,month order by year desc,month desc limit ? ", true, Time.now, count.to_i])
+    article_counts = Article.published.select('count(*) as count', *date_funcs).
+      group(:year, :month).reorder('year desc', 'month desc').limit(count.to_i)
 
     @archives = article_counts.map do |entry|
       month = entry.month.to_i