biovision-post 0.21.190513.0 → 0.26.191013.0

data/app/views/my/posts/_post.html.erb

@@ -1,10 +1,9 @@
-<% handler = PostManager.new(post) %>
 <article class="post" itemscope itemtype="http://schema.org/Article" itemprop="mainEntityOfPage">
   <h1 itemprop="headline"><%= post.title %></h1>
   <ul class="actions">
     <li><%= back_icon(my_posts_path) %></li>
     <% if post.visible? %>
-      <li><%= world_icon(handler.post_path) %></li>
+      <li><%= world_icon(post.url) %></li>
     <% end %>
     <% unless post.locked? %>
       <li><%= edit_icon(edit_my_post_path(id: post.id)) %></li>
@@ -38,7 +37,7 @@
   <% end %>
 
   <div class="body" itemprop="articleBody mainEntityOfPage">
-    <%= raw(post.parsed_body || post.body) %>
+    <%= raw(post.body) %>
   </div>
 
   <% if post.tags_cache.any? %>

data/app/views/my/posts/articles.html.erb

@@ -6,7 +6,7 @@
 <article>
   <h1><%= t('.heading') %></h1>
 
-  <% if current_user_has_privilege?(:editor) %>
+  <% if component_handler.allow_post_type?('article') %>
     <nav>
       <%=
         link_to(

data/app/views/my/posts/blog_posts.html.erb

@@ -6,7 +6,7 @@
 <article>
   <h1><%= t('.heading') %></h1>
 
-  <% if current_user_has_privilege?(:blogger) %>
+  <% if component_handler.allow_post_type?('blog_post') %>
     <nav>
       <%=
         link_to(

data/app/views/my/posts/index/_navigation.html.erb

@@ -1,5 +1,5 @@
 <nav>
-  <% if current_user_has_privilege?(:editor) %>
+  <% if component_handler.allow_post_type?('article') %>
     <%=
       link_to(
           t('my.posts.new_article.nav_text'),
@@ -8,7 +8,7 @@
       )
     %>
   <% end %>
-  <% if current_user_has_privilege?(:reporter) %>
+  <% if component_handler.allow_post_type?('news') %>
     <%=
       link_to(
           t('my.posts.new_news.nav_text'),
@@ -17,7 +17,7 @@
       )
     %>
   <% end %>
-  <% if current_user_has_privilege?(:blogger) %>
+  <% if component_handler.allow_post_type?('blog_post') %>
       <%=
         link_to(
             t('my.posts.new_blog_post.nav_text'),

data/app/views/my/posts/new.html.erb

@@ -10,5 +10,13 @@
     <li><%= return_icon(my_posts_path) %></li>
   </ul>
 
-  <%= render partial: 'form', locals: { entity: @entity } %>
+  <%=
+    render(
+        partial: 'form',
+        locals: {
+            entity: @entity,
+            handler: component_handler
+        }
+    )
+  %>
 </article>

data/app/views/my/posts/news_index.html.erb

@@ -6,7 +6,7 @@
 <article>
   <h1><%= t('.heading') %></h1>
 
-  <% if current_user_has_privilege?(:reporter) %>
+  <% if component_handler.allow_post_type?('news') %>
     <nav>
       <%=
         link_to(

data/app/views/posts/_breadcrumbs.html.erb

@@ -1,7 +1,2 @@
-<% unless entity.post_category.blank? %>
-  <% entity.post_category.parents.each do |parent| %>
-    <%= post_category_link(parent) %>
-  <% end %>
-  <%= post_category_link(entity.post_category) %>
-<% end %>
+<%= post_type_link(entity.post_type) %>
 <span><%= entity.title %></span>

data/app/views/posts/_form.html.erb

@@ -1,4 +1,5 @@
 <%
+  handler ||= Biovision::Components::BaseComponent.handler('post', current_user)
   model_name = entity.class.to_s.underscore
   languages = Language.active
 %>
@@ -6,7 +7,7 @@
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
   <dl>
-    <% if current_user_has_privilege?(:chief_editor) %>
+    <% if handler.allow?('chief_editor') %>
       <dt><%= t('activerecord.attributes.post.user') %></dt>
       <dd>
         <div>
@@ -364,7 +365,7 @@
       <div class="guideline"><%= t('.guidelines.meta_keywords') %></div>
     </dd>
 
-    <% if current_user_has_privilege?(:chief_editor) %>
+    <% if handler.allow?('chief_editor', 'deputy_chief_editor') %>
       <dt><%= f.label :rating %></dt>
       <dd>
         <%=
@@ -381,6 +382,12 @@
     <dt><%= t(:flags) %></dt>
     <dd>
       <ul class="flags">
+        <% if entity.id.nil? && handler.allow?('chief_editor', 'deputy_chief_editor') %>
+          <li>
+            <%= check_box_tag :featured, '1' %>
+            <%= label_tag :featured, t('activerecord.models.featured_post') %>
+          </li>
+        <% end %>
         <li>
           <%= f.check_box :visible, id: "#{model_name}_visible" %>
           <%= f.label :visible %>

data/app/views/posts/_post.html.erb

@@ -1,19 +1,15 @@
-<% handler = PostManager.new(post) %>
+<% handler = Biovision::Components::BaseComponent.handler('posts', current_user) %>
 <article class="post" itemscope itemtype="http://schema.org/Article" itemprop="mainEntityOfPage">
   <h1 itemprop="headline"><%= post.title %></h1>
-  <% if post.editable_by? current_user %>
+  <% if handler.editable?(post) %>
     <ul class="actions">
-      <% if post.owned_by?(current_user) %>
-        <li><%= gear_icon(my_post_path(id: post.id)) %></li>
-      <% elsif UserPrivilege.user_in_group?(current_user, :editors) %>
+      <% if handler.group?(:chief) %>
         <li><%= gear_icon(admin_post_path(id: post.id)) %></li>
+      <% elsif post.owned_by?(current_user) %>
+        <li><%= gear_icon(my_post_path(id: post.id)) %></li>
       <% end %>
       <% unless post.locked? %>
-        <% if post.owned_by?(current_user) %>
-          <li><%= edit_icon(edit_my_post_path(id: post.id)) %></li>
-        <% else %>
-          <li><%= edit_icon(handler.edit_path) %></li>
-        <% end %>
+          <li><%= edit_icon(handler.edit_path(post)) %></li>
       <% end %>
     </ul>
   <% end %>
@@ -50,7 +46,7 @@
     <div class="lead"><%= post.lead %></div>
 
     <div class="body">
-      <%= raw(post.parsed_body || post.body) %>
+      <%= raw(post.body) %>
     </div>
   </div>
 

data/app/views/posts/_preview.html.erb

@@ -24,7 +24,13 @@
       <%= time_tag(entity.publication_time.to_date, format: :default) %>
     </div>
     <div class="category" aria-label="<%= t('activerecord.attributes.post.post_category_id') %>">
-      <%= post_category_link(entity) %>
+      <% if entity.post_categories.any? %>
+        <% entity.post_categories.each do |category| %>
+          <%= post_category_link(category) %>
+        <% end %>
+      <% else %>
+        <%= post_type_link(entity.post_type) %>
+      <% end %>
     </div>
     <% if entity.tags_cache.any? %>
       <ul class="post-tags">

data/app/views/posts/edit.html.erb

@@ -8,5 +8,13 @@
     <li class="danger"><%= destroy_icon(@entity) %></li>
   </ul>
 
-  <%= render partial: 'form', locals: { entity: @entity } %>
+  <%=
+    render(
+        partial: 'form',
+        locals: {
+            entity: @entity,
+            handler: component_handler
+        }
+    )
+  %>
 </article>

data/app/views/posts/post_type/_category.html.erb

@@ -1,7 +1,9 @@
 <% content_for :meta_description, category.meta_description unless category.meta_description.blank? %>
 
 <article>
-  <h1><%= category.name %></h1>
+  <div class="content-wrapper">
+    <h1><%= category.name %></h1>
 
-  <%= render partial: 'posts/collection', locals: { collection: collection } %>
+    <%= render partial: 'posts/collection', locals: { collection: collection } %>
+  </div>
 </article>

data/app/views/posts/post_type/_post_page.html.erb

@@ -1,6 +1,12 @@
+<% content_for :breadcrumbs do %>
+  <%= render partial: 'posts/breadcrumbs', locals: { entity: entity } %>
+<% end %>
+
 <%= render partial: 'posts/entity/metadata', locals: { entity: entity } %>
 <%= render partial: 'posts/post', locals: { post: entity } %>
-<%# render partial: 'comments/list', locals: { commentable: entity, comments: entity.comments } %>
+<% if Gem.loaded_specs.key?('biovision-comment') %>
+  <%= render partial: 'comments/section', locals: { entity: entity } %>
+<% end %>
 <%=
   render(
       partial: 'posts/entity/linked_posts',

data/app/views/posts/post_type/_posts.html.erb

@@ -1,5 +1,14 @@
+<% allow_new ||= false %>
 <article>
-  <h1><%= heading %></h1>
+  <div class="content-wrapper">
+    <h1><%= heading %></h1>
 
-  <%= render partial: 'posts/collection', locals: { collection: collection } %>
+    <% if allow_new && local_assigns[:path_for_new] %>
+      <ul class="actions">
+        <li><%= create_icon(path_for_new) %></li>
+      </ul>
+    <% end %>
+
+    <%= render partial: 'posts/collection', locals: { collection: collection } %>
+  </div>
 </article>

data/app/views/posts/post_type/_tagged.html.erb

@@ -1,7 +1,7 @@
 <article>
-  <header>
-    <h1><%= heading %></h1>
-  </header>
+  <div class="content-wrapper">
+    <header><h1><%= heading %></h1></header>
 
-  <%= render partial: 'posts/collection', locals: { collection: collection } %>
+    <%= render partial: 'posts/collection', locals: { collection: collection } %>
+  </div>
 </article>

data/app/views/posts/rss.xml.erb

@@ -16,7 +16,7 @@
     <% @collection.each do |post| %>
     <item>
       <title><%= post.title %></title>
-      <link><%= site_link + PostManager.new(post).post_path %></link>
+      <link><%= site_link + post.url %></link>
       <description><%= post.lead! %></description>
       <guid isPermaLink="false"><%= post.uuid %></guid>
       <pubDate><%= post.publication_time.rfc822 %></pubDate>

data/app/views/posts/show.html.erb

@@ -1,6 +1 @@
-<% content_for :breadcrumbs do %>
-  <%= link_to(t('posts.index.nav_text'), posts_path) %>
-  <%= render partial: 'posts/breadcrumbs', locals: { entity: @entity } %>
-<% end %>
-
 <%= render partial: 'posts/post_type/post_page', locals: { entity: @entity } %>

data/app/views/posts/zen.xml.erb

@@ -19,7 +19,7 @@
       <% next if item.image.blank? %>
       <item>
         <title><%= item.title %></title>
-        <link><%= site_link + PostManager.new(item).post_path %></link>
+        <link><%= site_link + item.url %></link>
         <media:rating scheme="urn:simple"><%= item.explicit? ? 'adult' : 'nonadult' %></media:rating>
         <pubDate><%= item.publication_time.rfc822 %></pubDate>
         <author><![CDATA[<%= item.author!(t(:anonymous)) %>]]></author>
@@ -31,11 +31,11 @@
           length="<%= File.size(item.image.hd.current_path) %>"
           type="<%= item.image.content_type %>"
         />
-        <% PostManager.enclosures(item).each do |url| %>
+        <% item.enclosures.each do |url| %>
           <enclosure url="<%= media_link + url %>" type="<%= Rack::Mime::MIME_TYPES[File.extname(url)] %>"/>
         <% end %>
         <description><![CDATA[<%= item.lead! %>]]></description>
-        <content:encoded><![CDATA[<%= raw(item.parsed_body) %>]]></content:encoded>
+        <content:encoded><![CDATA[<%= raw(item.body) %>]]></content:encoded>
       </item>
     <% end %>
   </channel>

data/config/locales/posts-ru.yml

@@ -269,7 +269,7 @@ ru:
     posts:
       nav_item:
         description: "Управление публикациями"
-        text: "Публикации"
+        text: "Все публикации"
       index:
         heading: "Публикации"
         title: "Публикации, страница %{page}"
@@ -304,6 +304,14 @@ ru:
       entity:
         in_list:
           post_categories: "Категории публикаций"
+  biovision:
+    components:
+      posts:
+        name: "Публикации"
+        privileges:
+          chief_editor: "Главный редактор"
+          deputy_chief_editor: "Заместитель главного редактора"
+          editor: "Редактор"
   editorial_members:
     new:
       heading: "Добавление члена редакции"
@@ -542,3 +550,5 @@ ru:
         title: "Редактирование моей публикации"
         nav_text: "Редактировать"
         heading: "Редактирование публикации"
+      form:
+        categories: "Категории"

data/config/routes.rb

@@ -54,6 +54,7 @@ Rails.application.routes.draw do
 
     scope :articles, controller: :articles do
       get '/' => :index, as: :articles
+      get 'new' => :new, as: :new_article
       get 'archive/(:year)(-:month)(-:day)' => :archive, as: :articles_archive, constraints: archive_constraints
       get 'tagged/(:tag_name)' => :tagged, as: :tagged_articles, constraints: { tag_name: /[^\/]+?/ }
       get '/:category_slug' => :category, as: :articles_category, constraints: { category_slug: category_slug_pattern }
@@ -62,6 +63,7 @@ Rails.application.routes.draw do
 
     scope :news, controller: :news do
       get '/' => :index, as: :news_index
+      get 'new' => :new, as: :new_news
       get 'archive/(:year)(-:month)(-:day)' => :archive, as: :news_archive, constraints: archive_constraints
       get 'tagged/(:tag_name)' => :tagged, as: :tagged_news, constraints: { tag_name: /[^\/]+?/ }
       get '/:category_slug' => :category, as: :news_category, constraints: { category_slug: category_slug_pattern }
@@ -70,6 +72,7 @@ Rails.application.routes.draw do
 
     scope :blog_posts, controller: :blog_posts do
       get '/' => :index, as: :blog_posts
+      get 'new' => :new, as: :new_blog_post
       get 'archive/(:year)(-:month)(-:day)' => :archive, as: :blog_posts_archive, constraints: archive_constraints
       get 'tagged/(:tag_name)' => :tagged, as: :tagged_blog_posts, constraints: { tag_name: /[^\/]+?/ }
       get '/:category_slug' => :category, as: :blog_posts_category, constraints: { category_slug: category_slug_pattern }

data/db/amends/20190925181818_add_search_index_to_posts.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Add full-text search to posts table
+class AddSearchIndexToPosts < ActiveRecord::Migration[5.2]
+  def up
+    execute %(
+      create or replace function posts_tsvector(title text, lead text, body text)
+        returns tsvector as $$
+          begin
+            return (
+              setweight(to_tsvector('russian', title), 'A') ||
+              setweight(to_tsvector('russian', coalesce(lead, '')), 'B') ||
+              setweight(to_tsvector('russian', body), 'C')
+            );
+          end
+        $$ language 'plpgsql' immutable;
+    )
+    execute 'create index posts_search_idx on posts using gin(posts_tsvector(title, lead, body));'
+  end
+
+  def down
+    # no rollback needed
+  end
+end

data/db/migrate/20170930000001_create_post_types.rb

@@ -3,6 +3,7 @@
 # Tables for post types, categories and tags
 class CreatePostTypes < ActiveRecord::Migration[5.2]
   def up
+    create_component
     create_post_types unless PostType.table_exists?
     create_post_categories unless PostCategory.table_exists?
     create_post_tags unless PostTag.table_exists?
@@ -34,7 +35,6 @@ class CreatePostTypes < ActiveRecord::Migration[5.2]
     add_index :post_types, :name, unique: true
 
     create_default_types
-    create_privileges
   end
 
   def create_post_categories
@@ -54,6 +54,7 @@ class CreatePostTypes < ActiveRecord::Migration[5.2]
       t.string :meta_description
       t.string :parents_cache, default: '', null: false
       t.integer :children_cache, default: [], array: true, null: false
+      t.jsonb :data, default: {}, null: false
     end
 
     add_foreign_key :post_categories, :post_categories, column: :parent_id, on_update: :cascade, on_delete: :cascade
@@ -89,17 +90,7 @@ class CreatePostTypes < ActiveRecord::Migration[5.2]
     end
   end
 
-  def create_privileges
-    group        = PrivilegeGroup.find_by(slug: 'editors') || PrivilegeGroup.create!(slug: 'editors', name: 'Редакторы')
-    chief_editor = Privilege.find_by(slug: 'chief_editor') || Privilege.create(slug: 'chief_editor', name: 'Главный редактор')
-    children     = {
-      editor: 'Редактор'
-    }
-
-    children.each do |slug, name|
-      child = Privilege.new(parent: chief_editor, slug: slug, name: name, administrative: false)
-
-      group.add_privilege(child) if child.save
-    end
+  def create_component
+    BiovisionComponent.create(slug: 'posts')
   end
 end

data/db/migrate/20170930000010_create_posts.rb

@@ -13,9 +13,11 @@ class CreatePosts < ActiveRecord::Migration[5.2]
     create_post_notes unless PostNote.table_exists?
     create_featured_posts unless FeaturedPost.table_exists?
     create_post_illustrations unless PostIllustration.table_exists?
+    create_post_attachments unless PostAttachment.table_exists?
   end
 
   def down
+    drop_table :post_attachments if PostAttachment.table_exists?
     drop_table :post_illustrations if PostIllustration.table_exists?
     drop_table :featured_posts if FeaturedPost.table_exists?
     drop_table :post_notes if PostNote.table_exists?
@@ -87,15 +89,26 @@ class CreatePosts < ActiveRecord::Migration[5.2]
 
     execute "create index posts_created_at_month_idx on posts using btree (date_trunc('month', created_at), post_type_id, user_id);"
     execute "create index posts_pubdate_month_idx on posts using btree (date_trunc('month', publication_time), post_type_id, user_id);"
+    execute %(
+      create or replace function posts_tsvector(title text, lead text, body text)
+        returns tsvector as $$
+          begin
+            return (
+              setweight(to_tsvector('russian', title), 'A') ||
+              setweight(to_tsvector('russian', coalesce(lead, '')), 'B') ||
+              setweight(to_tsvector('russian', body), 'C')
+            );
+          end
+        $$ language 'plpgsql' immutable;
+    )
+    execute "create index posts_search_idx on posts using gin(posts_tsvector(title, lead, body));"
 
     add_foreign_key :posts, :posts, column: :original_post_id, on_update: :cascade, on_delete: :nullify
 
     add_index :posts, :created_at
     add_index :posts, :data, using: :gin
 
-    if Gem.loaded_specs.key?('elasticsearch-model')
-      Post.__elasticsearch__.create_index!
-    end
+    Post.__elasticsearch__.create_index! if Gem.loaded_specs.key?('elasticsearch-model')
   end
 
   def create_post_post_tags
@@ -191,4 +204,14 @@ class CreatePosts < ActiveRecord::Migration[5.2]
       t.string :image
     end
   end
+
+  def create_post_attachments
+    create_table :post_attachments, comment: 'Attachment for post' do |t|
+      t.references :post, foreign_key: { on_update: :cascade, on_delete: :cascade }
+      t.uuid :uuid
+      t.timestamps
+      t.string :name
+      t.string :file
+    end
+  end
 end