rocket_cms 0.30.0 → 0.33.1

data/lib/generators/rocket_cms/templates/package.json

@@ -5,6 +5,9 @@
   "private": true,
   "repository": "git@rscz.ru:rocket-science/<%= app_name.downcase %>.git",
   "dependencies": {
+    "@rails/actioncable": "^6.0.0",
+    "@rails/ujs": "^6.0.0",
+    "turbolinks": "^5.2.0",
     "@babel/core": "^7.0.0",
     "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-function-bind": "^7.0.0",

data/lib/generators/rocket_cms/templates/webpack.config.js

@@ -8,7 +8,7 @@ var autoprefixer = require('autoprefixer');
 var CompressionPlugin = require("compression-webpack-plugin");
 
 var host = process.env.HOST || 'localhost'
-var devServerPort = 3808;
+var devServerPort = <%= port %>;
 
 var production = process.env.NODE_ENV === 'production';
 
@@ -55,7 +55,7 @@ var config = {
               {
                 loader: ExtractCssChunks.loader,
                 options: {
-                  hot: production ? false : true,
+                  hmr: production ? false : true,
                   // Force reload all
                   //reloadAll: true,
                 }

data/lib/generators/rocket_cms/templates/webpack/application.es6

@@ -1,30 +1,21 @@
 import './fonts';
 import './layout';
 
-import Errors from 'errors';
-import 'flash';
-
-var errors = new Errors()
-document.addEventListener("DOMContentLoaded", function(event) {
-  errors.checkCookie();
-});
-
 import Turbolinks from "turbolinks";
 Turbolinks.start()
 
-import Rails from 'rails-ujs';
+import Rails from '@rails/ujs';
 Rails.start();
 
-import axios from 'axios';
-
-import "./blocks";
+import "./components";
 import "./pages";
 
-import "analytics"
+//import "analytics"
 //import goal from "analytics"
 
-document.addEventListener("turbolinks:load", function() {
-  axios.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content');
-  axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
-});
+//import axios from 'axios';
+//document.addEventListener("turbolinks:load", function() {
+  //axios.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content');
+  //axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
+//});
 

data/lib/generators/rocket_cms/templates/webpack/components/footer/index.sass

@@ -0,0 +1,2 @@
+.footer
+

data/lib/generators/rocket_cms/templates/webpack/components/header/index.sass

@@ -0,0 +1 @@
+.header

data/lib/generators/rocket_cms/templates/webpack/{blocks → components}/index.es6

@@ -1,4 +1,4 @@
-// import your blocks here
+// import your components here
 import "./header";
 import "./footer";
 

data/lib/generators/rocket_cms/templates/webpack/flash/index.es6

@@ -1,12 +1,16 @@
 import './index.sass';
 
-$(document).on("click", 'a.close_flash', function() {
-  $(this).parent().fadeOut(function() {
-    let $box = $(this).parents('.flash');
-    $(this).remove();
-    if ($box.children().length == 0) {
-      $box.remove();
-    }
+//document.addEventListener('DOMContentLoaded', function () {
+document.addEventListener("turbolinks:load", function() {
+  var close = document.querySelectorAll("a.close_flash");
+  close.forEach(function(n) {
+    n.addEventListener("click", function() {
+      var msg = this.parentNode.parentNode;
+      var box = msg.parentNode;
+      this.parentNode.parentNode.remove();
+      if (box.childNodes.length == 0) {
+        box.remove()
+      }
+    })
   })
 });
-

data/lib/generators/rocket_cms/templates/webpack/pages/home/index.es6

@@ -1 +1 @@
-// import page-specific blocks here
+// import page-specific components here

data/lib/generators/rocket_cms/webpack_generator.rb

@@ -12,15 +12,13 @@ module RocketCms
     desc 'RocketCMS webpack generator'
     def install
       copy_file ".babelrc", ".babelrc"
+      copy_file ".browserlistrc", ".browserlistrc"
+      copy_file "postcss.config.js", "postcss.config.js"
 
       copy_file "webpack/common/mixins.sass", "webpack/common/mixins.sass"
       copy_file "webpack/common/variables.sass", "webpack/common/variables.sass"
       copy_file "webpack/common/index.sass", "webpack/common/index.sass"
 
-      copy_file "webpack/errors/errors.pug", "webpack/errors/errors.pug"
-      copy_file "webpack/errors/index.es6", "webpack/errors/index.es6"
-      copy_file "webpack/errors/index.sass", "webpack/errors/index.sass"
-
       copy_file "webpack/flash/index.es6", "webpack/flash/index.es6"
       copy_file "webpack/flash/index.sass", "webpack/flash/index.sass"
 
@@ -32,9 +30,9 @@ module RocketCms
       copy_file "webpack/layout/main.sass", "webpack/layout/main.sass"
       copy_file "webpack/layout/typography.sass", "webpack/layout/typography.sass"
 
-      copy_file "webpack/blocks/index.es6", "webpack/blocks/index.es6"
-      copy_file "webpack/blocks/header/index.sass", "webpack/blocks/header/index.sass"
-      copy_file "webpack/blocks/footer/index.sass", "webpack/blocks/footer/index.sass"
+      copy_file "webpack/components/index.es6", "webpack/components/index.es6"
+      copy_file "webpack/components/header/index.sass", "webpack/components/header/index.sass"
+      copy_file "webpack/components/footer/index.sass", "webpack/components/footer/index.sass"
 
       copy_file "webpack/pages/index.es6", "webpack/pages/index.es6"
       copy_file "webpack/pages/home/index.es6", "webpack/pages/home/index.es6"

data/lib/rocket_cms.rb

@@ -6,7 +6,6 @@ end
 require 'rocket_cms/version'
 require 'validates_email_format_of'
 require 'smart_excerpt'
-require 'filename_to_slug'
 
 require 'kaminari'
 require 'addressable/uri'
@@ -42,6 +41,13 @@ module RocketCMS
       "#{model_namespace}::#{name}".constantize
     end
 
+    def shrine?
+      defined?(::Shrine)
+    end
+    def paperclip?
+      !shrine? && defined?(::Paperclip)
+    end
+
     def url_helper
       @@url_helper ||= RocketCMS::UrlHelper.new
     end

data/lib/rocket_cms/admin.rb

@@ -37,7 +37,11 @@ module RocketCMS
         field :robots, :string
 
         field :og_title, :string
-        field :og_image, :paperclip
+        if RocketCMS.shrine?
+          field :og_image, :paperclip
+        elsif RocketCMS.paperclip?
+          field :og_image, :paperclip
+        end
       end
     end
 
@@ -60,7 +64,7 @@ module RocketCMS
         end
         edit do
           field :name
-          field :content, :ck_editor
+          field :content, :ckeditor
           RocketCMS.apply_patches self
           group :menu do
             label I18n.t('rs.menu')
@@ -143,7 +147,7 @@ module RocketCMS
         end
 
         edit do
-          field :content, :ck_editor
+          field :content, :ckeditor
           RocketCMS.apply_patches self
           group :seo, &RocketCMS.seo_config
         end

data/lib/rocket_cms/controller.rb

@@ -4,7 +4,7 @@ module RocketCMS::Controller
     include RsErrors
     include RsPages
     include RsMenu
-    include RsCookies
+    #include RsCookies
     protect_from_forgery with: :exception
     helper_method :page_title
     helper_method :app_url

data/lib/rocket_cms/engine.rb

@@ -4,18 +4,6 @@ module RocketCMS
       require File.expand_path('../tasks', __FILE__)
     end
 
-    initializer 'rocket_cms.paperclip' do
-      require 'paperclip/style'
-      module ::Paperclip
-        class Style
-          alias_method :processor_options_without_auto_orient, :processor_options
-          def processor_options
-            processor_options_without_auto_orient.merge(auto_orient: false)
-          end
-        end
-      end
-    end
-
     config.after_initialize do
       # trigger autoload so models are registered in Mongoid::Elasticearch
       RocketCMS.config.search_models.map(&:constantize)

data/lib/rocket_cms/migration.rb

@@ -17,7 +17,12 @@ module RocketCMS
         t.string :og_title
       end
       t.string :robots
-      t.attachment :og_image
+
+      if RocketCMS.shrine?
+        t.jsonb :og_image_data
+      elsif RocketCMS.paperclip?
+        t.attachment :og_image
+      end
     end
 
     def map_fields(t)

data/lib/rocket_cms/models/active_record/news.rb

@@ -4,8 +4,12 @@ module RocketCMS
       module News
         extend ActiveSupport::Concern
         included do
-          unless RocketCMS.config.news_image_styles.nil?
-            has_attached_file :image, styles: RocketCMS.config.news_image_styles
+          if !RocketCMS.config.news_image_styles.nil?
+            if RocketCMS.shrine?
+              include NewsUploader.attachment(:image)
+            elsif RocketCMS.paperclip?
+              has_attached_file :image, styles: RocketCMS.config.news_image_styles
+            end
           end
 
           has_paper_trail if respond_to?(:has_paper_trail)

data/lib/rocket_cms/models/active_record/seo.rb

@@ -4,7 +4,11 @@ module RocketCMS
       module Seo
         extend ActiveSupport::Concern
         included do
-          has_attached_file :og_image, styles: {thumb: "800x600>"}
+          if RocketCMS.shrine?
+            include OgImageUploader.attachment(:og_image)
+          elsif RocketCMS.paperclip?
+            has_attached_file :og_image, styles: {thumb: "800x600>"}
+          end
           if RocketCMS.config.localize
             translates :h1, :title, :keywords, :description, :og_title
           end

data/lib/rocket_cms/models/mongoid/news.rb

@@ -3,13 +3,17 @@ module RocketCMS
     module Mongoid
       module News
         extend ActiveSupport::Concern
-        unless RocketCMS.config.news_image_styles.nil?
-          include ::Mongoid::Paperclip
+        if !RocketCMS.config.news_image_styles.nil?
+          if RocketCMS.shrine?
+            include ImageUploader::Attachment(:image)
+          elsif RocketCMS.paperclip?
+            include ::Mongoid::Paperclip
+          end
         end
         included do
           field :time, type: Time
           index({enabled: 1, time: 1})
-          unless RocketCMS.config.news_image_styles.nil?
+          if RocketCMS.paperclip? && RocketCMS.config.news_image_styles.nil?
             has_mongoid_attached_file :image, styles: RocketCMS.config.news_image_styles
           end
           field :name, type: String, localize: RocketCMS.config.localize

data/lib/rocket_cms/models/mongoid/seo.rb

@@ -3,7 +3,11 @@ module RocketCMS
     module Mongoid
       module Seo
         extend ActiveSupport::Concern
-        include ::Mongoid::Paperclip
+        if RocketCMS.shrine?
+          include ImageUploader::Attachment(:og_image)
+        elsif RocketCMS.paperclip?
+          include ::Mongoid::Paperclip
+        end
         included do
           field :name, type: String, localize: RocketCMS.config.localize
           field :h1, type: String, localize: RocketCMS.config.localize
@@ -14,7 +18,10 @@ module RocketCMS
           field :robots, type: String, localize: RocketCMS.config.localize
 
           field :og_title, type: String, localize: RocketCMS.config.localize
-          has_mongoid_attached_file :og_image, styles: {thumb: "800x600>"}
+
+          if RocketCMS.paperclip?
+            has_mongoid_attached_file :og_image, styles: {thumb: "800x600>"}
+          end
         end
       end
     end

data/lib/rocket_cms/models/news.rb

@@ -13,7 +13,8 @@ module RocketCMS
       end
 
       included do
-        unless RocketCMS.config.news_image_styles.nil?
+
+        if RocketCMS.paperclip? && !RocketCMS.config.news_image_styles.nil?
           validates_attachment_content_type :image, content_type: /\Aimage\/.*\Z/, if: :image?
         end
 

data/lib/rocket_cms/models/seo.rb

@@ -9,7 +9,9 @@ module RocketCMS
 
       included do
         RocketCMS.apply_patches self
-        validates_attachment_content_type :og_image, content_type: /\Aimage\/.*\Z/, if: :og_image?
+        if RocketCMS.paperclip?
+          validates_attachment_content_type :og_image, content_type: /\Aimage\/.*\Z/, if: :og_image?
+        end
       end
     end
   end

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = '0.30.0'
+  VERSION = '0.33.1'
 end

data/template.rb

@@ -3,10 +3,13 @@ version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
 yarn = !options[:skip_yarn]
-no_dev = !options[:is_dev]
+is_dev = !options[:template].start_with?("http")
 spring = !options[:skip_spring]
+if is_dev
+  rocket_cms_path = File.realpath(options[:template] + "/..")
+end
 
-if Gem::Version.new(version) < Gem::Version.new('5.0.0')
+if Gem::Version.new(version) < Gem::Version.new('6.0.0')
   puts "You are using an old version of Rails (#{version})"
   puts "Please update"
   puts "Stopping"
@@ -24,25 +27,26 @@ git_source(:github) do |repo_name|
   "https://github.com/#{repo_name}.git"
 end
 '}
-gem 'rails', '5.2.0'
+gem 'rails', '6.0.1'
+gem 'rails-i18n'
 #{if mongoid then "gem 'mongoid', '~> 6.1.0'" else "gem 'pg', '>= 0.18', '< 2.0'" end}
 gem 'turbolinks' #required for redirects even if using via webpack
 
-gem 'sass'
-
 #{
-"#{if mongoid then "gem 'rocket_cms_mongoid', path: '/data/rocket_cms'" else "gem 'rocket_cms_activerecord', path: '/data/rocket_cms'" end}
-gem 'rocket_cms', path: '/data/rocket_cms'" unless no_dev}
-#{"#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}" if no_dev}
+"#{if mongoid then "gem 'rocket_cms_mongoid', path: '#{rocket_cms_path}'" else "gem 'rocket_cms_activerecord', path: '#{rocket_cms_path}'" end}
+gem 'rocket_cms', path: '#{rocket_cms_path}'" if is_dev}
+#{"#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}" if !is_dev}
+
+gem 'glebtv-ckeditor'
 
-gem 'rails_admin', github: 'sferik/rails_admin'
-#{"gem 'friendly_id', github: 'norman/friendly_id'" unless mongoid}
+# wait for https://github.com/sferik/rails_admin/pull/3207
+gem 'rails_admin', github: "sferik/rails_admin"
 
 gem 'slim'
-gem 'haml'
 
-gem 'sass-rails'
-gem 'rs-webpack-rails', '~> 0.11.1'
+#gem 'sass'
+#gem 'sass-rails'
+gem 'rs-webpack-rails'
 
 gem 'devise'
 gem 'devise-i18n'
@@ -54,9 +58,13 @@ gem 'puma'
 
 gem 'sentry-raven'
 
-gem 'uglifier'
+gem 'shrine'
+#{"gem 'shrine-mongoid'" if mongoid}
+gem 'image_processing'
 
-gem 'rs_russian'
+#gem 'uglifier'
+
+#gem 'rs_russian'
 #gem 'enumerize'
 #gem 'active_model_serializers'
 
@@ -65,6 +73,7 @@ gem 'tzinfo-data' if Gem.win_platform?
 gem 'wdm', '>= 0.1.0' if Gem.win_platform?
 
 gem 'bootsnap', require: false
+gem 'irb'
 
 group :development do
   #gem 'binding_of_caller'
@@ -80,16 +89,21 @@ group :development do
   gem 'capistrano-rails', require: false
 end
 
-group :test do
+group :development, :test do
+  gem "factory_bot_rails"
   gem 'rspec-rails'
-  gem 'email_spec'
 #{if mongoid then "  gem 'mongoid-rspec'" else "" end}
-  gem 'ffaker'
-  gem 'factory_bot_rails'
-
   gem 'capybara'
-  gem 'capybara-webkit'
+  # https://github.com/mattheworiordan/capybara-screenshot/issues/243
+  gem 'capybara-screenshot'
+  gem 'selenium-webdriver'
+  gem 'webdrivers'
   gem 'database_cleaner'
+#{if mongoid then "  gem 'database_cleaner-mongoid'" else "" end}
+  #gem 'database_cleaner-redis'
+  gem 'ffaker'
+  gem 'timecop'
+  gem "pry-rails"
   gem 'childprocess'
 end
 
@@ -150,20 +164,20 @@ ORM: #{if mongoid then 'Mongoid' else 'ActiveRecord' end}
 
 To run (windows):
 ```
-npm start
+yarn start
 bundle exec rails s webrick
 ```
 
 
 To run (nix/mac):
 ```
-npm start
+yarn start
 puma
 ```
 
 "
 
-#create_file '.ruby-version', "2.5.0\n"
+#create_file '.ruby-version', "2.6.5\n"
 #create_file '.ruby-gemset', "#{app_name}\n"
 
 run 'bundle install --without production'
@@ -233,10 +247,11 @@ gsub_file 'app/models/user.rb', '# field :locked_at', 'field :locked_at'
 end
 
 if mongoid
-  generate "ckeditor:install", "--orm=mongoid", "--backend=paperclip"
+  generate "ckeditor:install", "--orm=mongoid", "--backend=shrine"
 else
-  generate "ckeditor:install", "--orm-active_record", "--backend=paperclip"
+  generate "ckeditor:install", "--orm-active_record", "--backend=shrine"
 end
+remove_file 'config/initializers/ckeditor_shrine.rb'
 
 unless mongoid
   generate "rocket_cms:migration"
@@ -279,14 +294,6 @@ end
 
 create_file 'config/locales/ru.yml' do <<-TEXT
 ru:
-  attributes:
-    is_default: По умолчанию
-  mongoid:
-    models:
-      item: Товар
-    attributes:
-      item:
-        price: Цена
 TEXT
 end
 
@@ -301,36 +308,205 @@ User.create!(email: 'admin@#{app_name.dasherize.downcase}.ru', password: admin_p
 
 Page.destroy_all
 Menu.destroy_all
+News.destroy_all
+
 h = Menu.create(name: 'Главное', text_slug: 'main').id
-p = Page.create!(name: 'Проекты', content: 'проекты', fullpath: '/projects', menu_ids: [h])
-Page.create!(name: 'Прайс лист', fullpath: '/price', menu_ids: [h])
-Page.create!(name: 'Галерея', fullpath: '/galleries', menu_ids: [h])
-c = Page.create!(name: 'О компании', fullpath: '/company', menu_ids: [h], content: 'О Компании')
+Page.create!(name: 'О компании', fullpath: '/company', menu_ids: [h], content: 'О Компании')
 Page.create!(name: 'Новости', fullpath: '/news', menu_ids: [h])
 Page.create!(name: 'Контакты', fullpath: '/contacts', menu_ids: [h], content: 'Текст стр контакты')
 
+3.times do |i|
+  News.create!(name: "test " + i.to_s, content: "test", time: i.days.ago)
+end
+
 TEXT
 end
 
-create_file 'config/initializers/rack.rb' do <<-TEXT
-Rack::Utils.multipart_part_limit = 0
+create_file 'app/uploaders/news_uploader.rb' do <<-TEXT
+class NewsUploader < Shrine
+  plugin :determine_mime_type
+  plugin :validation_helpers
+  plugin :derivatives
+
+  Attacher.validate do
+    validate_mime_type_inclusion %w[image/jpeg image/gif image/png]
+    validate_max_size 2.megabytes
+  end
+
+  Attacher.derivatives do |original|
+    magick = ImageProcessing::MiniMagick.source(original)
+
+    {
+      main:  magick.resize_to_limit!(800, 800),
+      thumb:  magick.resize_to_limit!(300, 300)
+    }
+  end
+end
+TEXT
+end
+
+create_file 'app/uploaders/og_image_uploader.rb' do <<-TEXT
+class OgImageUploader < Shrine
+  plugin :determine_mime_type
+  plugin :validation_helpers
+
+  Attacher.validate do
+    validate_mime_type_inclusion %w[image/jpeg image/gif image/png]
+    validate_max_size 2.megabytes
+  end
+end
+TEXT
+end
+
+create_file 'extra/shrine/plugins/custom_pretty_location.rb' do <<-TEXT
+require 'shrine/plugins/pretty_location'
+
+class Shrine
+  module Plugins
+    module CustomPrettyLocation
+      def self.configure(uploader, **opts)
+        uploader.opts[:custom_pretty_location] ||= { identifier: :id }
+        uploader.opts[:custom_pretty_location].merge!(opts)
+      end
+
+      module InstanceMethods
+        def generate_location(io, **options)
+          custom_pretty_location(io, **options)
+        end
+
+        def custom_pretty_location(io, name: nil, record: nil, version: nil, derivative: nil, identifier: nil, metadata: {}, **)
+          if record
+            namespace    = record_namespace(record)
+            identifier ||= record_identifier(record)
+          end
+
+          basename = basic_location(io, metadata: metadata)
+          basename = [*(version || derivative), basename].join("-")
 
-if Rails.env.development?
-  module Rack
-    class CommonLogger
-      alias_method :log_without_assets, :log
-      #{'ASSETS_PREFIX = "/#{Rails.application.config.assets.prefix[/\A\/?(.*?)\/?\z/, 1]}/"'}
-      def log(env, status, header, began_at)
-        unless env['REQUEST_PATH'].start_with?(ASSETS_PREFIX) || env['REQUEST_PATH'].start_with?('/uploads')  || env['REQUEST_PATH'].start_with?('/system')
-          log_without_assets(env, status, header, began_at)
+          [*namespace, *identifier, *name, basename].join("/")
         end
+
+        private
+
+        def record_identifier(record)
+          id = record.public_send(opts[:custom_pretty_location][:identifier])
+          case id
+          when Integer
+            str_id = "%09d".freeze % id
+            str_id.scan(/\\d{3}/).join("/".freeze)
+          when String
+            id.scan(/.{3}/).first(3).join("/".freeze)
+          else
+            # NOTE: 'raise' cannot be used.  It fails on save.
+            nil
+          end
+        end
+
+        def transform_class_name(class_name)
+          if opts[:custom_pretty_location][:class_underscore]
+            class_name.gsub(/([A-Z]+)([A-Z][a-z])/, '\\1_\\2').gsub(/([a-z])([A-Z])/, '\\1_\\2').downcase
+          else
+            class_name.downcase
+          end
+        end
+
+        def record_namespace(record)
+          class_name = record.class.name or return
+          parts      = transform_class_name(class_name).split("::")
+
+          if separator = opts[:custom_pretty_location][:namespace]
+            parts.join(separator)
+          else
+            parts.last
+          end
+        end
+
       end
     end
+    register_plugin(:custom_pretty_location, CustomPrettyLocation)
   end
 end
 TEXT
 end
 
+remove_file 'app/assets/config/manifest.js'
+create_file 'app/assets/config/manifest.js' do <<-TEXT
+//= link_tree ../images
+//= link_directory ../stylesheets .css
+//= link ckcontent.css
+//= link ckeditor/application.css
+//= link ckeditor/application.js
+TEXT
+end
+
+remove_file 'config/initializers/assets.rb'
+create_file 'config/initializers/assets.rb' do <<-TEXT
+# Be sure to restart your server when you modify this file.
+
+# Version of your assets, change this if you want to expire all your assets.
+Rails.application.config.assets.version = '1.0'
+
+# Add additional assets to the asset load path.
+# Rails.application.config.assets.paths << Emoji.images_path
+# Add Yarn node_modules folder to the asset load path.
+#Rails.application.config.assets.paths << Rails.root.join('node_modules')
+
+# Precompile additional assets.
+# application.js, application.css, and all non-JS/CSS in the app/assets
+# folder are already added.
+# Rails.application.config.assets.precompile += %w( admin.js admin.css )
+
+TEXT
+end
+
+create_file 'config/initializers/shrine.rb' do <<-TEXT
+require "shrine"
+require "shrine/storage/file_system"
+
+Shrine.logger = Rails.logger
+
+# Choose your favorite image processor
+require 'image_processing/mini_magick'
+SHRINE_PICTURE_PROCESSOR = ImageProcessing::MiniMagick
+
+Shrine.storages = {
+  # temporary
+  cache: Shrine::Storage::FileSystem.new(
+    "public",
+    prefix: "uploads/cache"
+  ),
+  # permanent
+  store: Shrine::Storage::FileSystem.new(
+    "public",
+    prefix: "uploads"
+  ),
+}
+
+Shrine.plugin :upload_options, cache: { move: true }, store: { move: true }
+
+Shrine.plugin :custom_pretty_location, class_underscore: :true
+
+Shrine.plugin :determine_mime_type
+#{"Shrine.plugin :mongoid" if mongoid}
+Shrine.plugin :instrumentation
+
+Shrine.plugin :activerecord           # loads Active Record integration
+Shrine.plugin :cached_attachment_data # enables retaining cached file across form redisplays
+Shrine.plugin :restore_cached_data    # extracts metadata for assigned cached files
+
+Shrine.plugin :validation_helpers
+Shrine.plugin :derivatives
+
+require 'ckeditor/backend/shrine'
+TEXT
+end
+
+
+create_file 'config/initializers/rack.rb' do <<-TEXT
+Rack::Utils.multipart_part_limit = 0
+TEXT
+end
+
 create_file 'app/assets/stylesheets/rails_admin/custom/theming.sass' do <<-TEXT
 TEXT
 end
@@ -431,6 +607,9 @@ Bundler.require(*Rails.groups)
 
 module #{app_name.camelize}
   class Application < Rails::Application
+    # Initialize configuration defaults for originally generated Rails version.
+    config.load_defaults 6.0
+
     config.generators do |g|
       g.test_framework :rspec
       g.view_specs false
@@ -472,11 +651,17 @@ create_file 'app/assets/javascripts/application.js' do <<-TEXT
 TEXT
 end
 
-remove_file 'app/assets/javascripts/application.css'
-create_file 'app/assets/javascripts/application.css' do <<-TEXT
+remove_file 'app/assets/stylesheets/application.css'
+create_file 'app/assets/stylesheets/application.css' do <<-TEXT
 TEXT
 end
 
+create_file 'app/assets/stylesheets/ckcontent.css' do <<-TEXT
+div.red {
+  color: red;
+}
+TEXT
+end
 
 if mongoid
   FileUtils.cp(Pathname.new(destination_root).join('config', 'mongoid.yml').to_s, Pathname.new(destination_root).join('config', 'mongoid.yml.example').to_s)
@@ -631,18 +816,57 @@ TEXT
 end
 
 create_file "spec/support/capybara.rb" do <<-TEXT
-require 'capybara/rspec'
-require 'capybara/webkit'
-
-# https://github.com/teamcapybara/capybara/blob/master/lib/capybara.rb#L35
-Capybara.configure do |config|
-  config.default_driver = :webkit
-  config.javascript_driver = :webkit
-
-  # use the custom server
-  config.server = :puma
-  config.run_server = true
-end
+  if ENV['CI']
+    Selenium::WebDriver::Chrome.path = '/usr/bin/google-chrome-stable'
+  else
+    begin
+      Selenium::WebDriver::Chrome.path = '/usr/bin/chromium'
+    rescue Selenium::WebDriver::Error::WebDriverError
+    end
+  end
+  
+  Capybara.register_driver :chrome_root do |app|
+      service = ::Selenium::WebDriver::Service.chrome#(args: { verbose: true, log_path: 'chromedriver.log' })
+      options = ::Selenium::WebDriver::Chrome::Options.new
+      options.args << '--headless' unless ENV['NO_HEADLESS']
+      options.args << '--no-sandbox'
+      options.args << '--window-size=1280,1024'
+  
+      Capybara::Selenium::Driver.new(app, browser: :chrome, options: options, service: service)
+  end
+  # не работает, установлено выше
+  # Capybara::Screenshot.webkit_options = { width: 1280, height: 1024 }
+  
+  if ENV['CHROME_VISIBLE']
+    Capybara.javascript_driver = :selenium_chrome
+  else
+    Capybara.javascript_driver = :chrome_root
+  end
+  Capybara.default_driver = :rack_test
+  Capybara.default_max_wait_time = 15
+  Capybara.register_server :puma do |app, port, host|
+    require 'rack/handler/puma'
+    Rack::Handler::Puma.run(app, Host: host, Port: port, Threads: "1:1")
+  end
+  
+  Capybara.configure do |config|
+    config.app_host = "http://\#{Rails.application.secrets.host}"
+    config.server = :puma
+    config.server_port = 9332
+    config.run_server = true
+    config.always_include_port = true
+  end
+  
+  
+  Capybara::Screenshot.register_driver(:selenium_chrome) do |driver, path|
+    driver.browser.save_screenshot(path)
+  end
+  Capybara::Screenshot.register_driver(:chrome_root) do |driver, path|
+    driver.browser.save_screenshot(path)
+  end
+  
+  Capybara::Screenshot.autosave_on_failure = true
+  
 TEXT
 end
 
@@ -745,3 +969,9 @@ end
 
 git add: "."
 git commit: %Q{ -m 'Initial commit' }
+
+unless mongoid
+  rake "db:migrate"
+end
+
+rake 'db:seed'