biovision-base 0.11.180127 → 0.14.180326

data/config/locales/users-ru.yml

@@ -41,7 +41,7 @@ ru:
         user:
           attributes:
             email:
-              unreasonable: "не выглядит как email"
+              invalid: "не выглядит как email"
             slug:
               invalid: "должен содержать от 1 до 30 латинских букв, цифр или знаков подчёркивания"
     attributes:
@@ -49,6 +49,7 @@ ru:
         agent: "Агент пользователя при регистрации"
         allow_login: "Позволить вход"
         allow_mail: "Разрешить email-уведомления"
+        birthday: "Дата рождения"
         bot: "Это бот"
         email: "Email"
         email_confirmed: "Email подтверждён"
@@ -66,7 +67,6 @@ ru:
         search_string: "Строка для поиска"
         slug: "Идентификатор"
       user_profile:
-        birthday: "Дата рождения"
         gender: "Пол"
         name: "Имя"
         patronymic: "Отчество"
@@ -229,6 +229,10 @@ ru:
     index:
       title: "Пользователи сайта, страница %{page}"
       heading: "Пользователи сайта"
+    form:
+      guidelines:
+        notice: "Заметка для себя и других администраторов"
+        screen_name: "Только латинские буквы, цифры и знаки подчёркивания, от 1 до 30 символов."
   profiles:
     profile:
       user_info: "Информация о пользователе"
@@ -299,6 +303,7 @@ ru:
     index:
       index:
         title: "Личный кабинет"
+        heading: "Личный кабинет"
     recoveries:
       create:
         impossible: "Сброс пароля для этого пользователя недоступен"
@@ -327,7 +332,7 @@ ru:
         send_code: "Отправить код подтверждения"
     profiles:
       nav_item:
-        text: "Мой профиль"
+        text: "Личный кабинет"
         description: "Просмотр и редактирование вашего профиля"
       new:
         title: "Регистрация"

data/config/routes.rb

@@ -1,140 +1,164 @@
 Rails.application.routes.draw do
-  # Handling errors
-  match '/400' => 'errors#bad_request', via: :all
-  match '/401' => 'errors#unauthorized', via: :all
-  match '/403' => 'errors#forbidden', via: :all
-  match '/404' => 'errors#not_found', via: :all
-  match '/422' => 'errors#unprocessable_entity', via: :all
-  match '/500' => 'errors#internal_server_error', via: :all
-
-  controller :authentication do
-    get 'login' => :new
-    post 'login' => :create
-    delete 'logout' => :destroy
-    get 'auth/:provider/callback' => :auth_callback, as: :auth_callback
-  end
+  resources :agents, :browsers, only: [:update, :destroy]
 
-  controller :about do
-    get 'about' => :index
-    get 'tos' => :tos
-  end
+  resources :editable_pages, only: [:update, :destroy]
+  resources :stored_values, only: [:update, :destroy]
 
-  scope 'u/:slug', controller: :profiles, constraints: { slug: /[^\/]+/ } do
-    get '/' => :show, as: :user_profile
-  end
+  resources :users, only: [:update, :destroy]
+  resources :tokens, :codes, only: [:update, :destroy]
 
-  namespace :admin do
-    get '/' => 'index#index'
+  resources :metrics, only: [:update]
 
-    resources :agents, :browsers, only: [:index, :show] do
-      member do
-        post 'toggle', defaults: { format: :json }
-        put 'lock', defaults: { format: :json }
-        delete 'lock', action: :unlock, defaults: { format: :json }
-      end
+  resources :privileges, only: [:update, :destroy]
+  resources :privilege_groups, only: [:update, :destroy]
+
+  resources :media_folders, only: [:update, :destroy]
+  resources :media_files, only: [:update, :destroy]
+
+  resources :feedback_requests, only: [:destroy]
+
+  scope '(:locale)', constraints: { locale: /ru|en/ } do
+    # Handling errors
+    match '/400' => 'errors#bad_request', via: :all
+    match '/401' => 'errors#unauthorized', via: :all
+    match '/403' => 'errors#forbidden', via: :all
+    match '/404' => 'errors#not_found', via: :all
+    match '/422' => 'errors#unprocessable_entity', via: :all
+    match '/500' => 'errors#internal_server_error', via: :all
+
+    controller :authentication do
+      get 'login' => :new
+      post 'login' => :create
+      delete 'logout' => :destroy
+      get 'auth/:provider/callback' => :auth_callback, as: :auth_callback
     end
 
-    resources :codes, only: [:index, :show]
-    resources :tokens, only: [:index, :show] do
-      member do
-        post 'toggle', defaults: { format: :json }
-      end
+    controller :about do
+      get 'about' => :index
+      get 'tos' => :tos
+    end
+
+    scope 'u/:slug', controller: :profiles, constraints: { slug: /[^\/]+/ } do
+      get '/' => :show, as: :user_profile
     end
 
-    resources :editable_pages, only: [:index, :show]
-    resources :stored_values, only: [:index, :show]
+    namespace :admin do
+      get '/' => 'index#index'
 
-    resources :metrics, only: [:index, :show] do
-      member do
-        get 'data', defaults: { format: :json }
+      resources :agents, :browsers, only: [:index, :show] do
+        member do
+          post 'toggle', defaults: { format: :json }
+          put 'lock', defaults: { format: :json }
+          delete 'lock', action: :unlock, defaults: { format: :json }
+        end
       end
-    end
 
-    resources :privileges, only: [:index, :show] do
-      member do
-        put 'lock', defaults: { format: :json }
-        delete 'lock', action: :unlock, defaults: { format: :json }
-        post 'priority', defaults: { format: :json }
-        post 'toggle', defaults: { format: :json }
-        get 'users'
-        get 'regions', defaults: { format: :json }
+      resources :codes, only: [:index, :show]
+      resources :tokens, only: [:index, :show] do
+        member do
+          post 'toggle', defaults: { format: :json }
+        end
       end
-    end
-    resources :privilege_groups, only: [:index, :show] do
-      member do
-        put 'privileges/:privilege_id' => :add_privilege, as: :privilege, defaults: { format: :json }
-        delete 'privileges/:privilege_id' => :remove_privilege, defaults: { format: :json }
+
+      resources :editable_pages, only: [:index, :show]
+      resources :stored_values, only: [:index, :show]
+
+      resources :metrics, only: [:index, :show] do
+        member do
+          get 'data', defaults: { format: :json }
+        end
       end
-    end
 
-    resources :users, only: [:index, :show] do
-      collection do
-        get 'search', defaults: { format: :json }
+      resources :privileges, only: [:index, :show] do
+        member do
+          put 'lock', defaults: { format: :json }
+          delete 'lock', action: :unlock, defaults: { format: :json }
+          post 'priority', defaults: { format: :json }
+          post 'toggle', defaults: { format: :json }
+          get 'users'
+          get 'regions', defaults: { format: :json }
+        end
       end
-      member do
-        get 'tokens'
-        get 'codes'
-        get 'privileges'
-        put 'privileges/:privilege_id' => :grant_privilege, as: :privilege
-        delete 'privileges/:privilege_id' => :revoke_privilege
-        post 'toggle', defaults: { format: :json }
-        post 'authenticate'
+      resources :privilege_groups, only: [:index, :show] do
+        member do
+          put 'privileges/:privilege_id' => :add_privilege, as: :privilege, defaults: { format: :json }
+          delete 'privileges/:privilege_id' => :remove_privilege, defaults: { format: :json }
+        end
+      end
+
+      resources :users, only: [:index, :show] do
+        collection do
+          get 'search', defaults: { format: :json }
+        end
+        member do
+          get 'tokens'
+          get 'codes'
+          get 'privileges'
+          put 'privileges/:privilege_id' => :grant_privilege, as: :privilege
+          delete 'privileges/:privilege_id' => :revoke_privilege
+          post 'toggle', defaults: { format: :json }
+          post 'authenticate'
+        end
       end
-    end
 
-    resources :login_attempts, only: [:index]
+      resources :login_attempts, only: [:index]
 
-    resources :media_folders, only: [:index, :show] do
-      member do
-        get 'files'
+      resources :media_folders, only: [:index, :show] do
+        member do
+          get 'files'
+        end
       end
-    end
-    resources :media_files, only: [:index, :show] do
-      member do
-        put 'lock', defaults: { format: :json }
-        delete 'lock', action: :unlock, defaults: { format: :json }
+      resources :media_files, only: [:index, :show] do
+        member do
+          put 'lock', defaults: { format: :json }
+          delete 'lock', action: :unlock, defaults: { format: :json }
+        end
       end
-    end
 
-    resources :feedback_requests, only: [:index] do
-      member do
-        post 'toggle', defaults: { format: :json }
+      resources :feedback_requests, only: [:index] do
+        member do
+          post 'toggle', defaults: { format: :json }
+        end
       end
     end
-  end
 
-  namespace :my do
-    get '/' => 'index#index'
+    namespace :my do
+      get '/' => 'index#index'
 
-    resource :profile, except: [:destroy]
-    resource :confirmation, :recovery, only: [:show, :create, :update]
-    resources :tokens, only: [:index] do
-      member do
-        post 'toggle', defaults: { format: :json }
+      resource :profile, except: [:destroy]
+      resource :confirmation, :recovery, only: [:show, :create, :update]
+      resources :tokens, only: [:index] do
+        member do
+          post 'toggle', defaults: { format: :json }
+        end
       end
+      resources :login_attempts, only: [:index]
     end
-    resources :login_attempts, only: [:index]
-  end
 
-  resources :agents, :browsers, except: [:index, :show]
+    resources :agents, :browsers, except: [:index, :show, :update, :destroy]
 
-  resources :editable_pages, except: [:index, :show]
-  resources :stored_values, except: [:index, :show]
+    resources :editable_pages, except: [:index, :show, :update, :destroy]
+    resources :stored_values, except: [:index, :show, :update, :destroy]
 
-  resources :users, except: [:index, :show]
-  resources :tokens, :codes, except: [:index, :show]
+    resources :users, except: [:index, :show, :update, :destroy] do
+      collection do
+        post 'check', defaults: { format: :json }
+      end
+    end
+    resources :tokens, :codes, except: [:index, :show, :update, :destroy]
 
-  resources :metrics, only: [:edit, :update]
+    resources :metrics, only: [:edit]
 
-  resources :privileges, except: [:index, :show]
-  resources :privilege_groups, except: [:index, :show]
+    resources :privileges, except: [:index, :show, :update, :destroy]
+    resources :privilege_groups, except: [:index, :show, :update, :destroy]
 
-  resources :media_folders, except: [:index, :show]
-  resources :media_files, except: [:index, :show] do
-    collection do
-      post :ckeditor
+    resources :media_folders, except: [:index, :show, :update, :destroy]
+    resources :media_files, except: [:index, :show, :update, :destroy] do
+      collection do
+        post :ckeditor
+      end
     end
-  end
 
-  resources :feedback_requests, only: [:create, :destroy]
+    resources :feedback_requests, only: [:create]
+  end
 end

data/db/migrate/20170302000001_create_users.rb

@@ -26,6 +26,7 @@ class CreateUsers < ActiveRecord::Migration[5.1]
         t.boolean :allow_mail, default: true, null: false
         t.boolean :foreign_slug, default: false, null: false
         t.datetime :last_seen
+        t.date :birthday
         t.string :slug, null: false
         t.string :screen_name, index: true, null: false
         t.string :password_digest
@@ -34,6 +35,7 @@ class CreateUsers < ActiveRecord::Migration[5.1]
         t.string :image
         t.string :notice
         t.string :search_string
+        t.json :profile_data, default: {}, null: false
       end
 
       add_foreign_key :users, :users, column: :inviter_id, on_update: :cascade, on_delete: :nullify

data/db/migrate/20170320000000_create_editable_pages.rb

@@ -23,7 +23,7 @@ class CreateEditablePages < ActiveRecord::Migration[5.1]
       }
 
       pages.each do |slug, names|
-        Language.each do |language|
+        Language.all.each do |language|
           EditablePage.create(slug: slug, name: names[language.code.to_sym], language: language)
         end
       end

data/db/migrate/20180321000000_add_profile_data_to_users.rb

@@ -0,0 +1,31 @@
+class AddProfileDataToUsers < ActiveRecord::Migration[5.1]
+  def up
+    unless column_exists? :users, :birthday
+      add_column :users, :birthday, :date
+    end
+    unless column_exists? :users, :profile_data
+      add_column :users, :profile_data, :json, null: false, default: {}
+    end
+
+    copy_data if UserProfile.table_exists?
+  end
+
+  def down
+    # no rollback
+  end
+
+  private
+
+  def copy_data
+    ignore = %w(id created_at updated_at user_id birthday)
+    UserProfile.order('user_id asc').each do |profile|
+      data = {
+        profile_data: profile.attributes.reject { |a| ignore.include?(a) }
+      }
+      if profile.attributes.key?('birthday')
+        data[:birthday] = profile.birthday
+      end
+      profile.user.update!(data)
+    end
+  end
+end

data/lib/biovision/base/base_methods.rb

@@ -4,8 +4,11 @@ module Biovision
       extend ActiveSupport::Concern
 
       included do
+        before_action :set_locale
+
         helper_method :current_page, :param_from_request
-        helper_method :current_user
+        helper_method :current_user, :current_language
+        helper_method :agent
       end
 
       # Get current page number from request
@@ -32,6 +35,22 @@ module Biovision
         @current_user ||= Token.user_by_token cookies['token'], true
       end
 
+      # Get current language from locale
+      #
+      # @return [Language]
+      def current_language
+        @current_language ||= Language.find_by(code: locale)
+      end
+
+      # @return [Agent]
+      def agent
+        @agent ||= Agent.named(request.user_agent || 'n/a')
+      end
+
+      def set_locale
+        I18n.locale = params[:locale] || I18n.default_locale
+      end
+
       protected
 
       # Handle HTTP error with status 404 without raising exception
@@ -82,15 +101,26 @@ module Biovision
         result
       end
 
-      # @return [Agent]
-      def agent
-        @agent ||= Agent.named(request.user_agent || 'n/a')
-      end
-
       # @return [Hash]
       def tracking_for_entity
         { agent: agent, ip: request.env['HTTP_X_REAL_IP'] || request.remote_ip }
       end
+
+      # @param [String] next_page
+      def form_processed_ok(next_page)
+        respond_to do |format|
+          format.js { render(js: "document.location.href = '#{next_page}'") }
+          format.html { redirect_to(next_page) }
+        end
+      end
+
+      # @param [Symbol|String] view_to_render
+      def form_processed_with_error(view_to_render)
+        respond_to do |format|
+          format.js { render('shared/forms/errors', status: :bad_request) }
+          format.html { render(view_to_render, status: :bad_request) }
+        end
+      end
     end
   end
-end
+end

data/lib/biovision/base/engine.rb

@@ -1,7 +1,7 @@
 module Biovision
   module Base
     class Engine < ::Rails::Engine
-      initializer  "biovision_base.load_base_methods" do
+      initializer "biovision_base.load_base_methods" do
         ActiveSupport.on_load(:action_controller) do
           include Biovision::Base::BaseMethods
         end