biovision-base 0.34.190331.1 → 0.36.190526.0

data/app/controllers/admin_controller.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Common administrative controller
 class AdminController < ApplicationController
   before_action :restrict_access
 
@@ -5,6 +8,7 @@ class AdminController < ApplicationController
 
   def restrict_access
     return if UserPrivilege.user_has_any_privilege?(current_user)
+
     handle_http_401("User #{current_user&.id} has no privileges")
   end
 end

data/app/controllers/concerns/authentication.rb

@@ -10,6 +10,9 @@ module Authentication
 
   # @param [User] user
   def create_token_for_user(user)
+    forced_user = User.find_by(id: user.native_id)
+    user = forced_user unless forced_user.nil?
+
     token = user.tokens.create!(tracking_for_entity)
 
     cookies['token'] = {

data/app/controllers/editable_pages_controller.rb

@@ -20,6 +20,7 @@ class EditablePagesController < AdminController
   def create
     @entity = EditablePage.new(entity_parameters)
     if @entity.save
+      EditablePageBodyParserJob.perform_later(@entity.id)
       form_processed_ok(admin_editable_page_path(id: @entity.id))
     else
       form_processed_with_error(:new)
@@ -33,6 +34,7 @@ class EditablePagesController < AdminController
   # patch /editable_pages/:id
   def update
     if @entity.update(entity_parameters)
+      EditablePageBodyParserJob.perform_later(@entity.id)
       form_processed_ok(admin_editable_page_path(id: @entity.id))
     else
       form_processed_with_error(:edit)

data/app/controllers/my/profiles_controller.rb

@@ -8,7 +8,7 @@ class My::ProfilesController < ApplicationController
   before_action :restrict_anonymous_access, except: %i[check new create]
   before_action :set_handler
 
-  layout 'profile', only: %i[show edit]
+  # layout 'profile', only: %i[show edit]
 
   # post /my/profile/check
   def check

data/app/helpers/biovision_users_helper.rb

@@ -24,7 +24,7 @@ module BiovisionUsersHelper
     return I18n.t(:anonymous) if entity.nil? || entity.deleted?
 
     link_options = { class: 'profile' }.merge(options)
-    link_to(text, user_profile_path(slug: entity.screen_name), link_options)
+    link_to(text, user_profile_path(slug: entity.slug), link_options)
   end
 
   # @param [User] entity

data/app/jobs/editable_page_body_parser_job.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+# Parse editable page body
+class EditablePageBodyParserJob < ApplicationJob
+  queue_as :default
+
+  # @param [Integer] id
+  def perform(id)
+    entity = EditablePage.find_by(id: id)
+
+    return if entity.nil?
+
+    entity.parsed_body = OembedReceiver.convert(entity.body)
+    entity.save
+  end
+end

data/app/models/biovision_component.rb

@@ -10,7 +10,10 @@
 class BiovisionComponent < ApplicationRecord
   include RequiredUniqueSlug
 
-  has_many :biovision_parameters, dependent: :delete_all
+  SLUG_LIMIT        = 250
+  SLUG_PATTERN      = /\A[a-z][-a-z0-9_]+[a-z0-9]\z/i.freeze
+  SLUG_PATTERN_HTML = '^[a-zA-Z][-a-zA-Z0-9_]+[a-zA-Z0-9]$'
+  VALUE_LIMIT       = 65_535
 
   # Find component by slug
   #
@@ -20,24 +23,28 @@ class BiovisionComponent < ApplicationRecord
   end
 
   # @param [String] slug
+  # @param [String] default_value
+  def get(slug, default_value = '')
+    parameters.fetch(slug.to_s) { default_value }
+  end
+
+  # @param [String] slug
+  # @deprecated use #get
   def receive(slug)
-    biovision_parameters.find_by(slug: slug)&.value
+    parameters[slug.to_s]
   end
 
   # @param [String] slug
-  # @param [String] default
-  def receive!(slug, default = '')
-    biovision_parameters.find_by(slug: slug)&.value || default
+  # @param [String] default_value
+  # @deprecated use #get
+  def receive!(slug, default_value = '')
+    get(slug, default_value)
   end
 
   # @param [String] slug
   # @param [String] value
   def []=(slug, value)
-    parameter = biovision_parameters.find_by(slug: slug)
-    if parameter.nil?
-      biovision_parameters.create!(slug: slug, value: value.to_s)
-    else
-      parameter.update!(value: value.to_s)
-    end
+    parameters[slug.to_s] = value.to_s
+    save!
   end
 end

data/app/models/editable_page.rb

@@ -3,19 +3,20 @@
 # Editable page for site
 #
 # Attributes:
-#   - body [String]
-#   - image [EditablePageImageUploader], optional
-#   - image_alt_text [String], optional
-#   - language_id [Language]
-#   - meta_description [String], optional
-#   - meta_keywords [String], optional
-#   - meta_title [String], optional
-#   - name [String]
-#   - nav_group [String], optional
-#   - priority [Integer]
-#   - slug [String]
-#   - url [String], optional
-#   - visible [Boolean]
+#   body [String]
+#   image [EditablePageImageUploader], optional
+#   image_alt_text [String], optional
+#   language_id [Language]
+#   meta_description [String], optional
+#   meta_keywords [String], optional
+#   meta_title [String], optional
+#   name [String]
+#   nav_group [String], optional
+#   parsed_body [Text]
+#   priority [Integer]
+#   slug [String]
+#   url [String], optional
+#   visible [Boolean]
 class EditablePage < ApplicationRecord
   include RequiredUniqueName
   include FlatPriority
@@ -23,21 +24,21 @@ class EditablePage < ApplicationRecord
   include Checkable
   include Toggleable
 
-  BODY_LIMIT = 65_535
+  BODY_LIMIT = 16_777_215
   META_LIMIT = 255
   NAME_LIMIT = 100
   SLUG_LIMIT = 100
 
   toggleable :visible
 
-  mount_uploader :image, EditablePageImageUploader
+  mount_uploader :image, SimpleImageUploader
 
   belongs_to :language, optional: true
 
   before_validation { self.slug = slug.strip unless slug.nil? }
 
   validates_presence_of :slug
-  validates_uniqueness_of :slug, scope: [:language_id]
+  validates_uniqueness_of :slug, scope: :language_id
   validates_length_of :body, maximum: BODY_LIMIT
   validates_length_of :image_alt_text, maximum: META_LIMIT
   validates_length_of :name, maximum: NAME_LIMIT
@@ -89,6 +90,10 @@ class EditablePage < ApplicationRecord
     name
   end
 
+  def text
+    parsed_body.blank? ? body : parsed_body
+  end
+
   # @deprecated use #meta_keywords
   def keywords
     meta_keywords

data/app/models/foreign_site.rb

@@ -1,3 +1,11 @@
+# frozen_string_literal: true
+
+# Model for foreign site for external authentication
+#
+# Attributes:
+#   foreign_users_count [Integer]
+#   name [String]
+#   slug [String]
 class ForeignSite < ApplicationRecord
   include RequiredUniqueName
   include RequiredUniqueSlug
@@ -10,9 +18,7 @@ class ForeignSite < ApplicationRecord
   validates_length_of :name, maximum: NAME_LIMIT
   validates_length_of :slug, maximum: SLUG_LIMIT
 
-  def self.page_for_administration
-    ordered_by_name
-  end
+  scope :list_for_administration, -> { ordered_by_name }
 
   # @param [Hash] data
   # @param [Hash] tracking

data/app/services/biovision/components/base_component.rb

@@ -26,51 +26,28 @@ module Biovision
         handler_class.new(entity)
       end
 
-      # @param [Hash] data
-      def settings=(data)
-        @component.settings.merge!(normalize_settings(data))
-        @component.save!
+      def self.default_privilege_name
+        self.class.to_s.demodulize.underscore.gsub('component', 'manager')
       end
 
-      def settings
-        @component.settings
-      end
+      # @param [User] user
+      # @param [Hash] options
+      def self.allow?(user, options = {})
+        return false if user.nil?
 
-      def parameters
-        @component.biovision_parameters.list_for_administration
-      end
+        privilege = options[:privilege] || default_privilege_name
 
-      # Get instance of BiovisionParameter with given slug
-      #
-      # @param [String] slug
-      def parameter(slug)
-        @component.biovision_parameters.find_by(slug: slug)
+        UserPrivilege.user_has_privilege?(user, privilege)
       end
 
-      # Create or update parameter values
-      #
-      # @param [String] slug
-      # @param [String] value
-      # @param [String] name
-      # @param [String] description
-      def set_parameter(slug, value, name = '', description = '')
-        @component[slug] = value
-
-        item = parameter(slug)
-        item.update(name: name, description: description) if item.deletable?
-
-        item
+      # @param [Hash] data
+      def settings=(data)
+        @component.settings.merge!(normalize_settings(data))
+        @component.save!
       end
 
-      # Delete parameter with given slug (if it is deletable)
-      #
-      # @param [String] slug
-      def delete_parameter(slug)
-        item = parameter(slug)
-
-        return unless item&.deletable?
-
-        item.destroy
+      def settings
+        @component.settings
       end
 
       # Receive parameter value with default
@@ -82,7 +59,7 @@ module Biovision
       # @param [String] default
       # @return [String]
       def receive(key, default = '')
-        @component.receive!(key, default)
+        @component.get(key, default)
       end
 
       # Receive parameter value or nil
@@ -90,9 +67,9 @@ module Biovision
       # Returns value of component's parameter of nil when it's not found
       #
       # @param [String] key
-      # @return [String|nil]
+      # @return [String]
       def [](key)
-        @component.receive(key)
+        @component.get(key)
       end
 
       # Set parameter

data/app/services/canonizer.rb

@@ -1,31 +1,38 @@
+# frozen_string_literal: true
+
+# Helper for canonizing and transliterating strings
 class Canonizer
+  # Keys are not latin letters
   TRANSLITERATION_MAP = {
-      'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e',
-      'ё' => 'yo', 'ж' => 'zh', 'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k',
-      'л' => 'l', 'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r',
-      'с' => 's', 'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'kh', 'ц' => 'c',
-      'ч' => 'ch', 'ш' => 'sh', 'щ' => 'shh', 'ъ' => '', 'ы' => 'y', 'ь' => '',
-      'э' => 'e', 'ю' => 'yu', 'я' => 'ya',
-      'å' => 'ao', 'ä' => 'ae', 'ö' => 'oe', 'é' => 'e'
-  }
+    'а' => 'a', 'б' => 'b', 'в' => 'v', 'г' => 'g', 'д' => 'd', 'е' => 'e',
+    'ё' => 'yo', 'ж' => 'zh', 'з' => 'z', 'и' => 'i', 'й' => 'j', 'к' => 'k',
+    'л' => 'l', 'м' => 'm', 'н' => 'n', 'о' => 'o', 'п' => 'p', 'р' => 'r',
+    'с' => 's', 'т' => 't', 'у' => 'u', 'ф' => 'f', 'х' => 'kh', 'ц' => 'c',
+    'ч' => 'ch', 'ш' => 'sh', 'щ' => 'shh', 'ъ' => '', 'ы' => 'y', 'ь' => '',
+    'э' => 'e', 'ю' => 'yu', 'я' => 'ya',
+    'å' => 'ao', 'ä' => 'ae', 'ö' => 'oe', 'é' => 'e'
+  }.freeze
 
   # @param [String] text
   def self.transliterate(text)
-    result = text.downcase
-    TRANSLITERATION_MAP.each { |r, e| result.gsub!(r, e) }
-    result.downcase.gsub(/[^-a-z0-9_]/, '-').gsub(/^[-_]*([-a-z0-9_]*[a-z0-9]+)[-_]*$/, '\1').gsub(/--+/, '-')
+    pattern = Regexp.new "[#{TRANSLITERATION_MAP.keys.join}]"
+    result = text.to_s.downcase.gsub(pattern, TRANSLITERATION_MAP)
+
+    a = /[^-a-z0-9_]/ # non-allowed characters will be replaced with dash
+    b = /\A[-_]*([-a-z0-9_]*[a-z0-9]+)[-_]*\z/ # chop leading and trailing dash
+    result.gsub(a, '-').gsub(b, '\1').gsub(/--+/, '-').gsub(/-+\z/, '')
   end
 
   # @param [String] input
   def self.canonize(input)
-    lowered   = input.downcase.strip
+    lowered = input.to_s.downcase.strip
     canonized = lowered.gsub(/[^a-zа-я0-9ё]/, '')
     canonized.empty? ? lowered : canonized
   end
 
   # @param [String] input
   def self.urlize(input)
-    lowered = input.downcase.squish
-    lowered.gsub(/[^a-zа-я0-9ё]/, '-').gsub(/-\z/, '')
+    lowered = input.to_s.downcase.squish
+    lowered.gsub(/[^a-zа-я0-9ё]/, '-').gsub(/-+\z/, '')
   end
 end

data/app/services/oembed_receiver.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+# Receiver for OEmbed-wrapped content
+class OembedReceiver
+  PATTERN = %r{<oembed url="([^"]+)"></oembed>}.freeze
+
+  attr_accessor :url
+
+  # @param [String] url
+  def initialize(url = '')
+    @url = url
+  end
+
+  # @param [String] text
+  def self.convert(text)
+    receiver = new
+    text.gsub(PATTERN) do |fragment|
+      receiver.url = fragment.match(PATTERN)[1]
+      receiver.code
+    end
+  end
+
+  def code
+    @host = URI.parse(@url).host
+    receive url_for_host
+  end
+
+  def fallback
+    attributes = %(rel="external nofollow noopener noreferrer" target="_blank")
+    %(<a href="#{@url}" #{attributes}>#{@host}</a>)
+  end
+
+  private
+
+  # @param [String] embed_url
+  def receive(embed_url)
+    response = RestClient.get(embed_url)
+    parse(response.body)
+  rescue RestClient::Exception => e
+    Rails.logger.warn("Cannot receive data for #{embed_url}: #{e}")
+    fallback
+  end
+
+  # @param [String] response
+  def parse(response)
+    json = JSON.parse(response)
+    json['html'] || fallback
+  rescue JSON::ParserError => e
+    Rails.logger.warn("Cannot parse response #{response}: #{e}")
+    fallback
+  end
+
+  def url_for_host
+    case @host
+    when 'www.youtube.com', 'youtube.com', 'youtu.be'
+      url_for_youtube
+    when 'twitter.com', 'www.twitter.com'
+      url_for_twitter
+    when 'www.facebook.com', 'facebook.com'
+      url_for_facebook
+    when 'www.instagram.com', 'instagr.am', 'instagram.com'
+      url_for_instagram
+    else
+      default_url
+    end
+  end
+
+  def url_for_youtube
+    "https://www.youtube.com/oembed?url=#{CGI.escape(@url)}&format=json"
+  end
+
+  def url_for_twitter
+    "https://publish.twitter.com/oembed?url=#{CGI.escape(@url)}"
+  end
+
+  def url_for_facebook
+    url = CGI.escape(@url)
+    if @url.match?('/videos/')
+      "https://www.facebook.com/plugins/video/oembed.json/?url=#{url}"
+    else
+      "https://www.facebook.com/plugins/post/oembed.json/?url=#{url}"
+    end
+  end
+
+  def url_for_instagram
+    "https://api.instagram.com/oembed?url=#{CGI.escape(@url)}"
+  end
+
+  def default_url
+    "https://#{@host}/oembed?url=#{CGI.escape(@url)}&format=json"
+  end
+end