biovision-post 0.21.190513.0 → 0.26.191013.0

data/app/controllers/authors_controller.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
+# Displaying post authors
 class AuthorsController < ApplicationController
-  before_action :set_entity, except: [:index]
+  before_action :set_entity, except: :index
 
   # get /authors
   def index
@@ -17,11 +20,13 @@ class AuthorsController < ApplicationController
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
   def set_entity
     user = User.find_by(slug: params[:slug].downcase, deleted: false)
     @entity = EditorialMember.visible.find_by(user: user)
-    if @entity.nil?
-      handle_http_404('Cannot find user')
-    end
+    handle_http_404('Cannot find user') if @entity.nil?
   end
 end

data/app/controllers/blog_posts_controller.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
+# Viewing blog posts
 class BlogPostsController < ApplicationController
   before_action :set_category, only: :category
   before_action :set_entity, only: :show
 
   # get /blog_posts
   def index
-    post_type   = PostType.find_by(slug: 'blog_post')
-    @collection = post_type.posts.for_language(current_language).page_for_visitors(current_page)
+    posts = PostType['blog_post'].posts.for_language(current_language)
+    @collection = posts.page_for_visitors(current_page)
     respond_to do |format|
       format.html
       format.json { render('posts/index') }
@@ -14,7 +17,8 @@ class BlogPostsController < ApplicationController
 
   # get /blog_posts/:category_slug
   def category
-    @collection = Post.in_category_branch(@category).for_language(current_language).page_for_visitors(current_page)
+    posts = Post.in_category_branch(@category).for_language(current_language)
+    @collection = posts.page_for_visitors(current_page)
     respond_to do |format|
       format.html
       format.json { render('posts/index') }
@@ -26,18 +30,24 @@ class BlogPostsController < ApplicationController
     @entity.increment :view_count
     @entity.increment :rating, 0.0025
     @entity.save
+
+    render 'posts/show'
   end
 
   # get /blog_posts/tagged/:tag_name
   def tagged
-    post_type   = PostType.find_by(slug: 'blog_post')
-    @collection = post_type.posts.tagged(params[:tag_name]).page_for_visitors(current_page)
+    posts = PostType['blog_post'].posts.tagged(params[:tag_name])
+    @collection = posts.page_for_visitors(current_page)
   end
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
   def set_category
-    type = PostType.find_by(slug: 'blog_post')
+    type = PostType['blog_post']
     @category = type.post_categories.find_by(long_slug: params[:category_slug])
     handle_http_404('Cannot find post category (blog_post)') if @category.nil?
   end

data/app/controllers/editorial_members_controller.rb

@@ -40,6 +40,15 @@ class EditorialMembersController < AdminController
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
+  def restrict_access
+    error = 'Managing editorial members is not allowed'
+    handle_http_401(error) unless component_handler.allow?('chief_editor')
+  end
+
   def set_entity
     @entity = EditorialMember.find_by(id: params[:id])
     if @entity.nil?
@@ -47,10 +56,6 @@ class EditorialMembersController < AdminController
     end
   end
 
-  def restrict_access
-    require_privilege :chief_editor
-  end
-
   def entity_parameters
     params.require(:editorial_member).permit(EditorialMember.entity_parameters)
   end

data/app/controllers/featured_posts_controller.rb

@@ -21,8 +21,13 @@ class FeaturedPostsController < AdminController
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
   def restrict_access
-    require_privilege :chief_editor
+    error = 'Managing featured posts is not allowed'
+    handle_http_401(error) unless component_handler.allow?('chief_editor', 'deputy_chief_editor')
   end
 
   def creation_parameters

data/app/controllers/my/posts_controller.rb

@@ -1,51 +1,34 @@
+# frozen_string_literal: true
+
+# Post handler for user
 class My::PostsController < ProfileController
-  before_action :set_entity, only: [:show, :edit, :update, :destroy]
-  before_action :restrict_editing, only: [:edit, :update, :destroy]
+  before_action :set_entity, only: %i[show edit update destroy]
+  before_action :restrict_editing, only: %i[edit update destroy]
 
   # get /my/posts
   def index
     @collection = Post.page_for_owner(current_user, current_page)
   end
 
-  # get /my/posts/new
-  def new
-    @entity = Post.new
-  end
-
   # get /my/articles/new
   def new_article
-    if current_user_has_privilege?(:editor)
-      @entity = Post.of_type(:article).new
-      render :new
-    else
-      handle_http_401('User has no editor privilege')
-    end
+    render_form_if_allowed 'article'
   end
 
   # get /my/news/new
   def new_news
-    if current_user_has_privilege?(:reporter)
-      @entity = Post.of_type(:news).new
-      render :new
-    else
-      handle_http_401('User has no reporter privilege')
-    end
+    render_form_if_allowed 'news'
   end
 
   # get /my/blog_posts/new
   def new_blog_post
-    if current_user_has_privilege?(:blogger)
-      @entity = Post.of_type(:blog_post).new
-      render :new
-    else
-      handle_http_401('User has no blogger privilege')
-    end
+    render_form_if_allowed 'blog_post'
   end
 
   # post /my/posts
   def create
     @entity = Post.new(creation_parameters)
-    if @entity.save
+    if component_handler.allow_post_type?(@entity.post_type) && @entity.save
       apply_post_tags
       form_processed_ok(my_post_path(id: @entity.id))
     else
@@ -73,40 +56,54 @@ class My::PostsController < ProfileController
 
   # delete /my/posts/:id
   def destroy
-    if @entity.destroy
-      flash[:notice] = t('posts.destroy.success')
-    end
+    flash[:notice] = t('posts.destroy.success') if @entity.destroy
+
     redirect_to my_posts_path
   end
 
   # get /my/articles
   def articles
-    @collection = Post.of_type(:article).page_for_owner(current_user, current_page)
+    prepare_collection 'article'
   end
 
   # get /my/news
   def news_index
-    @collection = Post.of_type(:news).page_for_owner(current_user, current_page)
+    prepare_collection 'news'
   end
 
   # get /my/blog
   def blog_posts
-    @collection = Post.of_type(:blog_post).page_for_owner(current_user, current_page)
+    prepare_collection 'blog_post'
   end
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
+  # @param [String] slug
+  def render_form_if_allowed(slug)
+    if component_handler.allow_post_type?(slug)
+      @entity = PostType[slug].posts.new
+      render :new
+    else
+      handle_http_401("User cannot create posts of type #{slug}")
+    end
+  end
+
+  # @param [String] slug
+  def prepare_collection(slug)
+    @collection = PostType[slug].posts.page_for_owner(current_user, current_page)
+  end
+
   def set_entity
     @entity = Post.owned_by(current_user).find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find post')
-    end
+    handle_http_404('Cannot find post') if @entity.nil?
   end
 
   def restrict_editing
-    if @entity.locked?
-      handle_http_403('Entity is locked')
-    end
+    handle_http_403('Entity is locked') if @entity.locked?
   end
 
   def entity_parameters

data/app/controllers/news_controller.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
+# News for visitors
 class NewsController < ApplicationController
   before_action :set_category, only: :category
   before_action :set_entity, only: :show
 
   # get /news
   def index
-    post_type   = PostType.find_by(slug: 'news')
-    @collection = post_type.posts.for_language(current_language).page_for_visitors(current_page)
+    posts = PostType['news'].posts.for_language(current_language)
+    @collection = posts.page_for_visitors(current_page)
     respond_to do |format|
       format.html
       format.json { render('posts/index') }
@@ -14,7 +17,8 @@ class NewsController < ApplicationController
 
   # get /news/:category_slug
   def category
-    @collection = Post.in_category_branch(@category).for_language(current_language).page_for_visitors(current_page)
+    posts = Post.in_category_branch(@category).for_language(current_language)
+    @collection = posts.page_for_visitors(current_page)
     respond_to do |format|
       format.html
       format.json { render('posts/index') }
@@ -26,18 +30,24 @@ class NewsController < ApplicationController
     @entity.increment :view_count
     @entity.increment :rating, 0.0025
     @entity.save
+
+    render 'posts/show'
   end
 
   # get /news/tagged/:tag_name
   def tagged
-    post_type   = PostType.find_by(slug: 'news')
-    @collection = post_type.posts.tagged(params[:tag_name]).page_for_visitors(current_page)
+    posts = PostType['news'].posts
+    @collection = posts.tagged(params[:tag_name]).page_for_visitors(current_page)
   end
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
   def set_category
-    type      = PostType.find_by(slug: 'news')
+    type = PostType['news']
     @category = type.post_categories.find_by(long_slug: params[:category_slug])
     handle_http_404('Cannot find post category (news)') if @category.nil?
   end

data/app/controllers/post_attachments_controller.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Controller for deleting post attachments
+class PostAttachmentsController < AdminController
+  before_action :set_entity, only: :destroy
+  before_action :restrict_editing, only: :destroy
+
+  # delete /post_attachments/:id
+  def destroy
+    @entity.destroy
+
+    redirect_to(admin_post_path(id: @entity.post_id))
+  end
+
+  private
+
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
+  def restrict_access
+    error = 'Managing post attachments is not allowed'
+    handle_http_401(error) unless component_handler.allow?
+  end
+
+  def restrict_editing
+    return if component_handler.editable?(@entity)
+
+    handle_http_403("Attachment is not editable by user #{current_user&.id}")
+  end
+
+  def set_entity
+    @entity = PostAttachment.find_by(id: params[:id])
+    handle_http_404('Cannot find post_attachment') if @entity.nil?
+  end
+end

data/app/controllers/post_categories_controller.rb

@@ -40,8 +40,13 @@ class PostCategoriesController < AdminController
 
   protected
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
   def restrict_access
-    require_privilege :chief_editor
+    error = 'Managing post categories is not allowed'
+    handle_http_401(error) unless component_handler.allow?('chief_editor')
   end
 
   def restrict_editing

data/app/controllers/post_groups_controller.rb

@@ -61,13 +61,18 @@ class PostGroupsController < ApplicationController
 
   private
 
-  def set_entity
-    @entity = PostGroup.find_by(id: params[:id])
-    handle_http_404('Cannot find post_group') if @entity.nil?
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def restrict_access
-    require_privilege :chief_editor
+    error = 'Managing post groups is not allowed'
+    handle_http_401(error) unless component_handler.allow?('chief_editor')
+  end
+
+  def set_entity
+    @entity = PostGroup.find_by(id: params[:id])
+    handle_http_404('Cannot find post_group') if @entity.nil?
   end
 
   def entity_parameters

data/app/controllers/post_illustrations_controller.rb

@@ -12,8 +12,13 @@ class PostIllustrationsController < ApplicationController
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
   def restrict_access
-    require_privilege_group :editors
+    error = 'Managing post groups is not allowed'
+    handle_http_401(error) unless component_handler.allow?
   end
 
   def ckeditor_parameters

data/app/controllers/post_images_controller.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Managing post images
 class PostImagesController < AdminController
   before_action :set_entity, only: [:edit, :update, :destroy]
   before_action :restrict_editing, only: [:edit, :update, :destroy]
@@ -35,19 +38,17 @@ class PostImagesController < AdminController
 
   private
 
-  def set_entity
-    @entity = PostImage.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find post_image')
-    end
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
-  def restrict_access
-    require_privilege_group :editors
+  def set_entity
+    @entity = PostImage.find_by(id: params[:id])
+    handle_http_404('Cannot find post_image') if @entity.nil?
   end
 
   def restrict_editing
-    unless @entity.editable_by?(current_user)
+    unless component_handler.editable?(@entity.post)
       handle_http_401('Post image is not editable by current user')
     end
   end

data/app/controllers/post_links_controller.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Managing post links
 class PostLinksController < AdminController
   before_action :set_entity, only: :destroy
 
@@ -20,8 +23,8 @@ class PostLinksController < AdminController
 
   private
 
-  def restrict_access
-    require_privilege_group :editors
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def entity_parameters