trusty-cms 6.0.1 → 6.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a4f3d8dcc1b4fbf6568e27bf98af7cfcae4a052931c2937335537cb66daaa8a
-  data.tar.gz: c5984194b82b7ed08c422ec84146e67e5832eb87ff3f989e67783b3c3ce9eb17
+  metadata.gz: fd070d2a1f939233a8e702c0bca79d3642bbc42968b0f8ec119cd7da09f443be
+  data.tar.gz: b2da94658488d9005dfa919f1be59296f691cd65143b7badb2878118909e351c
 SHA512:
-  metadata.gz: 0aa5445008f164b7b963e8b018cf6790cff461f3847a5ee743d2da39ede9aba32d8c55353d7ed390030c6ad9001fcafe49aae39daa4cbf8cfb3e43bde2a44bda
-  data.tar.gz: f6dd5c1ca6d1d48453bb0101ebbe2e149298a832e57f7aedf41bbab7c20edfaa8b0d4cd3aeaa76720c919f10d12034f5ba95d0c9acc6b35611bfa3001067ba2d
+  metadata.gz: 57aa2f3b55e1f1c45396ba0ad1d7d0fba25d0fa48a2bf9da705b90ee28bc4764174bc5ee977fe814cb8b4c33df50f13082f96e837b8ae8feba3bf4d1ce3f5f10
+  data.tar.gz: a2451eda0132fce61f848c770dd066c3b28451fc6d3336984221a19cc209504d591a7ba041aaccb3453743c00703e3c09be37eafa6f25dfce5a5fa5d9a67c22b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (6.0.1)
+    trusty-cms (6.0.3)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.2.0)

data/app/controllers/admin/pages_controller.rb

@@ -17,7 +17,7 @@ class Admin::PagesController < Admin::ResourceController
       @template_name = 'index'
       self.models = Page.find(params[:page_id]).children.all
       response.headers['Content-Type'] = 'text/html;charset=utf-8'
-      render action: 'children.html.haml', layout: false
+      render action: 'children', layout: false
     end
   end
 

data/app/models/trusty_cms/config.rb

@@ -81,8 +81,7 @@ module TrustyCms
               TrustyCms::Config.initialize_cache
             end
             TrustyCms::Config.initialize_cache if TrustyCms::Config.stale_cache?
-            # Rails.cache.read('TrustyCms::Config')[key]
-            # TODO: Do we need this line?
+            Rails.cache.read('TrustyCms::Config')[key]
           end
         end
       end

data/lib/trusty_cms/task_support.rb

@@ -44,7 +44,7 @@ module TrustyCms
       def cache_files(dir, files, cache_file)
         cache_content = files.collect do |f|
           File.read(File.join(dir, f))
-        end .join("\n\n")
+        end.join("\n\n")
 
         cache_path = File.join(dir, cache_file)
         File.delete(cache_path) if File.exists?(cache_path)
@@ -54,7 +54,7 @@ module TrustyCms
       # Reads through the layout file and returns an array of JS filenames
       #
       def find_admin_js
-        layout = "#{TRUSTY_CMS_ROOT}/app/views/layouts/application.html.haml"
+        layout = "#{TRUSTY_CMS_ROOT}/app/views/layouts/application"
         js_regexp = /javascript_include_tag %w\((.*)\), :cache => 'admin\/all/
         files = File.open(layout) { |f| f.read.match(js_regexp)[1].split }
         files.collect { |f| f.split('/').last + '.js' }

data/lib/trusty_cms.rb

@@ -2,7 +2,7 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '6.0.1'.freeze
+    VERSION = '6.0.3'.freeze
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trusty-cms
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.3
 platform: ruby
 authors:
 - TrustyCms CMS dev team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-25 00:00:00.000000000 Z
+date: 2023-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage-validator
@@ -1152,52 +1152,52 @@ signing_key:
 specification_version: 4
 summary: A no-fluff content management system designed for small teams.
 test_files:
+- spec/models/layout_spec.rb
+- spec/features/layouts_spec.rb
+- spec/features/config_spec.rb
+- spec/features/pages_spec.rb
+- spec/support/custom_actions.rb
+- spec/ci/database.mysql.yml
 - spec/controllers/users_controller_spec.rb
 - spec/controllers/application_controller_spec.rb
-- spec/fixtures/users.yml
-- spec/ci/database.mysql.yml
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/bin/rails
-- spec/dummy/bin/setup
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
+- spec/rails_helper.rb
+- spec/spec_helper.rb
+- spec/dummy/config.ru
 - spec/dummy/config/application.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/database.yml
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/routes.rb
+- spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/trusty_cms_config.rb
-- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/cookies_serializer.rb
-- spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/initializers/trusty_cms_config.rb
+- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
 - spec/dummy/config/initializers/assets.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/environment.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/environments/development.rb
+- spec/dummy/config/environments/production.rb
+- spec/dummy/config/environments/test.rb
+- spec/dummy/config/database.yml
 - spec/dummy/config/boot.rb
+- spec/dummy/db/schema.rb
+- spec/dummy/yarn.lock
+- spec/dummy/README.rdoc
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/setup
+- spec/dummy/bin/rake
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/config/manifest.js
 - spec/dummy/package.json
-- spec/dummy/yarn.lock
-- spec/dummy/README.rdoc
-- spec/dummy/db/schema.rb
-- spec/dummy/config.ru
-- spec/spec_helper.rb
-- spec/rails_helper.rb
-- spec/models/layout_spec.rb
+- spec/dummy/public/favicon.ico
+- spec/dummy/public/500.html
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
 - spec/factories/page.rb
-- spec/factories/page_part.rb
 - spec/factories/user.rb
 - spec/factories/layout.rb
-- spec/support/custom_actions.rb
-- spec/features/config_spec.rb
-- spec/features/layouts_spec.rb
-- spec/features/pages_spec.rb
+- spec/factories/page_part.rb
+- spec/fixtures/users.yml