biovision-base 0.8.171029 → 0.9.171227

data/db/migrate/20171223333333_amend_foreign_keys.rb

@@ -0,0 +1,72 @@
+class AmendForeignKeys < ActiveRecord::Migration[5.1]
+  def up
+    correct_data = {
+      metric_values:              {
+        metrics: { on_update: :cascade, on_delete: :cascade }
+      },
+      agents:                     {
+        browsers: { on_update: :cascade, on_delete: :cascade }
+      },
+      users:                      {
+        regions: { on_update: :cascade, on_delete: :nullify },
+        agents:  { on_update: :cascade, on_delete: :nullify }
+      },
+      user_profiles:              {
+        users: { on_update: :cascade, on_delete: :cascade }
+      },
+      tokens:                     {
+        users:  { on_update: :cascade, on_delete: :cascade },
+        agents: { on_update: :cascade, on_delete: :nullify }
+      },
+      codes:                      {
+        code_types: { on_update: :cascade, on_delete: :cascade },
+        users:      { on_update: :cascade, on_delete: :cascade },
+        agents:     { on_update: :cascade, on_delete: :nullify }
+      },
+      user_privileges:            {
+        regions:    { on_update: :cascade, on_delete: :cascade },
+        users:      { on_update: :cascade, on_delete: :cascade },
+        privileges: { on_update: :cascade, on_delete: :cascade }
+      },
+      privilege_group_privileges: {
+        privilege_groups: { on_update: :cascade, on_delete: :cascade },
+        privileges:       { on_update: :cascade, on_delete: :cascade }
+      },
+      foreign_users:              {
+        foreign_sites: { on_update: :cascade, on_delete: :cascade },
+        users:         { on_update: :cascade, on_delete: :cascade },
+        agents:        { on_update: :cascade, on_delete: :nullify }
+      },
+      login_attempts:             {
+        users:  { on_update: :cascade, on_delete: :cascade },
+        agents: { on_update: :cascade, on_delete: :nullify }
+      },
+      media_folders:              {
+        users:  { on_update: :cascade, on_delete: :nullify },
+        agents: { on_update: :cascade, on_delete: :nullify }
+      },
+      media_files:                {
+        media_folders: { on_update: :cascade, on_delete: :nullify },
+        users:         { on_update: :cascade, on_delete: :nullify },
+        agents:        { on_update: :cascade, on_delete: :nullify }
+      },
+      feedback_requests:          {
+        agents: { on_update: :cascade, on_delete: :nullify }
+      }
+    }
+
+    correct_data.each do |table_name, links|
+      foreign_keys(table_name).each do |current_key|
+        reference = current_key.to_table.to_sym
+        next unless links.key?(reference)
+        next unless current_key.options[:on_delete].nil?
+        remove_foreign_key(table_name, reference)
+        add_foreign_key(table_name, reference, links[reference])
+      end
+    end
+  end
+
+  def down
+    # keys should remain correct
+  end
+end

data/lib/biovision/base/base_methods.rb

@@ -62,7 +62,7 @@ module Biovision
       # @param [String] metric
       # @param [String|Symbol] view
       # @param [Symbol] status
-      def handle_http_error(message, metric, view, status)
+      def handle_http_error(message, metric, view = :error, status = 500)
         logger.warn "#{message}\n\t#{request.method} #{request.original_url}"
         Metric.register(metric)
         render view, status: status

data/lib/biovision/base/engine.rb

@@ -16,7 +16,7 @@ module Biovision
 
       config.generators do |g|
         g.test_framework :rspec
-        g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+        g.fixture_replacement :factory_bot, :dir => 'spec/factories'
       end
     end
 

data/lib/biovision/base/version.rb

@@ -1,5 +1,5 @@
 module Biovision
   module Base
-    VERSION = '0.8.171029'
+    VERSION = '0.9.171227'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: biovision-base
 version: !ruby/object:Gem::Version
-  version: 0.8.171029
+  version: 0.9.171227
 platform: ruby
 authors:
 - Maxim Khan-Magomedov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,63 +53,63 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: mini_magick
+  name: carrierwave-bombshelter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: carrierwave-bombshelter
+  name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_bot_rails
+  name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -178,6 +178,8 @@ files:
 - app/assets/config/biovision_base_manifest.js
 - app/assets/images/biovision/base/icons/alert.svg
 - app/assets/images/biovision/base/icons/back.svg
+- app/assets/images/biovision/base/icons/breadcrumb-hover.svg
+- app/assets/images/biovision/base/icons/breadcrumb.svg
 - app/assets/images/biovision/base/icons/create.svg
 - app/assets/images/biovision/base/icons/destroy.svg
 - app/assets/images/biovision/base/icons/edit.svg
@@ -190,10 +192,12 @@ files:
 - app/assets/images/biovision/base/icons/return.svg
 - app/assets/images/biovision/base/icons/warning.svg
 - app/assets/images/biovision/base/icons/world.svg
+- app/assets/images/biovision/base/placeholders/file.svg
 - app/assets/images/biovision/base/placeholders/image.svg
 - app/assets/images/biovision/base/placeholders/photo.svg
 - app/assets/images/biovision/base/placeholders/region_image.svg
 - app/assets/images/biovision/base/placeholders/user.svg
+- app/assets/javascripts/biovision/base/biovision-sliders.js
 - app/assets/javascripts/biovision/base/biovision.js
 - app/assets/stylesheets/biovision/base/admin.scss
 - app/assets/stylesheets/biovision/base/biovision.scss
@@ -215,8 +219,11 @@ files:
 - app/controllers/admin/browsers_controller.rb
 - app/controllers/admin/codes_controller.rb
 - app/controllers/admin/editable_pages_controller.rb
+- app/controllers/admin/feedback_requests_controller.rb
 - app/controllers/admin/index_controller.rb
 - app/controllers/admin/login_attempts_controller.rb
+- app/controllers/admin/media_files_controller.rb
+- app/controllers/admin/media_folders_controller.rb
 - app/controllers/admin/metrics_controller.rb
 - app/controllers/admin/privilege_groups_controller.rb
 - app/controllers/admin/privileges_controller.rb
@@ -234,7 +241,11 @@ files:
 - app/controllers/concerns/lockable_entity.rb
 - app/controllers/concerns/toggleable_entity.rb
 - app/controllers/editable_pages_controller.rb
+- app/controllers/errors_controller.rb
+- app/controllers/feedback_requests_controller.rb
 - app/controllers/index_controller.rb
+- app/controllers/media_files_controller.rb
+- app/controllers/media_folders_controller.rb
 - app/controllers/metrics_controller.rb
 - app/controllers/my/confirmations_controller.rb
 - app/controllers/my/index_controller.rb
@@ -254,6 +265,7 @@ files:
 - app/helpers/biovision_users_helper.rb
 - app/helpers/codes_helper.rb
 - app/helpers/editable_pages_helper.rb
+- app/helpers/media_helper.rb
 - app/helpers/privileges_helper.rb
 - app/helpers/stored_values_helper.rb
 - app/helpers/tracking_helper.rb
@@ -261,6 +273,7 @@ files:
 - app/jobs/clean_tokens_job.rb
 - app/mailers/application_mailer.rb
 - app/mailers/code_sender.rb
+- app/mailers/feedback_mailer.rb
 - app/mailers/user_mailer.rb
 - app/models/agent.rb
 - app/models/application_record.rb
@@ -273,9 +286,12 @@ files:
 - app/models/concerns/required_unique_slug.rb
 - app/models/concerns/toggleable.rb
 - app/models/editable_page.rb
+- app/models/feedback_request.rb
 - app/models/foreign_site.rb
 - app/models/foreign_user.rb
 - app/models/login_attempt.rb
+- app/models/media_file.rb
+- app/models/media_folder.rb
 - app/models/metric.rb
 - app/models/metric_value.rb
 - app/models/privilege.rb
@@ -297,6 +313,8 @@ files:
 - app/uploaders/avatar_uploader.rb
 - app/uploaders/editable_page_image_uploader.rb
 - app/uploaders/header_image_uploader.rb
+- app/uploaders/media_file_uploader.rb
+- app/uploaders/media_snapshot_uploader.rb
 - app/uploaders/region_image_uploader.rb
 - app/views/about/editable.html.erb
 - app/views/admin/agents/_filter.html.erb
@@ -322,6 +340,17 @@ files:
 - app/views/admin/editable_pages/entity/_in_list.html.erb
 - app/views/admin/editable_pages/index.html.erb
 - app/views/admin/editable_pages/show.html.erb
+- app/views/admin/feedback_requests/_nav_item.html.erb
+- app/views/admin/feedback_requests/entity/_in_list.html.erb
+- app/views/admin/feedback_requests/index.html.erb
+- app/views/admin/index/_biovision_base.html.erb
+- app/views/admin/index/_custom_dashboard.html.erb
+- app/views/admin/index/dashboard/_biovision_feedback.html.erb
+- app/views/admin/index/dashboard/_biovision_region.html.erb
+- app/views/admin/index/dashboard/_biovision_track.html.erb
+- app/views/admin/index/dashboard/_biovision_user.html.erb
+- app/views/admin/index/dashboard/_editorial.html.erb
+- app/views/admin/index/dashboard/_settings.html.erb
 - app/views/admin/index/index.html.erb
 - app/views/admin/login_attempts/_nav_item.html.erb
 - app/views/admin/login_attempts/entity/_in_list.html.erb
@@ -329,6 +358,15 @@ files:
 - app/views/admin/login_attempts/included/_users.jbuilder
 - app/views/admin/login_attempts/index.html.erb
 - app/views/admin/login_attempts/index.jbuilder
+- app/views/admin/media_files/_nav_item.html.erb
+- app/views/admin/media_files/entity/_in_list.html.erb
+- app/views/admin/media_files/index.html.erb
+- app/views/admin/media_files/show.html.erb
+- app/views/admin/media_folders/_nav_item.html.erb
+- app/views/admin/media_folders/entity/_in_list.html.erb
+- app/views/admin/media_folders/files.html.erb
+- app/views/admin/media_folders/index.html.erb
+- app/views/admin/media_folders/show.html.erb
 - app/views/admin/metrics/_list.html.erb
 - app/views/admin/metrics/_nav_item.html.erb
 - app/views/admin/metrics/data.jbuilder
@@ -386,6 +424,7 @@ files:
 - app/views/agents/index.jbuilder
 - app/views/agents/new.html.erb
 - app/views/agents/show.jbuilder
+- app/views/application/error.html.erb
 - app/views/application/not_found.html.erb
 - app/views/application/not_found.jbuilder
 - app/views/application/service_unavailable.html.erb
@@ -405,8 +444,14 @@ files:
 - 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/entity/_metadata.html.erb
 - app/views/editable_pages/form/_ckeditor.html.erb
 - app/views/editable_pages/new.html.erb
+- app/views/errors/error.html.erb
+- app/views/feedback_mailer/new_feedback_request.html.erb
+- app/views/feedback_mailer/new_feedback_request.text.erb
+- app/views/feedback_requests/_form.html.erb
+- app/views/feedback_requests/create.js.erb
 - app/views/index/index.html.erb
 - app/views/layouts/admin.html.erb
 - app/views/layouts/admin/_footer.html.erb
@@ -421,6 +466,17 @@ files:
 - app/views/layouts/application/header/authentication/_plate.html.erb
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
+- app/views/media_files/_form.html.erb
+- app/views/media_files/ckeditor.html.erb
+- app/views/media_files/edit.html.erb
+- app/views/media_files/edit.js.erb
+- app/views/media_files/new.html.erb
+- app/views/media_files/new.js.erb
+- app/views/media_folders/_form.html.erb
+- app/views/media_folders/edit.html.erb
+- app/views/media_folders/edit.js.erb
+- app/views/media_folders/new.html.erb
+- app/views/media_folders/new.js.erb
 - app/views/metrics/_form.html.erb
 - app/views/metrics/edit.html.erb
 - app/views/metrics/index.jbuilder
@@ -469,8 +525,11 @@ files:
 - 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/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/_list_of_errors.js.erb
 - app/views/stored_values/_form.html.erb
 - app/views/stored_values/edit.html.erb
 - app/views/stored_values/new.html.erb
@@ -483,8 +542,12 @@ files:
 - app/views/users/new.html.erb
 - config/initializers/carrierwave.rb
 - config/initializers/pluralization.rb
+- config/locales/common-en.yml
 - config/locales/common-ru.yml
 - config/locales/editable-pages-ru.yml
+- config/locales/feedback-en.yml
+- config/locales/feedback-ru.yml
+- config/locales/media-ru.yml
 - config/locales/plurals.rb
 - config/locales/regions-ru.yml
 - config/locales/track-ru.yml
@@ -510,6 +573,11 @@ files:
 - db/migrate/20170629120000_create_login_attempts.rb
 - db/migrate/20170823000001_create_stored_values.rb
 - db/migrate/20171025222222_add_new_fields_171026.rb
+- db/migrate/20171202000000_create_media_folders.rb
+- db/migrate/20171202000001_create_media_files.rb
+- db/migrate/20171211000000_create_feedback_requests.rb
+- db/migrate/20171217222222_add_fields_to_feedback_requests.rb
+- db/migrate/20171223333333_amend_foreign_keys.rb
 - lib/biovision/base.rb
 - lib/biovision/base/base_methods.rb
 - lib/biovision/base/engine.rb
@@ -542,7 +610,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Base components for Biovision applications