svelte-on-rails 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea6749866c7f8dc1f8a29c24c617d359e9b92c9c2d62557b32d475a4bbccdc8
-  data.tar.gz: 81b36d010aab7e8691a78f25a6b98acc69dab5eb1d238ab7c342afab81d170e5
+  metadata.gz: c6b58bda075eda9a5f99024e0903349bded01f4e383f241c08108c73f012b124
+  data.tar.gz: d252c973002ce1bcc9359869a77c0800c2a6b94c813563019432a1490180cbd7
 SHA512:
-  metadata.gz: 89a88fb47bb30c0b7119ea47b05734d5bdbed9dbe82413099316a29251ccdbabb55092760cf0473d6629326c89a4b50b585a2c023f62c48b771712a6c43395a4
-  data.tar.gz: ac545bd664f6ac91a9245c447954d01821d70af98443c5764efc4d5c84c063b83d592049a857ac85f65bd24c3f8f200964b20a7e784644e1d67346b3a5728968
+  metadata.gz: 4299f254dbe525ad6a4725c75f5db2254883776a3479e137adfbefa4dbca4bd39421963458e73eb476c355c820a164e6ee28df1de9ae45443896f6bcc2c89ec1
+  data.tar.gz: fcbf455e8ab2b244b3dad582f01d822ed6d76f5bafdadc2fd6bc75eec08eaaa4aec456f9ea69afc9abc0b691f4628eab1049748a29a8b549ebeb07340f61c8ab

data/lib/svelte_on_rails/lib/view_helper_support.rb

@@ -10,6 +10,7 @@ module SvelteOnRails
         @start_time = Time.now
         @filename = (file.match(/\.svelte$/) ? file[0..-8] : file)
         @conf = SvelteOnRails::Configuration.instance
+        @all_arguments = props
         @helper_options, @html_options, @props, @props_json = split_props(
           props,
           %i[class id style],
@@ -46,36 +47,7 @@ module SvelteOnRails
       end
 
       def redis_expiration_seconds
-        (conf.redis_cache_store[:expires_in] || 1.hour).to_i
-      end
-
-      def split_props(props, html_options, helper_options)
-        prp = {}
-        hlp_opts = {}
-        ht_opts = {
-          data: {
-            svelte_component: "/#{conf.components_folder + filename}",
-            controller: 'svelte-on-rails',
-          }
-        }
-
-        props.each do |k, v|
-          _k = k.to_sym
-          if helper_options.include?(_k)
-            hlp_opts[_k] = v
-          elsif html_options.include?(_k)
-            ht_opts[_k] = v
-          else
-            prp[_k] = v
-          end
-        end
-
-        ht_opts[:class] = "#{ht_opts[:class]} svelte-component".strip
-        prp_js = prp.to_json
-        ht_opts[:data][:props] = prp_js
-        ht_opts[:data][:svelte_status] = 'do-not-hydrate-me' if hlp_opts[:hydrate] == false
-
-        [hlp_opts, ht_opts, prp, prp_js]
+        (conf.redis_cache_store[:expires_in] || @helper_options[:expires_in] || 1.hour).to_i
       end
 
       def elapsed_milliseconds
@@ -155,8 +127,6 @@ module SvelteOnRails
         _ssr == :auto ? request.headers[conf.non_ssr_request_header].blank? : _ssr
       end
 
-      private
-
       def generate_cache_key
 
         mtime_file = @conf.ssr_dist_folder.join('last_mtime')
@@ -172,7 +142,7 @@ module SvelteOnRails
           "#{filename.split('/').last}.svelte",
           Zlib.crc32(filename).to_s(36),
           key2
-        ].join('-')
+        ].compact.join('-')
 
         @cache_key_primary = [
           conf.redis_cache_store[:namespace] ? conf.redis_cache_store[:namespace] : "svelte-on-rails:#{Rails.env}",
@@ -181,13 +151,42 @@ module SvelteOnRails
 
         last_part = [
           (@conf.watch_changes? ? Zlib.crc32(mtime).to_s(36) : nil),
-          Zlib.crc32(@props_json).to_s(36)
+          Zlib.crc32(@all_arguments.to_json).to_s(36)
         ].compact.join('-')
 
         @cache_key = [@cache_key_primary, last_part].join(':')
 
       end
 
+      def split_props(props, html_options, helper_options)
+        prp = {}
+        hlp_opts = {}
+        ht_opts = {
+          data: {
+            svelte_component: "/#{conf.components_folder + filename}",
+            controller: 'svelte-on-rails',
+          }
+        }
+
+        props.each do |k, v|
+          _k = k.to_sym
+          if helper_options.include?(_k)
+            hlp_opts[_k] = v
+          elsif html_options.include?(_k)
+            ht_opts[_k] = v
+          else
+            prp[_k] = v
+          end
+        end
+
+        ht_opts[:class] = "#{ht_opts[:class]} svelte-component".strip
+        prp_js = prp.to_json
+        ht_opts[:data][:props] = prp_js
+        ht_opts[:data][:svelte_status] = 'do-not-hydrate-me' if hlp_opts[:hydrate] == false
+
+        [hlp_opts, ht_opts, prp, prp_js]
+      end
+
     end
   end
 end

data/lib/svelte_on_rails/view_helpers.rb

@@ -31,7 +31,7 @@ module SvelteOnRails
       # TTL
       if support.debug?
         ttl = redis.ttl(support.cache_key)
-        support.debug_log("Cache key: #{support.cache_key} (ttl was: #{ttl} seconds, now set to: #{support.redis_expiration_seconds} seconds)")
+        support.debug_log("Cache key: «#{support.cache_key}» (ttl was: #{ttl} seconds, now set to: #{support.redis_expiration_seconds} seconds)")
       end
       redis.expire(support.cache_key, support.redis_expiration_seconds)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svelte-on-rails
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Christian Sedlmair