svelte-on-rails 22.5.4 → 22.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a6a1c4758093d4ee7080494a52d0a3709728dc830b7f0c261841363100ea593
-  data.tar.gz: 18d316a0a47d9c780d3169acd3edc525f4a097864302182b1398173ffd26aba7
+  metadata.gz: ab6d571ef0c95edbc34868a44322a5fd65ce530ec4bf9d25abae20bb3f07cb6d
+  data.tar.gz: 875903772b806d6be74e66057cfb75c14d12e127a7024ab240be4d8e9b52f8c6
 SHA512:
-  metadata.gz: af06be9fb96620f83701d90eb2745dc551329f25b1fceedf55e02f42150361f4d491b0ae5fb1279639761449a08dbab73861711c6776178d294bc84343f012c9
-  data.tar.gz: c8c362043c2872cb7b4bf8b89de643daca6accfca5d5d7937ed726f3f49dea6babe3b5501c43a9c497be5eb843b4195832b0cf1a97e3e856d9e836605a3feda6
+  metadata.gz: 0bf76f5cc03cd13af95609c0a3e5d1ae7c5d6e9b899cad7f0fea2da9636a12cd8e015bf6e8f7fb5475d55a82f33ad3362123ee57c81e30b9cbecfb2f669586e5
+  data.tar.gz: 585f3cefa671842756b103dbafded674e47c217db31954044e42731dbe1648a293210b0b156ef8de842a74c24891a929c871121fd3d3da9e1d4b06d9032b0312

data/lib/svelte_on_rails/configuration.rb

@@ -43,7 +43,7 @@ module SvelteOnRails
       # DEFAULTS
 
       rd = @configs[:redis_cache_store] && @configs[:redis_cache_store][:namespace]
-      @redis_namespace ||= "#{rd || app_name}:svelte-on-rails:#{Rails.env rescue 'no-env'}"
+      @redis_namespace ||= "#{rd || app_name}:svelte-on-rails:#{Rails.env rescue 'no-env'}:"
       @configs[:skip_ssr_header] ||= 'X-Turbo-Request-ID'
       if defined? Redis
         @redis_instance = Redis.new(url: redis_cache_store[:url])

data/lib/svelte_on_rails/lib/view_helper_support.rb

@@ -344,10 +344,11 @@ module SvelteOnRails
                        fingerprint = (@conf.watch_changes? ? @conf.fingerprint(component_paths[:path], debug?, component_paths[:name]) : '')
 
                        cache_key_raw = @options.to_s +
-                                       @cached_props.to_s + fingerprint + @options[:cache_key].to_s +
-                                       (@cached_props.key?(:_uncached) ? "" : @html_options.to_s)
+                                       @cached_props.to_s +
+                                       fingerprint +
+                                       @html_options.to_s
 
-                       "#{@conf.redis_namespace}:#{@component_name.gsub('/','-')}:#{Digest::XXH64.hexdigest(cache_key_raw)}"
+                       "#{@conf.redis_namespace}#{@component_name.gsub('/','-')}:#{Digest::XXH64.hexdigest(cache_key_raw)}"
                      end
       end
 

data/lib/svelte_on_rails/view_helpers.rb

@@ -45,9 +45,9 @@ module SvelteOnRails
               support.render_cached(self) do
                 rnd = support.render_svelte(@current_template)
                 if rnd[:success]
+                  support.log_completed("returned from cache, with uncached props#{', (Fallback!)' if rnd[:fallback]}")
                   concat(rnd[:head].html_safe)
                   concat(rnd[:html].html_safe)
-                  support.log_completed("returned from cache, with uncached props#{', (Fallback!)' if rnd[:fallback]}")
                 elsif config.configs[:ssr_error_tag]
                   sor_error_tag(support, wrapper_html, component_props, 'server-side-svelte-render-error', 'SVELTE RENDER FAILED')
                 else

data/lib/tasks/cache_tasks.rake

@@ -13,7 +13,7 @@ namespace :svelte_on_rails do
       end
 
       if Rails.env.production? && ENV["FORCE"] != "1"
-        print "You are about to delete all keys matching «#{namespace}:*» in PRODUCTION. Continue? (y/N) "
+        print "You are about to delete all keys matching «#{namespace}*» in PRODUCTION. Continue? (y/N) "
         answer = STDIN.gets.to_s.strip.downcase
         unless %w[y yes].include?(answer)
           puts "Aborted."
@@ -21,7 +21,7 @@ namespace :svelte_on_rails do
         end
       end
 
-      pattern = "#{namespace}:*"
+      pattern = "#{namespace}*"
       cursor = "0"
       total_deleted = 0
       batches = 0
@@ -51,16 +51,72 @@ namespace :svelte_on_rails do
 
     desc "Show all svelte-on-rails Redis keys with their memory footprint (scoped to redis_namespace). Env: LIMIT=n, SORT=size|key, PATTERN=extra-glob"
     task show: :environment do
+
+      _entries = entries
+
+      _entries.sort_by! { |e| -e[:bytes] }
+
+      key_w = [_entries.map { |e| e[:key].length }.max, 3].max
+      size_w = [_entries.map { |e| human_bytes(e[:bytes]).length }.max, 4].max
+      ttl_w = [_entries.map { |e| ttl_str(e[:ttl]).length }.max, 3].max
+      type_w = [_entries.map { |e| e[:type].to_s.length }.max, 4].max
+
+      header = format("%-#{key_w}s  %#{size_w}s  %#{ttl_w}s  %-#{type_w}s", "KEY", "SIZE", "TTL", "TYPE")
+      puts header
+      puts "-" * header.length
+
+      _entries.each do |e|
+        puts format(
+               "%-#{key_w}s  %#{size_w}s  %#{ttl_w}s  %-#{type_w}s",
+               e[:key], human_bytes(e[:bytes]), ttl_str(e[:ttl]), e[:type]
+             )
+      end
+
+      total_bytes = _entries.sum { |e| e[:bytes] }
+      puts "-" * header.length
+      puts "Total: #{_entries.size} key(s), #{human_bytes(total_bytes)} in RAM"
+    end
+
+    desc "Show contents of cached keys"
+    task show_contents: :environment do
+
+      entries.each do |e|
+        puts '='*120
+        puts "#{e[:key]} (#{human_bytes(e[:bytes])})"
+        puts '-'*120
+        puts SvelteOnRails::Configuration.instance.redis_instance.get(e[:key])
+      end
+
+    end
+
+    desc "Show only the svelte part (wrapping div stripped away) of cached keys"
+    task show_svelte: :environment do
+
+      entries.each do |e|
+
+        ht = SvelteOnRails::Configuration.instance.redis_instance.get(e[:key])
+        nok = Nokogiri::HTML(ht)
+
+        puts '='*120
+        puts "#{e[:key]} (#{human_bytes(e[:bytes])})"
+        puts '-'*120
+        puts nok.at_css('.svelte-component')&.inner_html
+      end
+
+    end
+
+
+    def entries
       conf = SvelteOnRails::Configuration.instance
       redis = conf.redis_instance
       namespace = conf.redis_namespace
 
       unless redis
         warn "svelte_on_rails:show_cache — no redis_instance configured, nothing to show."
-        next
+        return []
       end
 
-      pattern = "#{namespace}:*"
+      pattern = "#{namespace}*"
 
       puts "Scanning Redis for keys matching «#{pattern}» ..."
 
@@ -96,30 +152,9 @@ namespace :svelte_on_rails do
 
       if entries.empty?
         puts "No keys found under «#{pattern}»."
-        next
-      end
-
-      entries.sort_by! { |e| -e[:bytes] }
-
-      key_w = [entries.map { |e| e[:key].length }.max, 3].max
-      size_w = [entries.map { |e| human_bytes(e[:bytes]).length }.max, 4].max
-      ttl_w = [entries.map { |e| ttl_str(e[:ttl]).length }.max, 3].max
-      type_w = [entries.map { |e| e[:type].to_s.length }.max, 4].max
-
-      header = format("%-#{key_w}s  %#{size_w}s  %#{ttl_w}s  %-#{type_w}s", "KEY", "SIZE", "TTL", "TYPE")
-      puts header
-      puts "-" * header.length
-
-      entries.each do |e|
-        puts format(
-               "%-#{key_w}s  %#{size_w}s  %#{ttl_w}s  %-#{type_w}s",
-               e[:key], human_bytes(e[:bytes]), ttl_str(e[:ttl]), e[:type]
-             )
+        return []
       end
-
-      total_bytes = entries.sum { |e| e[:bytes] }
-      puts "-" * header.length
-      puts "Total: #{entries.size} key(s), #{human_bytes(total_bytes)} in RAM"
+      entries
     end
   end
 end

metadata

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