plutonium 0.10.2 → 0.10.3

data/lib/generators/pu/service/sidekiq/templates/config/initializers/sidekiq.rb

@@ -0,0 +1,53 @@
+# frozen_string_literal: true
+
+redis_config = {
+  url: ENV.fetch("REDIS_QUEUE_URL", ""),
+  connect_timeout: 1,  # Defaults to 1 second
+  read_timeout: 0.2, # Defaults to 1 second
+  write_timeout: 0.2, # Defaults to 1 second
+  # https://github.com/redis/redis-rb#reconnections
+  reconnect_attempts: [ # Defaults to 1
+    0, # retry immediately
+    0.25, # retry a second time after 250ms
+    1, # retry a third time after another 1s
+    5, # retry a fourth time after another 5s
+    10 # retry a fifth and final time after another 15s
+  ]
+}
+
+Sidekiq.configure_client do |config|
+  config.redis = redis_config
+
+  # Configure sidekiq client here
+end
+
+Sidekiq.configure_server do |config|
+  config.redis = redis_config
+  config.logger = Rails.logger = Sidekiq::Logger.new($stdout)
+  config.death_handlers << lambda { |job, exception|
+    worker = job["wrapped"].safe_constantize
+    worker&.sidekiq_retries_exhausted_block&.call(job, exception)
+  }
+
+  if defined?(Prosopite)
+    # configure prosopite
+    config.server_middleware do |chain|
+      require "prosopite/middleware/sidekiq"
+      chain.add(Prosopite::Middleware::Sidekiq)
+    end
+  end
+
+  # Configure sidekiq server here
+end
+
+# Use sidekiq
+Rails.application.config.active_job.queue_adapter = :sidekiq
+
+# nil will use the "default" queue
+# some of these options will not work with your Rails version. add/remove as necessary
+Rails.application.config.action_mailer.deliver_later_queue_name = nil if Rails.application.config.respond_to?(:action_mailbox)  # defaults to "mailers"
+Rails.application.config.action_mailbox.queues.routing = nil if Rails.application.config.respond_to?(:action_mailbox)  # defaults to "action_mailbox_routing"
+Rails.application.config.active_storage.queues.analysis = nil if Rails.application.config.respond_to?(:active_storage)  # defaults to "active_storage_analysis"
+Rails.application.config.active_storage.queues.purge = nil if Rails.application.config.respond_to?(:active_storage)  # defaults to "active_storage_purge"
+Rails.application.config.active_storage.queues.mirror = nil if Rails.application.config.respond_to?(:active_storage)  # defaults to "active_storage_mirror"
+Rails.application.config.active_storage.queues.purge = :low if Rails.application.config.respond_to?(:active_storage) # put purge jobs in the `low` queue

data/lib/generators/pu/service/sidekiq/templates/config/sidekiq.yml

@@ -0,0 +1,6 @@
+---
+:queues:
+  - [critical, 5]
+  - [high, 3]
+  - [default, 2]
+  - [low, 1]

data/lib/plutonium/config.rb

@@ -5,12 +5,17 @@ module Plutonium
   module Config
     mattr_accessor :stylesheet_tag
     @@stylesheet_tag = ->(view_context) {
-      "<link rel=\"stylesheet\" href=\"#{Plutonium.stylesheet_link}\" />"
+      "<link rel=\"stylesheet\" href=\"#{Plutonium.stylesheet_link}\" data-turbo-track=\"reload\" />".html_safe
     }
 
     mattr_accessor :script_tag
     @@script_tag = ->(view_context) {
-      "<script src=\"#{Plutonium.script_link}\"></script>"
+      "<script src=\"#{Plutonium.script_link}\" data-turbo-track=\"reload\"></script>".html_safe
+    }
+
+    mattr_accessor :favicon_tag
+    @@favicon_tag = ->(view_context) {
+      "<link rel=\"icon\" type=\"image/x-icon\" href=\"#{Plutonium.favicon_link}\">".html_safe
     }
   end
 end

data/lib/plutonium/core/controllers/base.rb

@@ -35,7 +35,7 @@ module Plutonium
         end
 
         def application_name
-          Rails.application.class.module_parent.name
+          Plutonium.application_name
         end
 
         #

data/lib/plutonium/core/controllers/entity_scoping.rb

@@ -43,15 +43,15 @@ module Plutonium
           return unless current_user.present?
 
           @current_scoped_entity ||= case scoped_entity_strategy
-          when :current_user
-            current_user
           when :path
             scoped_entity_class
               .associated_with(current_user)
               .from_path_param(request.path_parameters[scoped_entity_param_key])
               .first! # Raise NotFound if user does not have access to the entity or it does not exist
+          when Symbol
+            send scoped_entity_strategy
           else
-            raise NotImplementedError, "unknown scoped entity strategy: #{scoped_entity_strategy}"
+            raise NotImplementedError, "unknown scoped entity strategy: #{scoped_entity_strategy.inspect}"
           end
         end
 

data/lib/plutonium/icons.rb

@@ -17,7 +17,7 @@ module Plutonium
           path = Plutonium.root.join "app/assets/icons/#{name}.svg"
           raise "Invalid icon: #{name}" unless File.exist?(path)
 
-          File.read(path).sub("<svg ", "<svg class=\"#{ICON_SIZES[size]}\" ")
+          File.read(path).sub("<svg ", "<svg class=\"#{ICON_SIZES[size]}\" ").html_safe
         end
       end
     end

data/lib/plutonium/railtie.rb

@@ -39,6 +39,10 @@ module Plutonium
       config.view_component.capture_compatibility_patch_enabled = true
     end
 
+    rake_tasks do
+      load "tasks/create_rodauth_admin.rake"
+    end
+
     config.after_initialize do
       Plutonium::Reloader.start! if Rails.application.config.plutonium.enable_hotreload
       Plutonium::ZEITWERK_LOADER.eager_load if Rails.env.production?

data/lib/plutonium/resource/controller.rb

@@ -49,6 +49,7 @@ module Plutonium
       # @return [ActiveRecord::Base, nil] The resource record
       def resource_record
         @resource_record ||= policy_scope(resource_class).from_path_param(params[:id]).first! if params[:id].present?
+        @resource_record
       end
 
       # Returns the submitted resource parameters

data/lib/plutonium/rodauth/controller_methods.rb

@@ -12,7 +12,7 @@ module Plutonium
       private
 
       def application_name
-        Rails.application.class.module_parent.name
+        Plutonium.application_name
       end
     end
   end

data/lib/plutonium/version.rb

@@ -1,3 +1,3 @@
 module Plutonium
-  VERSION = "0.10.2"
+  VERSION = "0.10.3"
 end

data/lib/plutonium.rb

@@ -23,6 +23,10 @@ module Plutonium
     Rails.logger
   end
 
+  def self.application_name
+    Rails.application.class.module_parent.name
+  end
+
   def self.development?
     ActiveModel::Type::Boolean.new.cast(ENV["PLUTONIUM_DEV"]).present?
   end

data/lib/tasks/create_rodauth_admin.rake

@@ -0,0 +1,16 @@
+namespace :rodauth do
+  desc "Create a Rodauth admin account"
+  task admin: :environment do
+    # require "rodauth"
+    # require "active_record"
+    require "tty-prompt"
+
+    prompt = TTY::Prompt.new
+    email = ENV["EMAIL"] || prompt.ask("email:", required: true)
+    # password = SecureRandom.hex
+    # password = ENV["PASSWORD"] || prompt.mask("password:", required: true)
+    # password_confirm = ENV["PASSWORD"] || prompt.mask("password:", required: true)
+
+    RodauthApp.rodauth(:admin).create_account(login: email)
+  end
+end