biovision-base 0.22.180920.0 → 0.34.190331.1

data/app/services/code_manager.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Manager for Codes
 class CodeManager
   attr_accessor :user, :code
 
@@ -13,4 +16,4 @@ class CodeManager
     @code = code
     @user = user
   end
-end
+end

data/app/services/code_manager/confirmation.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Manager for email confirmation codes
 class CodeManager::Confirmation < CodeManager
   # @return [CodeType]
   def self.code_type
@@ -7,20 +10,21 @@ class CodeManager::Confirmation < CodeManager
   # @param [User] user
   def self.code_for_user(user)
     code = code_type.codes.active.find_by(user: user)
-    if code.nil?
-      code = code_type.codes.create(user: user, payload: user.email)
-    end
+    code = code_type.codes.create(user: user, payload: user.email) if code.nil?
+
     code
   end
 
   def code_is_valid?
     return false if @code.nil?
+
     @code.active? && @code.code_type == self.class.code_type
   end
 
   def activate
     return if @code.quantity < 1
+
     @code.decrement!(:quantity)
     @code.user.update email_confirmed: true if @code.payload == @code.user.email
   end
-end
+end

data/app/services/code_manager/invitation.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Manager for invitation codes
 class CodeManager::Invitation < CodeManager
   # @return [CodeType]
   def self.code_type
@@ -6,21 +9,22 @@ class CodeManager::Invitation < CodeManager
 
   # @param [User] user
   def self.code_for_user(user)
-    code = code_type.codes.active.owned_by(user).first
-    if code.nil?
-      code = code_type.codes.create(user: user)
-    end
+    code = code_type.codes.active.find_by(user: user)
+    code = code_type.codes.create(user: user) if code.nil?
+
     code
   end
 
   def code_is_valid?
     return false if @code.nil?
-    @code.active? && @code.code_type == self.code_type
+
+    @code.active? && @code.code_type == self.class.code_type
   end
 
   # @param [User] invitee
   def activate(invitee)
     return if invitee.nil? || @code.quantity < 1
+
     @code.decrement!(:quantity)
     invitee.update(inviter_id: @code.user_id)
   end

data/app/services/code_manager/recovery.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+# Recovery codes manager
 class CodeManager::Recovery < CodeManager
   # @return [CodeType]
   def self.code_type
@@ -7,25 +10,25 @@ class CodeManager::Recovery < CodeManager
   # @param [User] user
   def self.code_for_user(user)
     code = code_type.codes.active.find_by(user: user)
-    if code.nil?
-      code = code_type.codes.create(user: user, payload: user.email)
-    end
+    code = code_type.codes.create(user: user, payload: user.email) if code.nil?
+
     code
   end
 
   def code_is_valid?
     return false if @code.nil?
+
     @code.active? && @code.code_type == self.class.code_type
   end
 
   # @param [Hash] new_parameters
   def activate(new_parameters)
     return false if @code.quantity < 1 || new_parameters[:password].blank?
+
     new_parameters[:email_confirmed] = true if @code.payload == @code.user.email
     user_updated = @code.user.update(new_parameters)
-    if user_updated
-      @code.decrement!(:quantity)
-    end
+    @code.decrement!(:quantity) if user_updated
+
     user_updated
   end
 end

data/app/services/user_manager.rb

@@ -11,19 +11,20 @@ class UserManager
   def self.create(parameters, profile)
     user = User.new(parameters)
 
-    user.profile_data = UserProfileHandler.clean_parameters(profile)
+    user.data['profile'] = UserProfileHandler.clean_parameters(profile)
 
-    { user: user, profile: user.profile_data }
+    { user: user, profile: user.data['profile'] }
   end
 
   # @param [Hash] parameters
   # @param [Hash] profile
   def update(parameters, profile)
     raise 'User is not set' if @user.nil?
-    parameters[:profile_data] = UserProfileHandler.clean_parameters(profile)
+
+    parameters['data'] = @user.data.merge(profile: UserProfileHandler.clean_parameters(profile))
 
     @user.update(parameters)
 
-    { user: @user, profile: @user.profile_data }
+    { user: @user, profile: @user.data['profile'] }
   end
 end

data/app/services/user_profile_handler.rb

@@ -1,28 +1,55 @@
+# frozen_string_literal: true
+
+# Handler for user profile parameters
 class UserProfileHandler
-  GENDERS = { 0 => 'female', 1 => 'male' }
+  GENDERS = { 0 => 'female', 1 => 'male' }.freeze
 
+  # List of attributes that can be used in user profile
+  #
+  # Change this method in decorators for other values
   def self.allowed_parameters
-    %w(gender name patronymic surname about)
+    %w[gender name patronymic surname about]
   end
 
+  # Normalize profile parameters for storage
+  #
+  # Makes consistent format of profile hash.
+  #
   # @param [Hash] input
   def self.clean_parameters(input)
-    if input.key?('gender')
-      gender_key = input['gender'].blank? ? nil : input['gender'].to_i
-      gender     = GENDERS.key?(gender_key) ? gender_key : nil
-    else
-      gender = nil
-    end
+    return {} unless input.respond_to?(:key?)
 
-    output = { gender: gender }
-    (allowed_parameters - ['gender']).each do |parameter|
+    output = normalized_parameters(input)
+    (allowed_parameters - output.keys).each do |parameter|
       output[parameter] = input.key?(parameter) ? input[parameter].to_s : nil
     end
     output
   end
 
+  # Prepare search string for simple user search
+  #
   # @param [User] user
   def self.search_string(user)
-    "#{user.profile_data['surname']} #{user.profile_data['name']}"
+    "#{user.data.dig('profile', 'surname')} #{user.data.dig('profile', 'name')}"
+  end
+
+  # Format parameters that have more restrictions than just "string" type
+  #
+  # Change this method in decorator to add other fields with type enumerable,
+  # integer, etc.
+  #
+  # @param [Hash] input
+  def self.normalized_parameters(input)
+    { gender: clean_gender(input['gender']) }
+  end
+
+  # Restrict gender to only available values
+  #
+  # Defined gender is stored as integer.
+  #
+  # @param [Integer] input
+  def self.clean_gender(input)
+    gender_key = input.blank? ? nil : input.to_i
+    GENDERS.key?(gender_key) ? gender_key : nil
   end
 end

data/app/uploaders/avatar_uploader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AvatarUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
   include CarrierWave::BombShelter
@@ -9,7 +11,9 @@ class AvatarUploader < CarrierWave::Uploader::Base
   storage :file
 
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id/10000.floor}/#{model.id/100.floor}/#{model.id}"
+    slug = "#{model.id / 10_000}/#{model.id / 100}/#{model.id}"
+
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
   end
 
   def default_url

data/app/uploaders/editable_page_image_uploader.rb

@@ -1,10 +1,8 @@
+# frozen_string_literal: true
+
+# Image uploader for editable pages
 class EditablePageImageUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
-  include CarrierWave::BombShelter
-
-  def max_pixel_dimensions
-    [4000, 4000]
-  end
 
   storage :file
 
@@ -37,6 +35,6 @@ class EditablePageImageUploader < CarrierWave::Uploader::Base
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_whitelist
-    %w(jpg jpeg png)
+    %w[jpg jpeg png]
   end
 end

data/app/uploaders/media_file_uploader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MediaFileUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
   include CarrierWave::BombShelter
@@ -6,10 +8,10 @@ class MediaFileUploader < CarrierWave::Uploader::Base
   storage :file
   # storage :fog
 
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id/10000.floor}/#{model.id/100.floor}/#{model.id}"
+    slug = "#{model.id / 10_000}/#{model.id / 100}/#{model.id}"
+
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
   end
 
   version :medium_2x do
@@ -21,7 +23,7 @@ class MediaFileUploader < CarrierWave::Uploader::Base
   end
 
   def extension_whitelist
-    %w(jpg jpeg gif png)
+    %w[jpg jpeg gif png]
   end
 
   def filename

data/app/uploaders/media_snapshot_uploader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MediaSnapshotUploader < CarrierWave::Uploader::Base
   include CarrierWave::MiniMagick
   include CarrierWave::BombShelter
@@ -7,7 +9,9 @@ class MediaSnapshotUploader < CarrierWave::Uploader::Base
   # storage :fog
 
   def store_dir
-    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id/10000.floor}/#{model.id/100.floor}/#{model.id}"
+    slug = "#{model.id / 10_000}/#{model.id / 100}/#{model.id}"
+
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
   end
 
   def default_url(*args)
@@ -23,7 +27,7 @@ class MediaSnapshotUploader < CarrierWave::Uploader::Base
   end
 
   def extension_whitelist
-    %w(jpg jpeg png)
+    %w[jpg jpeg png]
   end
 
   def filename

data/app/uploaders/simple_file_uploader.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Simple file uploader without any processing
+class SimpleFileUploader < CarrierWave::Uploader::Base
+  storage :file
+
+  def store_dir
+    slug = "#{model.id / 100}/#{model.id}"
+
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
+  end
+end

data/app/uploaders/simple_image_uploader.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+# Simple image uploader with scaling
+class SimpleImageUploader < CarrierWave::Uploader::Base
+  include CarrierWave::MiniMagick
+
+  storage :file
+
+  # Override the directory where uploaded files will be stored.
+  # This is a sensible default for uploaders that are meant to be mounted:
+  def store_dir
+    slug = "#{model.id / 1000}/#{model.id}"
+
+    "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{slug}"
+  end
+
+  def default_url(*)
+    ActionController::Base.helpers.asset_path('biovision/base/placeholders/1x1.svg')
+  end
+
+  version :hd, if: :raster_image? do
+    resize_to_fit(1920, 1920)
+  end
+
+  version :large, from_version: :hd, if: :raster_image? do
+    resize_to_fit(1280, 1280)
+  end
+
+  version :medium, from_version: :large, if: :raster_image? do
+    resize_to_fit(640, 640)
+  end
+
+  version :small, from_version: :medium, if: :raster_image? do
+    resize_to_fit(320, 320)
+  end
+
+  version :preview, from_version: :small, if: :raster_image? do
+    resize_to_fit(160, 160)
+  end
+
+  # Add a white list of extensions which are allowed to be uploaded.
+  # For images you might use something like this:
+  def extension_whitelist
+    %w[jpg jpeg png svg svgz]
+  end
+
+  # @param [SanitizedFile]
+  def raster_image?(new_file)
+    !new_file.extension.match?(/svgz?\z/i)
+  end
+
+  def raster?
+    !File.extname(path).match?(/\.svgz?\z/i)
+  end
+
+  def preview_url
+    raster? ? preview.url : url
+  end
+
+  def small_url
+    raster? ? small.url : url
+  end
+
+  def medium_url
+    raster? ? medium.url : url
+  end
+
+  def large_url
+    raster? ? large.url : url
+  end
+
+  def hd_url
+    raster? ? hd.url : url
+  end
+end

data/app/views/about/editable.html.erb

@@ -1,7 +1,7 @@
 <% if @editable_page.nil? %>
   <% content_for :meta_title, t('.title') %>
 
-  <article>
+  <article class="editable-page">
     <h1><%= t('.heading') %></h1>
 
     <div class="message-box-warning"><%= t('.message') %></div>

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

@@ -1,4 +1,4 @@
-<%= form_tag admin_agents_path, method: :get, class: :filter do %>
+<%= form_with url: admin_agents_path, local: true, method: :get, html: { class: :filter } do %>
     <fieldset>
       <legend><%= t(:filter) %></legend>
 

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

@@ -17,6 +17,22 @@
       <%= language_name(entity.language) %>
     </div>
   <% end %>
+  <% unless entity.nav_group.nil? %>
+    <div class="secondary info">
+      <%= t('activerecord.attributes.editable_page.nav_group') %>:
+      <%= entity.nav_group %>
+    </div>
+  <% end %>
+
+  <%=
+    render(
+        partial: 'shared/admin/toggleable',
+        locals:  {
+            entity: entity,
+            url:    toggle_admin_editable_page_path(id: entity.id)
+        }
+    )
+  %>
 
   <ul class="actions">
     <li><%= edit_icon(edit_editable_page_path(id: entity.id)) %></li>

data/app/views/admin/editable_pages/index.html.erb

@@ -10,5 +10,12 @@
     <li><%= create_icon(new_editable_page_path) %></li>
   </ul>
 
-  <%= render partial: 'shared/admin/list_with_priority', locals: { collection: @collection } %>
+  <%=
+    render(
+        partial: 'shared/admin/list_with_priority',
+        locals: {
+            collection: @collection
+        }
+    )
+  %>
 </article>