biovision-base 0.19.180703.1 → 0.20.180731.0

data/config/routes.rb

@@ -1,30 +1,30 @@
 Rails.application.routes.draw do
-  resources :agents, :browsers, only: [:update, :destroy]
+  resources :agents, :browsers, only: %i[update destroy]
 
-  resources :editable_blocks, only: [:update, :destroy]
-  resources :editable_pages, only: [:update, :destroy]
-  resources :stored_values, only: [:update, :destroy]
+  resources :editable_blocks, only: %i[update destroy]
+  resources :editable_pages, only: %i[update destroy]
+  resources :stored_values, only: %i[update destroy]
 
-  resources :users, only: [:update, :destroy]
-  resources :tokens, :codes, only: [:update, :destroy]
+  resources :users, only: %i[update destroy]
+  resources :tokens, :codes, only: %i[update destroy]
 
-  resources :metrics, only: [:update]
+  resources :metrics, only: :update
 
-  resources :privileges, only: [:update, :destroy]
-  resources :privilege_groups, only: [:update, :destroy]
+  resources :privileges, only: %i[update destroy]
+  resources :privilege_groups, only: %i[update destroy]
 
-  resources :media_folders, only: [:update, :destroy]
-  resources :media_files, only: [:update, :destroy]
+  resources :media_folders, only: %i[update destroy]
+  resources :media_files, only: %i[update destroy]
 
-  resources :feedback_requests, only: [:destroy]
+  resources :feedback_requests, only: :destroy
 
-  resources :link_blocks, :link_block_items, only: [:update, :destroy] do
+  resources :link_blocks, :link_block_items, only: %i[update destroy] do
     collection do
       post 'check', defaults: { format: :json }
     end
   end
 
-  scope '(:locale)', constraints: { locale: /ru|en/ } do
+  scope '(:locale)', constraints: { locale: /ru|en|sv/ } do
     # Handling errors
     match '/400' => 'errors#bad_request', via: :all
     match '/401' => 'errors#unauthorized', via: :all
@@ -54,7 +54,7 @@ Rails.application.routes.draw do
     namespace :admin do
       get '/' => 'index#index'
 
-      resources :agents, :browsers, only: [:index, :show] do
+      resources :agents, :browsers, only: %i[index show] do
         member do
           post 'toggle', defaults: { format: :json }
           put 'lock', defaults: { format: :json }
@@ -62,32 +62,32 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :codes, only: [:index, :show]
-      resources :tokens, only: [:index, :show] do
+      resources :codes, only: %i[index show]
+      resources :tokens, only: %i[index show] do
         member do
           post 'toggle', defaults: { format: :json }
         end
       end
 
-      resources :editable_pages, only: [:index, :show] do
+      resources :editable_pages, only: %i[index show] do
         member do
           post 'priority', defaults: { format: :json }
         end
       end
-      resources :editable_blocks, only: [:index, :show] do
+      resources :editable_blocks, only: %i[index show] do
         member do
           post 'toggle', defaults: { format: :json }
         end
       end
-      resources :stored_values, only: [:index, :show]
+      resources :stored_values, only: %i[index show]
 
-      resources :metrics, only: [:index, :show] do
+      resources :metrics, only: %i[index show] do
         member do
           get 'data', defaults: { format: :json }
         end
       end
 
-      resources :privileges, only: [:index, :show] do
+      resources :privileges, only: %i[index show] do
         member do
           put 'lock', defaults: { format: :json }
           delete 'lock', action: :unlock, defaults: { format: :json }
@@ -97,14 +97,14 @@ Rails.application.routes.draw do
           get 'regions', defaults: { format: :json }
         end
       end
-      resources :privilege_groups, only: [:index, :show] do
+      resources :privilege_groups, only: %i[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
+      resources :users, only: %i[index show] do
         collection do
           get 'search', defaults: { format: :json }
         end
@@ -119,32 +119,32 @@ Rails.application.routes.draw do
         end
       end
 
-      resources :login_attempts, only: [:index]
+      resources :login_attempts, only: :index
 
-      resources :media_folders, only: [:index, :show] do
+      resources :media_folders, only: %i[index show] do
         member do
           get 'files'
         end
       end
-      resources :media_files, only: [:index, :show] do
+      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 :feedback_requests, only: [:index] do
+      resources :feedback_requests, only: :index do
         member do
           post 'toggle', defaults: { format: :json }
         end
       end
 
-      resources :link_blocks, only: [:index, :show] do
+      resources :link_blocks, only: %i[index show] do
         member do
           post 'toggle', defaults: { format: :json }
         end
       end
-      resources :link_block_items, only: [:show] do
+      resources :link_block_items, only: :show do
         member do
           post 'toggle', defaults: { format: :json }
           post 'priority', defaults: { format: :json }
@@ -155,54 +155,54 @@ Rails.application.routes.draw do
     namespace :my do
       get '/' => 'index#index'
 
-      resource :profile, except: [:destroy] do
+      resource :profile, except: :destroy do
         post 'check'
       end
-      resource :confirmation, :recovery, only: [:show, :create, :update]
-      resources :tokens, only: [:index] do
+      resource :confirmation, :recovery, only: %i[show create update]
+      resources :tokens, only: :index do
         member do
           post 'toggle', defaults: { format: :json }
         end
       end
-      resources :login_attempts, only: [:index]
+      resources :login_attempts, only: :index
     end
 
-    resources :agents, :browsers, except: [:index, :show, :update, :destroy]
+    resources :agents, :browsers, except: %i[index show update destroy]
 
-    resources :editable_pages, except: [:index, :show, :update, :destroy]
-    resources :editable_blocks, except: [:index, :show, :update, :destroy] do
+    resources :editable_pages, except: %i[index show update destroy]
+    resources :editable_blocks, except: %i[index show update destroy] do
       collection do
         post 'check', defaults: { format: :json }
       end
     end
-    resources :stored_values, except: [:index, :show, :update, :destroy]
+    resources :stored_values, except: %i[index show update destroy]
 
-    resources :link_blocks, :link_block_items, except: [:index, :show, :update, :destroy] do
+    resources :link_blocks, :link_block_items, except: %i[index show update destroy] do
       collection do
         post 'check', defaults: { format: :json }
       end
     end
 
-    resources :users, except: [:index, :show, :update, :destroy] do
+    resources :users, except: %i[index show update destroy] do
       collection do
         post 'check', defaults: { format: :json }
       end
     end
-    resources :tokens, :codes, except: [:index, :show, :update, :destroy]
+    resources :tokens, :codes, except: %i[index show update destroy]
 
-    resources :metrics, only: [:edit]
+    resources :metrics, only: :edit
 
-    resources :privileges, except: [:index, :show, :update, :destroy]
-    resources :privilege_groups, except: [:index, :show, :update, :destroy]
+    resources :privileges, except: %i[index show update destroy]
+    resources :privilege_groups, except: %i[index show update destroy]
 
-    resources :media_folders, except: [:index, :show, :update, :destroy]
-    resources :media_files, except: [:index, :show, :update, :destroy] do
+    resources :media_folders, except: %i[index show update destroy]
+    resources :media_files, except: %i[index show update destroy] do
       collection do
         post :ckeditor
       end
     end
 
-    resources :feedback_requests, only: [:create]
+    resources :feedback_requests, only: :create
 
     get ':editable_page_url' => 'fallback#show', constraints: { editable_page_url: /.+/ }
   end

data/db/migrate/20170228000000_create_languages.rb

@@ -5,6 +5,7 @@ class CreateLanguages < ActiveRecord::Migration[5.1]
         t.timestamps
         t.integer :users_count, default: 0, null: false
         t.integer :priority, limit: 2, default: 1, null: false
+        t.boolean :active, default: true, null: false
         t.string :slug, null: false
         t.string :code, null: false
       end

data/db/migrate/20170302000001_create_users.rb

@@ -36,6 +36,7 @@ class CreateUsers < ActiveRecord::Migration[5.1]
         t.string :image
         t.string :notice
         t.string :search_string
+        t.string :referral_link, index: true
         t.json :profile_data, default: {}, null: false
       end
 

data/db/migrate/20170320000000_create_editable_pages.rb

@@ -44,7 +44,7 @@ class CreateEditablePages < ActiveRecord::Migration[5.1]
           slug:     slug,
           name:     names[language.code.to_sym],
           language: language,
-          url:      url
+          url:      "/#{language.code}/#{url}"
         )
       end
     end

data/db/migrate/20180722222222_add_active_to_languages.rb

@@ -0,0 +1,11 @@
+class AddActiveToLanguages < ActiveRecord::Migration[5.2]
+  def up
+    unless column_exists?(:languages, :active)
+      add_column :languages, :active, :boolean
+    end
+  end
+
+  def down
+    # No rollback needed
+  end
+end

data/db/migrate/20180725111111_add_referral_link_to_users.rb

@@ -0,0 +1,22 @@
+class AddReferralLinkToUsers < ActiveRecord::Migration[5.2]
+  def up
+    unless column_exists?(:users, :referral_link)
+      add_column :users, :referral_link, :string, index: true
+
+      seed_links
+    end
+  end
+
+  def down
+    # No need to rollback
+  end
+
+  private
+
+  def seed_links
+    User.order('id asc').each do |user|
+      next unless user.referral_link.blank?
+      user.update(referral_link: SecureRandom.alphanumeric(12))
+    end
+  end
+end

data/lib/biovision/base/base_methods.rb

@@ -8,7 +8,7 @@ module Biovision
 
         helper_method :current_page, :param_from_request
         helper_method :current_user, :current_language
-        helper_method :agent
+        helper_method :agent, :visitor_slug
       end
 
       # Get current page number from request
@@ -48,6 +48,15 @@ module Biovision
         @agent ||= Agent.named(request.user_agent || 'n/a')
       end
 
+      # @return [String]
+      def visitor_slug
+        if current_user.nil?
+          "#{request.env['HTTP_X_REAL_IP'] || request.remote_ip}:#{agent.id}"
+        else
+          current_user.id
+        end
+      end
+
       def set_locale
         I18n.locale = params[:locale] || I18n.default_locale
       end

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.19.180703.1'
+    VERSION = '0.20.180731.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.19.180703.1
+  version: 0.20.180731.0
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-03 00:00:00.000000000 Z
+date: 2018-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -569,10 +569,8 @@ files:
 - app/views/shared/admin/_toggleable.html.erb
 - app/views/shared/editable_pages/_body.html.erb
 - app/views/shared/filter/_flag.html.erb
-- app/views/shared/forms/_default_ajax_handler.html.erb
 - app/views/shared/forms/_entity_flags.html.erb
 - app/views/shared/forms/_image_remover.html.erb
-- app/views/shared/forms/_list_of_errors.js.erb
 - app/views/shared/forms/_wysiwyg.html.erb
 - app/views/shared/forms/check.jbuilder
 - app/views/shared/forms/errors.js.erb
@@ -592,17 +590,26 @@ files:
 - config/initializers/pluralization.rb
 - config/locales/common-en.yml
 - config/locales/common-ru.yml
+- config/locales/common-sv.yml
 - config/locales/editable-pages-en.yml
 - config/locales/editable-pages-ru.yml
+- config/locales/editable-pages-sv.yml
 - config/locales/feedback-en.yml
 - config/locales/feedback-ru.yml
+- config/locales/feedback-sv.yml
+- config/locales/links-en.yml
 - config/locales/links-ru.yml
+- config/locales/links-sv.yml
 - config/locales/media-en.yml
 - config/locales/media-ru.yml
+- config/locales/media-sv.yml
 - config/locales/plurals.rb
+- config/locales/track-en.yml
 - config/locales/track-ru.yml
+- config/locales/track-sv.yml
 - config/locales/users-en.yml
 - config/locales/users-ru.yml
+- config/locales/users-sv.yml
 - config/routes.rb
 - db/migrate/20170228000000_create_languages.rb
 - db/migrate/20170301000001_create_metrics.rb
@@ -637,6 +644,8 @@ files:
 - db/migrate/20180622140001_create_link_block_items.rb
 - db/migrate/20180627190000_create_editable_blocks.rb
 - db/migrate/20180703111111_add_fields_to_editable_blocks.rb
+- db/migrate/20180722222222_add_active_to_languages.rb
+- db/migrate/20180725111111_add_referral_link_to_users.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb

data/app/views/shared/forms/_default_ajax_handler.html.erb

@@ -1,15 +0,0 @@
-<!--
-<script>
-    'use strict';
-    document.addEventListener('DOMContentLoaded', function () {
-        const form = document.getElementById('<%= form_id %>');
-        const button = form.querySelector('button[type=submit]');
-        form.addEventListener('ajax:before', function() {
-            button.disabled = true;
-        });
-        form.addEventListener('ajax:complete', function() {
-            button.disabled = false;
-        });
-    });
-</script>
--->

data/app/views/shared/forms/_list_of_errors.js.erb

@@ -1,21 +0,0 @@
-{
-    const form = document.getElementById('<%= form_id %>');
-
-    let errors = form.querySelector('ol.errors');
-    let data = '';
-
-    if (!errors) {
-        errors = document.createElement('ol');
-        errors.classList.add('errors');
-    }
-
-    <% entity.errors.full_messages.each do |message| %>
-    data += '<li><%= j message %></li>';
-    <% end %>
-
-    errors.innerHTML = data;
-
-    form.prepend(errors);
-
-    errors.scrollIntoView();
-}