svelte-on-rails 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ea6749866c7f8dc1f8a29c24c617d359e9b92c9c2d62557b32d475a4bbccdc8
-  data.tar.gz: 81b36d010aab7e8691a78f25a6b98acc69dab5eb1d238ab7c342afab81d170e5
+  metadata.gz: a04f321576291cd2c8663dd72fb181438a64e678151a48cce151fab567cb63be
+  data.tar.gz: 896d0ca8348e9ef37cfd5ba61fef9ea51a9c315e14afb0fd6a4f2c6472737ae1
 SHA512:
-  metadata.gz: 89a88fb47bb30c0b7119ea47b05734d5bdbed9dbe82413099316a29251ccdbabb55092760cf0473d6629326c89a4b50b585a2c023f62c48b771712a6c43395a4
-  data.tar.gz: ac545bd664f6ac91a9245c447954d01821d70af98443c5764efc4d5c84c063b83d592049a857ac85f65bd24c3f8f200964b20a7e784644e1d67346b3a5728968
+  metadata.gz: eed1857d6d317005ba1f87afe6ec79f1a003823f6a84351fa14abb8fa29c46454ab71ed8496e387ee8faec48235f71203b0562f0b24b560236701c4afbe2e90e
+  data.tar.gz: aedb4fb0928a82b0d53426603d15604b64fc664c61e93b28040b9f8b52d5f1e319a14bbb81b2c6d1cce8da1292e46632ce038f24f6f098a71637ebb1d7ef2f4b

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')
@@ -165,14 +135,24 @@ module SvelteOnRails
         key2 = if @helper_options[:cache_key]
                  k2 = (@helper_options[:cache_key])
                  keys = k2.is_a?(Array) ? k2 : [k2]
-                 keys.map { |k| k.is_a?(ActiveRecord::Base) ? "#{k.class.name}#{k.id}" : k.to_s }.join('-')
+                 keys.map do |k|
+                   if k.is_a?(ActiveRecord::Base)
+                     "#{k.class.name}#{k.id}"
+                   elsif k == nil
+                     'nil'
+                   elsif k.present?
+                     k.to_s
+                   else
+                     "empty-#{k.class}"
+                   end.join('-')
+                 end
                end
 
         filename_part = [
           "#{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 +161,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

@@ -22,20 +22,34 @@ module SvelteOnRails
 
       support = SvelteOnRails::Lib::ViewHelperSupport.new(filename, props, request, true)
 
-      support.debug_log("Rendering component: #{filename}")
       log_message = '?'
       redis = support.conf.redis_instance
-
-      support.debug_log("Redis configuration: #{support.conf.redis_cache_store}")
+      cached_content = redis.get(support.cache_key)
 
       # TTL
       if support.debug?
+
+        support.debug_log("Rendering component: #{filename}")
+        support.debug_log("Redis configuration: #{support.conf.redis_cache_store}")
         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)")
+
+        key_stat = if cached_content.present?
+                     'has content'
+                   elsif redis.exists(support.cache_key)
+                     'exists but no content'
+                   else
+                     'not exists'
+                   end
+
+        ttl_stat = if redis.exists(support.cache_key)
+                     ", ttl was: #{ttl} seconds, now set to: #{support.redis_expiration_seconds} seconds"
+                   end
+
+        support.debug_log("Cache key: «#{support.cache_key}» (#{key_stat}#{ttl_stat})")
+
       end
-      redis.expire(support.cache_key, support.redis_expiration_seconds)
 
-      cached_content = redis.get(support.cache_key)
+      redis.expire(support.cache_key, support.redis_expiration_seconds)
 
       res = if cached_content
               log_message = "Returned #{support.filename}.svelte from cache"

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.2
 platform: ruby
 authors:
 - Christian Sedlmair