trusty-cms 5.5.8 → 5.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f153cb16e77134be24802048d7ba184050c14a3d71e9d76ccc1499e1ee3d9ff
-  data.tar.gz: e2cf2d5ebd9a4f0a5b09298e2d07e90711167fa4f193855e7d00acd87627ef4b
+  metadata.gz: 5f4ef88729e786d8a0977ac190c8546b49d5324469c7e9eaf80ef77ede977167
+  data.tar.gz: f2e6ddf0633251c8c6db60676c7f2a6ec83b6f4a39a2785cd7bb4f673c433081
 SHA512:
-  metadata.gz: a678af78e72cdcc397b26d946800ed3c23063d65a5aae6fbf02003b1a4014c1947fedd2b503dcceb466dd003bca27e42fe0203d4bbcfece95c4ac74f376eff2e
-  data.tar.gz: 3081cee243cc7c6cd1cb17fea14b5540b9236d873f31353a8d9ca7225d7296e79e129355abdb77027f667623da3f04eff0ffcef3f85eeb51aa759b5f9165de51
+  metadata.gz: 4402deb3bc80c490eec946374b38311cba2d447d626d43956ee05c969b393f1502528fe4eeded862610022af5d47d1904cda074f527e36df7a83aeda7a62c7b8
+  data.tar.gz: f1ce51e5f002ed8dbe4a0182ed0c20cae0b46f079ac3947c97ddd692d7697edb31bef42e19589d465ab327e9b177b09d9e748d5824b41b57ab74658eac7e7406

data/Gemfile.lock

@@ -29,68 +29,68 @@ PATH
       tzinfo (>= 1.2.3, < 2.1.0)
       uglifier (>= 3.2, < 5.0)
       uuidtools (>= 2.1.5, < 2.3.0)
-      will_paginate (~> 3.0)
+      will_paginate (>= 3, < 5)
 
 GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actioncable (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailbox (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionmailer (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      actionview (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.3)
-      actionview (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionpack (6.1.7.4)
+      actionview (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actiontext (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    actionview (6.1.7.4)
+      activesupport (= 6.1.7.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activejob (6.1.7.4)
+      activesupport (= 6.1.7.4)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activerecord (6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
-    activestorage (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    activemodel (6.1.7.4)
+      activesupport (= 6.1.7.4)
+    activerecord (6.1.7.4)
+      activemodel (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
+    activestorage (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activestorage-validator (0.2.2)
-      rails (>= 6.0.4.1)
-    activesupport (6.1.7.3)
+    activestorage-validator (0.3.0)
+      rails (>= 6.1.0)
+    activesupport (6.1.7.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -123,15 +123,15 @@ GEM
     crass (1.0.6)
     css_parser (1.12.0)
       addressable
-    database_cleaner (2.0.1)
-      database_cleaner-active_record (~> 2.0.0)
-    database_cleaner-active_record (2.0.1)
+    database_cleaner (2.0.2)
+      database_cleaner-active_record (>= 2, < 3)
+    database_cleaner-active_record (2.1.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
     delocalize (1.2.0)
       rails (>= 2)
-    devise (4.9.0)
+    devise (4.9.2)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
@@ -166,11 +166,12 @@ GEM
     httparty (0.21.0)
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.12.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
+    io-wait (0.3.0)
     json (2.6.3)
     kraken-io (0.1.3)
       activesupport
@@ -181,9 +182,9 @@ GEM
       addressable (~> 2.8)
     libv8-node (16.10.0.0-x86_64-darwin)
     libv8-node (16.10.0.0-x86_64-linux)
-    loofah (2.19.1)
+    loofah (2.21.3)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     mail (2.8.1)
       mini_mime (>= 0.1.1)
       net-imap
@@ -198,24 +199,27 @@ GEM
     mini_mime (1.1.2)
     mini_racer (0.6.3)
       libv8-node (~> 16.10.0.0)
-    minitest (5.18.0)
+    minitest (5.15.0)
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     mysql2 (0.5.5)
-    net-imap (0.2.3)
+    net-imap (0.2.2)
       digest
       net-protocol
       strscan
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.1.3)
+    net-protocol (0.1.1)
+      io-wait
       timeout
-    net-smtp (0.3.3)
+    net-smtp (0.3.0)
+      digest
       net-protocol
-    nio4r (2.5.8)
-    nokogiri (1.14.2-x86_64-darwin)
+      timeout
+    nio4r (2.5.9)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.14.2-x86_64-linux)
+    nokogiri (1.12.5-x86_64-linux)
       racc (~> 1.4)
     orm_adapter (0.5.0)
     poltergeist (1.18.1)
@@ -231,38 +235,39 @@ GEM
     psych (5.1.0)
       stringio
     public_suffix (4.0.7)
-    racc (1.6.2)
-    rack (2.2.6.4)
+    racc (1.7.1)
+    rack (2.2.7)
     rack-cache (1.13.0)
       rack (>= 0.4)
     rack-test (2.1.0)
       rack (>= 1.3)
     radius (0.7.5)
-    rails (6.1.7.3)
-      actioncable (= 6.1.7.3)
-      actionmailbox (= 6.1.7.3)
-      actionmailer (= 6.1.7.3)
-      actionpack (= 6.1.7.3)
-      actiontext (= 6.1.7.3)
-      actionview (= 6.1.7.3)
-      activejob (= 6.1.7.3)
-      activemodel (= 6.1.7.3)
-      activerecord (= 6.1.7.3)
-      activestorage (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    rails (6.1.7.4)
+      actioncable (= 6.1.7.4)
+      actionmailbox (= 6.1.7.4)
+      actionmailer (= 6.1.7.4)
+      actionpack (= 6.1.7.4)
+      actiontext (= 6.1.7.4)
+      actionview (= 6.1.7.4)
+      activejob (= 6.1.7.4)
+      activemodel (= 6.1.7.4)
+      activerecord (= 6.1.7.4)
+      activestorage (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.3)
+      railties (= 6.1.7.4)
       sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.1.1)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.5.0)
       loofah (~> 2.19, >= 2.19.1)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.7.3)
-      actionpack (= 6.1.7.3)
-      activesupport (= 6.1.7.3)
+    railties (6.1.7.4)
+      actionpack (= 6.1.7.4)
+      activesupport (= 6.1.7.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -279,22 +284,22 @@ GEM
     roadie-rails (2.3.0)
       railties (>= 5.1, < 7.1)
       roadie (>= 3.1, < 5.0)
-    rspec-core (3.12.0)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.1)
+    rspec-mocks (3.12.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-rails (6.0.1)
+    rspec-rails (6.0.3)
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       railties (>= 6.1)
-      rspec-core (~> 3.11)
-      rspec-expectations (~> 3.11)
-      rspec-mocks (~> 3.11)
-      rspec-support (~> 3.11)
+      rspec-core (~> 3.12)
+      rspec-expectations (~> 3.12)
+      rspec-mocks (~> 3.12)
+      rspec-support (~> 3.12)
     rspec-support (3.12.0)
     ruby-vips (2.1.4)
       ffi (~> 1.12)
@@ -321,15 +326,15 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    stringex (2.8.5)
+    stringex (2.8.6)
     stringio (3.0.5)
     strscan (3.0.6)
     temple (0.10.0)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (1.2.1)
+    thor (1.2.2)
     tilt (2.1.0)
-    timeout (0.3.2)
+    timeout (0.4.0)
     trustygems (0.2.1)
       rake
     tzinfo (2.0.6)
@@ -342,10 +347,10 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    will_paginate (3.3.1)
+    will_paginate (4.0.0)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.7)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   x86_64-darwin-18

data/app/models/asset_type.rb

@@ -152,10 +152,6 @@ class AssetType
     end
   end
 
-  def legacy_styles
-    TrustyCms::config['assets.additional_thumbnails'].to_s.gsub(' ', '').split(',').collect { |s| s.split('=') }.inject({}) { |ha, (k, v)| ha[k.to_sym] = v; ha }
-  end
-
   def style_dimensions(style_name)
     if style = paperclip_styles[style_name.to_sym]
       style[:size]

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 = '5.5.8'.freeze
+    VERSION = '5.5.9'.freeze
   end
 end

data/trusty_cms.gemspec

@@ -51,5 +51,5 @@ a general purpose content management system--not merely a blogging engine.'
   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', '< 2.3.0'
-  s.add_dependency 'will_paginate', '~> 3.0'
+  s.add_dependency 'will_paginate', '>= 3', '< 5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 5.5.8
+  version: 5.5.9
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-30 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -452,16 +452,22 @@ dependencies:
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 description: |-
   TrustyCms is a simple and powerful publishing system designed for small teams.
   It is built with Rails and is similar to Textpattern or MovableType, but is
@@ -1139,52 +1145,52 @@ signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
-- spec/rails_helper.rb
-- spec/models/layout_spec.rb
-- spec/controllers/application_controller_spec.rb
-- spec/controllers/users_controller_spec.rb
-- spec/spec_helper.rb
 - spec/fixtures/users.yml
+- spec/factories/page.rb
+- spec/factories/user.rb
+- spec/factories/page_part.rb
+- spec/factories/layout.rb
+- spec/models/layout_spec.rb
 - spec/support/custom_actions.rb
-- spec/dummy/config.ru
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/config/manifest.js
-- spec/dummy/db/schema.rb
-- spec/dummy/public/422.html
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/README.rdoc
-- spec/dummy/yarn.lock
-- spec/dummy/bin/setup
+- spec/ci/database.mysql.yml
+- spec/features/pages_spec.rb
+- spec/features/config_spec.rb
+- spec/features/layouts_spec.rb
+- spec/controllers/users_controller_spec.rb
+- spec/controllers/application_controller_spec.rb
 - spec/dummy/bin/rake
 - spec/dummy/bin/bundle
 - spec/dummy/bin/rails
-- spec/dummy/config/boot.rb
+- spec/dummy/bin/setup
+- spec/dummy/Rakefile
+- spec/dummy/README.rdoc
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/404.html
+- spec/dummy/public/500.html
+- spec/dummy/public/422.html
+- spec/dummy/package.json
 - spec/dummy/config/locales/en.yml
-- spec/dummy/config/database.yml
-- spec/dummy/config/secrets.yml
 - spec/dummy/config/environment.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/application.rb
+- spec/dummy/config/secrets.yml
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/trusty_cms_config.rb
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/trusty_cms_config.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/package.json
-- spec/ci/database.mysql.yml
-- spec/features/layouts_spec.rb
-- spec/features/config_spec.rb
-- spec/features/pages_spec.rb
-- spec/factories/page_part.rb
-- spec/factories/layout.rb
-- spec/factories/page.rb
-- spec/factories/user.rb
+- spec/dummy/config/database.yml
+- spec/dummy/yarn.lock
+- spec/dummy/app/assets/config/manifest.js
+- spec/dummy/db/schema.rb
+- spec/dummy/config.ru
+- spec/spec_helper.rb
+- spec/rails_helper.rb