biovision 0.0.200518.1 → 0.1.210414.0

data/app/controllers/my/profiles_controller.rb

@@ -9,19 +9,22 @@ class My::ProfilesController < ApplicationController
 
   # post /my/profile/check
   def check
-    @entity = User.new(creation_parameters)
+    code = Code.active.find_by(body: param_from_request(:code))
+    registration_handler.check(creation_parameters.to_h, code)
   end
 
   # get /my/profile/new
   def new
     @entity = User.new
 
-    render :closed unless component_handler.settings['registration_open']
+    render :closed unless component_handler.registration_open?
   end
 
   # post /my/profile
   def create
     if params[:agree]
+      metric = Biovision::Components::UsersComponent::METRIC_REGISTRATION_BOT
+      component_handler.register_metric(metric)
       redirect_to root_path, alert: t('.are_you_bot')
     else
       create_user
@@ -39,7 +42,7 @@ class My::ProfilesController < ApplicationController
   # patch /my/profile
   def update
     @entity = current_user
-    if @entity.update(user_parameters)
+    if component_handler.update_user(@entity, user_parameters, profile_parameters)
       flash[:notice] = t('.success')
       form_processed_ok(my_path)
     else
@@ -47,7 +50,7 @@ class My::ProfilesController < ApplicationController
     end
   end
 
-  protected
+  private
 
   def component_class
     Biovision::Components::UsersComponent
@@ -57,17 +60,20 @@ class My::ProfilesController < ApplicationController
     redirect_to my_path if current_user.is_a?(User)
   end
 
+  def registration_handler
+    handler_class = Biovision::Components::Users::RegistrationHandler
+    @registration_handler ||= handler_class.new(component_handler)
+  end
+
   def create_user
     code = Code.active.find_by(body: param_from_request(:code))
-    @entity = component_handler.register_user(creation_parameters, code)
+    registration_handler.handle(creation_parameters.to_h, code)
+    @entity = registration_handler.user
 
     if @entity.persisted?
-      create_token_for_user(@entity)
-      cookies.delete('r', domain: :all)
-
-      redirect_after_creation
+      user_created
     else
-      form_processed_with_error(:new)
+      form_processed_with_error(:new, @entity.errors.full_messages)
     end
   end
 
@@ -85,13 +91,12 @@ class My::ProfilesController < ApplicationController
     sensitive = sensitive_parameters
     editable = User.profile_parameters + sensitive
     parameters = params.require(:user).permit(editable)
-    new_data = @entity.data.merge(profile: profile_parameters)
 
-    filter_parameters(parameters.merge(data: new_data), sensitive)
+    filter_parameters(parameters.to_h, sensitive)
   end
 
   def sensitive_parameters
-    if current_user.authenticate params[:password].to_s
+    if current_user.authenticate param_from_request(:password)
       User.sensitive_parameters
     else
       []
@@ -99,9 +104,12 @@ class My::ProfilesController < ApplicationController
   end
 
   def profile_parameters
-    permitted = UserProfileHandler.allowed_parameters
-    dirty = params.require(:user_profile).permit(permitted)
-    UserProfileHandler.clean_parameters(dirty)
+    if params.key?(:profile)
+      list = Biovision::Components::Users::ProfileHandler.permitted_for_request
+      params.require(:profile).permit(list)
+    else
+      {}
+    end
   end
 
   # @param [Hash] parameters
@@ -118,6 +126,13 @@ class My::ProfilesController < ApplicationController
     parameters
   end
 
+  def user_created
+    create_token_for_user(@entity)
+    cookies.delete('r', domain: :all)
+
+    redirect_after_creation
+  end
+
   def redirect_after_creation
     return_path = cookies['return_path'].to_s
     return_path = my_profile_path unless return_path[0] == '/'

data/app/controllers/profile_controller.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+# Controllers for logged-in users only
+class ProfileController < ApplicationController
+  before_action :restrict_access
+
+  protected
+
+  def restrict_access
+    restrict_anonymous_access
+  end
+end

data/app/controllers/users_controller.rb

@@ -0,0 +1,61 @@
+# frozen_string_literal: true
+
+# Users for visitors
+class UsersController < ApplicationController
+  before_action :restrict_anonymous_access, only: %i[ban follow unban unfollow]
+  before_action :set_socialization, only: %i[ban follow unban unfollow]
+  before_action :set_entity
+
+  # get /u/:slug
+  def show
+  end
+
+  # get /u/:slug/followees
+  def followees
+    @filter     = params[:filter] || Hash.new
+    @collection = UserLink.filtered(:followee, @filter).with_follower(@entity).page_for_user(current_page)
+  end
+
+  # put /u/:slug/follow
+  def follow
+    @socialization.follow(@entity)
+
+    head :no_content
+  end
+
+  # delete /u/:slug/follow
+  def unfollow
+    @socialization.unfollow(@entity)
+
+    head :no_content
+  end
+
+  # put /u/:slug/ban
+  def ban
+    @socialization.ban(@entity)
+
+    head :no_content
+  end
+
+  # delete /u/:slug/ban
+  def unban
+    @socialization.unban(@entity)
+
+    head :no_content
+  end
+
+  private
+
+  def component_class
+    Biovision::Components::UsersComponent
+  end
+
+  def set_socialization
+    @socialization = Biovision::Components::SocializationComponent[current_user]
+  end
+
+  def set_entity
+    @entity = User.find_by(slug: params[:slug].downcase, deleted: false)
+    handle_http_404('Cannot find user') if @entity.nil?
+  end
+end

data/app/helpers/biovision_helper.rb

@@ -0,0 +1,171 @@
+# frozen_string_literal: true
+
+# Helper methods for common cases
+module BiovisionHelper
+  # @param [ApplicationRecord] entity
+  # @param [String] text
+  # @param [Hash] options
+  def admin_entity_link(entity, text = nil, options = {})
+    return '∅' if entity.nil?
+
+    if text.nil?
+      text = entity.respond_to?(:text_for_link) ? entity.text_for_link : entity.id
+    end
+
+    href = if entity.respond_to?(:admin_url)
+             entity.admin_url
+           else
+             "/admin/#{entity.class.table_name}/#{entity.id}"
+           end
+
+    link_to(text, href, options)
+  end
+
+  # @param [ApplicationRecord] entity
+  # @param [String] text
+  # @param [Hash] options
+  def my_entity_link(entity, text = nil, options = {})
+    return '∅' if entity.nil?
+
+    if text.nil?
+      text = entity.respond_to?(:text_for_link) ? entity.text_for_link : entity.id
+    end
+
+    href = if entity.respond_to?(:my_url)
+             entity.my_url
+           else
+             "/my/#{entity.class.table_name}/#{entity.id}"
+           end
+
+    link_to(text, href, options)
+  end
+
+  # @param [ApplicationRecord] entity
+  # @param [String] text
+  # @param [Hash] options
+  def entity_link(entity, text = nil, options = {})
+    return '' if entity.nil?
+
+    if text.nil?
+      text = entity.respond_to?(:text_for_link) ? entity.text_for_link : entity.id
+    end
+
+    href = if entity.respond_to?(:world_url)
+             entity.world_url
+           else
+             "/#{entity.class.table_name}/#{entity.id}"
+           end
+
+    link_to(text, href, options)
+  end
+
+  # @param [Hash] options
+  def my_home_link(options = {})
+    link_to(t('my.index.index.nav_text'), my_path, options)
+  end
+
+  # @param [String|ApplicationRecord] path
+  # @param [String] title
+  # @param [Hash] options
+  def world_icon(path, title = t(:view_as_visitor), options = {})
+    if path.is_a? ApplicationRecord
+      table_name = path.class.table_name
+      path = path.respond_to?(:world_url) ? path.world_url : "/#{table_name}/#{path.id}"
+    end
+    icon_with_link('biovision/icons/world.svg', path, title, options)
+  end
+
+  # @param [String|ApplicationRecord] path
+  # @param [String] title
+  # @param [Hash] options
+  def gear_icon(path, title = t(:view_settings), options = {})
+    path = "/admin/#{path.class.table_name}/#{path.id}" if path.is_a? ApplicationRecord
+    icon_with_link('biovision/icons/gear.svg', path, title, options)
+  end
+
+  # @param [String] path
+  # @param [String] title
+  # @param [Hash] options
+  def create_icon(path, title = t(:create), options = {})
+    icon_with_link('biovision/icons/create.svg', path, title, options)
+  end
+
+  # @param [String] path
+  # @param [String] title
+  # @param [Hash] options
+  def back_icon(path, title = t(:back), options = {})
+    icon_with_link('biovision/icons/back.svg', path, title, options)
+  end
+
+  # @param [String] path
+  # @param [String] title
+  # @param [Hash] options
+  def return_icon(path, title = t(:back), options = {})
+    icon_with_link('biovision/icons/return.svg', path, title, options)
+  end
+
+  # @param [String|ApplicationRecord] path
+  # @param [String] title
+  # @param [Hash] options
+  def edit_icon(path, title = t(:edit), options = {})
+    path = "/admin/#{path.class.table_name}/#{path.id}/edit" if path.is_a? ApplicationRecord
+    icon_with_link('biovision/icons/edit.svg', path, title, options)
+  end
+
+  # @param [String|ApplicationRecord] path
+  # @param [String] title
+  # @param [Hash] options
+  def destroy_icon(path, title = t(:delete), options = {})
+    path = "/admin/#{path.class.table_name}/#{path.id}" if path.is_a? ApplicationRecord
+    default = {
+      class: 'danger',
+      data: { confirm: t(:are_you_sure) },
+      method: :delete,
+    }
+    icon_with_link('biovision/icons/destroy.svg', path, title, default.merge(options))
+  end
+
+  # @param [String|ApplicationRecord] path
+  # @param [String] title
+  # @param [Hash] options
+  def icon_with_link(source, path, title, options = {})
+    link_to(image_tag(source, alt: title), path, options)
+  end
+
+  # @param [String] path
+  # @param [String] text
+  def create_button(path, text = t(:create))
+    link_to(text, path, class: 'button button-save')
+  end
+
+  # @param [String|ApplicationRecord] path
+  # @param [String] text
+  def edit_button(path, text = t(:edit))
+    path = "/admin/#{path.class.table_name}/#{path.id}/edit" if path.is_a? ApplicationRecord
+    link_to(text, path, class: 'button button-secondary')
+  end
+
+  # @param [String|ApplicationRecord] path
+  # @param [String] text
+  def destroy_button(path, text = t(:delete))
+    path = "/admin/#{path.class.table_name}/#{path.id}" if path.is_a? ApplicationRecord
+    options = {
+      class: 'button button-danger',
+      data: { confirm: t(:are_you_sure) },
+      method: :delete
+    }
+    link_to(text, path, options)
+  end
+
+  # @param [String] phone
+  # @param [Hash] options
+  def phone_link(phone, options = {})
+    link_to(phone, "tel:#{phone.gsub(/[^+0-9]/, '')}", options)
+  end
+
+  # @param [String] email
+  # @param [Hash] options
+  def email_link(email, options = {})
+    link_to(email, "mailto:#{email}", options)
+  end
+end

data/app/helpers/simple_image_helper.rb

@@ -0,0 +1,125 @@
+# frozen_string_literal: true
+
+# Helper methods for displaying versions for SimpleImageUploader
+module SimpleImageHelper
+  # Tiny (48x48) version of simple image
+  #
+  # @param [ApplicationRecord|SimpleImageUploader] entity
+  # @param [Hash] options
+  def simple_image_tiny(entity, options = {})
+    return '' if entity.nil?
+
+    image = entity.is_a?(SimpleImageUploader) ? entity : entity.image
+    default_image = options.delete(:default_image).to_s
+
+    return default_image if image.blank?
+
+    default = {
+      alt: image.alt_text,
+      load: 'lazy'
+    }
+    image_tag(image.tiny_url, default.merge(options))
+  end
+
+  # Preview (160x160) version of simple image
+  #
+  # @param [ApplicationRecord|SimpleImageUploader] entity
+  # @param [Hash] options
+  def simple_image_preview(entity, options = {})
+    return '' if entity.nil?
+
+    image = entity.is_a?(SimpleImageUploader) ? entity : entity.image
+    default_image = options.delete(:default_image).to_s
+
+    return default_image if image.blank?
+
+    default = {
+      alt: image.alt_text,
+      load: 'lazy'
+    }
+    image_tag(image.preview_url, default.merge(options))
+  end
+
+  # Small (320x320) version of simple image
+  #
+  # @param [ApplicationRecord|SimpleImageUploader] entity
+  # @param [Hash] options
+  def simple_image_small(entity, options = {})
+    return '' if entity.nil?
+
+    image = entity.is_a?(SimpleImageUploader) ? entity : entity.image
+    default_image = options.delete(:default_image).to_s
+
+    return default_image if image.blank?
+
+    default = {
+      alt: image.alt_text,
+      load: 'lazy'
+    }
+    default[:srcset] = "#{image.medium.url} 2x" if image.raster?
+
+    image_tag(image.small_url, default.merge(options))
+  end
+
+  # Medium (640x640) version of simple image
+  #
+  # @param [ApplicationRecord|SimpleImageUploader] entity
+  # @param [Hash] options
+  def simple_image_medium(entity, options = {})
+    return '' if entity.nil?
+
+    image = entity.is_a?(SimpleImageUploader) ? entity : entity.image
+    default_image = options.delete(:default_image).to_s
+
+    return default_image if image.blank?
+
+    default = {
+      alt: image.alt_text,
+      load: 'lazy'
+    }
+    default[:srcset] = "#{image.large.url} 2x" if image.raster?
+
+    image_tag(image.medium_url, default.merge(options))
+  end
+
+  # Large (1280x1280) version of simple image
+  #
+  # @param [ApplicationRecord|SimpleImageUploader] entity
+  # @param [Hash] options
+  def simple_image_large(entity, options = {})
+    return '' if entity.nil?
+
+    image = entity.is_a?(SimpleImageUploader) ? entity : entity.image
+    default_image = options.delete(:default_image).to_s
+
+    return default_image if image.blank?
+
+    default = {
+      alt: image.alt_text,
+      load: 'lazy'
+    }
+    default[:srcset] = "#{image.hd.url} 2x" if image.raster?
+
+    image_tag(image.large_url, default.merge(options))
+  end
+
+  # HD (1920x1920) version of simple image
+  #
+  # @param [ApplicationRecord|SimpleImageUploader] entity
+  # @param [Hash] options
+  def simple_image_hd(entity, options = {})
+    return '' if entity.nil?
+
+    image = entity.is_a?(SimpleImageUploader) ? entity : entity.image
+    default_image = options.delete(:default_image).to_s
+
+    return default_image if image.blank?
+
+    default = {
+      alt: image.alt_text,
+      load: 'lazy'
+    }
+
+    image_tag(image.hd_url, default.merge(options))
+  end
+end