scrivito_sdk 1.19.0 → 1.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbd40a4e845d898a3b9f70d2a0c7a1302fea17b3106f547feae57b5a500a6a5
-  data.tar.gz: ba6207f0ae4ad56339de6f85655fbf084e834752ae98839a78a666ccc9118f76
+  metadata.gz: 83ab8abce7b3bdd3029afc044601146bc3b1702af66106e19943de299c05e951
+  data.tar.gz: b30c1c3499e2ddd522981f2b665c04e008934c66064885c433fa7051ef2bcf61
 SHA512:
-  metadata.gz: e5ddca7bf935f59ce92b443356388f96cdd2940e6263049996ae96411718bb97b7d950edb13c40fe92772e4eb57d2cd289ac23818bdc7108462bb1d89c76a0f4
-  data.tar.gz: f82a13347f14a213f08fb9e1a28e185111de34ad042d02adf5ad943161ef525eee241cd8039caf4cc03a0310f6ff0beb0fef5ec9f5961f90ecf07ac5fe8c5498
+  metadata.gz: 72f68ad2c3c7cff70d055deac8a346c24b401ac3bdecb17dff39cc01145a85d034688f2f18283dcbc95f5ccc09b844ec2a3579b86c827e5a67c24973dd612281
+  data.tar.gz: f86f9983e797d8cad89ecd24d28be0daaf5b1b25221522a100949c667d00497da17959e173c7db93d98da716ff296f5f31483d758a56f8935deaa0999ec7fcfd

data/app/cms/scrivito/binary_param_verifier.rb

@@ -37,7 +37,7 @@ module BinaryParamVerifier
 
   private_class_method def self.message_verifier
     ActiveSupport::MessageVerifier.new(
-      Rails.application.credentials.secret_key_base, serializer: JSON)
+      Rails.application.secret_key_base, serializer: JSON)
   end
 end
 

data/app/cms/scrivito/cms_routing.rb

@@ -1,3 +1,5 @@
+require 'cgi/escape'
+
 module Scrivito
 
 class CmsRouting < Struct.new(:request, :context, :scrivito_engine, :image_options)
@@ -20,18 +22,19 @@ class CmsRouting < Struct.new(:request, :context, :scrivito_engine, :image_optio
 
           if $2.present?
             begin
-              uri = URI.parse($2)
+              uri = URI.parse(CGI.unescapeHTML($2))
               options.merge!(extract_query(uri))
               options[:anchor] = uri.fragment
             rescue
             end
           end
 
+          safe = "".html_safe
           if editing_context.display_mode == 'editing'
             options[:id] = obj.id
-            scrivito_engine.base_id_path(options)
+            safe + scrivito_engine.base_id_path(options)
           else
-            path_or_url(obj, :path, options)
+            safe + path_or_url(obj, :path, options)
           end
         else
           "#__target_object_not_reachable"

data/app/cms/scrivito/migrations/migration.rb

@@ -1,3 +1,5 @@
+require 'benchmark'
+
 module Scrivito
   module Migrations
     class Migration
@@ -21,7 +23,7 @@ module Scrivito
       def migrate
         announce 'migrating'
 
-        time = Benchmark.measure { up }
+        time = ::Benchmark.measure { up }
 
         announce 'migrated (%.4fs)' % time.real; puts
       end

data/app/cms/scrivito/model_library.rb

@@ -110,11 +110,18 @@ class ModelLibrary
 
   def require_dependencies
     @require_dependencies ||= begin
+      zeitwerk_dirs = Rails.autoloaders.main.dirs.map(&:to_s)
       paths.each do |path|
+        path = path.to_s
         Dir["#{path}/**/*.rb"].sort.each do |file_path|
           begin
-            require_dependency(file_path)
-          rescue TypeError, Zeitwerk::NameError => e
+            if zeitwerk_dirs.include?(path)
+              relative = file_path.delete_prefix("#{path}/").delete_suffix('.rb')
+              relative.camelize.constantize
+            else
+              require file_path
+            end
+          rescue TypeError, NameError => e
             raise e if file_path.starts_with?(Rails.root.to_s)
           end
         end
@@ -123,7 +130,7 @@ class ModelLibrary
   end
 
   def autoload_model_paths
-    ActiveSupport::Dependencies.autoload_paths.select do |path|
+    Rails.autoloaders.main.dirs.select do |path|
       path.to_s.ends_with?('/app/models')
     end
   end

data/app/cms/scrivito/routing_extensions.rb

@@ -67,7 +67,7 @@ module RoutingExtensions
     options[:constraints] = {id: /[a-f0-9]{16}/} if route_name == :slug_id
 
     begin
-      match(path, options)
+      match(path, **options)
     rescue ArgumentError => error
       if error.message.include?(route.helper_name)
         raise ScrivitoError,

data/app/cms/scrivito/sdk_engine.rb

@@ -11,7 +11,7 @@ module ::Scrivito
     def self.to_prepare
       Scrivito::Configuration.to_prepare
 
-      unless Rails.application.config.cache_classes
+      if Rails.application.config.enable_reloading
         Scrivito.models.clear_cache
       end
     end
@@ -68,6 +68,7 @@ module ::Scrivito
     end
 
     scrivito_path = root.join('app', 'cms').to_s
+    $LOAD_PATH.unshift(scrivito_path) unless $LOAD_PATH.include?(scrivito_path)
     config.autoload_paths += [scrivito_path, root.join('app', 'models').to_s]
     config.autoload_once_paths += [scrivito_path]
   end

data/app/cms/scrivito/workspace/publish_checker.rb

@@ -89,7 +89,7 @@ module Scrivito
 
       def message_verifier
         @message_verifier ||= ActiveSupport::MessageVerifier.new(
-          Rails.application.credentials.secret_key_base, serializer: JSON
+          Rails.application.secret_key_base, serializer: JSON
         )
       end