svelte-on-rails 22.5.3 → 22.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 956d441cb147f816e089c8d524941dbce2fea72cdb90917054d3e01af43fdd04
-  data.tar.gz: bca954afa4a9a82b211ee76636abbef038dd2a7ae2bd951df82644a460515bd6
+  metadata.gz: b68077cf4a1661381ad07003c4b4bb08f837c5c7c25715e766c417aed5ef00e1
+  data.tar.gz: 93f86527e6be4a76d1bcbb0ecc45c9116bcb38442ad19318aca269b446c4ed68
 SHA512:
-  metadata.gz: 9caf26fece953877f1fe2dcf82592553d391732acdeb0775e9d0f520a739758c561b5b454bb51c109a75a8abfb87aab1cc1711aed8e72a4917a98d2544bf0ec1
-  data.tar.gz: f8a37fd78306cb4755813c7ce783e97c77be4833894b2b226783077c36fa694136459cca27e4755243fe03c372dd919bf7d3a2cf9805fd7e43392f3439a395c6
+  metadata.gz: 7120ba8595db223b52a9ca2be209ea927fced27d2dfc8844cbe2dfdf962d8e4e030432dfc3d9535eb801685c35ef08dce5b357c56e8f74105ffbebd1ba1cc667
+  data.tar.gz: c60db572d6ab9c5407577fc6369393602a22a2f8c60905c2650385dd2b38c9f3c97cee0ca1300c98409e67af68d0af863b7797e4e1dfb76ddf3672c44e85ee01

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/ssr_client.rb

@@ -33,7 +33,7 @@ module SvelteOnRails
       @socket_namespace = [
         "svelte",
         Rails.application.class.module_parent_name[0..15],
-        SsrClientControlChannel.short_env
+        Rails.env
       ].join("-")
       @socket_path = socket_path_fresh
 
@@ -453,13 +453,13 @@ module SvelteOnRails
     # Sits next to the SSR socket in tmp/sockets, or in the /tmp/svelte
     # fallback directory when Rails.root pushes total length over 103 chars.
     def self.socket_path
-      primary = Rails.root.join("tmp", "sockets", "svelte-ctl-#{short_env}.sock")
+      primary = Rails.root.join("tmp", "sockets", "svelte-ctl-#{Rails.env}.sock")
       if primary.to_s.length <= 103
         FileUtils.mkdir_p(File.dirname(primary))
         return primary
       end
 
-      Pathname.new("/tmp/svelte-#{short_env}-ctl-#{Digest::XXH64.hexdigest(Rails.root.to_s)}.sock")
+      Pathname.new("/tmp/svelte-#{Rails.env}-ctl-#{Digest::XXH64.hexdigest(Rails.root.to_s)}.sock")
     end
 
     # enable communication by rake task for admin purposes
@@ -527,20 +527,6 @@ module SvelteOnRails
 
     end
 
-    def self.short_env
-
-      name = Rails.env.to_s
-
-      short = {
-        "development" => "dev",
-        "production" => "prod",
-        "staging" => "stage",
-      }[name]
-
-      return name unless short
-      return name if Rails.root.join("config", "environments", "#{short}.rb").exist?
-      short
-    end
   end
 
   class SsrError < StandardError; end

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
@@ -60,7 +60,7 @@ namespace :svelte_on_rails do
         next
       end
 
-      pattern = "#{namespace}:*"
+      pattern = "#{namespace}*"
 
       puts "Scanning Redis for keys matching «#{pattern}» ..."
 

data/lib/tasks/ssr_client_tasks.rake

@@ -70,7 +70,7 @@ namespace :svelte_on_rails do
 
   namespace :ssr_client do
 
-    desc 'For development: to simulate when a client did not start on deploy (Then, on the first request of a svelte component - if not cached! - it must start)'
+    desc 'For development(and only ONE WORKER! for multiple puma workers it doesnt work!): to simulate when a client did not start on deploy (Then, on the first request of a svelte component - if not cached! - it must start)'
     task :stop do
       r = get_from_ssr_client(:stop)
       if r['success']

metadata

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