biovision-post 0.21.190513.0 → 0.26.191013.0

data/app/controllers/post_tags_controller.rb

@@ -26,13 +26,18 @@ class PostTagsController < AdminController
 
   private
 
-  def set_entity
-    @entity = PostTag.find_by(id: params[:id])
-    handle_http_404('Cannot find post_tag') if @entity.nil?
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def restrict_access
-    require_privilege_group :editors
+    error = 'Managing post tags is not allowed'
+    handle_http_401(error) unless component_handler.allow?('chief_editor')
+  end
+
+  def set_entity
+    @entity = PostTag.find_by(id: params[:id])
+    handle_http_404('Cannot find post_tag') if @entity.nil?
   end
 
   def entity_parameters

data/app/controllers/posts_controller.rb

@@ -20,8 +20,9 @@ class PostsController < ApplicationController
     if @entity.save
       apply_post_tags
       apply_post_categories
-      PostBodyParserJob.perform_later(@entity.id)
-      form_processed_ok(PostManager.new(@entity).post_path)
+      add_attachments if params.key?(:post_attachment)
+      mark_as_featured if params[:featured]
+      form_processed_ok(@entity.url)
     else
       form_processed_with_error(:new)
     end
@@ -48,8 +49,8 @@ class PostsController < ApplicationController
     if @entity.update(entity_parameters)
       apply_post_tags
       apply_post_categories
-      PostBodyParserJob.perform_later(@entity.id)
-      form_processed_ok(PostManager.new(@entity).post_path)
+      add_attachments if params.key?(:post_attachment)
+      form_processed_ok(@entity.url)
     else
       form_processed_with_error(:edit)
     end
@@ -57,9 +58,8 @@ class PostsController < ApplicationController
 
   # delete /posts/:id
   def destroy
-    if @entity.destroy #@entity.update(deleted: true)
-      flash[:notice] = t('posts.destroy.success')
-    end
+    flash[:notice] = t('posts.destroy.success') if @entity.destroy #@entity.update(deleted: true)
+
     redirect_to admin_posts_path
   end
 
@@ -70,7 +70,8 @@ class PostsController < ApplicationController
 
   # get /posts/:category_slug
   def category
-    @collection = Post.in_category(params[:category_slug]).page_for_visitors(current_page)
+    posts = Post.in_category(params[:category_slug])
+    @collection = posts.page_for_visitors(current_page)
     @category = @collection.first&.post_category
 
     handle_http_404('Cannot find post category in collection') if @category.nil?
@@ -88,12 +89,14 @@ class PostsController < ApplicationController
 
   # get /posts/rss/zen.xml
   def zen
-    @collection = Post.for_language(current_language).list_for_visitors.posted_after(3.days.ago)
+    posts = Post.for_language(current_language).list_for_visitors
+    @collection = posts.posted_after(3.days.ago)
   end
 
   # get /posts/rss.xml
   def rss
-    @collection = Post.for_language(current_language).list_for_visitors.first(20)
+    posts = Post.for_language(current_language).list_for_visitors
+    @collection = posts.first(20)
   end
 
   # get /posts/archive/(:year)(-:month)(-:day)
@@ -108,17 +111,22 @@ class PostsController < ApplicationController
 
   private
 
-  def set_entity
-    @entity = Post.find_by(id: params[:id])
-    handle_http_404('Cannot find post') if @entity.nil?
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def restrict_access
-    require_privilege_group :editors
+    error = 'Managing posts is not allowed'
+    handle_http_401(error) unless component_handler.allow?
+  end
+
+  def set_entity
+    @entity = Post.find_by(id: params[:id])
+    handle_http_404('Cannot find post') if @entity.nil?
   end
 
   def restrict_editing
-    if @entity.locked? || !@entity.editable_by?(current_user)
+    if @entity.locked? || !component_handler.editable?(@entity)
       handle_http_403('Post is locked or not editable by current user')
     end
   end
@@ -147,7 +155,7 @@ class PostsController < ApplicationController
   def owner_for_post
     key    = :user_for_entity
     result = {}
-    if current_user_has_privilege?(:chief_editor) && params.key?(key)
+    if component_handler.group?(:chief) && params.key?(key)
       result[:user_id] = param_from_request(key)
     end
     result
@@ -178,7 +186,21 @@ class PostsController < ApplicationController
     if Post.respond_to?(:search)
       Post.search(q).records.first(50).select(&:visible_to_visitors?)
     else
-      Post.where('title ilike ?', "%#{q}%").list_for_visitors.first(50)
+      Post.pg_search(q).list_for_visitors.first(50)
     end
   end
+
+  def add_attachments
+    permitted = PostAttachment.entity_parameters
+    parameters = params.require(:post_attachment).permit(permitted)
+
+    @entity.post_attachments.create(parameters)
+  end
+
+  def mark_as_featured
+    FeaturedPost.where(language: @entity.language).update_all('priority = priority + 1')
+    link = FeaturedPost.new(language: @entity.language, post: @entity)
+    link.priority = 1
+    link.save
+  end
 end

data/app/helpers/biovision_posts_helper.rb

@@ -70,26 +70,6 @@ module BiovisionPostsHelper
     end
   end
 
-  # @param [Integer] post_type_id
-  # @param [String] first_item
-  def post_categories_for_select(post_type_id, first_item = t(:not_set))
-    options = [[first_item, '']]
-    PostCategory.for_tree(post_type_id).each do |category|
-      options << [category.name, category.id]
-      if category.child_categories.any?
-        PostCategory.for_tree(post_type_id, category.id).each do |subcategory|
-          options << ["-#{subcategory.name}", subcategory.id]
-          if subcategory.child_categories.any?
-            PostCategory.for_tree(post_type_id, subcategory.id).each do |deep_category|
-              options << ["--#{deep_category.name}", deep_category.id]
-            end
-          end
-        end
-      end
-    end
-    options
-  end
-
   def post_layouts_for_select
     options = PostLayout.ordered_by_name.map { |i| [i.name, i.id] }
     options + [[t(:not_set), '']]
@@ -99,13 +79,22 @@ module BiovisionPostsHelper
   # @param [String] text
   # @param [Hash] options
   def post_link(entity, text = entity.title, options = {})
-    link_to(text, PostManager.new(entity).post_path, options)
+    link_to(text, entity.url, options)
   end
 
-  # @param [Post|PostCategory] entity
-  def post_category_link(entity)
-    handler = PostManager.new(entity)
-    link_to(handler.category_name, handler.category_path)
+  # @param [PostCategory] entity
+  # @param [String] text
+  # @param [Hash] options
+  def post_category_link(entity, text = nil, options = {})
+    text ||= entity.respond_to?(:name) ? entity.name : entity.title
+    link_to(text, entity.url, options)
+  end
+
+  # @param [PostType] entity
+  # @param [String] text
+  # @param [Hash] options
+  def post_type_link(entity, text = entity.category_name!, options = {})
+    link_to(text, entity.url, options)
   end
 
   # @param [PostGroup] entity
@@ -134,11 +123,23 @@ module BiovisionPostsHelper
     if entity.nil?
       link_to(tag_name, tagged_posts_path(tag_name: tag_name), rel: 'tag')
     else
-      handler = PostManager.new(entity)
-      link_to(tag_name, handler.tagged_path(tag_name), rel: 'tag')
+      link_to(tag_name, entity.tagged_path(tag_name), rel: 'tag')
     end
   end
 
+  # @param [PostAttachment] entity
+  # @param [String] text
+  # @param [Hash] options
+  def post_attachment_link(entity, text = entity.name!, options = {})
+    return '' if entity.file.blank?
+
+    default_options = {
+      target: '_blank'
+    }
+
+    link_to(text, entity.file.url, default_options.merge(options))
+  end
+
   # Post image preview for displaying in "administrative" lists
   #
   # @param [Post] entity

data/app/jobs/post_body_parser_job.rb

@@ -10,6 +10,6 @@ class PostBodyParserJob < ApplicationJob
 
     return if post.nil?
 
-    post.update(parsed_body: PostManager.new(post).parsed_body)
+    post.update(parsed_body: PostParser.new(post).parsed_body)
   end
 end

data/app/models/concerns/post_child_with_priority.rb

@@ -15,8 +15,9 @@ module PostChildWithPriority
     end
 
     # @param [User] user
+    # @deprecated use component handler
     def editable_by?(user)
-      post.editable_by?(user)
+      Biovision::Components::BaseComponent.handler('posts', user).editable?(post)
     end
 
     # @param [Integer] delta

data/app/models/editorial_member.rb

@@ -50,6 +50,14 @@ class EditorialMember < ApplicationRecord
     user.is_a?(self) || owned_by(user).visible.exists?
   end
 
+  # @param [String|User] user
+  def self.[](user)
+    criteria = {
+      user: user.is_a?(User) ? user : User.find_by(slug: user)
+    }
+    find_by(criteria)
+  end
+
   def name
     user.profile_name
   end
@@ -71,8 +79,9 @@ class EditorialMember < ApplicationRecord
   end
 
   # @param [User] user
+  # @deprecated use component handler
   def editable_by?(user)
-    UserPrivilege.user_has_privilege?(user, :chief_editor)
+    Biovision::Components::BaseComponent.handler('posts', user).editable?(self)
   end
 
   # @param [PostType] post_type

data/app/models/post.rb

@@ -45,21 +45,19 @@ class Post < ApplicationRecord
   has_many :post_post_tags, dependent: :destroy
   has_many :post_tags, through: :post_post_tags
   has_many :post_images, dependent: :destroy
+  has_many :post_attachments, dependent: :destroy
   has_many :post_translations, dependent: :delete_all
   has_many :post_zen_categories, dependent: :destroy
   has_many :zen_categories, through: :post_zen_categories
 
   after_initialize { self.uuid = SecureRandom.uuid if uuid.nil? }
   after_initialize { self.publication_time = Time.now if publication_time.nil? }
-  before_validation { self.slug = Canonizer.transliterate(title.to_s) if slug.blank? }
-  before_validation { self.slug = slug.downcase }
+  before_validation :prepare_slug
   before_validation :prepare_source_names
 
   validates_presence_of :uuid, :title, :slug, :body
   validates_length_of :title, maximum: TITLE_LIMIT
-  validates_length_of :slug, maximum: SLUG_LIMIT
   validates_length_of :lead, maximum: LEAD_LIMIT
-  validates_length_of :body, maximum: BODY_LIMIT
   validates_length_of :image_name, maximum: IMAGE_NAME_LIMIT
   validates_length_of :image_alt_text, maximum: ALT_LIMIT
   validates_length_of :image_source_name, maximum: META_LIMIT
@@ -74,14 +72,15 @@ class Post < ApplicationRecord
   validates_length_of :author_title, maximum: META_LIMIT
   validates_length_of :author_url, maximum: META_LIMIT
   validates_length_of :translator_name, maximum: META_LIMIT
-  validates_format_of :slug, with: SLUG_PATTERN
+  # validates_format_of :slug, with: SLUG_PATTERN
   validates_numericality_of :time_required, in: TIME_RANGE, allow_nil: true
 
   scope :recent, -> { order('publication_time desc') }
   scope :popular, -> { order('rating desc') }
   scope :visible, -> { where(visible: true, deleted: false, approved: true) }
   scope :published, -> { where('publication_time <= current_timestamp') }
-  scope :for_language, ->(language) { where(language: language) }
+  scope :for_language, ->(language) { where(language: language).or(where(language: nil)) }
+  scope :pg_search, ->(v) { where("posts_tsvector(title, lead, body) @@ phraseto_tsquery('russian', ?)", v) }
   scope :exclude_ids, ->(v) { where('posts.id not in (?)', Array(v)) unless v.blank? }
   scope :list_for_visitors, -> { visible.published.recent }
   scope :list_for_administration, -> { order('id desc') }
@@ -89,6 +88,7 @@ class Post < ApplicationRecord
   scope :tagged, ->(tag) { joins(:post_post_tags).where(post_post_tags: { post_tag_id: PostTag.ids_for_name(tag) }).distinct unless tag.blank? }
   scope :in_category, ->(slug) { joins(:post_post_categories).where(post_post_categories: { post_category_id: PostCategory.ids_for_slug(slug) }).distinct unless slug.blank? }
   scope :in_category_branch, ->(category) { joins(:post_post_categories).where(post_post_categories: { post_category_id: category.subbranch_ids }).distinct }
+  scope :with_category_ids, ->(v) { joins(:post_post_categories).where(post_post_categories: { post_category_id: Array(v) }) }
   scope :authors, -> { User.where(id: Post.author_ids).order('screen_name asc') }
   scope :of_type, ->(slug) { where(post_type: PostType.find_by(slug: slug)) unless slug.blank? }
   scope :archive, -> { f = Arel.sql('date(publication_time)'); distinct.order(f).pluck(f) }
@@ -116,7 +116,7 @@ class Post < ApplicationRecord
   end
 
   def self.entity_parameters
-    main_data = %i[body language_id lead original_title post_layout_id publication_time slug title]
+    main_data = %i[body language_id lead original_title post_layout_id publication_time region_id slug title]
     image_data = %i[image image_alt_text image_source_link image_source_name image_name]
     meta_data = %i[rating source_name source_link meta_title meta_description meta_keywords time_required]
     flags_data = %i[allow_comments allow_votes explicit show_owner visible translation]
@@ -148,9 +148,8 @@ class Post < ApplicationRecord
   def lead!
     if lead.blank?
       pattern = %r{<p>(.+?)</p>}
-      chunk = parsed_body.blank? ? body : parsed_body
-      passage = chunk.match(pattern)
-      (passage.nil? ? chunk.gsub(/<[^>]+>/, '') : passage[1]).to_s[0..499]
+      passage = body.match(pattern)
+      (passage.nil? ? body.gsub(/<[^>]+>/, '') : passage[1]).to_s[0..499]
     else
       lead
     end
@@ -167,6 +166,25 @@ class Post < ApplicationRecord
     end
   end
 
+  # @param [Symbol] locale
+  def url(locale = I18n.default_locale)
+    prefix = locale.nil? || locale == I18n.default_locale ? '' : "/#{locale}"
+    "#{prefix}/#{post_type.url_part}/#{id}-#{slug}"
+  end
+
+  # @param [String] tag_name
+  # @param [Symbol] locale
+  def tagged_path(tag_name, locale = I18n.default_locale)
+    prefix = locale.nil? || locale == I18n.default_locale ? '' : "/#{locale}"
+    "#{prefix}/#{post_type.url_part}/tagged/#{CGI.escape(tag_name)}"
+  end
+
+  def enclosures
+    body.scan(/<img[^>]+>/).map do |image|
+      image.scan(/src="([^"]+)"/)[0][0]
+    end
+  end
+
   # Get editorial member instance for this post
   #
   # If user can be shown and is member of editorial, this method returns
@@ -223,8 +241,9 @@ class Post < ApplicationRecord
   end
 
   # @param [User] user
+  # @deprecated use component handler
   def editable_by?(user)
-    owned_by?(user) || UserPrivilege.user_has_privilege?(user, :chief_editor)
+    Biovision::Components::BaseComponent.handler('posts', user).editable?(self)
   end
 
   def has_image_data?
@@ -253,8 +272,17 @@ class Post < ApplicationRecord
     update! tags_cache: post_tags.order('slug asc').map(&:name)
   end
 
+  def commentable_by?(user)
+    allow_comments? && !user.nil?
+  end
+
   private
 
+  def prepare_slug
+    self.slug = Canonizer.transliterate(title.to_s) if slug.blank?
+    self.slug = slug.downcase
+  end
+
   def prepare_source_names
     prepare_image_source
     prepare_source

data/app/models/post_attachment.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+# Model for post attachment
+#
+# Attributes
+#   created_at [DateTime]
+#   file [SimpleFileUploader]
+#   name [String]
+#   post_id [Post]
+#   updated_at [DateTime]
+#   uuid [UUID]
+class PostAttachment < ApplicationRecord
+  include Checkable
+
+  NAME_LIMIT = 120
+
+  mount_uploader :file, SimpleFileUploader
+
+  belongs_to :post
+
+  after_initialize { self.uuid = SecureRandom.uuid if uuid.nil? }
+
+  validates_length_of :name, maximum: NAME_LIMIT
+  validates_presence_of :file
+
+  scope :ordered_for_list, -> { order('name asc, file asc') }
+
+  def self.entity_parameters
+    %i[file name]
+  end
+
+  def name!
+    return '' if file.blank?
+
+    name.blank? ? CGI.unescape(File.basename(file.path)) : name
+  end
+
+  def size
+    return 0 if file.blank?
+
+    File.size(file.path)
+  end
+
+  # @param [User] user
+  # @deprecated use component handler
+  def editable_by?(user)
+    Biovision::Components::BaseComponent.handler('posts', user).editable?(post)
+  end
+end

data/app/models/post_category.rb

@@ -141,6 +141,12 @@ class PostCategory < ApplicationRecord
     post_post_categories.where(post: post).delete_all
   end
 
+  # @param [Symbol] locale
+  def url(locale = I18n.default_locale)
+    prefix = locale.nil? || locale == I18n.default_locale ? '' : "/#{locale}"
+    "#{prefix}/#{post_type.url_part}/#{long_slug}"
+  end
+
   def text_for_link
     nav_text.blank? ? name : nav_text
   end