biovision-base 0.14.180326 → 0.15.180415

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1353161eefdcb8571b2b56a451e83333d79bf82583127c2d561e9ffdb1859953
-  data.tar.gz: 42f4e3dcab70faf1e77dc46ff68a2c248d7952c434eb85ee66228e5ad5092168
+  metadata.gz: b32ca23796647159d2a821d53b9b83ece30a748e846c666b55aa8d24579c8fc7
+  data.tar.gz: f00de9e1ea2772e8863b66f96f1fea59c0d5675f0062dd87ce015eba7b3bfa0f
 SHA512:
-  metadata.gz: c4242e909f0fdf4760ce0e131469cb8a92b976e02bb731166ace8a28b48ad30e6927c04118274374f694c2d43da3770dba23f7edccaedcd8a102a3e03375e37e
-  data.tar.gz: 43f83f5678b7705c21a54a548d19a0bcddca133f57d53a910b29e701d6b734e876344fd7c2a41d1186ea899f88952d8e70b190b7347d27216c3920c032ca6687
+  metadata.gz: 5ebdb6a0c58f56706b1b93fdaa2fe23e17f801c53aca06bd018e5e1b2fcff96eafd8aa3e0a99dfc4c16f00d522c44e2ff6432df42843278becff5920ce3adf84
+  data.tar.gz: 7af837c64015a5694ed8b917b7b1ee9e8579c1943318ffdae4d3f73a797d7ca61bcb653f27181b07c1359adbfea1a374da1f18a4165a067e17018c879dd2f75d

data/app/assets/javascripts/biovision/base/biovision-sliders.js

@@ -43,9 +43,30 @@ Biovision.sliders = {
             Biovision.sliders.behavior[type].left(list, delay);
         };
 
+        const handle_gesture = function () {
+            const x0 = Biovision.sliders.touch_state.x0;
+            const x1 = Biovision.sliders.touch_state.x1;
+
+            if (x0 < x1) {
+                slide_left();
+            } else if (x0 > x1) {
+                slide_right();
+            }
+        };
+
         slider.querySelector('button.prev').addEventListener('click', slide_left);
         slider.querySelector('button.next').addEventListener('click', slide_right);
-    }
+        slider.addEventListener('touchstart', function (event) {
+            Biovision.sliders.touch_state.x0 = event.changedTouches[0].pageX;
+            Biovision.sliders.touch_state.y0 = event.changedTouches[0].pageY;
+        }, false);
+        slider.addEventListener('touchend', function (event) {
+            Biovision.sliders.touch_state.x1 = event.changedTouches[0].pageX;
+            Biovision.sliders.touch_state.y1 = event.changedTouches[0].pageY;
+            handle_gesture();
+        }, false);
+    },
+    touch_state: {x0: 0, y0: 0, x1: 0, y1: 0}
 };
 
 document.addEventListener('DOMContentLoaded', function () {

data/app/assets/javascripts/biovision/base/biovision.js

@@ -205,7 +205,7 @@ const Biovision = {
             element.addEventListener('blur', perform_check);
         });
     },
-    show_list_of_errors: function(entity_name, list) {
+    show_list_of_errors: function (entity_name, list) {
         const form = document.getElementById(entity_name + '-form');
         if (form) {
             let errors = form.querySelector('ol.errors');
@@ -471,6 +471,32 @@ function handle_ajax_failure(response) {
     }
 }
 
+/**
+ * Workaround for defective Safari behaviour with empty files
+ * @see https://github.com/rails/rails/issues/32440
+ */
+document.addEventListener('ajax:beforeSend', function (e) {
+    const formData = e.detail[1].data;
+
+    if (!(formData instanceof window.FormData) || !formData.keys) {
+        return;
+    }
+
+    const newFormData = new window.FormData();
+
+    Array.from(formData.entries()).forEach(function (entry) {
+        const value = entry[1];
+
+        if (value instanceof window.File && value.name === '' && value.size === 0) {
+            newFormData.append(entry[0], new window.Blob([]), '');
+        } else {
+            newFormData.append(entry[0], value);
+        }
+    });
+
+    e.detail[1].data = newFormData
+});
+
 /*
  *************
  * Polyfills *

data/app/assets/stylesheets/biovision/base/biovision.scss

@@ -11,7 +11,12 @@ html {
   -ms-text-size-adjust: none;
 }
 
-h1, h2, h3, h4, h6, h6 {
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
   font-family: $font-family-heading;
   font-weight: 500;
   margin: 0;

data/app/controllers/about_controller.rb

@@ -1,14 +1,21 @@
 class AboutController < ApplicationController
   # get /about
   def index
-    @editable_page = EditablePage.find_by(slug: 'about')
+    @editable_page = EditablePage.find_localized('about', locale)
 
     render :editable
   end
 
   # get /tos
   def tos
-    @editable_page = EditablePage.find_by(slug: 'tos')
+    @editable_page = EditablePage.find_localized('tos', locale)
+
+    render :editable
+  end
+
+  # get /privacy
+  def privacy
+    @editable_page = EditablePage.find_localized('privacy', locale)
 
     render :editable
   end

data/app/controllers/my/profiles_controller.rb

@@ -6,7 +6,7 @@ class My::ProfilesController < ApplicationController
 
   # get /my/profile/new
   def new
-    @user = User.new
+    @entity = User.new
   end
 
   # post /my/profile
@@ -28,9 +28,10 @@ class My::ProfilesController < ApplicationController
 
   # patch /my/profile
   def update
-    if current_user.update(user_parameters)
+    @entity = current_user
+    if @entity.update(user_parameters)
       flash[:notice] = t('my.profiles.update.success')
-      form_processed_ok(my_profile_path)
+      form_processed_ok(my_path)
     else
       form_processed_with_error(:edit)
     end
@@ -43,10 +44,10 @@ class My::ProfilesController < ApplicationController
   end
 
   def create_user
-    @user = User.new creation_parameters
-    if @user.save
+    @entity = User.new creation_parameters
+    if @entity.save
       Metric.register(User::METRIC_REGISTRATION)
-      create_token_for_user(@user)
+      create_token_for_user(@entity)
       redirect_after_creation
     else
       form_processed_with_error(:new)

data/app/controllers/users_controller.rb

@@ -11,7 +11,7 @@ class UsersController < ApplicationController
 
   # get /users/new
   def new
-    @entity = User.new
+    @entity = User.new(consent: true)
   end
 
   # post /users
@@ -64,7 +64,7 @@ class UsersController < ApplicationController
   end
 
   def creation_parameters
-    entity_parameters.merge(tracking_for_entity)
+    entity_parameters.merge(tracking_for_entity).merge(consent: true)
   end
 
   def profile_parameters

data/app/models/user.rb

@@ -39,6 +39,7 @@ class User < ApplicationRecord
   before_save :normalize_slug
   before_save :prepare_search_string
 
+  validates_acceptance_of :consent
   validates_presence_of :screen_name, :email
   validates_format_of :screen_name, with: SCREEN_NAME_PATTERN, if: :native_slug?
   validates_format_of :email, with: EMAIL_PATTERN
@@ -66,7 +67,7 @@ class User < ApplicationRecord
   end
 
   def self.profile_parameters
-    %i(image allow_mail birthday)
+    %i(image allow_mail birthday consent)
   end
 
   def self.sensitive_parameters

data/app/views/admin/index/_biovision_base.html.erb

@@ -4,5 +4,6 @@
 <%= render 'admin/index/dashboard/biovision_user' %>
 <%= render 'admin/index/dashboard/editorial' %>
 <%= render 'admin/index/dashboard/biovision_post' if Gem.loaded_specs.key?('biovision-post') %>
+<%= render 'admin/index/dashboard/biovision_poll' if Gem.loaded_specs.key?('biovision-poll') %>
 <%= render 'admin/index/dashboard/biovision_courses' if Gem.loaded_specs.key?('biovision-courses') %>
 <%= render 'admin/index/dashboard/biovision_feedback' %>

data/app/views/admin/privileges/entity/_in_list.html.erb

@@ -12,7 +12,7 @@
 
   <ul class="actions">
     <li class="lockable <%= entity.locked? ? 'hidden' : '' %>">
-      <%= edit_icon(edit_privilege_path(entity.id)) %>
+      <%= edit_icon(edit_privilege_path(id: entity.id)) %>
     </li>
     <%= render partial: 'shared/actions/priority_changer', locals: { path: priority_admin_privilege_path(id: entity.id) } %>
     <%= render partial: 'shared/actions/locks', locals: { entity: entity, path: lock_admin_privilege_path(id: entity.id) } %>

data/app/views/editable_pages/_form.html.erb

@@ -1,4 +1,5 @@
-<%= form_with(model: entity, html: { id: "#{entity.class.to_s.underscore}-form" }) do |f| %>
+<% entity_name = entity.class.to_s.underscore %>
+<%= form_with(model: entity, html: { id: "#{entity_name}-form" }) do |f| %>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>
 
   <dl>
@@ -21,7 +22,7 @@
 
     <dt><%= f.label :image %></dt>
     <dd>
-      <figure class="preview" role="group" id="editable_page-image">
+      <figure class="preview" role="group" id="<%= entity_name %>-image">
         <% if entity.image.blank? %>
           <%= f.label :image, image_tag('biovision/base/placeholders/image.svg') %>
         <% else %>
@@ -31,9 +32,9 @@
           <%=
             f.file_field(
                 :image,
-                id:     :editable_page_image,
+                id:     "#{entity_name}_image",
                 accept: 'image/jpeg,image/png',
-                data:   { image: 'editable_page-image' }
+                data:   { image: "#{entity_name}-image" }
             )
           %>
         </figcaption>

data/app/views/my/confirmations/show.html.erb

@@ -1,6 +1,6 @@
 <% content_for :meta_title, t('.title') %>
 
-<article class="my-confirmation">
+<article class="profile-content my-confirmation">
   <h1><%= t('.title') %></h1>
   <% if current_user&.email_confirmed? %>
       <div class="message-box-notice"><%= t('activerecord.attributes.user.email_confirmed') %></div>

data/app/views/my/index/index.html.erb

@@ -3,7 +3,7 @@
   <span><%= t('.heading') %></span>
 <% end %>
 
-<article id="my-index">
+<article id="my-index" class="profile-content">
   <div class="sidebar dashboard">
     <%= render 'my/index/index/sidebar' %>
   </div>

data/app/views/my/index/index/_sidebar.html.erb

@@ -3,6 +3,8 @@
     <li><%= render 'my/profiles/nav_item' %></li>
     <li><%= render 'my/tokens/nav_item' %></li>
     <li><%= render 'my/login_attempts/nav_item' %></li>
+    <%= render 'my/index/sidebar/biovision_courses' if Gem.loaded_specs.key?('biovision-courses') %>
+    <%= render 'my/index/index/custom_sidebar' %>
     <% if UserPrivilege.user_has_any_privilege?(current_user) %>
       <li><%= link_to t('admin.index.index.heading'), admin_path %></li>
     <% end %>

data/app/views/my/login_attempts/index.html.erb

@@ -4,7 +4,7 @@
     <span><%= t('my.login_attempts.nav_item.text') %></span>
 <% end %>
 
-<article>
+<article class="profile-content">
   <h1><%= t('.heading') %></h1>
 
   <%= paginate @collection %>

data/app/views/my/profiles/edit/_form.html.erb

@@ -3,7 +3,7 @@
       url: my_profile_path,
       method: :patch,
       multipart: true,
-      id: 'my-profile-form'
+      id: 'user-form'
   ) do
 %>
   <%= render partial: 'shared/list_of_errors', locals: { entity: entity } %>

data/app/views/my/profiles/new.html.erb

@@ -3,5 +3,5 @@
 <article class="my-profile-new">
   <h1><%= t('.heading') %></h1>
 
-  <%= render partial: 'my/profiles/new/form', locals: { entity: @user } %>
+  <%= render partial: 'my/profiles/new/form', locals: { entity: @entity } %>
 </article>

data/app/views/my/profiles/new/_form.html.erb

@@ -4,7 +4,7 @@
       scope: 'user',
       url:   my_profile_path,
       class: 'new-my-profile',
-      id:    'new-profile-form',
+      id:    'user-form',
       data:  { check_url: check_users_path }
   ) do |f|
 %>

data/app/views/my/tokens/index.html.erb

@@ -4,7 +4,7 @@
     <span><%= t('my.tokens.nav_item.text') %></span>
 <% end %>
 
-<article>
+<article class="profile-content">
   <h1><%= t('.heading') %></h1>
 
   <%= paginate @collection %>

data/app/views/users/_form.html.erb

@@ -142,6 +142,7 @@
   </dl>
 
   <div class="buttons">
+    <%= f.hidden_field :consent if entity.id.nil? %>
     <%= f.button t(:save), type: :submit, class: 'button-save' %>
   </div>
 <% end %>

data/config/locales/users-en.yml

@@ -51,6 +51,7 @@ en:
         allow_mail: "Allow email notifications"
         birthday: "Birthday"
         bot: "It is bot"
+        consent: "Consent for processing of personal data and acceptance of terms of service"
         email: "Email"
         email_confirmed: "Email is confirmed"
         foreign_slug: "Foreign slug"

data/config/locales/users-ru.yml

@@ -51,6 +51,7 @@ ru:
         allow_mail: "Разрешить email-уведомления"
         birthday: "Дата рождения"
         bot: "Это бот"
+        consent: "Согласие на обработку персональных данных и принятие пользовательского соглашения"
         email: "Email"
         email_confirmed: "Email подтверждён"
         foreign_slug: "Идентификатор пришёл извне"

data/config/routes.rb

@@ -36,6 +36,7 @@ Rails.application.routes.draw do
     controller :about do
       get 'about' => :index
       get 'tos' => :tos
+      get 'privacy' => :privacy
     end
 
     scope 'u/:slug', controller: :profiles, constraints: { slug: /[^\/]+/ } do

data/db/migrate/20170302000001_create_users.rb

@@ -25,6 +25,7 @@ class CreateUsers < ActiveRecord::Migration[5.1]
         t.boolean :phone_confirmed, default: false, null: false
         t.boolean :allow_mail, default: true, null: false
         t.boolean :foreign_slug, default: false, null: false
+        t.boolean :consent, default: false, null: false
         t.datetime :last_seen
         t.date :birthday
         t.string :slug, null: false

data/db/migrate/20170320000000_create_editable_pages.rb

@@ -20,6 +20,7 @@ class CreateEditablePages < ActiveRecord::Migration[5.1]
         index: { ru: 'Главная страница', en: 'Main page' },
         about: { ru: 'О проекте', en: 'About' },
         tos: { ru: 'Пользовательское соглашение', en: 'Terms of service' },
+        privacy: { ru: 'Соглашение о конфиденциальности', en: 'Privacy' }
       }
 
       pages.each do |slug, names|

data/db/migrate/20180405000000_add_consent_to_users.rb

@@ -0,0 +1,13 @@
+class AddConsentToUsers < ActiveRecord::Migration[5.1]
+  def up
+    unless column_exists? :users, :consent
+      add_column :users, :consent, :boolean, default: false, null: false
+
+      User.all.each { |user| user.update! consent: true }
+    end
+  end
+
+  def down
+    #   No rollback needed
+  end
+end

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.14.180326'
+    VERSION = '0.15.180415'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.14.180326
+  version: 0.15.180415
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-26 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -140,16 +140,16 @@ dependencies:
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -474,6 +474,7 @@ files:
 - app/views/metrics/show.jbuilder
 - app/views/my/confirmations/show.html.erb
 - app/views/my/index/index.html.erb
+- app/views/my/index/index/_custom_sidebar.html.erb
 - app/views/my/index/index/_dashboard.html.erb
 - app/views/my/index/index/_sidebar.html.erb
 - app/views/my/login_attempts/_list.html.erb
@@ -484,11 +485,9 @@ files:
 - app/views/my/login_attempts/index.jbuilder
 - app/views/my/profiles/_nav_item.html.erb
 - app/views/my/profiles/edit.html.erb
-- app/views/my/profiles/edit.js.erb
 - app/views/my/profiles/edit/_form.html.erb
 - app/views/my/profiles/edit/form/_profile_data.html.erb
 - app/views/my/profiles/new.html.erb
-- app/views/my/profiles/new.js.erb
 - app/views/my/profiles/new/_form.html.erb
 - app/views/my/profiles/show.html.erb
 - app/views/my/recoveries/show.html.erb
@@ -579,6 +578,7 @@ files:
 - db/migrate/20180117151515_add_language_to_models.rb
 - db/migrate/20180117160000_create_user_languages.rb
 - db/migrate/20180321000000_add_profile_data_to_users.rb
+- db/migrate/20180405000000_add_consent_to_users.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb
@@ -610,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Base components for Biovision applications

data/app/views/my/profiles/edit.js.erb

@@ -1 +0,0 @@
-<%= render partial: 'shared/forms/list_of_errors', locals: { entity: current_user, form_id: 'my-profile-form' } %>

data/app/views/my/profiles/new.js.erb

@@ -1 +0,0 @@
-<%= render partial: 'shared/forms/list_of_errors', locals: { entity: @user, form_id: 'new-profile-form' } %>