biovision-post 0.0.171104 → 0.1.171229

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 871f4df57bc36185ad704b40973eac86de0dc805
-  data.tar.gz: 5a6597244a86d50a0d22f6a831bfd6642f62d5d3
+SHA256:
+  metadata.gz: be80d9c2f7d4d049810beb5d10445ad941141a6984fedefc72afc66f5d8aa26c
+  data.tar.gz: 18afaf4b8bd45ccce8ed430f44ebb2ba29782b81ea0ed835fb7a1f77ae1e83a7
 SHA512:
-  metadata.gz: 6764d17960b4ec4761885b21b9731e0d2d268a3d79a0ee69af5a9bb556397cfab5b8635b070d1be8674acc670be483452d5cf4a5032f3b31e97b6b3e58cf6f0d
-  data.tar.gz: 5aed65b3c46a6f6b2b75bb7b95a204be0471cadb76e25483145d2796ce07c02793e46ea8659ea2541796911013aa73fd902acfa44481b40be69c6cb74101ee7e
+  metadata.gz: b7e5489d2ca7af603433b61f51fa4b9c15871b4e0c146eb2fd19840bc52e73788f894386859b85700fd7fc5c09e0f60634bc9bda5e9e6ef942a6c90817ba1c01
+  data.tar.gz: 1b5a1c2fad734dea9eb2c582a4f95fbc3bdb5eab16e2f5458fe42d9709ad8506e1708685b3e54d68be2850199d77771730f11bb0616c0a94fb5dacc87f6b80e4

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

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg style="enable-background:new 0 0 93.388 75.594;" version="1.1" viewBox="0 0 93.388 75.594" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><g id="search"><g><path d="M57.158,42.7l-2.041,1.076l-6.061-4.054l-0.669,0.762l5.607,3.994l-0.503,0.572c-0.836,0.953-1.522,2.376-2.059,4.268    c-0.615,2.047-0.683,3.534-0.204,4.461l-9.422-5.318c-3.705,3.835-8.748,5.736-15.131,5.702    c-6.593-0.05-12.336-2.224-17.228-6.518C4.747,43.517,1.864,39.496,0.8,35.581c-0.656-2.264-0.909-7.07-0.758-14.419    c0.685,6.845,3.648,12.568,8.89,17.17c5.591,4.909,11.841,7.752,18.752,8.531c7.753,0.845,13.986-1.419,18.699-6.788    c0.697-0.794,1.534-1.747,2.51-2.859L57.158,42.7z"/><path d="M51.853,21.927c-0.862-5.425-3.85-10.383-8.965-14.873c-5.147-4.518-11.186-6.866-18.116-7.044    C17.392-0.17,11.498,2.25,7.092,7.269c-8.952,10.197-7.9,20.149,3.154,29.854c5.401,4.742,11.505,7.4,18.311,7.975    c7.472,0.653,13.507-1.642,18.109-6.884C51.073,33.196,52.801,27.767,51.853,21.927z M44.868,36.804    c-4.156,4.734-9.637,6.812-16.444,6.236c-6.202-0.495-11.765-2.904-16.69-7.227C1.727,27.029,0.767,18.03,8.855,8.817    c4.016-4.574,9.369-6.794,16.057-6.66c6.326,0.098,11.825,2.197,16.495,6.296c4.67,4.1,7.405,8.61,8.204,13.53    C50.465,27.289,48.884,32.23,44.868,36.804z"/><path d="M38.683,13.453c6.735,5.913,8.805,13.102,6.21,21.568c-0.974-7.605-3.875-13.527-8.704-17.766    c-4.701-4.127-9.898-6.074-15.589-5.838c-5.692,0.235-10.666,2.619-14.924,7.149c0.623-1.927,1.66-3.717,3.11-5.369    c3.625-4.129,8.548-6.051,14.767-5.768C29.383,7.708,34.426,9.716,38.683,13.453z"/><path d="M31.133,32.963c-1.589,0.913-3.873,0.791-6.854-0.363c-2.456-0.918-4.541-2.131-6.257-3.637    c-2.097-1.84-3.291-3.845-3.581-6.012C19.638,25.488,25.202,28.826,31.133,32.963z"/><path d="M91.741,65.298c1.08,0.948,1.628,2.245,1.646,3.892c0.016,1.646-0.491,3.057-1.522,4.232    c-1.088,1.239-2.525,1.947-4.311,2.123c-1.547,0.16-2.776-0.075-3.685-0.704L53.183,54.82c-1.156-0.733-1.474-2.165-0.953-4.296    c0.468-2.007,1.442-3.853,2.92-5.537c1.004-1.144,2.281-1.541,3.832-1.192L87.85,62.81L91.741,65.298z"/></g></g><g id="Слой_1"/></svg>

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

@@ -0,0 +1,150 @@
+$block-shadow: .2rem .2rem .4rem .2rem rgba(0, 0, 0, .125) !default;
+$border-primary: .1rem solid rgb(192, 192, 192) !default;
+$border-secondary: .1rem solid rgb(230, 230, 230) !default;
+$text-color-secondary: #777 !default;
+$font-size-large: 2rem !default;
+$font-size-decreased: 1.2rem !default;
+$font-family-heading: serif !default;
+
+$background-post-footer: rgb(248, 248, 248) !default;
+$background-post-preview-image: linear-gradient(to top, #f0f0f0, #fff) !default;
+
+.recent-posts {
+  .list {
+    align-items: stretch;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-around;
+  }
+}
+
+.post-preview {
+  border-radius: .2rem;
+  box-shadow: $block-shadow;
+  display: flex;
+  flex: 1;
+  flex-direction: column;
+  margin: 1rem;
+  position: relative;
+  max-width: 30rem;
+  min-width: 28rem;
+
+  .image {
+    background: $background-post-preview-image;
+    border-radius: .2rem .2rem 0 0;
+    height: 20rem;
+    overflow: hidden;
+    width: 100%;
+  }
+
+  img {
+    height: 100%;
+    object-fit: cover;
+    width: 100%;
+  }
+
+  .title {
+    font: 500 $font-size-large $font-family-heading;
+    min-height: 6.4rem;
+    padding: .4rem;
+  }
+
+  .lead {
+    color: $text-color-secondary;
+    padding: .4rem;
+  }
+
+  .counters {
+    margin-top: auto;
+    padding: .4rem;
+    text-align: right;
+  }
+
+  .category {
+    padding: .4rem;
+  }
+
+  .info {
+    align-items: center;
+    -webkit-backdrop-filter: blur(.2rem);
+    background: rgba(255, 255, 255, .75);
+    border-radius: .2rem .2rem 0 0;
+    display: flex;
+    flex-wrap: wrap;
+    left: 0;
+    padding: .2rem .4rem;
+    position: absolute;
+    right: 0;
+
+    time {
+      font-size: $font-size-decreased;
+      font-style: italic;
+      line-height: 2rem;
+      margin-left: auto;
+    }
+  }
+}
+
+.view_count {
+  background: image_url('biovision/post/icons/view.svg') no-repeat center left / 1.6rem auto;
+  margin: 0 .4rem;
+  padding-left: 1.8rem;
+}
+
+article.post {
+  figure {
+    border-bottom: $border-secondary;
+    margin: 0 auto;
+    max-width: 64rem;
+    padding: 0 0 .8rem 0;
+  }
+
+  figcaption {
+    align-items: flex-end;
+    display: flex;
+    flex-wrap: wrap;
+  }
+
+  .image_author {
+    color: $text-color-secondary;
+    font-size: $font-size-decreased;
+    margin-left: auto;
+  }
+
+  .body {
+    padding: .4rem;
+  }
+
+  footer {
+    align-items: center;
+    background: $background-post-footer;
+    display: flex;
+    flex-wrap: wrap;
+    font-size: $font-size-decreased;
+    padding: .8rem;
+
+    .author {
+      margin: 0 1.6rem 0 0;
+    }
+
+    .author-title {
+      &::before {
+        content: '(';
+      }
+
+      &::after {
+        content: ')';
+      }
+    }
+
+    .source {
+      color: $text-color-secondary;
+      margin-left: auto;
+    }
+
+    .time {
+      margin: .8rem 0 0 0;
+      width: 100%;
+    }
+  }
+}

data/app/controllers/admin/post_types_controller.rb

@@ -25,6 +25,6 @@ class Admin::PostTypesController < AdminController
   end
 
   def restrict_access
-    require_privilege :chief_editor
+    require_privilege_group :editors
   end
 end

data/app/controllers/admin/posts_controller.rb

@@ -1,2 +1,27 @@
-class Admin::PostsController < ApplicationController
+class Admin::PostsController < AdminController
+  include ToggleableEntity
+
+  before_action :set_entity, except: [:index]
+
+  # get /admin/posts
+  def index
+    @collection = Post.page_for_administration(current_page)
+  end
+
+  # get /admin/posts/:id
+  def show
+  end
+
+  private
+
+  def set_entity
+    @entity = Post.find_by(id: params[:id])
+    if @entity.nil?
+      handle_http_404('Cannot find post')
+    end
+  end
+
+  def restrict_access
+    require_privilege_group :editors
+  end
 end

data/app/controllers/articles_controller.rb

@@ -1,2 +1,37 @@
 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.page_for_visitors(current_page)
+  end
+
+  # get /articles/:category_slug
+  def category
+    @collection = @category.posts.page_for_visitors(current_page)
+  end
+
+  # get /articles/:post_id-:post_slug
+  def show
+    @entity.increment!(:view_count)
+  end
+
+  private
+
+  def set_category
+    type      = PostType.find_by(slug: 'article')
+    @category = type.post_categories.find_by(long_slug: params[:category_slug])
+    if @category.nil?
+      handle_http_404('Cannot find post category (article)')
+    end
+  end
+
+  def set_entity
+    @entity = Post.visible.find_by(id: params[:post_id])
+    if @entity.nil?
+      handle_http_404('Cannot find article')
+    end
+  end
 end

data/app/controllers/blog_posts_controller.rb

@@ -0,0 +1,37 @@
+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.page_for_visitors(current_page)
+  end
+
+  # get /blog_posts/:category_slug
+  def category
+    @collection = @category.posts.page_for_visitors(current_page)
+  end
+
+  # get /blog_posts/:post_id-:post_slug
+  def show
+    @entity.increment!(:view_count)
+  end
+
+  private
+
+  def set_category
+    type = PostType.find_by(slug: 'blog_post')
+    @category = type.post_categories.find_by(long_slug: params[:category_slug])
+    if @category.nil?
+      handle_http_404('Cannot find post category (blog_post)')
+    end
+  end
+
+  def set_entity
+    @entity = Post.visible.find_by(id: params[:post_id])
+    if @entity.nil?
+      handle_http_404('Cannot find blog_post')
+    end
+  end
+end

data/app/controllers/news_controller.rb

@@ -0,0 +1,37 @@
+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.page_for_visitors(current_page)
+  end
+
+  # get /news/:category_slug
+  def category
+    @collection = @category.posts.page_for_visitors(current_page)
+  end
+
+  # get /news/:post_id-:post_slug
+  def show
+    @entity.increment!(:view_count)
+  end
+
+  private
+
+  def set_category
+    type      = PostType.find_by(slug: 'news')
+    @category = type.post_categories.find_by(long_slug: params[:category_slug])
+    if @category.nil?
+      handle_http_404('Cannot find post category (news)')
+    end
+  end
+
+  def set_entity
+    @entity = Post.visible.find_by(id: params[:post_id])
+    if @entity.nil?
+      handle_http_404('Cannot find news')
+    end
+  end
+end

data/app/controllers/posts_controller.rb

@@ -10,12 +10,6 @@ class PostsController < ApplicationController
     @collection = Post.page_for_visitors(current_page)
   end
 
-  # get /posts/:category_slug
-  def category
-    @category   = PostCategory.find_by! long_slug: params[:category_slug]
-    @collection = @category.posts.page_for_visitors(current_page)
-  end
-
   # post /posts
   def create
     @entity = Post.new(creation_parameters)
@@ -33,26 +27,12 @@ class PostsController < ApplicationController
 
   # get /posts/:id
   def show
-    @entity = Post.find_by(id: params[:id], deleted: false)
+    @entity = Post.find_by(id: params[:id], visible: true, deleted: false)
     if @entity.nil?
       handle_http_404("Cannot find non-deleted post #{params[:id]}")
     end
   end
 
-  # get /posts/:category_slug/:slug
-  def show_in_category
-    @category = PostCategory.find_by(slug: params[:category_slug])
-    @entity   = Post.find_by(slug: params[:slug], deleted: false)
-    if @entity.nil? || !@entity.visible_to?(current_user)
-      handle_http_404("Cannot show posts #{params[:slug]} to user #{current_user&.id}")
-    elsif @entity.posts_category == @category
-      @entity.increment! :view_count
-    else
-      parameters = { category_slug: @entity.posts_category.slug, slug: @entity.slug }
-      redirect_to posts_in_category_posts_index_path(parameters)
-    end
-  end
-
   # get /posts/:id/edit
   def edit
   end
@@ -73,24 +53,29 @@ class PostsController < ApplicationController
 
   # delete /posts/:id
   def destroy
-    if @entity.update(deleted: true)
+    if @entity.destroy #@entity.update(deleted: true)
       flash[:notice] = t('posts.destroy.success')
     end
-    redirect_to admin_posts_index_path
+    redirect_to admin_posts_path
   end
 
   private
 
   def set_entity
-    @entity = Post.find params[:id]
+    @entity = Post.find_by(id: params[:id])
+    if @entity.nil?
+      handle_http_404('Cannot find post')
+    end
   end
 
   def restrict_access
-    require_privilege_group :reporters
+    require_privilege_group :editors
   end
 
   def restrict_editing
-    raise record_not_found unless @entity.editable_by? current_user
+    if @entity.locked? || !@entity.editable_by?(current_user)
+       handle_http_403('Post is locked or not editable by current user')
+    end
   end
 
   def entity_parameters
@@ -101,10 +86,4 @@ class PostsController < ApplicationController
     parameters = params.require(:post).permit(Post.creation_parameters)
     parameters.merge(owner_for_entity(true))
   end
-
-  def add_figures
-    params[:figures].values.reject { |f| f[:slug].blank? || f[:image].blank? }.each do |data|
-      @entity.figures.create!(data.select { |key, _| Figure.creation_parameters.include? key.to_sym })
-    end
-  end
 end

data/app/helpers/biovision_posts_helper.rb

@@ -37,8 +37,23 @@ module BiovisionPostsHelper
   end
 
   # @param [Post] entity
-  def post_link(entity, text = entity.title)
-    link_to(text, PostManager.handler(entity).post_path)
+  # @param [String] text
+  # @param [Hash] options
+  def post_link(entity, text = entity.title, options = {})
+    link_to(text, PostManager.handler(entity).post_path, options)
+  end
+
+  # @param [Post] entity
+  # @param [Hash] options
+  def post_author_link(entity, options = {})
+    if entity.author_url.blank?
+      entity.author_name
+    else
+      link_options = {
+        rel: 'external nofollow noopener noreferrer'
+      }
+      link_to(entity.author_name, entity.author_url, link_options.merge(options))
+    end
   end
 
   # Post image preview for displaying in "administrative" lists
@@ -58,8 +73,9 @@ module BiovisionPostsHelper
   def post_image_small(entity, add_options = {})
     return '' if entity.image.blank?
 
+    alt_text = entity.image_alt_text.to_s
     versions = "#{entity.image.medium.url} 2x"
-    options  = { alt: entity.title, srcset: versions }.merge(add_options)
+    options  = { alt: alt_text, srcset: versions }.merge(add_options)
     image_tag(entity.image.small.url, options)
   end
 
@@ -70,8 +86,9 @@ module BiovisionPostsHelper
   def post_image_medium(entity, add_options = {})
     return '' if entity.image.blank?
 
+    alt_text = entity.image_alt_text.to_s
     versions = "#{entity.image.big.url} 2x"
-    options  = { alt: entity.title, srcset: versions }.merge(add_options)
+    options  = { alt: alt_text, srcset: versions }.merge(add_options)
     image_tag(entity.image.medium.url, options)
   end
 end

data/app/models/post.rb

@@ -2,15 +2,19 @@ class Post < ApplicationRecord
   include HasOwner
   include CommentableItem if 'CommentableItem'.safe_constantize
   include VotableItem if 'VotableItem'.safe_constantize
+  include Toggleable
 
   TITLE_LIMIT  = 140
   SLUG_LIMIT   = 200
   SLUG_PATTERN = /\A[a-z0-9]+[-_.a-z0-9]*[a-z0-9]+\z/
   LEAD_LIMIT   = 350
   BODY_LIMIT   = 50000
-  META_LIMIT   = 100
+  META_LIMIT   = 250
+  ALT_LIMIT    = 200
   PER_PAGE     = 10
 
+  toggleable :visible, :show_owner, :allow_comments
+
   mount_uploader :image, PostImageUploader
 
   belongs_to :user
@@ -22,7 +26,6 @@ class Post < ApplicationRecord
   after_initialize { self.uuid = SecureRandom.uuid if uuid.nil? }
   before_validation { self.slug = Canonizer.transliterate(title.to_s) if slug.blank? }
   before_validation { self.slug = slug.downcase }
-  before_validation { self.publication_time = Time.now if publication_time.nil? }
   before_validation :prepare_source_names
   before_save { self.parsed_body = PostManager.handler(self).parsed_body }
 
@@ -32,15 +35,23 @@ class Post < ApplicationRecord
   validates_length_of :lead, maximum: LEAD_LIMIT
   validates_length_of :body, maximum: BODY_LIMIT
   validates_length_of :image_name, maximum: META_LIMIT
+  validates_length_of :image_alt_text, maximum: ALT_LIMIT
   validates_length_of :image_author_name, maximum: META_LIMIT
   validates_length_of :image_author_link, maximum: META_LIMIT
   validates_length_of :source_link, maximum: META_LIMIT
   validates_length_of :source_name, maximum: META_LIMIT
+  validates_length_of :meta_title, maximum: TITLE_LIMIT
+  validates_length_of :meta_description, maximum: META_LIMIT
+  validates_length_of :meta_keywords, maximum: META_LIMIT
+  validates_length_of :author_name, maximum: META_LIMIT
+  validates_length_of :author_title, maximum: META_LIMIT
+  validates_length_of :author_url, maximum: META_LIMIT
   validates_format_of :slug, with: SLUG_PATTERN
   validate :category_consistency
 
-  scope :recent, -> { order('publication_time desc') }
+  scope :recent, -> { order('id desc') }
   scope :visible, -> { where(visible: true, deleted: false, approved: true) }
+  scope :list_for_visitors, -> { visible.recent }
 
   # @param [Integer] page
   def self.page_for_administration(page = 1)
@@ -49,16 +60,17 @@ class Post < ApplicationRecord
 
   # @param [Integer] page
   def self.page_for_visitors(page = 1)
-    visible.recent.page(page).per(PER_PAGE)
+    list_for_visitors.page(page).per(PER_PAGE)
   end
 
   def self.entity_parameters
-    main_data  = %i(post_category_id title slug lead body visible region_id)
-    image_data = %i(image image_name image_author_name image_author_link)
-    meta_data  = %i(source_name source_link publication_time)
-    flags_data = %i(show_owner allow_comments)
+    main_data   = %i(post_category_id title slug lead body visible translation region_id)
+    image_data  = %i(image image_alt_text image_name image_author_name image_author_link)
+    meta_data   = %i(source_name source_link meta_title meta_description meta_keywords)
+    flags_data  = %i(show_owner allow_comments)
+    author_data = %i(author_name author_title author_url)
 
-    main_data + image_data + meta_data + flags_data
+    main_data + image_data + meta_data + author_data + flags_data
   end
 
   def self.creation_parameters

data/app/models/post_type.rb

@@ -8,7 +8,7 @@ class PostType < ApplicationRecord
   DEPTH_RANGE = (0..10)
 
   has_many :post_categories, dependent: :destroy
-  has_many :posts, through: :post_categories
+  has_many :posts
 
   validates_length_of :name, maximum: NAME_LIMIT
   validates_length_of :slug, maximum: SLUG_LIMIT

data/app/services/post_manager/article_handler.rb

@@ -0,0 +1,10 @@
+class PostManager::ArticleHandler < PostManager
+  def post_path
+    "/articles/#{@entity.id}-#{@entity.slug}"
+  end
+
+  # @param [PostCategory] category
+  def category_path(category)
+    "/articles/#{category.long_slug}"
+  end
+end

data/app/services/post_manager/blog_post_handler.rb

@@ -0,0 +1,10 @@
+class PostManager::BlogPostHandler < PostManager
+  def post_path
+    "/blog_posts/#{@entity.id}-#{@entity.slug}"
+  end
+
+  # @param [PostCategory] category
+  def category_path(category)
+    "/blog_posts/#{category.long_slug}"
+  end
+end

data/app/services/post_manager/news_handler.rb

@@ -0,0 +1,10 @@
+class PostManager::NewsHandler < PostManager
+  def post_path
+    "/news/#{@entity.id}-#{@entity.slug}"
+  end
+
+  # @param [PostCategory] category
+  def category_path(category)
+    "/news/#{category.long_slug}"
+  end
+end

data/app/services/post_manager.rb

@@ -19,4 +19,13 @@ class PostManager
   def post_path
     "/posts/#{@entity.id}"
   end
+
+  def edit_path
+    "/posts/#{@entity.id}/edit"
+  end
+
+  # @param [PostCategory] category
+  def category_path(category)
+    "posts/#{category.long_slug}"
+  end
 end

data/app/views/admin/index/_biovision_post.html.erb

@@ -0,0 +1,29 @@
+<% if current_user_in_group?(:editors) %>
+    <nav>
+      <div class="heading" id="biovision-post-nav-heading">
+        <%= t('.heading') %>
+      </div>
+      <ul aria-labelledby="biovision-post-nav-heading">
+        <li>
+          <%= render 'admin/post_types/nav_item' %>
+          <ul>
+            <% PostType.page_for_administration.each do |post_type| %>
+                <li>
+                  <div><%= admin_post_type_link(post_type) %></div>
+                  <div class="description">
+                    <%= t(:post_count, count: post_type.posts_count) %>
+                  </div>
+                  <ul class="actions">
+                    <li>
+                      <%= create_icon(new_post_admin_post_type_path(post_type.id)) %>
+                    </li>
+                  </ul>
+                </li>
+            <% end %>
+          </ul>
+        </li>
+        <li><%= render 'admin/posts/nav_item' %></li>
+        <%= render 'admin/index/biovision_post/additional_items' %>
+      </ul>
+    </nav>
+<% end %>