svelte-on-rails 22.4.0 → 22.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4e1180e9510fa0b8592b0b17be5ae1f75348124861184022648f2ec6b96865d
-  data.tar.gz: 737ff843db6d9fe9ae04d34fd24b214089368d2b34357ac0e64a14ff90c13d52
+  metadata.gz: 61a1a506e531e729e27433251f92fae2e24e73916f9004fafd75efb52b1a073e
+  data.tar.gz: d0cad407740e263bfc0f7b1dd58468734b4e4ddc00623257191c847144ddd1d1
 SHA512:
-  metadata.gz: 769b3c284cdddd35fb86895a29a6ae3a7bce52f501cb689856c1d166892fd360a264eafe274f2cc41944ec57d1a044d25c2c3a1934149ce9e0d1afb972f4501a
-  data.tar.gz: 2d067a4983fb063fc1e38a1a68e235050d405dad829bea0727ceed9a6d0a35752909d2ae2aba99177e73af21ef01e0cd848d51c30612838ea48fda5163c95c90
+  metadata.gz: 7d4404822d86e3e1eb612a937e2bf65883067e462779d5c4d469f6f456d87c97ad126d0ea9b2844ba4526880b82d44eeb12b1d40b988bb8c9dab3d9189ab219f
+  data.tar.gz: e86f2bb86f30a21165ed9422b7ef23eca36317ce1aedcc0e433792760cd3b7c6b10dc9d9bdd9c4ddc55f726fab5dd1c3f0d97f4817b93c75c14464ce1b8b38c3

data/lib/svelte_on_rails/configuration.rb

@@ -42,11 +42,8 @@ module SvelteOnRails
 
       # DEFAULTS
 
-      if @configs[:redis_cache_store]
-        store = @configs[:redis_cache_store]
-        @redis_namespace = store[:namespace]
-      end
-      @redis_namespace ||= "#{app_name}:svelte-on-rails:#{Rails.env rescue 'no-env'}"
+      rd = @configs[:redis_cache_store] && @configs[:redis_cache_store][:namespace]
+      @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])
@@ -182,7 +179,8 @@ module SvelteOnRails
 
     def redis_cache_store_configs
       if defined?(Rails.application) && Rails.application.config.cache_store.is_a?(Array) && Rails.application.config.cache_store.first == :redis_cache_store
-        { redis_cache_store: Rails.application.config.cache_store.second.deep_symbolize_keys }
+        rc = Rails.application.config.cache_store.second.deep_symbolize_keys
+        { redis_cache_store: rc.slice(:url, :namespace) }
       else
         {}
       end

data/lib/svelte_on_rails/lib/view_helper_support.rb

@@ -352,6 +352,7 @@ module SvelteOnRails
       end
 
       def redis_expiration_seconds
+        # this accepts integer or ActiveSupport::Duration
         ex = @options[:cache_expires_in] || conf.configs[:cache_expires_in] || 3.days
         ex.to_i
       end

data/lib/tasks/cache_tasks.rake

@@ -60,10 +60,7 @@ namespace :svelte_on_rails do
         next
       end
 
-      extra = ENV["PATTERN"].to_s.strip
-      pattern = extra.empty? ? "#{namespace}:*" : "#{namespace}:*#{extra}*"
-      limit = ENV["LIMIT"].to_s =~ /\A\d+\z/ ? ENV["LIMIT"].to_i : nil
-      sort_by = %w[size key].include?(ENV["SORT"]) ? ENV["SORT"] : "size"
+      pattern = "#{namespace}:*"
 
       puts "Scanning Redis for keys matching «#{pattern}» ..."
 
@@ -71,7 +68,7 @@ namespace :svelte_on_rails do
       cursor = "0"
 
       loop do
-        cursor, keys = redis.scan(cursor, match: pattern, count: 500)
+        cursor, keys = redis.scan(cursor, match: pattern)
 
         if keys.any?
           # Pipeline MEMORY USAGE / TTL / TYPE for the whole batch.
@@ -102,19 +99,18 @@ namespace :svelte_on_rails do
         next
       end
 
-      entries.sort_by! { |e| sort_by == "size" ? -e[:bytes] : e[:key] }
-      shown = limit ? entries.first(limit) : entries
+      entries.sort_by! { |e| -e[:bytes] }
 
-      key_w = [shown.map { |e| e[:key].length }.max, 3].max
-      size_w = [shown.map { |e| human_bytes(e[:bytes]).length }.max, 4].max
-      ttl_w = [shown.map { |e| ttl_str(e[:ttl]).length }.max, 3].max
-      type_w = [shown.map { |e| e[:type].to_s.length }.max, 4].max
+      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
 
-      shown.each do |e|
+      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]
@@ -123,8 +119,7 @@ namespace :svelte_on_rails do
 
       total_bytes = entries.sum { |e| e[:bytes] }
       puts "-" * header.length
-      puts "Total: #{entries.size} key(s), #{human_bytes(total_bytes)} in RAM" \
-             "#{limit && entries.size > limit ? " (showing top #{limit} by #{sort_by})" : ""}"
+      puts "Total: #{entries.size} key(s), #{human_bytes(total_bytes)} in RAM"
     end
   end
 end

data/templates/config_base/config/svelte_on_rails.yml

@@ -55,8 +55,9 @@ use_caching: false
 # this is the default for the #svelte view-helper.
 # When set to true, the redis gem is required.
 
-cache_expires_in: 3.days
+#cache_expires_in: 4.days
 # ttl for cache keys
+# can be overridden by view-helper options
 # default: 3.days
 
 debug: true

metadata

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