biovision-base 0.22.180920.0 → 0.34.190331.1

data/app/controllers/users_controller.rb

@@ -60,18 +60,23 @@ class UsersController < ApplicationController
 
   def entity_parameters
     parameters = params.require(:user).permit(User.entity_parameters)
-    parameters.merge(profile_parameters)
+    parameters.merge(data: @entity.data.merge(profile: profile_parameters))
   end
 
   def creation_parameters
-    entity_parameters.merge(tracking_for_entity).merge(consent: true)
+    parameters = params.require(:user).permit(User.entity_parameters)
+
+    parameters[:consent] = true
+    parameters[:data]    = { profile: profile_parameters }
+
+    parameters.merge(tracking_for_entity)
   end
 
   def profile_parameters
     if params.key?(:user_profile)
       permitted = UserProfileHandler.allowed_parameters
       dirty     = params.require(:user_profile).permit(permitted)
-      { profile_data: UserProfileHandler.clean_parameters(dirty) }
+      UserProfileHandler.clean_parameters(dirty)
     else
       {}
     end

data/app/helpers/biovision_users_helper.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Helper methods for user handling
 module BiovisionUsersHelper
   def genders_for_select
     genders = [[t(:not_selected), '']]
@@ -6,7 +9,7 @@ module BiovisionUsersHelper
 
   # @param [Integer] gender_id
   def gender_name(gender_id)
-    prefix = 'activerecord.attributes.user_profile.genders.'
+    prefix = 'activerecord.attributes.user_profile.genders'
     if UserProfileHandler::GENDERS.key?(gender_id)
       t("#{prefix}.#{UserProfileHandler::GENDERS[gender_id]}")
     else
@@ -16,18 +19,22 @@ module BiovisionUsersHelper
 
   # @param [User] entity
   # @param [String] text
-  def user_link(entity, text = entity&.profile_name)
+  # @param [Hash] options
+  def user_link(entity, text = entity&.profile_name, options = {})
     return I18n.t(:anonymous) if entity.nil? || entity.deleted?
 
-    link_to(text, user_profile_path(slug: entity.screen_name), class: 'profile')
+    link_options = { class: 'profile' }.merge(options)
+    link_to(text, user_profile_path(slug: entity.screen_name), link_options)
   end
 
   # @param [User] entity
   # @param [String] text
-  def admin_user_link(entity, text = entity&.profile_name)
+  # @param [Hash] options
+  def admin_user_link(entity, text = entity&.profile_name, options = {})
     return I18n.t(:anonymous) if entity.nil?
 
-    link_to(text, admin_user_path(id: entity.id), class: 'profile')
+    link_options = { class: 'profile' }.merge(options)
+    link_to(text, admin_user_path(id: entity.id), link_options)
   end
 
   # @param [ForeignUser] entity
@@ -51,41 +58,73 @@ module BiovisionUsersHelper
 
   # @param [User] entity
   def profile_avatar(entity)
-    if entity.is_a?(User) && !entity.image.blank? && !entity.deleted?
-      user_image_profile(entity)
+    if entity&.image.blank? || entity.deleted?
+      image_tag('biovision/base/placeholders/user.svg', alt: '')
     else
-      image_tag('biovision/base/placeholders/user.svg')
+      user_image_profile(entity)
     end
   end
 
   # @param [User] entity
-  def user_image_tiny(entity)
-    versions = "#{entity.image.tiny_2x.url} 2x"
-    image_tag(entity.image.tiny.url, alt: entity.profile_name, srcset: versions)
+  # @param [Hash] options
+  def user_image_tiny(entity, options = {})
+    if entity&.image.blank? || entity.deleted?
+      image_tag('biovision/base/placeholders/user.svg', alt: '')
+    else
+      default_options = {
+        alt: entity.profile_name,
+        srcset: "#{entity.image.tiny_2x.url} 2x"
+      }
+      image_tag(entity.image.tiny.url, default_options.merge(options))
+    end
   end
 
   # @param [User] entity
-  def user_image_preview(entity)
-    versions = "#{entity.image.preview_2x.url} 2x"
-    image_tag(entity.image.preview.url, alt: entity.profile_name, srcset: versions)
+  # @param [Hash] options
+  def user_image_preview(entity, options = {})
+    if entity&.image.blank? || entity.deleted?
+      image_tag('biovision/base/placeholders/user.svg', alt: '')
+    else
+      default_options = {
+        alt: entity.profile_name,
+        srcset: "#{entity.image.preview_2x.url} 2x"
+      }
+      image_tag(entity.image.preview.url, default_options.merge(options))
+    end
   end
 
   # @param [User] entity
-  def user_image_profile(entity)
-    versions = "#{entity.image.big.url} 2x"
-    image_tag(entity.image.profile.url, alt: entity.profile_name, srcset: versions)
+  # @param [Hash] options
+  def user_image_profile(entity, options = {})
+    if entity&.image.blank? || entity.deleted?
+      image_tag('biovision/base/placeholders/user.svg', alt: '')
+    else
+      default_options = {
+        alt: entity.profile_name,
+        srcset: "#{entity.image.big.url} 2x"
+      }
+      image_tag(entity.image.profile.url, default_options.merge(options))
+    end
   end
 
   # @param [User] entity
-  def user_image_big(entity)
-    versions = "#{entity.image.big_2x.url} 2x"
-    image_tag(entity.image.big.url, alt: entity.profile_name, srcset: versions)
+  # @param [Hash] options
+  def user_image_big(entity, options = {})
+    if entity&.image.blank? || entity.deleted?
+      image_tag('biovision/base/placeholders/user.svg', alt: '')
+    else
+      default_options = {
+        alt: entity.profile_name,
+        srcset: "#{entity.image.big_2x.url} 2x"
+      }
+      image_tag(entity.image.big.url, default_options.merge(options))
+    end
   end
 
   # @param [ForeignSite] foreign_site
   def foreign_login_link(foreign_site)
     image = "biovision/base/icons/foreign/#{foreign_site.slug}.svg"
-    path  = "/auth/#{foreign_site.slug}"
+    path = "/auth/#{foreign_site.slug}"
     link_to(image_tag(image, alt: foreign_site.name), path)
   end
 end

data/app/helpers/editable_pages_helper.rb

@@ -1,9 +1,19 @@
+# frozen_string_literal: true
+
+# Helper methods for handling editable pages and blocks
 module EditablePagesHelper
   # @param [EditablePage] entity
   def admin_editable_page_link(entity)
     link_to(entity.name, admin_editable_page_path(id: entity.id))
   end
 
+  # @param [SimpleBlock] entity
+  # @param [String] text
+  # @param [Hash] options
+  def admin_simple_block_link(entity, text = entity.slug, options = {})
+    link_to(text, admin_simple_block_path(id: entity.id), options)
+  end
+
   # @param [EditableBlock] entity
   def admin_editable_block_link(entity)
     link_to(entity.name, admin_editable_block_path(id: entity.id))
@@ -12,6 +22,7 @@ module EditablePagesHelper
   # @param [EditablePage] entity
   def editable_page_image_preview(entity)
     return '' if entity.image.blank?
+
     versions = "#{entity.image.preview_2x.url} 2x"
     image_tag(entity.image.preview.url, alt: entity.name, srcset: versions)
   end
@@ -19,13 +30,23 @@ module EditablePagesHelper
   # @param [EditablePage] entity
   def editable_page_image_medium(entity)
     return '' if entity.image.blank?
+
     versions = "#{entity.image.medium_2x.url} 2x"
     image_tag(entity.image.medium.url, alt: entity.name, srcset: versions)
   end
 
+  # @param [EditablePage] entity
+  def editable_page_image_hd(entity)
+    return '' if entity.image.blank?
+
+    versions = "#{entity.image.large.url} 2x"
+    image_tag(entity.image.medium_2x.url, alt: entity.name, srcset: versions)
+  end
+
   # @param [EditableBlock] entity
   def editable_block_image_preview(entity)
     return '' if entity.image.blank?
+
     versions = "#{entity.image.preview_2x.url} 2x"
     image_tag(entity.image.preview.url, alt: entity.name, srcset: versions)
   end
@@ -33,6 +54,7 @@ module EditablePagesHelper
   # @param [EditableBlock] entity
   def editable_block_image_medium(entity)
     return '' if entity.image.blank?
+
     versions = "#{entity.image.medium_2x.url} 2x"
     image_tag(entity.image.medium.url, alt: entity.name, srcset: versions)
   end

data/app/helpers/languages_helper.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Helper for language operations
 module LanguagesHelper
   # @param [Language] entity
   def language_name(entity)

data/app/helpers/simple_image_helper.rb

@@ -0,0 +1,66 @@
+# frozen_string_literal: true
+
+# Helper methods for displaying versions for SimpleImageUploader
+module SimpleImageHelper
+  # @param [ApplicationRecord] entity
+  # @param [Hash] options
+  def simple_image_preview(entity, options = {})
+    return '' if entity.image.blank?
+
+    default = {
+      alt: entity.respond_to?(:image_alt_text) ? entity.image_alt_text : ''
+    }
+    image_tag(entity.image.preview_url, default.merge(options))
+  end
+
+  # @param [ApplicationRecord] entity
+  # @param [Hash] options
+  def simple_image_small(entity, options = {})
+    return '' if entity.image.blank?
+
+    default = {
+      alt: entity.respond_to?(:image_alt_text) ? entity.image_alt_text : '',
+    }
+    default[:srcset] = "#{entity.image.medium.url} 2x" if entity.image.raster?
+
+    image_tag(entity.image.small_url, default.merge(options))
+  end
+
+  # @param [ApplicationRecord] entity
+  # @param [Hash] options
+  def simple_image_medium(entity, options = {})
+    return '' if entity.image.blank?
+
+    default = {
+      alt: entity.respond_to?(:image_alt_text) ? entity.image_alt_text : '',
+    }
+    default[:srcset] = "#{entity.image.large.url} 2x" if entity.image.raster?
+
+    image_tag(entity.image.medium_url, default.merge(options))
+  end
+
+  # @param [ApplicationRecord] entity
+  # @param [Hash] options
+  def simple_image_large(entity, options = {})
+    return '' if entity.image.blank?
+
+    default = {
+      alt: entity.respond_to?(:image_alt_text) ? entity.image_alt_text : '',
+    }
+    default[:srcset] = "#{entity.image.hd.url} 2x" if entity.image.raster?
+
+    image_tag(entity.image.large_url, default.merge(options))
+  end
+
+  # @param [ApplicationRecord] entity
+  # @param [Hash] options
+  def simple_image_hd(entity, options = {})
+    return '' if entity.image.blank?
+
+    default = {
+      alt: entity.respond_to?(:image_alt_text) ? entity.image_alt_text : ''
+    }
+
+    image_tag(entity.image.hd_url, default.merge(options))
+  end
+end

data/app/mailers/application_mailer.rb

@@ -1,5 +1,3 @@
 class ApplicationMailer < ActionMailer::Base
-  default from: 'from@example.com'
   layout 'mailer'
 end
-

data/app/mailers/code_sender.rb

@@ -1,15 +1,26 @@
+# frozen_string_literal: true
+
+# Mailer for sending codes to users
 class CodeSender < ApplicationMailer
+  # Email confirmation code
+  #
   # @param [Integer] code_id
   def email(code_id)
     @code = Code.find_by(id: code_id)
 
-    mail to: @code.user.email unless @code.nil?
+    return if @code.nil? || @code.user.email.blank?
+
+    mail to: @code.user.email
   end
 
+  # Password reset code
+  #
   # @param [Integer] code_id
   def password(code_id)
     @code = Code.find_by(id: code_id)
 
-    mail to: @code.user.email unless @code.nil?
+    return if @code.nil? || @code.user.email.blank?
+
+    mail to: @code.user.email
   end
 end

data/app/mailers/feedback_mailer.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
+# Mailer for sending feedback requests
 class FeedbackMailer < ApplicationMailer
   # @param [Integer] id
   def new_feedback_request(id)
     @entity = FeedbackRequest.find_by(id: id)
 
-    receiver = StoredValue.receive('feedback_receiver')
+    receiver = BiovisionComponent['contact'].receive('feedback_receiver')
 
-    mail to: receiver unless @entity.nil? || receiver.nil?
+    mail to: receiver unless @entity.nil? || receiver.blank?
   end
 end

data/app/mailers/user_mailer.rb

@@ -1,8 +1,13 @@
+# frozen_string_literal: true
+
+# Mailer for user-related things
 class UserMailer < ApplicationMailer
   # @param [Integer] user_id
   def login_attempt(user_id)
     @user = User.find_by(id: user_id)
 
-    mail to: @user.email unless @user&.email.blank?
+    return if @user.nil? || @user.email.blank?
+
+    mail to: @user.email
   end
 end

data/app/models/biovision_component.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+# Biovision component
+#
+# Attributes:
+#   - created_at [DateTime]
+#   - settings [JSON]
+#   - slug [String]
+#   - updated_at [DateTime]
+class BiovisionComponent < ApplicationRecord
+  include RequiredUniqueSlug
+
+  has_many :biovision_parameters, dependent: :delete_all
+
+  # Find component by slug
+  #
+  # @param [String] slug
+  def self.[](slug)
+    find_by(slug: slug)
+  end
+
+  # @param [String] slug
+  def receive(slug)
+    biovision_parameters.find_by(slug: slug)&.value
+  end
+
+  # @param [String] slug
+  # @param [String] default
+  def receive!(slug, default = '')
+    biovision_parameters.find_by(slug: slug)&.value || default
+  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
+  end
+end

data/app/models/biovision_parameter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+# Biovision component parameter
+#
+# Fields:
+#   - biovision_component_id [BiovisionComponent]
+#   - created_at [DateTime]
+#   - deletable [Boolean]
+#   - slug [String]
+#   - updated_at [DateTime]
+#   - value [String], optional
+class BiovisionParameter < ApplicationRecord
+  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
+
+  belongs_to :biovision_component
+
+  before_validation { self.slug = slug.to_s.strip.downcase }
+
+  validates_uniqueness_of :slug, scope: [:biovision_component_id]
+  validates_presence_of :slug
+  validates_format_of :slug, with: SLUG_PATTERN
+  validates_length_of :slug, maximum: SLUG_LIMIT
+  validates_length_of :value, maximum: VALUE_LIMIT
+
+  scope :ordered_by_slug, -> { order('slug asc') }
+  scope :list_for_administration, -> { ordered_by_slug }
+
+  def self.entity_parameters
+    %i[slug value]
+  end
+end

data/app/models/code.rb

@@ -1,10 +1,23 @@
+# frozen_string_literal: true
+
+# Code for user
+#
+# Attributes:
+#   - agent_id [Agent], optional
+#   - body [String]
+#   - code_type_id [CodeType]
+#   - created_at [DateTime]
+#   - ip [Inet]
+#   - payload [String], optional
+#   - quantity [Integer]
+#   - updated_at [DateTime]
+#   - user_id [User], optional
 class Code < ApplicationRecord
   include HasOwner
 
-  PER_PAGE       = 20
   BODY_LIMIT     = 50
-  PAYLOAD_LIMIT  = 250
-  QUANTITY_RANGE = (0..32767)
+  PAYLOAD_LIMIT  = 255
+  QUANTITY_RANGE = (0..32_767).freeze
 
   belongs_to :user, optional: true
   belongs_to :agent, optional: true
@@ -21,18 +34,19 @@ class Code < ApplicationRecord
 
   scope :recent, -> { order('id desc') }
   scope :active, -> { where('quantity > 0') }
+  scope :list_for_administration, -> { recent }
 
   # @param [Integer] page
   def self.page_for_administration(page = 1)
-    recent.page(page).per(PER_PAGE)
+    list_for_administration.page(page)
   end
 
   def self.entity_parameters
-    %i(body payload quantity)
+    %i[body payload quantity]
   end
 
   def self.creation_parameters
-    entity_parameters + %i(user_id code_type_id)
+    entity_parameters + %i[user_id code_type_id]
   end
 
   def activated?
@@ -40,13 +54,14 @@ class Code < ApplicationRecord
   end
 
   def active?
-    quantity > 0
+    quantity.positive?
   end
 
   private
 
   def generate_body
     return unless body.nil?
+
     number    = SecureRandom.random_number(0xffff_ffff_ffff_ffff)
     self.body = number.to_s(36).scan(/.{4}/).join('-').upcase
   end