rocket_cms 0.30.0 → 0.33.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99f28386f0c25e7b5b4130753a92cbd67879a73103731cfc7ee7becbb5f51b56
-  data.tar.gz: 4b40826b97201fac4d6e135b7626840b191ce27b196f3c2eae488ad47907ad06
+  metadata.gz: 15d7121ecc5a1d3a6cb949ac7d790faeb88cb3df191578687b48d179f583d15e
+  data.tar.gz: d3843ac98ba756d4399cad90a83dde8b8a12d56196bec5ed2a393e6bcf84df8a
 SHA512:
-  metadata.gz: 64a1c82f6fdd78704826efcf596168a8d8307b5d000cf7fc615f6f2a20aa595df4d8768b3d70a8f3a89293dcdc1beb8641ed42f253086b1e7337133c91ba0bd1
-  data.tar.gz: 8b02db625b5ce810e9b14fe92b2048e00c78f759c940bed48916abe8481932d91fcc4aeeb74daeac8579d9564d4c11ccb7a0d20383aabe06b2b5f7109e5e1cf3
+  metadata.gz: aeaf5510cd6d74c56c934c00bde9d1de486247b01d342ae925a07de6561579df2adced525dc009d2317ef5e7c43ae68600cc3f812bd715f44c2d46169a9961ab
+  data.tar.gz: d17429f5fd7b2433120f4fb2a8bccf91428a7b4d69569bf44014ba6e5523c4bab6d53e4eec28740c95c8528fbb6de1992d87bcfab025cdc0b5856ac3e361c974

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rocket_cms (0.30.0)
+    rocket_cms (0.33.1)
       addressable
       coffee-rails
       jquery-rails
@@ -16,64 +16,64 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.1)
-      actionpack (= 6.0.1)
+    actioncable (6.0.3.2)
+      actionpack (= 6.0.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actionmailbox (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       mail (>= 2.7.1)
-    actionmailer (6.0.1)
-      actionpack (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
+    actionmailer (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.1)
-      actionview (= 6.0.1)
-      activesupport (= 6.0.1)
-      rack (~> 2.0)
+    actionpack (6.0.3.2)
+      actionview (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.1)
-      actionpack (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    actiontext (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       nokogiri (>= 1.8.5)
-    actionview (6.0.1)
-      activesupport (= 6.0.1)
+    actionview (6.0.3.2)
+      activesupport (= 6.0.3.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.1)
-      activesupport (= 6.0.1)
+    activejob (6.0.3.2)
+      activesupport (= 6.0.3.2)
       globalid (>= 0.3.6)
-    activemodel (6.0.1)
-      activesupport (= 6.0.1)
-    activerecord (6.0.1)
-      activemodel (= 6.0.1)
-      activesupport (= 6.0.1)
-    activestorage (6.0.1)
-      actionpack (= 6.0.1)
-      activejob (= 6.0.1)
-      activerecord (= 6.0.1)
+    activemodel (6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activerecord (6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
+    activestorage (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
       marcel (~> 0.3.1)
-    activesupport (6.0.1)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.2)
+      zeitwerk (~> 2.2, >= 2.2.2)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    builder (3.2.3)
+    builder (3.2.4)
     coffee-rails (5.0.0)
       coffee-script (>= 2.2.0)
       railties (>= 5.2.0)
@@ -81,32 +81,32 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    concurrent-ruby (1.1.5)
-    crass (1.0.5)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
     erubi (1.9.0)
     execjs (2.7.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     htmlentities (4.3.4)
-    i18n (1.7.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    jquery-rails (4.3.5)
+    jquery-rails (4.4.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    kaminari (1.1.1)
+    kaminari (1.2.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.1)
-      kaminari-activerecord (= 1.1.1)
-      kaminari-core (= 1.1.1)
-    kaminari-actionview (1.1.1)
+      kaminari-actionview (= 1.2.1)
+      kaminari-activerecord (= 1.2.1)
+      kaminari-core (= 1.2.1)
+    kaminari-actionview (1.2.1)
       actionview
-      kaminari-core (= 1.1.1)
-    kaminari-activerecord (1.1.1)
+      kaminari-core (= 1.2.1)
+    kaminari-activerecord (1.2.1)
       activerecord
-      kaminari-core (= 1.1.1)
-    kaminari-core (1.1.1)
-    loofah (2.3.1)
+      kaminari-core (= 1.2.1)
+    kaminari-core (1.2.1)
+    loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -115,41 +115,41 @@ GEM
       activesupport
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.13.0)
+    minitest (5.14.1)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    public_suffix (4.0.1)
-    rack (2.0.7)
+    public_suffix (4.0.5)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.1)
-      actioncable (= 6.0.1)
-      actionmailbox (= 6.0.1)
-      actionmailer (= 6.0.1)
-      actionpack (= 6.0.1)
-      actiontext (= 6.0.1)
-      actionview (= 6.0.1)
-      activejob (= 6.0.1)
-      activemodel (= 6.0.1)
-      activerecord (= 6.0.1)
-      activestorage (= 6.0.1)
-      activesupport (= 6.0.1)
+    rails (6.0.3.2)
+      actioncable (= 6.0.3.2)
+      actionmailbox (= 6.0.3.2)
+      actionmailer (= 6.0.3.2)
+      actionpack (= 6.0.3.2)
+      actiontext (= 6.0.3.2)
+      actionview (= 6.0.3.2)
+      activejob (= 6.0.3.2)
+      activemodel (= 6.0.3.2)
+      activerecord (= 6.0.3.2)
+      activestorage (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       bundler (>= 1.3.0)
-      railties (= 6.0.1)
+      railties (= 6.0.3.2)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (6.0.1)
-      actionpack (= 6.0.1)
-      activesupport (= 6.0.1)
+    railties (6.0.3.2)
+      actionpack (= 6.0.3.2)
+      activesupport (= 6.0.3.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -157,7 +157,7 @@ GEM
     smart_excerpt (0.1.6)
       activesupport
       htmlentities
-    sprockets (4.0.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -165,16 +165,16 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     stringex (2.8.5)
-    thor (0.20.3)
+    thor (1.0.1)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     validates_email_format_of (1.6.3)
       i18n
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    zeitwerk (2.2.1)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.4.0)
 
 PLATFORMS
   ruby
@@ -185,4 +185,4 @@ DEPENDENCIES
   rocket_cms!
 
 BUNDLED WITH
-   1.17.3
+   2.1.4

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/app/views/shared/_og.slim

@@ -4,5 +4,5 @@
   meta property='og:image' content="http://#{request.host_with_port}#{image}"
 - if defined?(desc) && !desc.blank?
   meta property='og:description' content=desc
-- if defined?(url) && !url.blank?
-  meta property='og:url' content=url
+- if defined?(og_url) && !og_url.blank?
+  meta property='og:url' content=og_url

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