biovision-base 0.34.190331.1 → 0.36.190526.0

data/config/locales/components-ru.yml

@@ -6,9 +6,6 @@ ru:
     attributes:
       biovision_component:
         slug: "Идентификатор"
-      biovision_parameter:
-        slug: "Идентификатор"
-        value: "Значение"
   admin:
     settings:
       index:
@@ -27,6 +24,8 @@ ru:
           guidelines:
             slug: "Только латинские буквы, цифры, дефис и подчёркивание (кроме начала и конца)."
             value: "Произвольная строка"
+          slug: "Параметр"
+          value: "Значение"
       update:
         success: "Настройки компонента обновлены"
   biovision:

data/config/routes.rb

@@ -1,6 +1,29 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
+  concern :check do
+    post :check, on: :collection, defaults: { format: :json }
+  end
+
+  concern :toggle do
+    post :toggle, on: :member, defaults: { format: :json }
+  end
+
+  concern :priority do
+    post :priority, on: :member, defaults: { format: :json }
+  end
+
+  concern :removable_image do
+    delete :image, action: :destroy_image, on: :member, defaults: { format: :json }
+  end
+
+  concern :lock do
+    member do
+      put :lock, defaults: { format: :json }
+      delete :lock, action: :unlock, defaults: { format: :json }
+    end
+  end
+
   resources :agents, :browsers, only: %i[update destroy]
 
   resources :editable_blocks, only: %i[update destroy]
@@ -62,35 +85,14 @@ Rails.application.routes.draw do
         delete ':slug/:parameter_slug' => :delete_parameter, as: :parameter
       end
 
-      resources :agents, :browsers, only: %i[index show] do
-        member do
-          post 'toggle', defaults: { format: :json }
-          put 'lock', defaults: { format: :json }
-          delete 'lock', action: :unlock, defaults: { format: :json }
-        end
-      end
+      resources :agents, :browsers, only: %i[index show], concerns: %i[lock toggle]
 
       resources :codes, only: %i[index show]
-      resources :tokens, only: %i[index show] do
-        member do
-          post 'toggle', defaults: { format: :json }
-        end
-      end
+      resources :tokens, only: %i[index show], concerns: :toggle
 
-      resources :editable_pages, only: %i[index show] do
-        member do
-          post 'priority', defaults: { format: :json }
-          post 'toggle', defaults: { format: :json }
-        end
-      end
-      resources :simple_blocks, only: %i[index show] do
-        post 'toggle', on: :member, defaults: { format: :json }
-      end
-      resources :editable_blocks, only: %i[index show] do
-        member do
-          post 'toggle', defaults: { format: :json }
-        end
-      end
+      resources :editable_pages, only: %i[index show], concerns: %i[priority toggle]
+      resources :simple_blocks, only: %i[index show], concerns: :toggle
+      resources :editable_blocks, only: %i[index show], concerns: :toggle
       resources :stored_values, only: %i[index show]
 
       resources :metrics, only: %i[index show] do
@@ -99,28 +101,20 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :privileges, only: %i[index show] do
-        collection do
-          post 'check'
-        end
+      resources :privileges, only: %i[index show], concerns: %i[priority toggle] do
         member do
-          post 'priority', defaults: { format: :json }
-          post 'toggle', defaults: { format: :json }
           get 'users'
           get 'regions', defaults: { format: :json }
         end
       end
       resources :privilege_groups, only: %i[index show] do
-        collection do
-          post 'check'
-        end
         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: %i[index show] do
+      resources :users, only: %i[index show], concerns: :toggle do
         collection do
           get 'search', defaults: { format: :json }
         end
@@ -130,7 +124,6 @@ Rails.application.routes.draw do
           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
@@ -144,75 +137,33 @@ Rails.application.routes.draw do
           get 'files'
         end
       end
-      resources :media_files, only: %i[index show] do
-        member do
-          put 'lock', defaults: { format: :json }
-          delete 'lock', action: :unlock, defaults: { format: :json }
-        end
-      end
+      resources :media_files, only: %i[index show], concerns: :lock
 
-      resources :feedback_requests, only: :index do
-        member do
-          post 'toggle', defaults: { format: :json }
-        end
-      end
+      resources :feedback_requests, only: :index, concerns: :toggle
 
-      resources :link_blocks, only: %i[index show] do
-        member do
-          post 'toggle', defaults: { format: :json }
-        end
-      end
-      resources :link_block_items, only: :show do
-        member do
-          post 'toggle', defaults: { format: :json }
-          post 'priority', defaults: { format: :json }
-        end
-      end
+      resources :link_blocks, only: %i[index show], concerns: :toggle
+      resources :link_block_items, only: :show, concerns: %i[priority toggle]
     end
 
     namespace :my do
       get '/' => 'index#index'
 
-      resource :profile, except: :destroy do
-        post 'check'
-      end
+      resource :profile, except: :destroy, concerns: :check
       resource :confirmation, :recovery, only: %i[show create update]
-      resources :tokens, only: :index do
-        member do
-          post 'toggle', defaults: { format: :json }
-        end
-      end
+      resources :tokens, only: :index, concerns: :toggle
       resources :login_attempts, only: :index
     end
 
     resources :agents, :browsers, except: %i[index show update destroy]
 
-    resources :editable_pages, except: %i[index show update destroy] do
-      collection do
-        post 'check', defaults: { format: :json }
-      end
-    end
-    resources :editable_blocks, except: %i[index show update destroy] do
-      collection do
-        post 'check', defaults: { format: :json }
-      end
-    end
-    resources :simple_blocks, only: %i[new create edit] do
-      post 'check', on: :collection, defaults: { format: :json }
-    end
+    resources :editable_pages, except: %i[index show update destroy], concerns: :check
+    resources :editable_blocks, except: %i[index show update destroy], concerns: :check
+    resources :simple_blocks, only: %i[new create edit], concerns: :check
     resources :stored_values, except: %i[index show update destroy]
 
-    resources :link_blocks, :link_block_items, except: %i[index show update destroy] do
-      collection do
-        post 'check', defaults: { format: :json }
-      end
-    end
+    resources :link_blocks, :link_block_items, except: %i[index show update destroy], concerns: :check
 
-    resources :users, except: %i[index show update destroy] do
-      collection do
-        post 'check', defaults: { format: :json }
-      end
-    end
+    resources :users, except: %i[index show update destroy], concerns: :check
     resources :tokens, :codes, except: %i[index show update destroy]
 
     resources :metrics, only: :edit

data/db/migrate/20181217000000_create_biovision_components.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-# Tables for Biovision components
+# Table and default items for Biovision components
 class CreateBiovisionComponents < ActiveRecord::Migration[5.2]
   def up
     create_components_table unless BiovisionComponent.table_exists?
-    create_parameters_table unless BiovisionParameter.table_exists?
 
     seed_items
   end
 
   def down
-    drop_table :biovision_parameters if BiovisionParameter.table_exists?
     drop_table :biovision_components if BiovisionComponent.table_exists?
   end
 
@@ -21,60 +19,39 @@ class CreateBiovisionComponents < ActiveRecord::Migration[5.2]
       t.timestamps
       t.string :slug, null: false
       t.jsonb :settings, null: false, default: {}
+      t.jsonb :parameters, null: false, default: {}
     end
 
     add_index :biovision_components, :slug, unique: true
   end
 
-  def create_parameters_table
-    create_table :biovision_parameters, comment: 'Biovision component parameter' do |t|
-      t.timestamps
-      t.references :biovision_component, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
-      t.boolean :deletable, default: true, null: false
-      t.string :slug, null: false
-      t.text :value
-    end
-  end
-
   def seed_items
     create_registration_component
+    create_contact_component
 
-    component  = BiovisionComponent.create!(slug: 'contact')
-    collection = {
-      feedback_receiver: 'info@example.com',
-      email:             'info@example.com',
-      phone:             '',
-      address:           ''
-    }
-    create_parameters(component, collection)
   end
 
   def create_registration_component
-    slug     = 'registration'
     settings = {
-      open:          true,
-      invite_only:   false,
+      open: true,
+      invite_only: false,
       confirm_email: false,
-      use_invites:   false,
+      use_invites: false,
       require_email: false,
-      invite_count:  5
+      invite_count: 5
     }
 
-    BiovisionComponent.create!(slug: slug, settings: settings)
+    BiovisionComponent.create!(slug: 'registration', settings: settings)
   end
 
-  # @param [BiovisionComponent] component
-  # @param [Hash] collection
-  def create_parameters(component, collection)
-    collection.each do |slug, value|
-      attributes = {
-        biovision_component: component,
-        slug:                slug,
-        deletable:           false,
-        value:               value,
-      }
+  def create_contact_component
+    parameters = {
+      feedback_receiver: 'info@example.com',
+      email: 'info@example.com',
+      phone: '',
+      address: ''
+    }
 
-      BiovisionParameter.create!(attributes)
-    end
+    BiovisionComponent.create!(slug: 'contact', parameters: parameters)
   end
 end

data/db/migrate/20181217000110_create_editable_pages.rb

@@ -4,13 +4,9 @@
 class CreateEditablePages < ActiveRecord::Migration[5.1]
   def up
     create_editable_pages unless EditablePage.table_exists?
-    create_link_blocks unless LinkBlock.table_exists?
-    create_link_block_items unless LinkBlockItem.table_exists?
   end
 
   def down
-    drop_table :link_block_items if LinkBlockItem.table_exists?
-    drop_table :link_blocks if LinkBlock.table_exists?
     drop_table :editable_pages if EditablePage.table_exists?
   end
 
@@ -32,57 +28,32 @@ class CreateEditablePages < ActiveRecord::Migration[5.1]
       t.string :meta_keywords, default: '', null: false
       t.string :meta_description, default: '', null: false
       t.text :body, default: '', null: false
+      t.text :parsed_body
     end
 
     seed_pages
   end
 
-  def create_link_blocks
-    create_table :link_blocks, comment: 'Editable block of links' do |t|
-      t.timestamps
-      t.references :language, foreign_key: { on_update: :cascade, on_delete: :cascade }
-      t.boolean :visible, default: true, null: false
-      t.string :slug, null: false
-      t.string :title
-      t.text :lead
-      t.text :footer_text
-    end
-  end
-
-  def create_link_block_items
-    create_table :link_block_items, comment: 'Link in editable links block' do |t|
-      t.timestamps
-      t.references :link_block, null: false, foreign_key: { on_update: :cascade, on_delete: :cascade }
-      t.boolean :visible, default: true, null: false
-      t.integer :priority, limit: 2, default: 1, null: false
-      t.string :slug
-      t.string :image
-      t.string :image_alt_text
-      t.string :title
-      t.string :button_text
-      t.string :button_url
-      t.text :body
-    end
-  end
-
   def seed_pages
     pages = {
-      index:   ['', { ru: 'Главная страница', en: 'Main page' }],
-      about:   ['about', { ru: 'О проекте', en: 'About' }],
-      tos:     ['tos', { ru: 'Пользовательское соглашение', en: 'Terms of service' }],
+      index: ['', { ru: 'Главная страница', en: 'Main page' }],
+      about: ['about', { ru: 'О проекте', en: 'About' }],
+      tos: ['tos', { ru: 'Пользовательское соглашение', en: 'Terms of service' }],
       privacy: ['privacy', { ru: 'Политика конфиденциальности', en: 'Privacy' }],
       contact: ['contact', { ru: 'Контакты', en: 'Contact' }]
     }
 
     pages.each do |slug, data|
-      url   = data[0]
+      url = data[0]
       names = data[1]
-      Language.all.each do |language|
+      Language.where(active: true).each do |language|
+        code = language.code
+        prefix = code.to_sym == I18n.default_locale ? '' : "/#{code}"
         EditablePage.create(
-          slug:     slug,
-          name:     names[language.code.to_sym],
+          slug: slug,
+          name: names[code.to_sym],
           language: language,
-          url:      "/#{language.code}/#{url}"
+          url: "#{prefix}/#{url}"
         )
       end
     end

data/db/migrate/20190326120000_create_simple_blocks.rb

@@ -26,6 +26,12 @@ class CreateSimpleBlocks < ActiveRecord::Migration[5.2]
   private
 
   def seed_default_blocks
-    SimpleBlock.create(slug: 'counters', name: 'Счётчики для сайта')
+    data = [
+      ['counters', 'Счётчики для сайта']
+    ]
+
+    data.each do |row|
+      SimpleBlock.create(slug: row[0], name: row[1])
+    end
   end
 end

data/db/migrate/20190423101010_add_parameters_to_biovision_components.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+# Convert BiovisionParameter records to JSONB data in BiovisionComponent
+class AddParametersToBiovisionComponents < ActiveRecord::Migration[5.2]
+  def up
+    return if column_exists?(:biovision_components, :parameters)
+
+    add_column :biovision_components, :parameters, :jsonb, default: {}, null: false
+
+    move_data
+  end
+
+  def down
+    # No rollback needed
+  end
+
+  private
+
+  def move_data
+    BiovisionComponent.order('id asc').each do |component|
+      data = {}
+      BiovisionParameter.where(biovision_component: component).each do |parameter|
+        data[parameter.slug] = parameter.value
+      end
+
+      component.update! parameters: data
+    end
+  end
+end

data/db/migrate/20190429111111_add_parsed_body_to_editable_pages.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+# Add parsed body column to editable pages
+class AddParsedBodyToEditablePages < ActiveRecord::Migration[5.2]
+  def up
+    return if column_exists?(:editable_pages, :parsed_body)
+
+    add_column :editable_pages, :parsed_body, :text
+
+    EditablePage.pluck(:id).each do |id|
+      EditablePageBodyParserJob.perform_now(id)
+    end
+  end
+
+  def down
+    # No rollback needed
+  end
+end