svelte-on-rails 22.4.0 → 22.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4e1180e9510fa0b8592b0b17be5ae1f75348124861184022648f2ec6b96865d
-  data.tar.gz: 737ff843db6d9fe9ae04d34fd24b214089368d2b34357ac0e64a14ff90c13d52
+  metadata.gz: 58df2a12a11fd0781c7e00d95418b4313d18effd284f913ed9d8d2ac79191adf
+  data.tar.gz: eb08daf8b9bf7f60531fd3090890462a873c1f14a688a15e766f714ff36e38a5
 SHA512:
-  metadata.gz: 769b3c284cdddd35fb86895a29a6ae3a7bce52f501cb689856c1d166892fd360a264eafe274f2cc41944ec57d1a044d25c2c3a1934149ce9e0d1afb972f4501a
-  data.tar.gz: 2d067a4983fb063fc1e38a1a68e235050d405dad829bea0727ceed9a6d0a35752909d2ae2aba99177e73af21ef01e0cd848d51c30612838ea48fda5163c95c90
+  metadata.gz: 93853048bfc3ffdd8d874f94d012e555e9247f0bcf42db4850d1bfe2a9e450dc278f4ee4b85fef5ab721c61794e02f30e8041dd2a067bb4a2337c0966a100784
+  data.tar.gz: 4d504b58c5f9a32726ab1047dd8c1d14b37548c33642d13e5f37d2626bc9da7a3ee5e7cf85f004eca4aec8363f2de34e086fbc13773edc12afc1ce63f23680b7

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/lib/tasks/svelte_on_rails_tasks.rake

@@ -13,6 +13,21 @@ namespace :svelte_on_rails do
     ppid = (ppid_file.exist? ? File.read(ppid_file).chomp : nil)
     server_helpers = SvelteOnRails::SsrServerHelpers.new
     socket_path = server_helpers.socket_path(ppid: ppid)
+
+    unless File.socket?(socket_path)
+      puts "*" * 80
+      puts "ERROR: socket_path does not exist or is not a socket: #{socket_path}"
+      puts "Do you have set RAILS_ENV correctly?"
+      puts "*" * 80
+    end
+
+    unless ppid_file.exist?
+      puts "*" * 80
+      puts "ERROR: PPID File does not exist: #{ppid_file}"
+      puts "Is the app running?"
+      puts "*" * 80
+    end
+
     curl_installed = system('which curl > /dev/null 2>&1')
     if curl_installed
       curl_cmd = "curl --unix-socket #{socket_path} http://localhost"
@@ -20,12 +35,10 @@ namespace :svelte_on_rails do
       srv_details = (JSON.parse(stdout) rescue {})
     end
 
-    env_check = rails_env_check(socket_path)
-
     puts
     puts '=' * line_width
     puts "Svelte on Rails SSR Server Status:"
-    puts "  Rails env: #{Rails.env.upcase}"
+    puts "  Rails env: #{Rails.env}"
     if srv_details['uptime']
       puts "  Uptime: #{srv_details['uptime'].round(0)}sec"
     else
@@ -40,14 +53,8 @@ namespace :svelte_on_rails do
     puts label('SSR Server version') + configs.npm_package_version_test.to_s
     puts
     puts 'Rails instance'
-    if !server_helpers.ssr_server_ppid_file.exist?
-      puts label('Process.ppid') + "#{server_helpers.ssr_server_ppid_file} not found, rails seems not to run or the SsrServer is not initialized yet."
-    elsif env_check == :clearly_correct
-      puts label('Process.ppid') + ppid.to_s
-      puts label('Socket') + socket_path.to_s
-    else
-      puts 'Rails env could not be determinated, compared to the socket path, so, no socket path could be determined.'
-    end
+    puts label('Process.ppid') + ppid.to_s
+    puts label('Socket') + socket_path.to_s
     puts
     puts '=' * line_width
     puts
@@ -67,72 +74,28 @@ namespace :svelte_on_rails do
       puts "  • kill #{srv_details['pid']}" if srv_details['pid']
     end
     puts
-    if env_check == :clearly_correct
-      puts '=' * line_width
-      puts
-      puts 'NODE INSTANCE INFO:'
-      puts '  (output of the above mentioned curl command)'
-      puts
-      puts '-' * line_width
-      if curl_installed
-        stdout, stderr, status = Open3.capture3(curl_cmd)
-        if status.success?
-          puts stdout
-        else
-          puts "curl exited with status #{status.exitstatus}"
-          puts stderr unless stderr.to_s.strip.empty?
-        end
+
+    puts '=' * line_width
+    puts
+    puts 'NODE INSTANCE INFO:'
+    puts '  (output of the above mentioned curl command)'
+    puts
+    puts '-' * line_width
+    if curl_installed
+      stdout, stderr, status = Open3.capture3(curl_cmd)
+      if status.success?
+        puts stdout
       else
-        puts "curl is not installed on this machine, skipping execution."
+        puts "curl exited with status #{status.exitstatus}"
+        puts stderr unless stderr.to_s.strip.empty?
       end
-      puts
-      puts '=' * line_width
-      puts
-    end
-
-  end
-
-  def rails_env_check(socket_path)
-
-    line_width = 100
-
-    envs = guessed_rails_envs(socket_path.dirname)
-
-    if envs == [Rails.env]
-
-      :clearly_correct
-
-    elsif envs.empty?
-
-      puts
-      puts '*' * line_width
-      puts "WARNING: This Rails app seems not to run."
-      puts '*' * line_width
-      puts
-      :possible_correct
-
-    elsif envs.include?(Rails.env)
-
-      puts
-      puts '*' * line_width
-      puts "INFO: Based on the socket paths #{socket_path.dirname},"
-      puts "this Rails app may run in #{envs.join(' or ')}."
-      puts "You are running as #{Rails.env} (Rails.env) which may be right."
-      puts '*' * line_width
-      puts
-      :possible_correct
-
     else
-
-      puts
-      puts '*' * line_width
-      puts "WARNING: You are running as #{Rails.env} (Rails.env)"
-      puts "But the rails app seems to run in #{envs.join(' or ')}"
-      puts '*' * line_width
-      puts
-      :possible_wrong
-
+      puts "curl is not installed on this machine, skipping execution."
     end
+    puts
+    puts '=' * line_width
+    puts
+
   end
 
   def label(msg)
@@ -140,21 +103,6 @@ namespace :svelte_on_rails do
     "  #{msg}:"[0..20] + (msg.length > 22 ? ':' : '') + ' ' * (20 - l)
   end
 
-  def guessed_rails_envs(dir)
-    envs_dir = Rails.root.join('config', 'environments')
-    return [] unless File.directory?(envs_dir) && File.directory?(dir)
-
-    possible_envs = Dir.children(envs_dir)
-                       .select { |f| f.end_with?('.rb') }
-                       .map { |f| File.basename(f, '.rb') }
-
-    entries = Dir.children(dir)
-
-    possible_envs.select do |env|
-      entries.any? { |entry| entry.include?("-#{env}-") }
-    end
-  end
-
 end
 
 Rake::Task["assets:precompile"].enhance ["svelte_on_rails:precompile"]

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