biovision-post 0.1.180127 → 0.2.180325

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b889ba7a155e2072f97474ffa415f86b0aaeb387d5266de6f08715ca090dc016
-  data.tar.gz: b20b223bca477ff0f077720a6102a69dbdd72e68e8b6bbeabb821d632c5296c8
+  metadata.gz: fbf3b6832851e48e1450b9c63d50ac2a197b03c0b2eb05349b4f9d6f7cd58dd5
+  data.tar.gz: f0171a57eb12a4642dffb3c115a46e5bcd63fa9287b67080427e695ce7243abb
 SHA512:
-  metadata.gz: 9c4e4732cd224dfb38af8e72f881d306bed081a5382fcee710e493b685a87a7c7ba1b8b276660dde410adbfe6529b14a7ac1f2722d91f20e6fb0e52a9b792f81
-  data.tar.gz: e5f81682ceb25780a39098d3197fe1120b5e70051de31ebffa7b89baba832b771833b4120e127b6d4d117cdc31b8d0ee21ee5d6664b85b2e06bef2e7f95b975d
+  metadata.gz: 7bea4d1a8c899d26f28949e979801fcd1754819c8e371769a8e6c4024c933f2becbadddaefa695ab88fbd1ca838ce39a2a51ae689ebda12e82bb2e786e8c605c
+  data.tar.gz: 3ae3e714da864096277d071035387e316a0ff89155d866f1491308c64dc89ecaccfce16584280db74072d0f746f2f2ec60f823335da2539cb9a3c6113b5aad79

data/app/controllers/articles_controller.rb

@@ -5,12 +5,12 @@ class ArticlesController < ApplicationController
   # get /articles
   def index
     post_type   = PostType.find_by(slug: 'article')
-    @collection = post_type.posts.page_for_visitors(current_page)
+    @collection = post_type.posts.for_language(current_language).page_for_visitors(current_page)
   end
 
   # get /articles/:category_slug
   def category
-    @collection = @category.posts.page_for_visitors(current_page)
+    @collection = @category.posts.for_language(current_language).page_for_visitors(current_page)
   end
 
   # get /articles/:post_id-:post_slug

data/app/controllers/blog_posts_controller.rb

@@ -5,12 +5,12 @@ class BlogPostsController < ApplicationController
   # get /blog_posts
   def index
     post_type   = PostType.find_by(slug: 'blog_post')
-    @collection = post_type.posts.page_for_visitors(current_page)
+    @collection = post_type.posts.for_language(current_language).page_for_visitors(current_page)
   end
 
   # get /blog_posts/:category_slug
   def category
-    @collection = @category.posts.page_for_visitors(current_page)
+    @collection = @category.posts.for_language(current_language).page_for_visitors(current_page)
   end
 
   # get /blog_posts/:post_id-:post_slug

data/app/controllers/news_controller.rb

@@ -5,12 +5,12 @@ class NewsController < ApplicationController
   # get /news
   def index
     post_type   = PostType.find_by(slug: 'news')
-    @collection = post_type.posts.page_for_visitors(current_page)
+    @collection = post_type.posts.for_language(current_language).page_for_visitors(current_page)
   end
 
   # get /news/:category_slug
   def category
-    @collection = @category.posts.page_for_visitors(current_page)
+    @collection = @category.posts.for_language(current_language).page_for_visitors(current_page)
   end
 
   # get /news/:post_id-:post_slug

data/app/controllers/post_categories_controller.rb

@@ -11,7 +11,7 @@ class PostCategoriesController < AdminController
   def create
     @entity = PostCategory.new(creation_parameters)
     if @entity.save
-      next_page = admin_post_category_path(@entity.id)
+      next_page = admin_post_category_path(id: @entity.id)
       respond_to do |format|
         format.html { redirect_to(next_page) }
         format.json { render json: { links: { self: next_page } } }
@@ -29,7 +29,7 @@ class PostCategoriesController < AdminController
   # patch /post_categories/:id
   def update
     if @entity.update entity_parameters
-      next_page = admin_post_category_path(@entity)
+      next_page = admin_post_category_path(id: @entity.id)
       respond_to do |format|
         format.html { redirect_to(next_page, notice: t('post_categories.update.success')) }
         format.json { render json: { links: { self: next_page } } }
@@ -45,7 +45,7 @@ class PostCategoriesController < AdminController
     if @entity.destroy
       flash[:notice] = t('post_categories.destroy.success')
     end
-    redirect_to(post_categories_admin_post_type_path(@entity.post_type_id))
+    redirect_to(post_categories_admin_post_type_path(id: @entity.post_type_id))
   end
 
   protected
@@ -56,7 +56,7 @@ class PostCategoriesController < AdminController
 
   def restrict_editing
     if @entity.locked?
-      redirect_to admin_post_category_path(@entity.id), alert: t('post_categories.edit.forbidden')
+      redirect_to admin_post_category_path(id: @entity.id), alert: t('post_categories.edit.forbidden')
     end
   end
 

data/app/controllers/posts_controller.rb

@@ -14,20 +14,15 @@ class PostsController < ApplicationController
   def create
     @entity = Post.new(creation_parameters)
     if @entity.save
-      next_page = PostManager.handler(@entity).post_path
-      respond_to do |format|
-        format.html { redirect_to next_page }
-        format.json { render json: { links: { self: next_page } } }
-        format.js { render js: "document.location.href = '#{next_page}'" }
-      end
+      form_processed_ok(PostManager.handler(@entity).post_path)
     else
-      render :new, status: :bad_request
+      form_processed_with_error(:new)
     end
   end
 
   # get /posts/:id
   def show
-    @entity = Post.find_by(id: params[:id], visible: true, deleted: false)
+    @entity = Post.list_for_visitors.find_by(id: params[:id])
     if @entity.nil?
       handle_http_404("Cannot find non-deleted post #{params[:id]}")
     end
@@ -40,14 +35,9 @@ class PostsController < ApplicationController
   # patch /posts/:id
   def update
     if @entity.update(entity_parameters)
-      next_page = PostManager.handler(@entity).post_path
-      respond_to do |format|
-        format.html { redirect_to next_page }
-        format.json { render json: { links: { self: next_page } } }
-        format.js { render js: "document.location.href = '#{next_page}'" }
-      end
+      form_processed_ok(PostManager.handler(@entity).post_path)
     else
-      render :edit, status: :bad_request
+      form_processed_with_error(:edit)
     end
   end
 

data/app/helpers/biovision_posts_helper.rb

@@ -2,19 +2,19 @@ module BiovisionPostsHelper
   # @param [PostType] entity
   # @param [String] text
   def admin_post_type_link(entity, text = entity.name)
-    link_to(text, admin_post_type_path(entity.id))
+    link_to(text, admin_post_type_path(id: entity.id))
   end
 
   # @param [PostCategory] entity
   # @param [String] text
   def admin_post_category_link(entity, text = entity.name)
-    link_to(text, admin_post_category_path(entity.id))
+    link_to(text, admin_post_category_path(id: entity.id))
   end
 
   # @param [Post] entity
   # @param [String] text
   def admin_post_link(entity, text = entity.title)
-    link_to(text, admin_post_path(entity.id))
+    link_to(text, admin_post_path(id: entity.id))
   end
 
   # @param [Integer] post_type_id
@@ -40,7 +40,7 @@ module BiovisionPostsHelper
   # @param [String] text
   # @param [Hash] options
   def post_link(entity, text = entity.title, options = {})
-    link_to(text, PostManager.handler(entity).post_path, options)
+    link_to(text, PostManager.handler(entity, locale).post_path, options)
   end
 
   # @param [Post] entity

data/app/models/concerns/post_child_with_priority.rb

@@ -0,0 +1,49 @@
+module PostChildWithPriority
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :post
+
+    after_initialize :set_next_priority
+    before_validation :normalize_priority
+
+    scope :siblings, ->(entity) { where(post_id: entity.post_id) }
+    scope :ordered_by_priority, -> { order 'priority asc, id desc' }
+
+    def self.priority_range
+      (1..32767)
+    end
+
+    # @param [User] user
+    def editable_by?(user)
+      post.editable_by?(user)
+    end
+
+    # @param [Integer] delta
+    def change_priority(delta)
+      new_priority = priority + delta
+      criteria     = { post_id: post_id, priority: new_priority }
+      adjacent     = self.class.find_by(criteria)
+      if adjacent.is_a?(self.class) && (adjacent.id != id)
+        adjacent.update!(priority: priority)
+      end
+      self.update(priority: new_priority)
+
+      self.class.siblings(self).ordered_by_priority.map { |e| [e.id, e.priority] }.to_h
+    end
+
+    private
+
+    def set_next_priority
+      if id.nil? && priority == 1
+        self.priority = self.class.siblings(self).maximum(:priority).to_i + 1
+      end
+    end
+
+    def normalize_priority
+      range = self.class.priority_range
+      self.priority = range.first if priority < range.first
+      self.priority = range.last if priority > range.last
+    end
+  end
+end

data/app/models/post.rb

@@ -4,16 +4,17 @@ class Post < ApplicationRecord
   include VotableItem if Gem.loaded_specs.key?('biovision-vote')
   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   = 250
-  ALT_LIMIT    = 200
-  PER_PAGE     = 12
-
-  toggleable :visible, :show_owner, :allow_comments
+  TITLE_LIMIT       = 140
+  SLUG_LIMIT        = 200
+  SLUG_PATTERN      = /\A[a-z0-9]+[-_.a-z0-9]*[a-z0-9]+\z/
+  SLUG_PATTERN_HTML = '^[a-zA-Z0-9]+[-_.a-zA-Z0-9]*[a-zA-Z0-9]+$'
+  LEAD_LIMIT        = 350
+  BODY_LIMIT        = 50000
+  META_LIMIT        = 250
+  ALT_LIMIT         = 200
+  PER_PAGE          = 12
+
+  toggleable :visible, :show_owner
 
   mount_uploader :image, PostImageUploader
 
@@ -23,6 +24,9 @@ class Post < ApplicationRecord
   belongs_to :post_category, counter_cache: true, optional: true
   belongs_to :language, optional: true
   belongs_to :agent, optional: true
+  has_many :post_references, dependent: :delete_all
+  has_many :post_notes, dependent: :delete_all
+  has_many :post_links, dependent: :delete_all
 
   after_initialize { self.uuid = SecureRandom.uuid if uuid.nil? }
   before_validation { self.slug = Canonizer.transliterate(title.to_s) if slug.blank? }
@@ -50,13 +54,15 @@ class Post < ApplicationRecord
   validates_format_of :slug, with: SLUG_PATTERN
   validate :category_consistency
 
-  scope :recent, -> { order('id desc') }
+  scope :recent, -> { order('created_at desc') }
   scope :visible, -> { where(visible: true, deleted: false, approved: true) }
+  scope :for_language, -> (language) { where(language: language) }
   scope :list_for_visitors, -> { visible.recent }
+  scope :list_for_administration, -> { order('id desc') }
 
   # @param [Integer] page
   def self.page_for_administration(page = 1)
-    recent.page(page).per(PER_PAGE)
+    list_for_administration.page(page).per(PER_PAGE)
   end
 
   # @param [Integer] page
@@ -65,10 +71,10 @@ class Post < ApplicationRecord
   end
 
   def self.entity_parameters
-    main_data   = %i(post_category_id title slug lead body visible translation region_id)
+    main_data   = %i(post_category_id title slug lead body region_id language_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)
+    flags_data  = %i(show_owner allow_comments visible translation)
     author_data = %i(author_name author_title author_url)
 
     main_data + image_data + meta_data + author_data + flags_data
@@ -102,7 +108,7 @@ class Post < ApplicationRecord
 
   def prepare_source_names
     if image_author_name.blank? && !image_author_link.blank?
-      self.image_author_name = URI.parse(image_author_name).host
+      self.image_author_name = URI.parse(image_author_link).host
     end
     if source_name.blank? && !source_link.blank?
       self.source_name = URI.parse(source_link).host

data/app/models/post_link.rb

@@ -0,0 +1,15 @@
+class PostLink < ApplicationRecord
+  include PostChildWithPriority
+
+  belongs_to :other_post, class_name: Post.to_s
+
+  validates_uniqueness_of :other_post_id, scope: [:post_id]
+
+  def self.entity_parameters
+    %i(priority)
+  end
+
+  def self.creation_parameters
+    %i(post_id other_post_id)
+  end
+end

data/app/models/post_note.rb

@@ -0,0 +1,16 @@
+class PostNote < ApplicationRecord
+  include PostChildWithPriority
+
+  TEXT_LIMIT = 1000
+
+  validates_presence_of :text
+  validates_length_of :text, maximum: TEXT_LIMIT
+
+  def self.entity_parameters
+    %i(priority text)
+  end
+
+  def self.creation_parameters
+    entity_parameters + %i(post_id)
+  end
+end

data/app/models/post_reference.rb

@@ -0,0 +1,19 @@
+class PostReference < ApplicationRecord
+  include PostChildWithPriority
+
+  META_LIMIT = 255
+
+  validates_presence_of :title
+  validates_length_of :authors, maximum: META_LIMIT
+  validates_length_of :title, maximum: META_LIMIT
+  validates_length_of :url, maximum: META_LIMIT
+  validates_length_of :publishing_info, maximum: META_LIMIT
+
+  def self.entity_parameters
+    %i(priority authors title url publishing_info)
+  end
+
+  def self.creation_parameters
+    entity_parameters + %i(post_id)
+  end
+end

data/app/models/post_type.rb

@@ -15,7 +15,9 @@ class PostType < ApplicationRecord
   validates_format_of :slug, with: SLUG_PATTERN
   validates_inclusion_of :category_depth, in: DEPTH_RANGE
 
+  scope :active, -> { where(active: true) }
+
   def self.page_for_administration
-    ordered_by_name
+    active.ordered_by_name
   end
 end

data/app/services/post_manager.rb

@@ -1,15 +1,18 @@
 class PostManager
   # @param [Post] entity
-  def initialize(entity)
+  # @param [Symbol|String] locale
+  def initialize(entity, locale = I18n.locale)
     @entity = entity
     @body   = entity.body.to_s
+    @prefix = locale.nil? ? '' : "/#{locale}"
   end
 
   # @param [Post] entity
-  def self.handler(entity)
+  # @param [Symbol|String] locale
+  def self.handler(entity, locale = I18n.locale)
     handler_name  = "post_manager/#{entity.post_type.slug}_handler".classify
     handler_class = handler_name.safe_constantize || PostManager
-    handler_class.new(entity)
+    handler_class.new(entity, locale)
   end
 
   def parsed_body
@@ -17,15 +20,15 @@ class PostManager
   end
 
   def post_path
-    "/posts/#{@entity.id}"
+    "#{@prefix}/posts/#{@entity.id}"
   end
 
   def edit_path
-    "/posts/#{@entity.id}/edit"
+    "#{@prefix}/posts/#{@entity.id}/edit"
   end
 
   # @param [PostCategory] category
   def category_path(category)
-    "posts/#{category.long_slug}"
+    "#{@prefix}/posts/#{category.long_slug}"
   end
 end

data/app/services/post_manager/article_handler.rb

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

data/app/services/post_manager/blog_post_handler.rb

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

data/app/services/post_manager/news_handler.rb

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