biovision-base 0.11.180127 → 0.14.180326

data/app/helpers/biovision_users_helper.rb

@@ -1,8 +1,17 @@
 module BiovisionUsersHelper
   def genders_for_select
     genders = [[t(:not_selected), '']]
-    prefix  = 'activerecord.attributes.user_profile.genders.'
-    genders + UserProfile.genders.keys.to_a.map { |o| [t("#{prefix}#{o}"), o] }
+    genders + UserProfileHandler::GENDERS.keys.map { |k| [gender_name(k), k] }
+  end
+
+  # @param [Integer] gender_id
+  def gender_name(gender_id)
+    prefix = 'activerecord.attributes.user_profile.genders.'
+    if UserProfileHandler::GENDERS.key?(gender_id)
+      t("#{prefix}.#{UserProfileHandler::GENDERS[gender_id]}")
+    else
+      t(:not_selected)
+    end
   end
 
   # @param [User] entity
@@ -18,7 +27,7 @@ module BiovisionUsersHelper
     return I18n.t(:anonymous) if entity.nil?
 
     text = entity.profile_name
-    link_to(text, admin_user_path(entity.id), class: 'profile')
+    link_to(text, admin_user_path(id: entity.id), class: 'profile')
   end
 
   # @param [User] entity
@@ -30,7 +39,7 @@ module BiovisionUsersHelper
 
   # @param [Token] entity
   def admin_token_link(entity)
-    link_to entity.name, admin_token_path(entity.id)
+    link_to entity.name, admin_token_path(id: entity.id)
   end
 
   # @param [User] entity
@@ -42,6 +51,12 @@ module BiovisionUsersHelper
     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)
+  end
+
   # @param [User] entity
   def user_image_preview(entity)
     versions = "#{entity.image.preview_2x.url} 2x"
@@ -50,7 +65,7 @@ module BiovisionUsersHelper
 
   # @param [User] entity
   def user_image_profile(entity)
-    versions = "#{entity.image.profile_2x.url} 2x"
+    versions = "#{entity.image.big.url} 2x"
     image_tag(entity.image.profile.url, alt: entity.profile_name, srcset: versions)
   end
 

data/app/helpers/codes_helper.rb

@@ -1,7 +1,7 @@
 module CodesHelper
   # @param [Code] entity
   def admin_code_link(entity)
-    link_to entity.body, admin_code_path(entity.id)
+    link_to entity.body, admin_code_path(id: entity.id)
   end
 
   def code_types_for_select

data/app/helpers/editable_pages_helper.rb

@@ -1,7 +1,7 @@
 module EditablePagesHelper
   # @param [EditablePage] entity
   def admin_editable_page_link(entity)
-    link_to(entity.name, admin_editable_page_path(entity.id))
+    link_to(entity.name, admin_editable_page_path(id: entity.id))
   end
 
   # @param [EditablePage] entity

data/app/helpers/languages_helper.rb

@@ -0,0 +1,18 @@
+module LanguagesHelper
+  # @param [Language] entity
+  def language_name(entity)
+    return t(:not_set) if entity.nil?
+
+    t("languages.#{entity.slug}", default: entity.slug)
+  end
+
+  # @param [Boolean] include_blank
+  def languages_for_select(include_blank = true)
+    options = []
+    options << [t(:not_set), ''] if include_blank
+    Language.ordered_by_priority.each do |language|
+      options << ["#{language.code}: #{language_name(language)}", language.id]
+    end
+    options
+  end
+end

data/app/helpers/media_helper.rb

@@ -2,12 +2,12 @@ module MediaHelper
   # @param [MediaFolder] entity
   # @param [String] text
   def admin_media_folder_link(entity, text = entity.name)
-    link_to(text, admin_media_folder_path(entity.id))
+    link_to(text, admin_media_folder_path(id: entity.id))
   end
 
   # @param [MediaFile] entity
   def admin_media_file_link(entity)
-    link_to(entity.name, admin_media_file_path(entity.id))
+    link_to(entity.name, admin_media_file_path(id: entity.id))
   end
 
   # @param [MediaFolder|MediaFile] entity

data/app/helpers/privileges_helper.rb

@@ -1,11 +1,11 @@
 module PrivilegesHelper
   # @param [Privilege] entity
   def admin_privilege_link(entity)
-    link_to(entity.name, admin_privilege_path(entity.id))
+    link_to(entity.name, admin_privilege_path(id: entity.id))
   end
 
   # @param [PrivilegeGroup] entity
   def admin_privilege_group_link(entity)
-    link_to(entity.name, admin_privilege_group_path(entity.id))
+    link_to(entity.name, admin_privilege_group_path(id: entity.id))
   end
 end

data/app/helpers/stored_values_helper.rb

@@ -1,6 +1,6 @@
 module StoredValuesHelper
   # @param [StoredValue] entity
   def admin_stored_value_link(entity)
-    link_to entity.slug, admin_stored_value_path(entity.id)
+    link_to entity.slug, admin_stored_value_path(id: entity.id)
   end
 end

data/app/helpers/tracking_helper.rb

@@ -1,12 +1,12 @@
 module TrackingHelper
   # @param [Agent] entity
   def admin_agent_link(entity)
-    link_to(entity.name, admin_agent_path(entity.id))
+    link_to(entity.name, admin_agent_path(id: entity.id))
   end
 
   # @param [Browser] entity
   def admin_browser_link(entity)
-    link_to(entity.name, admin_browser_path(entity.id))
+    link_to(entity.name, admin_browser_path(id: entity.id))
   end
 
   def browsers_for_select

data/app/models/editable_page.rb

@@ -34,13 +34,22 @@ class EditablePage < ApplicationRecord
   end
 
   def self.entity_parameters
-    %i(image name title keywords description body)
+    %i(image name title keywords description body language_id)
   end
 
   def self.creation_parameters
     entity_parameters + %i(slug)
   end
 
+  # @param [String] slug
+  # @param [String] language_code
+  def self.find_localized(slug, language_code = nil)
+    language = Language.find_by(code: language_code)
+    criteria = { slug: slug }
+    instance = find_by(criteria.merge(language: language))
+    instance || find_by(criteria)
+  end
+
   # @param [Integer] delta
   def change_priority(delta)
     new_priority = priority + delta

data/app/models/user.rb

@@ -13,6 +13,11 @@ class User < ApplicationRecord
   NOTICE_LIMIT = 255
   PHONE_LIMIT  = 50
 
+  EMAIL_PATTERN            = /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z0-9][-a-z0-9]+)\z/i
+  SCREEN_NAME_LIMIT        = 30
+  SCREEN_NAME_PATTERN      = /\A[a-z0-9_]{1,30}\z/i
+  SCREEN_NAME_PATTERN_HTML = '^[a-zA-Z0-9_]{1,30}$'
+
   toggleable %i(allow_login bot email_confirmed phone_confirmed allow_mail)
 
   has_secure_password
@@ -22,7 +27,6 @@ class User < ApplicationRecord
   belongs_to :language, optional: true, counter_cache: true
   belongs_to :agent, optional: true
   belongs_to :inviter, class_name: User.to_s, optional: true
-  has_one :user_profile, dependent: :destroy
   has_many :invitees, class_name: User.to_s, foreign_key: :inviter_id, dependent: :nullify
   has_many :tokens, dependent: :delete_all
   has_many :codes, dependent: :delete_all
@@ -34,11 +38,10 @@ class User < ApplicationRecord
 
   before_save :normalize_slug
   before_save :prepare_search_string
-  after_create { UserProfile.create(user: self) }
 
   validates_presence_of :screen_name, :email
-  validates_format_of :screen_name, with: /\A[a-z0-9_]{1,30}\z/i, if: :native_slug?
-  validates_format_of :email, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z0-9][-a-z0-9]+)\z/i
+  validates_format_of :screen_name, with: SCREEN_NAME_PATTERN, if: :native_slug?
+  validates_format_of :email, with: EMAIL_PATTERN
   validates :screen_name, uniqueness: { case_sensitive: false }
   validates :email, uniqueness: { case_sensitive: false }
   validates_length_of :slug, maximum: SLUG_LIMIT
@@ -54,15 +57,16 @@ class User < ApplicationRecord
   scope :screen_name_like, ->(val) { where('screen_name ilike ?', "%#{val}%") unless val.blank? }
   scope :search, ->(q) { where('search_string like ?', "%#{q.downcase}%") unless q.blank? }
   scope :filtered, ->(f) { email_like(f[:email]).screen_name_like(f[:screen_name]) }
+  scope :list_for_administration, -> { order('id desc') }
 
   # @param [Integer] page
   # @param [String] search_query
   def self.page_for_administration(page, search_query = '')
-    search(search_query).order('id desc').page(page).per(PER_PAGE)
+    list_for_administration.search(search_query).page(page).per(PER_PAGE)
   end
 
   def self.profile_parameters
-    %i(image allow_mail)
+    %i(image allow_mail birthday)
   end
 
   def self.sensitive_parameters
@@ -87,10 +91,6 @@ class User < ApplicationRecord
     (min..max)
   end
 
-  def profile
-    user_profile
-  end
-
   # Name to be shown as profile
   #
   # This can be redefined for cases when something other than screen name should
@@ -102,14 +102,14 @@ class User < ApplicationRecord
   end
 
   def name_for_letter
-    user_profile&.name.blank? ? profile_name : user_profile.name
+    profile_data['name'].blank? ? profile_name : profile_data['name']
   end
 
   # @param [Boolean] include_patronymic
   def full_name(include_patronymic = false)
     result = [name_for_letter]
-    result << user_profile&.patronymic.to_s.strip if include_patronymic
-    result << user_profile&.surname.to_s.strip
+    result << profile_data['patronymic'].to_s.strip if include_patronymic
+    result << profile_data['surname'].to_s.strip
     result.compact.join(' ')
   end
 
@@ -124,18 +124,12 @@ class User < ApplicationRecord
   private
 
   def normalize_slug
-    if native_slug?
-      self.slug = screen_name.downcase
-    else
-      self.slug = slug.downcase
-    end
+    self.slug = (native_slug? ? screen_name : slug).downcase
   end
 
   def prepare_search_string
-    new_string = "#{slug} #{email}"
-    unless user_profile.nil?
-      new_string << " #{user_profile.search_string}"
-    end
-    self.search_string = new_string.downcase
+    string = "#{slug} #{email} #{UserProfileHandler.search_string(self)}"
+
+    self.search_string = string.downcase
   end
 end

data/app/services/user_manager.rb

@@ -6,27 +6,24 @@ class UserManager
     @user = user
   end
 
-  # @param [Hash] user_parameters
-  # @param [Hash] profile_parameters
-  def self.create(user_parameters, profile_parameters)
-    user = User.new(user_parameters)
-    if user.save
-      profile = user.user_profile.new(profile_parameters)
-      profile.save
-    else
-      profile = nil
-    end
-    { user: user, profile: profile }
+  # @param [Hash] parameters
+  # @param [Hash] profile
+  def self.create(parameters, profile)
+    user = User.new(parameters)
+
+    user.profile_data = UserProfileHandler.clean_parameters(profile)
+
+    { user: user, profile: user.profile_data }
   end
 
-  # @param [Hash] user_parameters
-  # @param [Hash] profile_parameters
-  def update(user_parameters, profile_parameters)
+  # @param [Hash] parameters
+  # @param [Hash] profile
+  def update(parameters, profile)
     raise 'User is not set' if @user.nil?
-    @user.update(user_parameters)
-    profile = @user.user_profile || @user.user_profile.create
-    profile.update(profile_parameters)
+    parameters[:profile_data] = UserProfileHandler.clean_parameters(profile)
+
+    @user.update(parameters)
 
-    { user: @user, profile: profile }
+    { user: @user, profile: @user.profile_data }
   end
 end

data/app/services/user_profile_handler.rb

@@ -0,0 +1,28 @@
+class UserProfileHandler
+  GENDERS = { 0 => 'female', 1 => 'male' }
+
+  def self.allowed_parameters
+    %w(gender name patronymic surname)
+  end
+
+  # @param [Hash] input
+  def self.clean_parameters(input)
+    if input.key?('gender')
+      gender_key = input['gender'].to_i
+      gender     = GENDERS.key?(gender_key) ? gender_key : nil
+    else
+      gender = nil
+    end
+
+    output = { gender: gender }
+    (allowed_parameters - ['gender']).each do |parameter|
+      output[parameter] = input.key?(parameter) ? input[parameter].to_s : nil
+    end
+    output
+  end
+
+  # @param [User] user
+  def self.search_string(user)
+    "#{user.profile_data['surname']} #{user.profile_data['name']}"
+  end
+end

data/app/uploaders/avatar_uploader.rb

@@ -32,11 +32,7 @@ class AvatarUploader < CarrierWave::Uploader::Base
     resize_to_fit(640, 640)
   end
 
-  version :profile_2x, from_version: :big do
-    resize_to_fit(640, 640)
-  end
-
-  version :profile, from_version: :profile_2x do
+  version :profile, from_version: :big do
     resize_to_fit(320, 320)
   end
 

data/app/uploaders/editable_page_image_uploader.rb

@@ -3,7 +3,7 @@ class EditablePageImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::BombShelter
 
   def max_pixel_dimensions
-    [2000, 2000]
+    [4000, 4000]
   end
 
   storage :file

data/app/views/admin/agents/entity/_in_list.html.erb

@@ -3,11 +3,11 @@
   <% unless entity.browser.nil? %>
       <div class="info"><%= admin_browser_link(entity.browser) %></div>
   <% end %>
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_agent_path(entity.id) } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_agent_path(id: entity.id) } %>
   <ul class="actions">
     <li class="lockable <%= entity.locked? ? 'hidden' : '' %>">
-      <%= edit_icon edit_agent_path(entity) %>
+      <%= edit_icon edit_agent_path(id: entity.id) %>
     </li>
-    <%= render partial: 'shared/actions/locks', locals: { path: lock_admin_agent_path(entity), entity: entity } %>
+    <%= render partial: 'shared/actions/locks', locals: { path: lock_admin_agent_path(id: entity.id), entity: entity } %>
   </ul>
 </div>

data/app/views/admin/agents/show.html.erb

@@ -10,7 +10,7 @@
   <ul class="actions">
     <li><%= return_icon(admin_agents_path) %></li>
     <% unless @entity.locked? %>
-        <li><%= edit_icon edit_agent_path(@entity.id) %></li>
+        <li><%= edit_icon edit_agent_path(id: @entity.id) %></li>
         <li class="danger"><%= destroy_icon @entity %></li>
     <% end %>
   </ul>
@@ -24,5 +24,13 @@
       </dl>
   <% end %>
 
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_agent_path(@entity.id) } %>
+  <%=
+    render(
+        partial: 'shared/admin/toggleable',
+        locals: {
+            entity: @entity,
+            url: toggle_admin_agent_path(id: @entity.id)
+        }
+    )
+  %>
 </article>

data/app/views/admin/browsers/entity/_in_list.html.erb

@@ -3,12 +3,12 @@
   <div class="info">
     <%= t(:agent_count, count: entity.agents_count) %>
   </div>
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_browser_path(entity.id) } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: entity, url: toggle_admin_browser_path(id: entity.id) } %>
 
   <ul class="actions">
     <li class="lockable <%= entity.locked? ? 'hidden' : '' %>">
-      <%= edit_icon edit_browser_path(entity.id) %>
+      <%= edit_icon edit_browser_path(id: entity.id) %>
     </li>
-    <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_browser_path(entity) } %>
+    <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_browser_path(id: entity.id) } %>
   </ul>
 </div>

data/app/views/admin/browsers/show.html.erb

@@ -10,12 +10,12 @@
     <li><%= create_icon new_browser_path %></li>
     <li><%= return_icon admin_browsers_path %></li>
     <% unless @entity.locked? %>
-        <li><%= edit_icon edit_browser_path(@entity) %></li>
+        <li><%= edit_icon edit_browser_path(id: @entity.id) %></li>
         <li class="danger"><%= destroy_icon @entity %></li>
     <% end %>
   </ul>
 
-  <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_browser_path(@entity.id) } %>
+  <%= render partial: 'shared/admin/toggleable', locals: { entity: @entity, url: toggle_admin_browser_path(id: @entity.id) } %>
 
   <section id="browser-agents">
     <h2><%= t('admin.agents.index.heading') %></h2>