biovision-post 0.1.180127 → 0.2.180325

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

@@ -4,7 +4,7 @@
   <% if post.editable_by? current_user %>
     <ul class="actions">
       <% if UserPrivilege.user_in_group?(current_user, :editors) %>
-        <li><%= gear_icon(admin_post_path(post.id)) %></li>
+        <li><%= gear_icon(admin_post_path(id: post.id)) %></li>
       <% end %>
       <% unless post.locked? %>
         <li><%= edit_icon(handler.edit_path) %></li>

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

@@ -4,7 +4,7 @@
   <h1><%= t('.heading') %></h1>
 
   <ul class="actions">
-    <li><%= back_icon(admin_post_path(@entity.id)) %></li>
+    <li><%= back_icon(admin_post_path(id: @entity.id)) %></li>
     <li class="danger"><%= destroy_icon(@entity) %></li>
   </ul>
 

data/app/views/posts/entity/_metadata.html.erb

@@ -1,12 +1,16 @@
 <% content_for :meta_description, (entity.meta_description.blank? ? entity.lead : entity.meta_description) %>
 <% content_for :meta_type, 'article' %>
 <% content_for :meta_type_extension do %>
-    <meta property="og:article:published_time" content="<%= entity.created_at.strftime('%Y-%m-%d') %>"/>
-    <meta property="og:article:modified_time" content="<%= entity.updated_at.strftime('%Y-%m-%d') %>"/>
-    <% if entity.show_owner? %>
-        <meta property="og:article:author" content="<%= entity.user.screen_name %>"/>
-    <% end %>
+  <meta property="og:article:published_time" content="<%= entity.created_at.strftime('%Y-%m-%d') %>"/>
+  <meta property="og:article:modified_time" content="<%= entity.updated_at.strftime('%Y-%m-%d') %>"/>
+  <% if entity.show_owner? %>
+    <meta property="og:article:author" content="<%= entity.user.screen_name %>"/>
+  <% end %>
 <% end %>
 <% content_for :meta_image, (request.protocol + request.host_with_port + entity.image.url) unless entity.image.blank? %>
-<% content_for :meta_title, entity.meta_title unless entity.meta_title.blank? %>
+<% if entity.meta_title.blank? %>
+  <% content_for :meta_title, entity.title %>
+<% else %>
+  <% content_for :meta_title, entity.meta_title %>
+<% end %>
 <% content_for :meta_keywords, entity.meta_keywords unless entity.meta_keywords.blank? %>

data/config/locales/posts-en.yml

@@ -132,11 +132,12 @@ en:
         author_name: "If specified, shown instead of current user"
         author_title: "For example, occupation of status"
         author_url: "If specified, author name will link here"
-        image: "Maximum dimensions is 3000×3000, format — JPG or PNG."
+        image: "Maximum dimensions are 3000×3000, format — JPG or PNG."
         image_alt_text: "Brief description of image. Maximum 200 chars."
         image_author_link: "Will be opened when one clicks on author name."
         image_author_name: "Person or organization name. Will be shown near image."
         image_name: "Will be shown as image caption."
+        language_id: "Language"
         lead: "Post essence, maximum 350 chars."
         meta_description: "50–55 words. Maximum 250 chars"
         meta_keywords: "Maximum 250 chars."
@@ -151,8 +152,8 @@ en:
     post:
       source: "Source"
   index:
-    index:
-      recent_posts:
+    dashboard:
+      biovision_post:
         heading: "Recent posts"
   articles:
     index:

data/config/locales/posts-ru.yml

@@ -137,6 +137,7 @@ ru:
         image_author_link: "Будет открываться при нажатии на имя автора картинки."
         image_author_name: "ФИО или название организации. Будет отображаться в подписи к картинке."
         image_name: "Будет отображаться в качестве подписи к картинке."
+        language_id: "Язык"
         lead: "Краткая суть, максимум 350 символов."
         meta_description: "50–55 слов. Максимум 250 символов."
         meta_keywords: "Максимум 250 символов."
@@ -151,8 +152,8 @@ ru:
     post:
       source: "Источник"
   index:
-    index:
-      recent_posts:
+    dashboard:
+      biovision_post:
         heading: "Недавние публикации"
   articles:
     index:

data/config/routes.rb

@@ -2,47 +2,51 @@ Rails.application.routes.draw do
   category_slug_pattern = /[a-z]+[-_0-9a-z]*[0-9a-z]/
   post_slug_pattern     = /[a-z0-9]+[-_.a-z0-9]*[a-z0-9]+/
 
-  resources :post_categories, except: [:index, :show]
-  resources :posts, except: [:new]
+  resources :post_categories, :posts, only: [:update, :destroy]
 
-  scope :articles, controller: :articles do
-    get '/' => :index, as: :articles
-    get '/:category_slug' => :category, as: :articles_category, constraints: { category_slug: category_slug_pattern }
-    get '/:post_id-:post_slug' => :show, as: :show_article, constraints: { post_id: /\d+/, post_slug: post_slug_pattern }
-  end
+  scope '/(:locale)', constraints: { locale: /[a-z]{2}/ } do
+    resources :post_categories, except: [:index, :show, :update, :destroy]
+    resources :posts, except: [:new, :update, :destroy]
 
-  scope :news, controller: :news do
-    get '/' => :index, as: :news_index
-    get '/:category_slug' => :category, as: :news_category, constraints: { category_slug: category_slug_pattern }
-    get '/:post_id-:post_slug' => :show, as: :show_news, constraints: { post_id: /\d+/, post_slug: post_slug_pattern }
-  end
+    scope :articles, controller: :articles do
+      get '/' => :index, as: :articles
+      get '/:category_slug' => :category, as: :articles_category, constraints: { category_slug: category_slug_pattern }
+      get '/:post_id-:post_slug' => :show, as: :show_article, constraints: { post_id: /\d+/, post_slug: post_slug_pattern }
+    end
 
-  scope :blog_posts, controller: :blog_posts do
-    get '/' => :index, as: :blog_posts
-    get '/:category_slug' => :category, as: :blog_posts_category, constraints: { category_slug: category_slug_pattern }
-    get '/:post_id-:post_slug' => :show, as: :show_blog_post, constraints: { post_id: /\d+/, post_slug: post_slug_pattern }
-  end
+    scope :news, controller: :news do
+      get '/' => :index, as: :news_index
+      get '/:category_slug' => :category, as: :news_category, constraints: { category_slug: category_slug_pattern }
+      get '/:post_id-:post_slug' => :show, as: :show_news, constraints: { post_id: /\d+/, post_slug: post_slug_pattern }
+    end
 
-  namespace :admin do
-    resources :post_types, only: [:index, :show] do
-      member do
-        get :post_categories
-        get :new_post
-      end
+    scope :blog_posts, controller: :blog_posts do
+      get '/' => :index, as: :blog_posts
+      get '/:category_slug' => :category, as: :blog_posts_category, constraints: { category_slug: category_slug_pattern }
+      get '/:post_id-:post_slug' => :show, as: :show_blog_post, constraints: { post_id: /\d+/, post_slug: post_slug_pattern }
     end
-    resources :post_categories, only: [:show] do
-      member do
-        put 'lock', defaults: { format: :json }
-        delete 'lock', action: :unlock, defaults: { format: :json }
-        post 'priority', defaults: { format: :json }
-        post 'toggle', defaults: { format: :json }
+
+    namespace :admin do
+      resources :post_types, only: [:index, :show] do
+        member do
+          get :post_categories
+          get :new_post
+        end
       end
-    end
-    resources :posts, only: [:index, :show] do
-      member do
-        put 'lock', defaults: { format: :json }
-        delete 'lock', action: :unlock, defaults: { format: :json }
-        post 'toggle', defaults: { format: :json }
+      resources :post_categories, only: [:show] do
+        member do
+          put 'lock', defaults: { format: :json }
+          delete 'lock', action: :unlock, defaults: { format: :json }
+          post 'priority', defaults: { format: :json }
+          post 'toggle', defaults: { format: :json }
+        end
+      end
+      resources :posts, only: [:index, :show] do
+        member do
+          put 'lock', defaults: { format: :json }
+          delete 'lock', action: :unlock, defaults: { format: :json }
+          post 'toggle', defaults: { format: :json }
+        end
       end
     end
   end

data/db/migrate/20170930000001_create_post_types.rb

@@ -3,6 +3,7 @@ class CreatePostTypes < ActiveRecord::Migration[5.1]
     unless PostType.table_exists?
       create_table :post_types do |t|
         t.timestamps
+        t.boolean :active, default: true, null: false
         t.integer :posts_count, default: 0, null: false
         t.integer :category_depth, limit: 2, default: 0
         t.string :name, null: false

data/db/migrate/20170930000003_create_posts.rb

@@ -47,6 +47,8 @@ class CreatePosts < ActiveRecord::Migration[5.1]
       execute "create index posts_created_at_month_idx on posts using btree (date_trunc('month', created_at), post_type_id, user_id);"
 
       add_foreign_key :posts, :posts, column: :original_post_id, on_update: :cascade, on_delete: :nullify
+
+      add_index :posts, :created_at
     end
   end
 

data/db/migrate/20171218111111_add_meta_fields_to_posts.rb

@@ -10,6 +10,6 @@ class AddMetaFieldsToPosts < ActiveRecord::Migration[5.1]
   end
 
   def down
-  #   No need to rollback
+    # No need to rollback
   end
 end

data/db/migrate/20171219111112_add_author_fields_to_posts.rb

@@ -6,6 +6,6 @@ class AddAuthorFieldsToPosts < ActiveRecord::Migration[5.1]
   end
 
   def down
-  #   no rollback
+    # no rollback
   end
 end

data/db/migrate/20180124111113_add_language_to_posts.rb

@@ -6,6 +6,6 @@ class AddLanguageToPosts < ActiveRecord::Migration[5.1]
   end
 
   def down
-  #   no rollback
+    # no rollback
   end
 end

data/db/migrate/20180318215555_add_active_to_post_types.rb

@@ -0,0 +1,11 @@
+class AddActiveToPostTypes < ActiveRecord::Migration[5.1]
+  def up
+    unless column_exists? :post_types, :active
+      add_column :post_types, :active, :boolean, default: true, null: false
+    end
+  end
+
+  def down
+    # no rollback
+  end
+end

data/db/migrate/20180321100000_create_post_references.rb

@@ -0,0 +1,21 @@
+class CreatePostReferences < ActiveRecord::Migration[5.1]
+  def up
+    unless PostReference.table_exists?
+      create_table :post_references do |t|
+        t.timestamps
+        t.references :post, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+        t.integer :priority, limit: 2, default: 1, null: false
+        t.string :authors
+        t.string :title, null: false
+        t.string :url
+        t.string :publishing_info
+      end
+    end
+  end
+
+  def down
+    if PostReference.table_exists?
+      drop_table :post_references
+    end
+  end
+end

data/db/migrate/20180321100001_create_post_notes.rb

@@ -0,0 +1,18 @@
+class CreatePostNotes < ActiveRecord::Migration[5.1]
+  def up
+    unless PostNote.table_exists?
+      create_table :post_notes do |t|
+        t.timestamps
+        t.references :post, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+        t.integer :priority, limit: 2, default: 1, null: false
+        t.text :text, null: false
+      end
+    end
+  end
+
+  def down
+    if PostNote.table_exists?
+      drop_table :post_notes
+    end
+  end
+end

data/db/migrate/20180321100002_create_post_links.rb

@@ -0,0 +1,20 @@
+class CreatePostLinks < ActiveRecord::Migration[5.1]
+  def up
+    unless PostLink.table_exists?
+      create_table :post_links do |t|
+        t.timestamps
+        t.references :post, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
+        t.integer :other_post_id, null: false
+        t.integer :priority, limit: 2, default: 1, null: false
+      end
+
+      add_foreign_key :post_links, :posts, column: :other_post_id, on_update: :cascade, on_delete: :cascade
+    end
+  end
+
+  def down
+    if PostLink.table_exists?
+      drop_table :post_links
+    end
+  end
+end

data/lib/biovision/post/engine.rb

@@ -8,12 +8,11 @@ module Biovision
     class Engine < ::Rails::Engine
       config.generators do |g|
         g.test_framework :rspec
-        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+        g.fixture_replacement :factory_bot, :dir => 'spec/factories'
       end
 
       config.assets.precompile << %w(admin.scss)
-      config.assets.precompile << %w(biovision/base/icons/*)
-      config.assets.precompile << %w(biovision/base/placeholders/*)
+      config.assets.precompile << %w(biovision/base/**/*)
     end
   end
 end

data/lib/biovision/post/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Post
-    VERSION = '0.1.180127'
+    VERSION = '0.2.180325'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-post
 version: !ruby/object:Gem::Version
-  version: 0.1.180127
+  version: 0.2.180325
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -138,8 +138,12 @@ files:
 - app/mailers/biovision/post/application_mailer.rb
 - app/models/application_record.rb
 - app/models/biovision/post/application_record.rb
+- app/models/concerns/post_child_with_priority.rb
 - app/models/post.rb
 - app/models/post_category.rb
+- app/models/post_link.rb
+- app/models/post_note.rb
+- app/models/post_reference.rb
 - app/models/post_type.rb
 - app/services/post_manager.rb
 - app/services/post_manager/article_handler.rb
@@ -168,7 +172,7 @@ files:
 - app/views/blog_posts/index.html.erb
 - app/views/blog_posts/index.jbuilder
 - app/views/blog_posts/show.html.erb
-- app/views/index/index/_recent_posts.html.erb
+- app/views/index/dashboard/_biovision_post.html.erb
 - app/views/layouts/biovision/post/application.html.erb
 - app/views/news/category.html.erb
 - app/views/news/index.html.erb
@@ -187,11 +191,8 @@ files:
 - app/views/posts/_post.html.erb
 - app/views/posts/_preview.html.erb
 - app/views/posts/edit.html.erb
-- app/views/posts/edit.js.erb
 - app/views/posts/entity/_metadata.html.erb
 - app/views/posts/entity/_publisher.html.erb
-- app/views/posts/form/_wysiwyg.html.erb
-- app/views/posts/new.js.erb
 - app/views/posts/show.html.erb
 - config/locales/posts-en.yml
 - config/locales/posts-ru.yml
@@ -202,6 +203,10 @@ files:
 - db/migrate/20171218111111_add_meta_fields_to_posts.rb
 - db/migrate/20171219111112_add_author_fields_to_posts.rb
 - db/migrate/20180124111113_add_language_to_posts.rb
+- db/migrate/20180318215555_add_active_to_post_types.rb
+- db/migrate/20180321100000_create_post_references.rb
+- db/migrate/20180321100001_create_post_notes.rb
+- db/migrate/20180321100002_create_post_links.rb
 - lib/biovision/post.rb
 - lib/biovision/post/engine.rb
 - lib/biovision/post/version.rb

data/app/views/index/index/_recent_posts.html.erb

@@ -1,5 +0,0 @@
-<section class="recent-posts">
-  <h2><%= t('.heading') %></h2>
-
-  <%= render partial: 'posts/list', locals: { collection: collection } %>
-</section>

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

@@ -1 +0,0 @@
-<%= render partial: 'shared/forms/list_of_errors', locals: { entity: @entity, form_id: 'post-form' } %>

data/app/views/posts/form/_wysiwyg.html.erb

@@ -1,14 +0,0 @@
-<script src="//cdn.ckeditor.com/4.7.3/full/ckeditor.js"></script>
-<script>
-    'use strict';
-
-    document.addEventListener('DOMContentLoaded', function () {
-        const editor = document.getElementById('post_body');
-
-        CKEDITOR.replace(editor, {
-            filebrowserUploadUrl: '/media_files/ckeditor',
-            removePlugins: 'forms,save,preview,flash,bidi,language,print,templates,newpage,iframe,about,scayt,wsc',
-//            extraPlugins: 'embed'
-        });
-    });
-</script>

data/app/views/posts/new.js.erb

@@ -1 +0,0 @@
-<%= render partial: 'shared/forms/list_of_errors', locals: { entity: @entity, form_id: 'post-form' } %>