rocket_cms 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f28386f0c25e7b5b4130753a92cbd67879a73103731cfc7ee7becbb5f51b56
-  data.tar.gz: 4b40826b97201fac4d6e135b7626840b191ce27b196f3c2eae488ad47907ad06
+  metadata.gz: b6f4ecf3595ded8061376b41de02f02ea0bf0f57cd134894cfa6d53b24ed2da7
+  data.tar.gz: 20ef8b7ac32fa60fdeb1e9e4e87e63f8d85de1d891302d4b09a7381310998cc1
 SHA512:
-  metadata.gz: 64a1c82f6fdd78704826efcf596168a8d8307b5d000cf7fc615f6f2a20aa595df4d8768b3d70a8f3a89293dcdc1beb8641ed42f253086b1e7337133c91ba0bd1
-  data.tar.gz: 8b02db625b5ce810e9b14fe92b2048e00c78f759c940bed48916abe8481932d91fcc4aeeb74daeac8579d9564d4c11ccb7a0d20383aabe06b2b5f7109e5e1cf3
+  metadata.gz: 708da4b98596577733e91e2e87ca255e8bc0a3b3bd5087e5e1238f4156eedd1318e90be53b51f78a3fbd01bb561fa2c29ab3943809882027556bed411eb86497
+  data.tar.gz: 705c53d6285f644329d506cd65fa24e65bebcfa932b105db772a8eb004e671d7b04cc5cbbd19f23db1c8bbcab4d84f420664986c09b2e563079d06e533cbc1ab

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.30.0)
+    rocket_cms (0.31.0)
       addressable
       coffee-rails
       jquery-rails

data/README.md

@@ -70,14 +70,19 @@ If not, uninstall rails and install again
 
 Then, for mongoid:
 
-    rails new my_app -T -O -m https://gitlab.com/rocket-science/rocket_cms/raw/master/template.rb --skip-spring
+    rails new my_app -T -O -m https://gitlab.com/rocket-science/rocket_cms/raw/master/template.rb --skip-spring --skip-javascript
 
 for ActiveRecord:
 
-    rails new my_app -T --database=postgresql -m https://gitlab.com/rocket-science/rocket_cms/raw/master/template.rb --skip-spring
+    rails new my_app -T --database=postgresql -m https://gitlab.com/rocket-science/rocket_cms/raw/master/template.rb --skip-spring --skip-javascript
 
 generator creates a new RVM gemset, so after cd'ing to app dir, you should run `bundle install` again if you use rvm.
 
+Development mode template:
+
+    rails new my_app -T --database=postgresql -m /data/rocket_cms/template.rb --skip-spring --skip-javascript
+
+
 ### Localization
 
 All models included in the gem support localization via either [hstore_translate](https://github.com/Leadformance/hstore_translate) or built-in Mongoid localize: true option.

data/app/views/layouts/application.slim

@@ -5,7 +5,6 @@ html lang="ru"
     meta name="viewport" content="width=device-width, maximum-scale=1, minimal-ui"
     -# meta property="fb:app_id" content=Rails.application.secrets.fb_app_id
     -# meta property="vk:app_id" content=Rails.application.secrets.vk_app_id
-    meta name="turbolinks-cache-control" content="no-cache"
 
     title= page_title
     = yield :meta
@@ -18,7 +17,7 @@ html lang="ru"
     = javascript_include_tag *webpack_asset_paths('application', extension: 'js')
 
   body.no-js class=body_class
-    = render 'blocks/header'
+    = render 'components/header'
     script.no-js-script
       | document.body.classList.remove('no-js');
 
@@ -26,14 +25,9 @@ html lang="ru"
       = render 'shared/messages'
       = yield
 
-    = render 'blocks/footer'
-
-    .no-js-error.alert.alert-error
-      | К сожалению, в вашем браузере отключен JavaScript
-      span Включите его, чтобы зайти на сайт
-      a class="btn-transparent" target="_blank" href="https://yandex.ru/support/common/browsers-settings/browsers-java-js-settings.xml" Включить JavaScript
+    = render 'components/footer'
 
     #fb-root data-turbolinks-permanent=""
     #vk_api_transport data-turbolinks-permanent=""
 
-    = render 'blocks/counters'
+    = render 'components/counters'

data/app/views/news/index.slim

@@ -4,7 +4,10 @@
     .rs-news-date= l(news.time.to_date)
     a.rs-news-title href=news_path(news)
       = news.name
-    - if !RocketCMS.config.news_image_styles.nil? && news.image?
-      .rs-news-image= image_tag news.image.url(:thumb)
+    - if !RocketCMS.config.news_image_styles.nil?
+      - if RocketCMS.paperclip? && news.image?
+        .rs-news-image= image_tag news.image.url(:thumb)
+      - elsif RocketCMS.shrine? && !news.image.nil?
+        .rs-news-image= image_tag news.image(:thumb).url
     .rs-news-excerpt= news.excerpt
   = paginate @news

data/app/views/news/show.slim

@@ -4,8 +4,10 @@
     = l(@news.time.to_date)
   .rs-news-text
     = @news.excerpt
-  - if !RocketCMS.config.news_image_styles.nil? && @news.image?
-    .rs-news-image
-      = image_tag @news.image.url(:main)
+  - if !RocketCMS.config.news_image_styles.nil?
+    - if RocketCMS.paperclip? && @news.image?
+      .rs-news-image= image_tag @news.image.url(:main)
+    - elsif RocketCMS.shrine? && !news.image.nil?
+      .rs-news-image= image_tag @news.image(:main).url
   .rs-news-content
     = render 'shared/obj', obj: @news

data/config/locales/ru.kaminari.yml

@@ -8,10 +8,16 @@ ru:
       truncate: "…"
   helpers:
     page_entries_info:
+      entry:
+        one: "запись"
+        few: "записи"
+        many: "записей"
+        other: "записей"
       one_page:
         display_entries:
-          zero: "%{entry_name} не найдены"
-          one: "Показано <b>1</b> %{entry_name}"
+          one: "Показана <b>1</b> %{entry_name}"
+          few: "Показано <b>1</b> %{entry_name}"
+          many: "Показаны <b>все %{count}</b> %{entry_name}"
           other: "Показаны <b>все %{count}</b> %{entry_name}"
       more_pages:
         display_entries: "Показаны %{entry_name} <b>%{first}&nbsp;-&nbsp;%{last}</b> из <b>%{total}</b>"

data/lib/generators/rocket_cms/layout_generator.rb

@@ -9,9 +9,11 @@ module RocketCms
     desc 'RocketCMS Layout generator'
     def layout
       template('app/views/layouts/application.slim', 'app/views/layouts/application.slim')
-      template('app/views/blocks/_footer.slim', 'app/views/blocks/_footer.slim')
-      template('app/views/blocks/_header.slim', 'app/views/blocks/_header.slim')
-      template('app/views/pages/home/index.slim', 'app/views/pages/home/index.slim')
+      template('app/views/components/_header.slim', 'app/views/components/_header.slim')
+      template('app/views/components/_footer.slim', 'app/views/components/_footer.slim')
+      template('app/views/components/_counters.html', 'app/views/components/_counters.html')
+      template('app/views/home/index.slim', 'app/views/home/index.slim')
+      template('app/views/pages/show.slim', 'app/views/pages/show.slim')
     end
   end
 end

data/lib/generators/rocket_cms/templates/.browserlistrc

@@ -0,0 +1 @@
+defaults

data/lib/generators/rocket_cms/templates/ability.erb

@@ -7,12 +7,16 @@ class Ability
       can :manage, :all
       cannot :destroy, Menu
       cannot :update, Menu
+      if RocketCMS.active_record?
+        cannot :destroy, PaperTrail::Version
+        cannot :update, PaperTrail::Version
+      end
       admin_ui
     end
   end
 
   def admin_ui
-    can :access, :rails_admin   # grant access to rails_admin
-    can :dashboard              # grant access to the dashboard
+    can :access, :rails_admin
+    can :read, :dashboard
   end
 end

data/lib/generators/rocket_cms/templates/admin.erb

@@ -14,7 +14,7 @@ RailsAdmin.config do |config|
   config.current_user_method(&:current_user)
 
   ## == Cancan ==
-  config.authorize_with :cancan
+  config.authorize_with :cancancan
 <% if RocketCMS.mongoid? %>
   ## == MongoidAudit
   # config.audit_with :mongoid_audit, 'HistoryTracker'

data/lib/generators/rocket_cms/templates/migration_news.rb

@@ -15,7 +15,11 @@ class RocketCmsCreateNews < ActiveRecord::Migration[5.0]
       end
 
       t.string :slug, null: false
-      t.attachment :image
+      if RocketCMS.shrine?
+        t.jsonb :image_data
+      elsif RocketCMS.paperclip?
+        t.attachment :image
+      end
       t.timestamps
     end
 

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';
 

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/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.31.0'
 end

data/template.rb

@@ -3,10 +3,10 @@ version = rails_spec.version.to_s
 
 mongoid = options[:skip_active_record]
 yarn = !options[:skip_yarn]
-no_dev = !options[:is_dev]
+is_dev = options[:template].index("http").nil?
 spring = !options[:skip_spring]
 
-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 +24,27 @@ 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}
+gem 'rocket_cms', path: '/data/rocket_cms'" if is_dev}
+#{"#{if mongoid then "gem 'rocket_cms_mongoid'" else "gem 'rocket_cms_activerecord'" end}" if !is_dev}
 
-gem 'rails_admin', github: 'sferik/rails_admin'
-#{"gem 'friendly_id', github: 'norman/friendly_id'" unless mongoid}
+gem 'glebtv-ckeditor'
+
+# 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 +56,13 @@ gem 'puma'
 
 gem 'sentry-raven'
 
-gem 'uglifier'
+gem 'shrine'
+#{"gem 'shrine-mongoid'" if mongoid}
+gem 'image_processing'
+
+#gem 'uglifier'
 
-gem 'rs_russian'
+#gem 'rs_russian'
 #gem 'enumerize'
 #gem 'active_model_serializers'
 
@@ -65,6 +71,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'
@@ -163,7 +170,7 @@ 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 +240,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 +287,6 @@ end
 
 create_file 'config/locales/ru.yml' do <<-TEXT
 ru:
-  attributes:
-    is_default: По умолчанию
-  mongoid:
-    models:
-      item: Товар
-    attributes:
-      item:
-        price: Цена
 TEXT
 end
 
@@ -301,36 +301,166 @@ 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
 
-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)
+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
+      include Shrine::Plugins::PrettyLocation
+
+      module InstanceMethods
+        include Shrine::Plugins::PrettyLocation::InstanceMethods
+
+        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
       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 +561,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 +605,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)
@@ -745,3 +884,9 @@ end
 
 git add: "."
 git commit: %Q{ -m 'Initial commit' }
+
+unless mongoid
+  rake "db:migrate"
+end
+
+rake 'db:seed'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.0
 platform: ruby
 authors:
 - glebtv
@@ -228,9 +228,9 @@ files:
 - app/models/news.rb
 - app/models/page.rb
 - app/models/seo.rb
-- app/views/blocks/_counters.html
-- app/views/blocks/_footer.slim
-- app/views/blocks/_header.slim
+- app/views/components/_counters.html
+- app/views/components/_footer.slim
+- app/views/components/_header.slim
 - app/views/contact_mailer/new_message_email.html.slim
 - app/views/contacts/new.slim
 - app/views/contacts/sent.slim
@@ -257,7 +257,6 @@ files:
 - config/locales/en.rocket_admin.yml
 - config/locales/en.rs.yml
 - config/locales/ru.cancan.yml
-- config/locales/ru.devise.yml
 - config/locales/ru.kaminari.yml
 - config/locales/ru.models.yml
 - config/locales/ru.rails_admin.yml
@@ -265,13 +264,13 @@ files:
 - config/locales/ru.rs.yml
 - config/locales/ru.simple_captcha.yml
 - config/locales/ru.simple_form.yml
-- lib/filename_to_slug.rb
 - lib/generators/rocket_cms/ability_generator.rb
 - lib/generators/rocket_cms/admin_generator.rb
 - lib/generators/rocket_cms/capify_generator.rb
 - lib/generators/rocket_cms/layout_generator.rb
 - lib/generators/rocket_cms/migration_generator.rb
 - lib/generators/rocket_cms/templates/.babelrc
+- lib/generators/rocket_cms/templates/.browserlistrc
 - lib/generators/rocket_cms/templates/Capfile
 - lib/generators/rocket_cms/templates/ability.erb
 - lib/generators/rocket_cms/templates/admin.erb
@@ -288,15 +287,12 @@ files:
 - lib/generators/rocket_cms/templates/webpack.config.js
 - lib/generators/rocket_cms/templates/webpack/analytics.es6
 - lib/generators/rocket_cms/templates/webpack/application.es6
-- lib/generators/rocket_cms/templates/webpack/blocks/footer/index.sass
-- lib/generators/rocket_cms/templates/webpack/blocks/header/index.sass
-- lib/generators/rocket_cms/templates/webpack/blocks/index.es6
 - lib/generators/rocket_cms/templates/webpack/common/index.sass
 - lib/generators/rocket_cms/templates/webpack/common/mixins.sass
 - lib/generators/rocket_cms/templates/webpack/common/variables.sass
-- lib/generators/rocket_cms/templates/webpack/errors/errors.pug
-- lib/generators/rocket_cms/templates/webpack/errors/index.es6
-- lib/generators/rocket_cms/templates/webpack/errors/index.sass
+- lib/generators/rocket_cms/templates/webpack/components/footer/index.sass
+- lib/generators/rocket_cms/templates/webpack/components/header/index.sass
+- lib/generators/rocket_cms/templates/webpack/components/index.es6
 - lib/generators/rocket_cms/templates/webpack/flash/index.es6
 - lib/generators/rocket_cms/templates/webpack/flash/index.sass
 - lib/generators/rocket_cms/templates/webpack/fonts/index.sass

data/config/locales/ru.devise.yml

@@ -1,65 +0,0 @@
-ru:
-  devise:
-    confirmations:
-      confirmed: Ваша учётная запись подтверждена. Теперь вы вошли в систему.
-      send_instructions: В течение нескольких минут вы получите письмо с инструкциями по подтверждению вашей учётной записи.
-      send_paranoid_instructions: Если ваш адрес e-mail есть в нашей базе данных, то в течение нескольких минут вы получите письмо с инструкциями по подтверждению вашей учётной записи.
-    failure:
-      already_authenticated: Вы уже вошли в систему.
-      inactive: Ваша учётная запись ещё не активирована.
-      invalid: Неверный адрес e-mail или пароль.
-      invalid_token: Неверный ключ аутентификации.
-      locked: Ваша учётная запись заблокирована.
-      not_found_in_database: 
-      timeout: Ваш сеанс закончился. Пожалуйста, войдите в систему снова.
-      unauthenticated: Вам необходимо войти в систему или зарегистрироваться.
-      unconfirmed: Вы должны подтвердить вашу учётную запись.
-    mailer:
-      confirmation_instructions:
-        subject: Инструкции по подтверждению учётной записи
-      reset_password_instructions:
-        subject: Инструкции по восстановлению пароля
-      unlock_instructions:
-        subject: Инструкции по разблокировке учётной записи
-    omniauth_callbacks:
-      failure: Вы не можете войти в систему с учётной записью из %{kind}, т.к. "%{reason}".
-      success: Вход в систему выполнен с учётной записью из %{kind}.
-    passwords:
-      no_token: Доступ к этой странице возможен только по ссылке из письма о восстановлении пароля. Если Вы пришли по такой ссылке, пожалуйста убедитесь что Вы скопировали всю ссылку целиком.
-      send_instructions: В течение нескольких минут вы получите письмо с инструкциями по восстановлению вашего пароля.
-      send_paranoid_instructions: Если ваш адрес e-mail есть в нашей базе данных, то в течение нескольких минут вы получите письмо с инструкциями по восстановлению вашего пароля.
-      updated: Ваш пароль изменён. Теперь вы вошли в систему.
-      updated_not_active: Ваш пароль изменен.
-    registrations:
-      destroyed: До свидания! Ваша учётная запись удалена. Надеемся снова увидеть вас.
-      signed_up: Добро пожаловать! Вы успешно зарегистрировались.
-      signed_up_but_inactive: Вы успешно зарегистрированы. Однако, вы не можете войти в систему, потому что ваша учетная запись не активирована.
-      signed_up_but_locked: Вы успешно зарегистрированы. Однако, вы не можете войти в систему, потому что ваша учетная запись заблокирована.
-      signed_up_but_unconfirmed: Письмо со ссылкой для подтверждения было отправлено на ваш e-mail. Пожалуйста, перейдите по ссылке, чтобы подтвердить вашу учетную запись.
-      update_needs_confirmation: Вы успешно обновили данные вашей учетной записи, но нам нужно проверить ваш новый адрес e-mail. Пожалуйста, проверьте ваш почтовый ящик и перейдите по ссылке, чтобы закончить процедуру проверки вашего нового адреса e-mail.
-      updated: Ваша учётная запись изменена.
-    sessions:
-      signed_in: Вход в систему выполнен.
-      signed_out: Выход из системы выполнен.
-    unlocks:
-      send_instructions: В течение нескольких минут вы получите письмо с инструкциями по разблокировке вашей учётной записи.
-      send_paranoid_instructions: Если ваша учётная запись существует, то в течение нескольких минут вы получите письмо с инструкциями по её разблокировке.
-      unlocked: Ваша учётная запись разблокирована. Теперь вы можете войти в систему.
-    failure:
-      user:
-        not_found_in_database: Пользователь не найден в базе
-        invalid: Неверный пароль
-        unauthenticated: Необходимо авторизоваться
-        unconfirmed: 'Необходимо подтвердить адрес электронной почты'
-  errors:
-    messages:
-      already_confirmed: уже подтверждена. Пожалуйста, попробуйте войти в систему
-      confirmation_period_expired: 
-      expired: устарела. Пожалуйста, запросите новую
-      not_found: не найдена
-      not_locked: не заблокирована
-      not_saved:
-        few: ! '%{resource}: сохранение не удалось из-за %{count} ошибок'
-        many: ! '%{resource}: сохранение не удалось из-за %{count} ошибок'
-        one: ! '%{resource}: сохранение не удалось из-за %{count} ошибки'
-        other: ! '%{resource}: сохранение не удалось из-за %{count} ошибки'

data/lib/filename_to_slug.rb

@@ -1,32 +0,0 @@
-require 'stringex'
-require 'digest/md5'
-
-class String
-  def filename_to_slug
-    s = self.to_url
-    if s.blank?
-      return Digest::MD5.hexdigest(self)
-    end
-    s
-  end
-end
-
-module FilenameToSlug
-  extend ActiveSupport::Concern
-  included do
-    before_post_process :filename_to_slug
-  end
-
-  def filename_to_slug
-    if self.class.attachment_definitions
-      self.class.attachment_definitions.each do |k,v|
-        if self.send(k).file?
-          full_file_name = self.send("#{k}_file_name")
-          extension = File.extname(full_file_name)[1..-1]
-          file_name = full_file_name[0..full_file_name.size-extension.size-1]
-          self.send("#{k}").instance_write(:file_name, "#{file_name.filename_to_slug}.#{extension.filename_to_slug}")
-        end
-      end
-    end
-  end
-end

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

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

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

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

data/lib/generators/rocket_cms/templates/webpack/errors/errors.pug

@@ -1,7 +0,0 @@
-.errors
-  .errors-inner
-    h3= title
-    a(target="_blank" href=link)
-      = anchor
-    = message
-

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

@@ -1,30 +0,0 @@
-import './index.sass';
-import Cookies from 'js-cookie';
-import template from './errors.pug';
-
-const COOKIE_ERROR = {
-  title: 'В вашем броузере отключены Cookies',
-  link: 'https://yandex.ru/support/common/browsers-settings/browsers-cookies.xml',
-  anchor: 'Включите их',
-  message: 'чтобы зайти на сайт'
-}
-
-class Errors {
-  show(error) {
-    $('body').prepend(template(error));
-  }
-
-  checkCookie() {
-    $(".no-js-error").remove()
-    $(".no-js-script").remove()
-    if (!Cookies.get('cookies_on')) {
-      this.show(COOKIE_ERROR);
-      console.error('cookies not supported');
-    } else {
-      //console.info('cookies supported');
-    }
-  }
-}
-
-export default Errors;
-

data/lib/generators/rocket_cms/templates/webpack/errors/index.sass

@@ -1,49 +0,0 @@
-.errors
-  position: fixed
-  top: 0
-  left: 0
-  right: 0
-  bottom: 0
-  background: #b70f25 no-repeat 100% 100% / cover
-  color: #fff
-  z-index: 2000
-  .logo-ta
-    top: 55px
-
-.errors-inner
-  display: table-cell
-  text-align: center
-  vertical-align: middle
-  width: 100vw
-  height: 100vh
-  a
-    color: #fff
-  h3
-    max-width: 720px
-    margin: 0 auto 20px
-    font-size: 44px
-    font-weight: 700
-    span
-      display: block
-      font-size: 34px
-      font-weight: 400
-      margin-bottom: 45px
-      margin-top: 20px
-
-  .btn-transparent
-    height: 66px
-    padding: 22px 25px
-    text-transform: uppercase
-    font-size: 17px
-    text-transform: none
-    &:hover
-      border-color: #fff
-      background: #fff
-      color: #ff0026
-
-.no-js-error
-  display: none
-
-body.no-js
-  .no-js-error
-    display: block