trusty-cms 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 495dd85a4cd0982f102f8fb63be44f2d2e7dbe8c51808bf5ef0b6979d31cd0d3
-  data.tar.gz: 00b74e6d0c539056d9c2c8d47cd197718c073698583d5fb2c9d7c19c65664d0a
+  metadata.gz: 1b4c0091419c21923c64c2b6a9848821262eb761f7ec3e6fa05c7dbc16986d5d
+  data.tar.gz: 6f7f51a3f833d71df2f0f8d3bc88a47b97303be303266d9245138182bf9a190f
 SHA512:
-  metadata.gz: 9da73e25d40b13367c1154eed3cc3f84a32c41a5d42435e5647a0cee356bb25578bf6d23f1a4d39d213a2ba7fedc1ea8e169d752b9f6d7046e2e4600e73d914e
-  data.tar.gz: cb4e090a2593a62755be1f19f2140cdfdaf1916adb3c4b20f78e79968205f300aa40c2eed33ed7ebf12ac9ff43e64696525d0c4a6455a2ae479e63b947f1df06
+  metadata.gz: b2c3d0d25e6daa74d683e2fd4260a157604278dcf622eebf34208ebf01317d444693f8fbe676534f2aaaf9d53ab670995fdb5133742c8c86fadca5cde3964764
+  data.tar.gz: 6a545b06e0b977518bdf314467012360c827c511381c073e73e66848ba83f8b7e96d94a59f086ff1999141d735047d07273e021983c65e16e54b94ea3db7799c

data/Gemfile

@@ -14,7 +14,7 @@ gemspec
 group :development, :test do
   gem 'acts_as_list'
   gem 'database_cleaner'
-  gem 'factory_bot_rails', '5.0.2'
+  gem 'factory_bot_rails', '5.2.0'
   gem 'launchy',         '~> 2.5.0'
   gem 'mysql2'
   gem 'poltergeist',      '~> 1.18.1'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (4.1.1)
+    trusty-cms (4.1.2)
       RedCloth (= 4.3.2)
       acts_as_list (>= 0.9.5, < 1.1.0)
       acts_as_tree (>= 2.6.1, < 2.9.0)
@@ -25,7 +25,7 @@ PATH
       roadie-rails
       sassc-rails
       stringex (>= 2.7.1, < 2.9.0)
-      tzinfo (~> 1.2.3)
+      tzinfo (>= 1.2.3, < 2.1.0)
       uglifier (>= 3.2, < 5.0)
       uuidtools (~> 2.1.5)
       will_paginate (~> 3.0)
@@ -34,61 +34,61 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.0.2.2)
-      actionpack (= 6.0.2.2)
+    actioncable (6.0.3.1)
+      actionpack (= 6.0.3.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionmailbox (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       mail (>= 2.7.1)
-    actionmailer (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
+    actionmailer (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.2.2)
-      actionview (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionpack (6.0.3.1)
+      actionview (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       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.2.2)
-      actionpack (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actiontext (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       nokogiri (>= 1.8.5)
-    actionview (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    actionview (6.0.3.1)
+      activesupport (= 6.0.3.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.2.2)
-      activesupport (= 6.0.2.2)
+    activejob (6.0.3.1)
+      activesupport (= 6.0.3.1)
       globalid (>= 0.3.6)
-    activemodel (6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activerecord (6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
-    activestorage (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
+    activemodel (6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activerecord (6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
+    activestorage (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
       marcel (~> 0.3.1)
-    activesupport (6.0.2.2)
+    activesupport (6.0.3.1)
       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)
     acts_as_list (1.0.1)
       activerecord (>= 4.2)
     acts_as_tree (2.8.0)
@@ -118,7 +118,7 @@ GEM
     crass (1.0.6)
     css_parser (1.7.1)
       addressable
-    database_cleaner (1.8.3)
+    database_cleaner (1.8.4)
     delocalize (1.2.0)
       rails (>= 2)
     devise (4.7.1)
@@ -132,10 +132,10 @@ GEM
     erubi (1.9.0)
     erubis (2.7.0)
     execjs (2.7.0)
-    factory_bot (5.0.2)
+    factory_bot (5.2.0)
       activesupport (>= 4.2.0)
-    factory_bot_rails (5.0.2)
-      factory_bot (~> 5.0.2)
+    factory_bot_rails (5.2.0)
+      factory_bot (~> 5.2.0)
       railties (>= 4.2.0)
     ffi (1.12.2)
     globalid (0.4.2)
@@ -169,7 +169,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     libv8 (7.3.492.27.1)
-    loofah (2.4.0)
+    loofah (2.5.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -179,13 +179,13 @@ GEM
     method_source (1.0.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.1009)
-    mimemagic (0.3.4)
+    mime-types-data (3.2020.0512)
+    mimemagic (0.3.5)
     mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    mini_racer (0.2.10)
+    mini_racer (0.2.14)
       libv8 (> 7.3)
-    minitest (5.14.0)
+    minitest (5.14.1)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
@@ -216,20 +216,20 @@ GEM
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.0.2.2)
-      actioncable (= 6.0.2.2)
-      actionmailbox (= 6.0.2.2)
-      actionmailer (= 6.0.2.2)
-      actionpack (= 6.0.2.2)
-      actiontext (= 6.0.2.2)
-      actionview (= 6.0.2.2)
-      activejob (= 6.0.2.2)
-      activemodel (= 6.0.2.2)
-      activerecord (= 6.0.2.2)
-      activestorage (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    rails (6.0.3.1)
+      actioncable (= 6.0.3.1)
+      actionmailbox (= 6.0.3.1)
+      actionmailer (= 6.0.3.1)
+      actionpack (= 6.0.3.1)
+      actiontext (= 6.0.3.1)
+      actionview (= 6.0.3.1)
+      activejob (= 6.0.3.1)
+      activemodel (= 6.0.3.1)
+      activerecord (= 6.0.3.1)
+      activestorage (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       bundler (>= 1.3.0)
-      railties (= 6.0.2.2)
+      railties (= 6.0.3.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -238,9 +238,9 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.0.2.2)
-      actionpack (= 6.0.2.2)
-      activesupport (= 6.0.2.2)
+    railties (6.0.3.1)
+      actionpack (= 6.0.3.1)
+      activesupport (= 6.0.3.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
@@ -304,7 +304,7 @@ GEM
     tilt (2.0.10)
     trustygems (0.2.1)
       rake
-    tzinfo (1.2.6)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -325,7 +325,7 @@ PLATFORMS
 DEPENDENCIES
   acts_as_list
   database_cleaner
-  factory_bot_rails (= 5.0.2)
+  factory_bot_rails (= 5.2.0)
   launchy (~> 2.5.0)
   mysql2
   poltergeist (~> 1.18.1)

data/app/assets/stylesheets/admin/partials/_content.scss

@@ -1,12 +1,13 @@
 main {
   float: left;
   grid-area: content;
+  padding: 1em 0 1em 1em;
   width: 100%;
 }
 
 .reversed main {
   .content {
-    padding: 1em;
+    padding: 1em 0;
   }
 }
 

data/app/assets/stylesheets/admin/partials/_forms.scss

@@ -53,7 +53,7 @@ select {
   color: $dark-gray;
   display: block;
   font-size: 1em;
-  height: 30px;
+  height: 40px;
   line-height: 1.5;
   margin: 0.5em;
   padding: 0.5em 1em;

data/app/controllers/admin/assets_controller.rb

@@ -64,17 +64,6 @@ class Admin::AssetsController < Admin::ResourceController
     end
   end
 
-  only_allow_access_to :regenerate,
-    :when => [:admin],
-    :denied_url => { :controller => 'admin/assets', :action => 'index' },
-    :denied_message => 'You must have admin privileges to refresh the whole asset set.'
-
-  def regenerate
-    Asset.all.each { |asset| asset.asset.reprocess! }
-    flash[:notice] = t('clipped_extension.all_thumbnails_refreshed')
-    redirect_to admin_assets_path
-  end
-
 private
   def compress(uploaded_asset)
     data = $kraken.upload(uploaded_asset.tempfile.path, 'lossy' => true)

data/app/views/admin/assets/edit.html.haml

@@ -30,12 +30,3 @@
           = save_model_and_continue_editing_button(@asset)
           = t("or")
           = link_to t("cancel"), admin_assets_path
-  
-  - main.edit_regenerate do
-    - if current_user.admin? or current_user.designer?
-      %fieldset
-        = form_tag refresh_admin_asset_path(@asset), :method => :put do
-          %label= t("clipped_extension.regenerate_thumbnails")
-          %br
-          .asset_buttons
-            %input.button{ :type => "submit", :value => t("clipped_extension.regenerate") }

data/app/views/admin/assets/new.html.haml

@@ -18,6 +18,3 @@
           = save_model_and_continue_editing_button(@asset)
           = t("or")
           = link_to t("cancel"), admin_assets_path
-
-    - main.edit_regenerate do
-       

data/app/views/admin/assets/remove.html.haml

@@ -2,7 +2,7 @@
 = stylesheet_link_tag 'admin/assets'
 
 %h1= t("clipped_extension.remove_asset")
-%h4.warning= t("clipped_extension.confirm_remove_asset")
+%h4.warning= t("clipped_extension.confirm_remove_asset").html_safe
 
 %table.index#assets{:cellpadding => "0", :cellspacing => "0", :border => "0"}
   %tbody

data/app/views/admin/layouts/remove.html.haml

@@ -1,12 +1,13 @@
+- body_classes << 'reversed'
+
 %h1= t('remove_layout')
 
 %h4= t('text.layouts.remove_warning').html_safe
 
-%table.index#layouts
+%table.tablesaw.index#layouts
   %tbody
     %tr.node.level_1
       %td.layout
-        = image('layout', :alt => '')
         = h @layout.name
 
 = form_for [:admin, @layout], :html => { :method => 'delete', 'data-onsubmit_status'=>'Removing layout&#8230;' } do

data/app/views/admin/page_parts/_page_part.html.haml

@@ -3,7 +3,7 @@
     = hidden_field_tag "page[parts_attributes][#{page_part_counter}][name]", page_part.name, :id => "part_#{page_part.name.to_slug}_name"
     = hidden_field_tag "page[parts_attributes][#{page_part_counter}][id]", page_part.id, :id => "part_#{page_part_counter}_id", :class => 'id_input' unless page_part.new_record?
     = hidden_field_tag "page[parts_attributes][#{page_part_counter}][_destroy]", page_part._destroy, :class => 'delete_input'
-    %p
+    .content
       %label To use HTML or Radius tags, switch to plain text view by clicking the 'Source' button.
       %span.reference_links
         = t('reference')

data/app/views/admin/snippets/remove.html.haml

@@ -1,13 +1,14 @@
+- body_classes << 'reversed'
+
 %h1= t('remove_snippet')
 
 %h4
   = t('text.snippets.remove_warning').html_safe
 
-%table.index#snippets
+%table.tablesaw.index#snippets
   %tbody
     %tr.node.level_1
       %td.snippet
-        = image('snippet', :alt => '')
         %span.title= @snippet.name
 
 = form_for [:admin, @snippet], :html => {:method => :delete, 'data-onsubmit_status'=>'Removing snippet&#8230;'} do

data/config/locales/en.yml

@@ -83,7 +83,6 @@ en:
     choose_file: 'Choose File'
     documents: 'Documents'
     caption: 'Caption'
-    confirm_refresh_assets: 'Are you sure you want to regenerate every asset thumbnail? This is likely to take a long time and use a lot of server resources: <strong class="warning">the performance of your site is very likely to be affected</strong> and your browser may time out before the operation is complete. This is only recommended if your asset collection is small!'
     confirm_remove_asset: 'Are you sure you want to <span class="warning">permanently remove</span> the following asset?'
     confirm_remove_from_page: 'Are you sure you want to remove this asset from the page?'
     delete_asset: 'Delete Asset'
@@ -103,9 +102,6 @@ en:
     no_assets: 'No Assets'
     no_attached_assets: 'No assets attached.'
     others: 'Others'
-    refresh_assets: 'Regenerate all thumbnails'
-    regenerate: 'Regenerate'
-    regenerate_thumbnails: 'Regenerate Thumbnails'
     remove_asset: 'Remove Asset'
     remove_from_page: 'Remove from page'
     reorder: 'Reorder'
@@ -177,6 +173,7 @@ en:
       - :month
       - :day
   delete_layout: 'Delete Layout'
+  delete_snippet: 'Delete Snippet'
   delete_pages: 'Delete %{pages}'
   delete_user: 'Delete User'
   description: 'Description'
@@ -249,6 +246,7 @@ en:
   remove: 'Remove'
   remove_field: 'Remove Field'
   remove_layout: 'Remove Layout'
+  remove_snippet: 'Remove Snippet'
   remove_page: 'Remove Page'
   remove_pages: 'Remove %{pages}'
   remove_tab: 'Remove Tab'
@@ -280,6 +278,8 @@ en:
   text:
     layouts:
       remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following layout?'
+    snippets:
+      remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following snippet?'
     pages:
       remove_warning: 'Are you sure you want to <span class="warning">permanently remove</span> the following %{pages}?'
     users:

data/config/routes.rb

@@ -27,7 +27,6 @@ TrustyCms::Application.routes.draw do
     resources :assets do
       get :remove, on: :member
       get :refresh, on: :collection
-      post :regenerate, on: :collection
       put :refresh, on: :member
     end
     resources :page_attachments, only: [:new] do

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '4.1.1'
+    VERSION = '4.1.2'
   end
 end

data/package.json

@@ -8,7 +8,7 @@
   "license": "MIT",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.13.0",
-    "jquery": "^3.2.1",
+    "jquery": "^3.5.0",
     "jquery-ui-bundle": "^1.12.1",
     "jquery-ujs": "^1.2.2",
     "tablesaw": "^3.1.2"

data/spec/dummy/package.json

@@ -4,7 +4,7 @@
   "main": "index.js",
   "license": "MIT",
   "dependencies": {
-    "jquery": "^3.2.1",
+    "jquery": "^3.5.0",
     "jquery-ui-bundle": "^1.12.1",
     "jquery-ujs": "^1.2.2"
   }

data/spec/dummy/yarn.lock

@@ -12,6 +12,6 @@ jquery-ujs@^1.2.2:
   dependencies:
     jquery ">=1.8.0"
 
-jquery@>=1.8.0, jquery@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.2.1.tgz#5c4d9de652af6cd0a770154a631bba12b015c787"
+jquery@>=1.8.0, jquery@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"

data/trusty_cms.gemspec

@@ -45,7 +45,7 @@ a general purpose content managment system--not merely a blogging engine.}
   s.add_dependency 'roadie-rails'
   s.add_dependency 'sassc-rails'
   s.add_dependency 'stringex',        '>= 2.7.1', '< 2.9.0'
-  s.add_dependency 'tzinfo',          '~> 1.2.3'
+  s.add_dependency 'tzinfo',          '>= 1.2.3', '< 2.1.0'
   s.add_dependency 'uglifier',        '>= 3.2', '< 5.0'
   s.add_dependency 'uuidtools',    '~> 2.1.5'
   s.add_dependency 'will_paginate',   '~> 3.0'

data/vendor/extensions/clipped-extension/lib/clipped_admin_ui.rb

@@ -8,7 +8,7 @@ module ClippedAdminUI
         def load_default_asset_regions
           OpenStruct.new.tap do |asset|
             asset.edit = TrustyCms::AdminUI::RegionSet.new do |edit|
-              edit.main.concat %w{edit_header edit_form edit_regenerate}
+              edit.main.concat %w{edit_header edit_form}
               edit.form.concat %w{edit_title edit_metadata}
             end
             asset.new = asset.edit

data/yarn.lock

@@ -943,10 +943,10 @@ jquery-ujs@^1.2.2:
   dependencies:
     jquery ">=1.8.0"
 
-jquery@>=1.8.0, jquery@^3.2.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
-  integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw==
+jquery@>=1.8.0, jquery@^3.5.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.0.tgz#9980b97d9e4194611c36530e7dc46a58d7340fc9"
+  integrity sha512-Xb7SVYMvygPxbFMpTFQiHh1J7HClEaThguL15N/Gg37Lri/qKyhRGZYzHRyLH8Stq3Aow0LsHO2O2ci86fCrNQ==
 
 js-tokens@^4.0.0:
   version "4.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts_as_list
@@ -378,16 +378,22 @@ dependencies:
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.3
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: uglifier
   requirement: !ruby/object:Gem::Requirement
@@ -706,7 +712,6 @@ files:
 - app/views/admin/assets/edit.html.haml
 - app/views/admin/assets/index.html.haml
 - app/views/admin/assets/new.html.haml
-- app/views/admin/assets/refresh.html.haml
 - app/views/admin/assets/remove.html.haml
 - app/views/admin/configuration/_clipped_edit.html.haml
 - app/views/admin/configuration/_clipped_show.html.haml

data/app/views/admin/assets/refresh.html.haml

@@ -1,14 +0,0 @@
-= stylesheet_link_tag 'admin/assets'
-
-%h1
-  = t("clipped_extension.refresh_assets")
-%p.confirmation
-  = t("clipped_extension.confirm_refresh_assets")
-%p.confirmation
-  =t('clipped_extension.refresh_assets_rake_task')
-
-%form{:action => regenerate_admin_assets_path, :method => :post}
-  .buttons
-    %input.button{:type => "submit", :value => t("clipped_extension.refresh_assets")}
-    = t("or")
-    = link_to t("cancel"), admin_assets_path