biovision-base 0.7.170709 → 0.8.170916

data/config/locales/editable-pages-ru.yml

@@ -2,6 +2,7 @@ ru:
   activerecord:
     models:
       editable_page: "Редактируемая страница"
+      stored_value: "Хранимое значение"
     attributes:
       editable_page:
         name: "Название"
@@ -11,16 +12,30 @@ ru:
         keywords: "Ключевые слова"
         description: "Метаописание"
         body: "Содержимое"
+      stored_value:
+        description: "Описание"
+        name: "Название"
+        slug: "Идентификатор"
+        value: "Значение"
   admin:
     editable_pages:
       nav_item:
-        text: "Редактируемые страницы"
         description: "Управление редактируемыми страницами"
+        text: "Редактируемые страницы"
       index:
-        title: "Редактируемые страницы"
         heading: "Редактируемые страницы"
+        title: "Редактируемые страницы"
       show:
         title: "Редактируемая страница «%{name}»"
+    stored_values:
+      nav_item:
+        description: "Управление хранимыми значениями"
+        text: "Хранимые значения (Реестр)"
+      index:
+        heading: "Хранимые значения"
+        title: "Хранимые значения"
+      show:
+        title: "Хранимое значение «%{slug}»"
   editable_pages:
     new:
       title: "Новая редактируемая страница"
@@ -41,3 +56,20 @@ ru:
         keywords: "Значение для meta keywords (для поисковых роботов). Максимум 250 символов."
         description: "Метаописание для поисковых роботов, результатов поиска и расшаривания. Максимум 250 символов."
         body: "HTML для вставки внутри сайта. Максимум 64кБ текста."
+  stored_values:
+    new:
+      heading: "Новое хранимое значение"
+      title: "Новое хранимое значение"
+    edit:
+      title: "Редактирование хранимого значения"
+      heading: "Редактирование хранимого значения"
+    update:
+      success: "Хранимое значение успешно изменено"
+    destroy:
+      success: "Хранимое значение успешно удалено"
+    form:
+      guidelines:
+        slug: "Используется для вставки внутри сайта. Максимум 50 символов."
+        value: "Отображается при необходимости. Максимум 255 символов."
+        name: "Внутреннее название для удобства. Максимум 100 символов."
+        description: "Описание для удобства. Максимум 250 символов."

data/config/locales/users-ru.yml

@@ -19,6 +19,7 @@ ru:
   activerecord:
     models:
       user: "Пользователь"
+      user_profile: "Профиль пользователя"
       foreign_site: "Внешний сайт"
       foreign_user: "Внешний пользователь"
       code_type: "Тип кода"
@@ -39,28 +40,30 @@ ru:
               invalid: "должен содержать от 1 до 30 латинских букв, цифр или знаков подчёркивания"
     attributes:
       user:
-        ip: "IP-адрес при регистрации"
         agent: "Агент пользователя при регистрации"
-        slug: "Идентификатор"
-        gender: "Пол"
-        birthday: "Дата рождения"
-        bot: "Это бот"
         allow_login: "Позволить вход"
-        email_confirmed: "Email подтверждён"
-        phone_confirmed: "Телефон подтверждён"
         allow_mail: "Разрешить email-уведомления"
+        bot: "Это бот"
+        email: "Email"
+        email_confirmed: "Email подтверждён"
+        foreign_slug: "Идентификатор пришёл извне"
+        image: "Картинка"
+        ip: "IP-адрес при регистрации"
         last_seen: "Последняя активность"
+        notice: "Заметка"
         password: "Пароль"
         password_confirmation: "Подтверждение пароля"
-        email: "Email"
         phone: "Телефон"
+        phone_confirmed: "Телефон подтверждён"
         screen_name: "Логин"
+        search_string: "Строка для поиска"
+        slug: "Идентификатор"
+      user_profile:
+        birthday: "Дата рождения"
+        gender: "Пол"
         name: "Имя"
         patronymic: "Отчество"
         surname: "Фамилия"
-        notice: "Заметка"
-        image: "Картинка"
-        foreign_slug: "Идентификатор пришёл извне"
         genders:
           female: "Женский"
           male: "Мужской"
@@ -197,6 +200,8 @@ ru:
       title: "Вход"
       heading: "Вход"
       breadcrumbs: "Вход"
+    form:
+      log_in: "Войти"
   users:
     create:
       success: "Пользователь успешно создан"
@@ -306,7 +311,7 @@ ru:
         invalid_code: "Недействительный код"
       show:
         title: "Подтвердить адрес электронной почты"
-        got_code: "Есть код подтверждения"
+        got_code: "Есть код подтверждения?"
         confirm: "Подтвердить адрес"
         no_code: "Кода подтверждения нет?"
         send_code: "Отправить код подтверждения"
@@ -325,6 +330,7 @@ ru:
             password: "Выберите надёжный пароль, который нельзя легко подобрать."
             password_confirmation: "Повторите пароль, чтобы убедиться, что вы не ошиблись в наборе."
             email: "Введите почту для обратной связи и на случай сброса пароля."
+          join: "Зарегистрироваться"
       create:
         success: "Вы зарегистрировались и вошли"
         are_you_bot: "Не нужно было отмечать галочку."
@@ -344,6 +350,7 @@ ru:
           leave_blank_if_necessary: "Если не будете менять пароль, оставьте эти поля пустыми."
           new_password: "Новый пароль"
           update: "Обновить данные"
+          flags: "Дополнительно"
     tokens:
       nav_item:
         text: "Жетоны доступа (сессии)"

data/config/routes.rb

@@ -7,6 +7,11 @@ Rails.application.routes.draw do
     get 'auth/:provider/callback' => :auth_callback, as: :auth_callback
   end
 
+  controller :about do
+    get 'about' => :index
+    get 'tos' => :tos
+  end
+
   scope 'u/:slug', controller: :profiles do
     get '/' => :show, as: :user_profile
   end
@@ -30,6 +35,7 @@ Rails.application.routes.draw do
     end
 
     resources :editable_pages, only: [:index, :show]
+    resources :stored_values, only: [:index, :show]
 
     resources :metrics, only: [:index, :show] do
       member do
@@ -96,6 +102,7 @@ Rails.application.routes.draw do
   resources :agents, :browsers, except: [:index, :show]
 
   resources :editable_pages, except: [:index, :show]
+  resources :stored_values, except: [:index, :show]
 
   resources :users, except: [:index, :show]
   resources :tokens, :codes, except: [:index, :show]

data/db/migrate/20170302000001_create_users.rb

@@ -8,7 +8,6 @@ class CreateUsers < ActiveRecord::Migration[5.0]
         t.inet :ip
         t.integer :inviter_id
         t.integer :native_id
-        t.integer :gender, limit: 2
         t.integer :follower_count, default: 0, null: false
         t.integer :followee_count, default: 0, null: false
         t.integer :comments_count, default: 0, null: false
@@ -25,17 +24,14 @@ class CreateUsers < ActiveRecord::Migration[5.0]
         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
         t.string :email, index: true
-        t.string :name
-        t.string :patronymic
-        t.string :surname
         t.string :phone
         t.string :image
         t.string :notice
+        t.string :search_string
       end
 
       add_foreign_key :users, :users, column: :inviter_id, on_update: :cascade, on_delete: :nullify

data/db/migrate/20170302000002_create_user_profiles.rb

@@ -0,0 +1,21 @@
+class CreateUserProfiles < ActiveRecord::Migration[5.1]
+  def up
+    unless UserProfile.table_exists?
+      create_table :user_profiles do |t|
+        t.timestamps
+        t.references :user, foreign_key: true, null: false, on_update: :cascade, on_delete: :cascade
+        t.integer :gender, limit: 2
+        t.date :birthday
+        t.string :name
+        t.string :patronymic
+        t.string :surname
+      end
+    end
+  end
+
+  def down
+    if UserProfile.table_exists?
+      drop_table :user_profiles
+    end
+  end
+end

data/db/migrate/20170320000000_create_editable_pages.rb

@@ -11,6 +11,10 @@ class CreateEditablePages < ActiveRecord::Migration[5.0]
         t.string :description, default: '', null: false
         t.text :body, default: '', null: false
       end
+
+      EditablePage.create(slug: 'index', name: 'Главная страница')
+      EditablePage.create(slug: 'about', name: 'О проекте')
+      EditablePage.create(slug: 'tos', name: 'Пользовательское соглашение')
     end
   end
 

data/db/migrate/20170823000001_create_stored_values.rb

@@ -0,0 +1,19 @@
+class CreateStoredValues < ActiveRecord::Migration[5.1]
+  def up
+    unless StoredValue.table_exists?
+      create_table :stored_values do |t|
+        t.timestamps
+        t.string :slug, null: false
+        t.string :value
+        t.string :name
+        t.string :description
+      end
+    end
+  end
+
+  def down
+    if StoredValue.table_exists?
+      drop_table :stored_values
+    end
+  end
+end

data/lib/biovision/base/engine.rb

@@ -4,6 +4,7 @@ module Biovision
       initializer  "biovision_base.load_base_methods" do
         ActiveSupport.on_load(:action_controller) do
           include Biovision::Base::BaseMethods
+          include Biovision::Base::PrivilegeMethods
         end
       end
 

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.7.170709'
+    VERSION = '0.8.170916'
   end
 end

data/lib/tasks/regions.rake

@@ -37,6 +37,41 @@ namespace :regions do
     end
   end
 
+  desc 'Import regions from YAML without deleting old data'
+  task import: :environment do
+    file_path = "#{Rails.root}/tmp/import/regions.yml"
+    media_dir = "#{Rails.root}/tmp/import/regions"
+    ignored   = %w(image header_image)
+    if File.exists? file_path
+      File.open file_path, 'r' do |file|
+        YAML.load(file).each do |id, data|
+          attributes = data.reject { |key| ignored.include?(key) }
+          entity     = Region.find_by(id: id) || Region.new(id: id)
+          entity.assign_attributes(attributes)
+          if data.key?('image') && entity.image.blank?
+            image_file = "#{media_dir}/image/#{id}/#{data['image']}"
+            if File.exists?(image_file)
+              entity.image = Pathname.new(image_file).open
+            end
+          end
+          if data.key?('header_image') && entity.header_image.blank?
+            image_file = "#{media_dir}/header_image/#{id}/#{data['header_image']}"
+            if File.exists?(image_file)
+              entity.header_image = Pathname.new(image_file).open
+            end
+          end
+          entity.save!
+          print "\r#{id}    "
+        end
+        puts
+      end
+      Region.connection.execute "select setval('regions_id_seq', (select max(id) from regions));"
+      puts "Done. We have #{Region.count} regions now"
+    else
+      puts "Cannot find file #{file_path}"
+    end
+  end
+
   desc 'Dump regions to YAML'
   task dump: :environment do
     file_path = "#{Rails.root}/tmp/export/regions.yml"
@@ -50,14 +85,14 @@ namespace :regions do
           file.puts "  #{attribute}: #{value.inspect}"
         end
         unless entity.image.blank?
-          image_name = "#{entity.long_slug}#{File.extension(File.basename(entity.image.path))}"
+          image_name = "#{entity.long_slug}#{File.extname(File.basename(entity.image.path))}"
           image_dir  = "#{media_dir}/image/#{entity.id}"
           FileUtils.mkdir_p(image_dir) unless Dir.exists?(image_dir)
           FileUtils.copy(entity.image.path, "#{image_dir}/#{image_name}")
           file.puts "  image: #{image_name.inspect}"
         end
         unless entity.header_image.blank?
-          image_name = "#{entity.long_slug}#{File.extension(File.basename(entity.header_image.path))}"
+          image_name = "#{entity.long_slug}#{File.extname(File.basename(entity.header_image.path))}"
           image_dir  = "#{media_dir}/header_image/#{entity.id}"
           FileUtils.mkdir_p(image_dir) unless Dir.exists?(image_dir)
           FileUtils.copy(entity.header_image.path, "#{image_dir}/#{image_name}")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.7.170709
+  version: 0.8.170916
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-09 00:00:00.000000000 Z
+date: 2017-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rails-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.7
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -205,9 +205,11 @@ files:
 - app/assets/stylesheets/biovision/base/message-box.scss
 - app/assets/stylesheets/biovision/base/pagination.scss
 - app/assets/stylesheets/biovision/base/regions.scss
+- app/assets/stylesheets/biovision/base/toggleable.scss
 - app/assets/stylesheets/biovision/base/tootik.scss
 - app/assets/stylesheets/biovision/base/track.scss
 - app/assets/stylesheets/biovision/base/users.scss
+- app/controllers/about_controller.rb
 - app/controllers/admin/agents_controller.rb
 - app/controllers/admin/browsers_controller.rb
 - app/controllers/admin/codes_controller.rb
@@ -218,6 +220,7 @@ files:
 - app/controllers/admin/privilege_groups_controller.rb
 - app/controllers/admin/privileges_controller.rb
 - app/controllers/admin/regions_controller.rb
+- app/controllers/admin/stored_values_controller.rb
 - app/controllers/admin/tokens_controller.rb
 - app/controllers/admin/users_controller.rb
 - app/controllers/admin_controller.rb
@@ -242,6 +245,7 @@ files:
 - app/controllers/privileges_controller.rb
 - app/controllers/profiles_controller.rb
 - app/controllers/regions_controller.rb
+- app/controllers/stored_values_controller.rb
 - app/controllers/tokens_controller.rb
 - app/controllers/users_controller.rb
 - app/helpers/biovision_helper.rb
@@ -250,6 +254,7 @@ files:
 - app/helpers/codes_helper.rb
 - app/helpers/editable_pages_helper.rb
 - app/helpers/privileges_helper.rb
+- app/helpers/stored_values_helper.rb
 - app/helpers/tracking_helper.rb
 - app/jobs/application_job.rb
 - app/jobs/clean_tokens_job.rb
@@ -276,19 +281,23 @@ files:
 - app/models/privilege_group.rb
 - app/models/privilege_group_privilege.rb
 - app/models/region.rb
+- app/models/stored_value.rb
 - app/models/token.rb
 - app/models/user.rb
 - app/models/user_privilege.rb
+- app/models/user_profile.rb
 - app/services/canonizer.rb
 - app/services/code_manager.rb
 - app/services/code_manager/confirmation.rb
 - app/services/code_manager/invitation.rb
 - app/services/code_manager/recovery.rb
 - app/services/user_bouncer.rb
+- app/services/user_manager.rb
 - app/uploaders/avatar_uploader.rb
 - app/uploaders/editable_page_image_uploader.rb
 - app/uploaders/header_image_uploader.rb
 - app/uploaders/region_image_uploader.rb
+- app/views/about/editable.html.erb
 - app/views/admin/agents/_filter.html.erb
 - app/views/admin/agents/_list.html.erb
 - app/views/admin/agents/_nav_item.html.erb
@@ -343,6 +352,10 @@ files:
 - app/views/admin/regions/entity/_in_list.html.erb
 - app/views/admin/regions/index.html.erb
 - app/views/admin/regions/show.html.erb
+- app/views/admin/stored_values/_nav_item.html.erb
+- app/views/admin/stored_values/entity/_in_list.html.erb
+- app/views/admin/stored_values/index.html.erb
+- app/views/admin/stored_values/show.html.erb
 - app/views/admin/tokens/_filter.html.erb
 - app/views/admin/tokens/_nav_item.html.erb
 - app/views/admin/tokens/_toggleable.html.erb
@@ -387,6 +400,7 @@ files:
 - app/views/codes/_form.html.erb
 - app/views/codes/edit.html.erb
 - app/views/codes/new.html.erb
+- app/views/editable_pages/_editable_page.html.erb
 - app/views/editable_pages/_form.html.erb
 - app/views/editable_pages/edit.html.erb
 - app/views/editable_pages/form/_ckeditor.html.erb
@@ -451,8 +465,12 @@ files:
 - app/views/shared/actions/_priority_changer.html.erb
 - app/views/shared/admin/_breadcrumbs.html.erb
 - app/views/shared/admin/_list.html.erb
+- app/views/shared/admin/_list_with_priority.html.erb
 - app/views/shared/editable_pages/_body.html.erb
 - app/views/shared/filter/_flag.html.erb
+- app/views/stored_values/_form.html.erb
+- app/views/stored_values/edit.html.erb
+- app/views/stored_values/new.html.erb
 - app/views/tokens/_form.html.erb
 - app/views/tokens/edit.html.erb
 - app/views/tokens/new.html.erb
@@ -475,9 +493,10 @@ files:
 - db/migrate/20170301000102_create_agents.rb
 - db/migrate/20170301000201_create_regions.rb
 - db/migrate/20170302000001_create_users.rb
-- db/migrate/20170302000002_create_tokens.rb
-- db/migrate/20170302000003_create_code_types.rb
-- db/migrate/20170302000004_create_codes.rb
+- db/migrate/20170302000002_create_user_profiles.rb
+- db/migrate/20170302000003_create_tokens.rb
+- db/migrate/20170302000004_create_code_types.rb
+- db/migrate/20170302000005_create_codes.rb
 - db/migrate/20170302000101_create_privileges.rb
 - db/migrate/20170302000102_create_user_privileges.rb
 - db/migrate/20170302000103_create_privilege_groups.rb
@@ -486,6 +505,7 @@ files:
 - db/migrate/20170425000001_create_foreign_sites.rb
 - db/migrate/20170425000002_create_foreign_users.rb
 - db/migrate/20170629120000_create_login_attempts.rb
+- db/migrate/20170823000001_create_stored_values.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb
@@ -518,7 +538,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Base components for Biovision applications