biovision-post 0.21.190513.0 → 0.26.191013.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5427643da925dc232b54e52d704e542598d5ecb780211113eaecf43484df90b
-  data.tar.gz: 5cfcb7077d4bd067b95b1752f4bae1c4546bd51a9903440ac77c9bdc9e708367
+  metadata.gz: 0df3d21cefcd77f482394c4b8f72245a2cb543e9963e993e22e9d010e9178228
+  data.tar.gz: a74d55c6455fe9506305cabc57253a02098edf5003b5ee928356d38142b80f2c
 SHA512:
-  metadata.gz: dcc7a0e1c3c4914c90e60fb97ab9064465c1ef253c97e41cd73c6dad51ececd708ea7e5ab374aa38dbdbf0f55591a3b6db15f8ce31b69d6122e41ef0c045f28e
-  data.tar.gz: c2db01c994e6f5f1784fc725c62da961fa3440ef49bbb0bfc771485eae652f6e427d35c27781f361cfbfe4338d9ab7aa26a6b541b593088e2b15fba461032a44
+  metadata.gz: ed8a50e26c8181f9a9f5a1128652cc60bbf4f05d5eed30e5841142ac0f612e8f03d7a1691b3bbf8ea64f6fa636983d8045f6a8766d20db27086989a3518305d7
+  data.tar.gz: 3e71cc4ac3149e09528cab8893407f0a866a7ac3b0762615d9821903671962f2a033f27a093500308770abf316179ccaf9989640f37c9ab8aa8c46264af8614b

data/app/assets/config/biovision_post_manifest.js

@@ -1,2 +1,3 @@
+//= link_tree ../images
 //= link_directory ../javascripts/biovision/post .js
 //= link_directory ../stylesheets/biovision/post .css

data/app/assets/images/biovision/post/icons/comment.svg

@@ -0,0 +1,9 @@
+<svg version="1.1" viewBox="0 0 24 24" width="24px" height="24px" xmlns="http://www.w3.org/2000/svg">
+  <title>Comment</title>
+  <defs>
+    <style type="text/css">
+      path { fill: #fff; stroke: #000; stroke-width: 1; stroke-linejoin: round}
+    </style>
+  </defs>
+  <path d="M16,21 v-3 h3 a3,3 0 0,0 3,-3 v-7 a3,3 0 0,0 -3,-3 h-14 a3,3 0 0,0 -3,3 v7 a3,3 0 0,0, 3,3 h8 z"/>
+</svg>

data/app/assets/javascripts/biovision/post/biovision-posts.js

@@ -2,37 +2,34 @@
 
 const Posts = {
     initialized: false,
-    autoInit: true,
-    components: {},
-    init: function () {
-        for (let component in this.components) {
-            if (this.components.hasOwnProperty(component)) {
-                if (this.components[component].hasOwnProperty("init")) {
-                    this.components[component].init();
-                }
-            }
-        }
-
-        this.initialized = true;
-    }
+    autoInitComponents: true,
+    components: {}
 };
 
-const BiovisionPosts = {
-    /**
-     * @type {Function}
-     * @param e
-     */
-    loadPosts: function (e) {
+Posts.components.postLoader = {
+    initialized: false,
+    buttons: [],
+    selector: ".posts-loader",
+    init: function () {
+        document.querySelectorAll(this.selector).forEach(this.apply);
+        this.initialized = true;
+    },
+    apply: function (button) {
+        const component = Posts.components.postLoader;
+        component.buttons.push(button);
+        button.addEventListener("click", component.handler);
+    },
+    handler: function (e) {
         e.preventDefault();
 
-        const button = this;
+        const button = e.target;
         const container = document.getElementById(button.getAttribute('data-container'));
         if (container) {
-            const list = container.querySelector('div.list');
+            const list = container.querySelector("div.posts-list");
 
             if (list && !button.classList.contains('loading')) {
                 const url = button.getAttribute('href');
-                const request = Biovision.newAjaxRequest('get', url, function () {
+                const request = Biovision.jsonAjaxRequest("get", url, function () {
                     button.classList.remove('loading');
 
                     const response = JSON.parse(this.responseText);
@@ -60,6 +57,8 @@ const BiovisionPosts = {
                 button.classList.add('loading');
                 request.send();
             }
+        } else {
+            console.log("Cannot find container for loaded posts");
         }
     }
 };
@@ -250,9 +249,3 @@ Posts.components.groupTagLinker = {
 };
 
 Biovision.components.posts = Posts;
-
-document.addEventListener('DOMContentLoaded', function () {
-    document.querySelectorAll('.posts-loader').forEach(function (button) {
-        button.addEventListener('click', BiovisionPosts.loadPosts);
-    });
-});

data/app/assets/stylesheets/biovision/post/posts.scss

@@ -132,6 +132,12 @@ $background-post-tag: rgb(248, 248, 248) !default;
   padding-left: 1.8rem;
 }
 
+.comment_count {
+  background: image_url('biovision/post/icons/comment.svg') no-repeat center left / 1.6rem auto;
+  display: inline-block;
+  padding-left: 1.8rem;
+}
+
 article.post {
   figure {
     border-bottom: $border-secondary;

data/app/controllers/admin/editorial_members_controller.rb

@@ -32,12 +32,17 @@ class Admin::EditorialMembersController < AdminController
 
   private
 
-  def set_entity
-    @entity = EditorialMember.find_by(id: params[:id])
-    handle_http_404('Cannot find editorial_member') if @entity.nil?
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def restrict_access
-    require_privilege :chief_editor
+    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])
+    handle_http_404('Cannot find editorial_member') if @entity.nil?
   end
 end

data/app/controllers/admin/featured_posts_controller.rb

@@ -10,14 +10,19 @@ class Admin::FeaturedPostsController < AdminController
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
+  def restrict_access
+    error = 'Managing post groups is not allowed'
+    handle_http_401(error) unless component_handler.allow?('chief_editor', 'deputy_chief_editor')
+  end
+
   def set_entity
     @entity = FeaturedPost.find_by(id: params[:id])
     if @entity.nil?
       handle_http_404('Cannot find post_link')
     end
   end
-
-  def restrict_access
-    require_privilege :chief_editor
-  end
 end

data/app/controllers/admin/post_categories_controller.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Handling post categories
 class Admin::PostCategoriesController < AdminController
   include LockableEntity
   include ToggleableEntity
@@ -12,14 +15,17 @@ class Admin::PostCategoriesController < AdminController
 
   private
 
-  def set_entity
-    @entity = PostCategory.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find post category')
-    end
+  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 set_entity
+    @entity = PostCategory.find_by(id: params[:id])
+    handle_http_404('Cannot find post category') if @entity.nil?
   end
 end

data/app/controllers/admin/post_group_categories_controller.rb

@@ -8,12 +8,17 @@ class Admin::PostGroupCategoriesController < AdminController
 
   private
 
-  def set_entity
-    @entity = PostGroupCategory.find_by(id: params[:id])
-    handle_http_404('Cannot find post_group_category') if @entity.nil?
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def restrict_access
-    require_privilege :chief_editor
+    error = 'Managing post group categories is not allowed'
+    handle_http_401(error) unless component_handler.allow?('chief_editor')
+  end
+
+  def set_entity
+    @entity = PostGroupCategory.find_by(id: params[:id])
+    handle_http_404('Cannot find post_group_category') if @entity.nil?
   end
 end

data/app/controllers/admin/post_group_tags_controller.rb

@@ -8,12 +8,17 @@ class Admin::PostGroupTagsController < AdminController
 
   private
 
-  def set_entity
-    @entity = PostGroupTag.find_by(id: params[:id])
-    handle_http_404('Cannot find post_group_tag') if @entity.nil?
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def restrict_access
-    require_privilege :chief_editor
+    error = 'Managing post tags is not allowed'
+    handle_http_401(error) unless component_handler.allow?('chief_editor')
+  end
+
+  def set_entity
+    @entity = PostGroupTag.find_by(id: params[:id])
+    handle_http_404('Cannot find post_group_tag') if @entity.nil?
   end
 end

data/app/controllers/admin/post_groups_controller.rb

@@ -51,12 +51,17 @@ class Admin::PostGroupsController < AdminController
 
   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
 end

data/app/controllers/admin/post_illustrations_controller.rb

@@ -15,12 +15,17 @@ class Admin::PostIllustrationsController < AdminController
 
   private
 
-  def set_entity
-    @entity = PostIllustration.find_by(id: params[:id])
-    handle_http_404('Cannot find post_illustration') if @entity.nil?
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def restrict_access
-    require_privilege_group :editors
+    error = 'Viewing post illustrations is not allowed'
+    handle_http_401(error) unless component_handler.allow?
+  end
+
+  def set_entity
+    @entity = PostIllustration.find_by(id: params[:id])
+    handle_http_404('Cannot find post_illustration') if @entity.nil?
   end
 end

data/app/controllers/admin/post_images_controller.rb

@@ -20,14 +20,19 @@ class Admin::PostImagesController < AdminController
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
+  def restrict_access
+    error = 'Viewing post images is not allowed'
+    handle_http_401(error) unless component_handler.allow?
+  end
+
   def set_entity
     @entity = PostImage.find_by(id: params[:id])
     if @entity.nil?
       handle_http_404('Cannot find post_image')
     end
   end
-
-  def restrict_access
-    require_privilege_group :editors
-  end
 end

data/app/controllers/admin/post_links_controller.rb

@@ -6,14 +6,19 @@ class Admin::PostLinksController < AdminController
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
+  def restrict_access
+    error = 'Managing post links is not allowed'
+    handle_http_401(error) unless component_handler.allow?
+  end
+
   def set_entity
     @entity = PostLink.find_by(id: params[:id])
     if @entity.nil?
       handle_http_404('Cannot find post_link')
     end
   end
-
-  def restrict_access
-    require_privilege_group :editors
-  end
 end

data/app/controllers/admin/post_tags_controller.rb

@@ -17,14 +17,19 @@ class Admin::PostTagsController < AdminController
 
   private
 
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
+  end
+
+  def restrict_access
+    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])
     if @entity.nil?
       handle_http_404('Cannot find post_tag')
     end
   end
-
-  def restrict_access
-    require_privilege_group :editors
-  end
 end

data/app/controllers/admin/post_types_controller.rb

@@ -29,14 +29,23 @@ class Admin::PostTypesController < AdminController
     @collection = @entity.editorial_members.list_for_administration
   end
 
+  # get /admin/post_types/:id/new_post
+  def new_post
+  end
+
   private
 
-  def set_entity
-    @entity = PostType.find_by(id: params[:id])
-    handle_http_404('Cannot find post type') if @entity.nil?
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
   def restrict_access
-    require_privilege_group :editors
+    error = 'Viewing post types is not allowed'
+    handle_http_401(error) unless component_handler.allow?
+  end
+
+  def set_entity
+    @entity = PostType.find_by(id: params[:id])
+    handle_http_404('Cannot find post type') if @entity.nil?
   end
 end

data/app/controllers/admin/posts_controller.rb

@@ -29,15 +29,13 @@ class Admin::PostsController < AdminController
 
   private
 
-  def set_entity
-    @entity = Post.find_by(id: params[:id])
-    if @entity.nil?
-      handle_http_404('Cannot find post')
-    end
+  def component_slug
+    Biovision::Components::PostsComponent::SLUG
   end
 
-  def restrict_access
-    require_privilege_group :editors
+  def set_entity
+    @entity = Post.find_by(id: params[:id])
+    handle_http_404('Cannot find post') if @entity.nil?
   end
 
   # @param [String] q
@@ -45,7 +43,7 @@ class Admin::PostsController < AdminController
     if Post.respond_to?(:search)
       Post.search(q).records.page(current_page)
     else
-      Post.where('title ilike ?', "%#{q}%").page_for_administration(current_page)
+      Post.pg_search(q).page_for_administration(current_page)
     end
   end
 end

data/app/controllers/articles_controller.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
+# Articles for visitors
 class ArticlesController < ApplicationController
   before_action :set_category, only: :category
   before_action :set_entity, only: :show
 
   # get /articles
   def index
-    post_type   = PostType.find_by(slug: 'article')
-    @collection = post_type.posts.for_language(current_language).page_for_visitors(current_page)
+    posts = PostType['article'].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 ArticlesController < ApplicationController
 
   # get /articles/: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 ArticlesController < ApplicationController
     @entity.increment :view_count
     @entity.increment :rating, 0.0025
     @entity.save
+
+    render 'posts/show'
   end
 
   # get /articles/tagged/:tag_name
   def tagged
-    post_type   = PostType.find_by(slug: 'article')
-    @collection = post_type.posts.tagged(params[:tag_name]).page_for_visitors(current_page)
+    posts = PostType['article'].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: 'article')
+    type = PostType['article']
     @category = type.post_categories.find_by(long_slug: params[:category_slug])
     handle_http_404('Cannot find post category (article)') if @category.nil?
   end