plutonium 0.12.13 → 0.13.0

data/lib/plutonium/helpers/form_helper.rb

@@ -5,19 +5,22 @@ module Plutonium
     module FormHelper
       include ActionView::Helpers::FormHelper
 
-      def resource_form_for(record, options = {}, &block)
-        options[:builder] ||= PlutoniumUi::FormBuilder
-        options[:wrapper] ||= :default_resource_form
-        options[:html] ||= {}
-        unless options[:html].key?(:novalidate)
-          options[:html][:novalidate] = false
-        end
+      def resource_form_for(record, **options, &block)
+        options[:url] ||= resource_url_for(record, action: record.new_record? ? :create : :update)
+        options = build_form_options(options)
 
         with_resource_form_field_error_proc do
           form_for(record, options, &block)
         end
       end
 
+      def resource_form_with(**options, &block)
+        options = build_form_options(options)
+        with_resource_form_field_error_proc do
+          form_with(**options, &block)
+        end
+      end
+
       def token_tag(...)
         # needed to workaround https://github.com/tailwindlabs/tailwindcss/issues/3350
         super(...).sub(" />", " hidden />").html_safe
@@ -25,6 +28,14 @@ module Plutonium
 
       private
 
+      def build_form_options(options)
+        options[:builder] ||= PlutoniumUi::FormBuilder
+        options[:wrapper] ||= :default_resource_form
+        options[:html] ||= {}
+        options[:html][:novalidate] = false unless options[:html].key?(:novalidate)
+        options
+      end
+
       def with_resource_form_field_error_proc
         # borrowed from https://github.com/heartcombo/simple_form/blob/main/lib/simple_form/action_view_extensions/form_helper.rb#L40C1-L50C10
         # this does not look threadsafe

data/lib/plutonium/pkg/app.rb

@@ -56,6 +56,10 @@ module Plutonium
           end
         end
 
+        def dom_id
+          module_parent_name.underscore.dasherize
+        end
+
         private
 
         def draw_resource_routes_internal

data/lib/plutonium/rodauth/controller_methods.rb

@@ -7,6 +7,7 @@ module Plutonium
         helper Plutonium::Helpers::ApplicationHelper
         helper Plutonium::Helpers::ComponentHelper
         helper Plutonium::Helpers::AssetsHelper
+        helper Plutonium::Helpers::FormHelper
 
         layout "rodauth"
         append_view_path File.expand_path("app/views", Plutonium.root)

data/lib/plutonium/version.rb

@@ -1,3 +1,3 @@
 module Plutonium
-  VERSION = "0.12.13"
+  VERSION = "0.13.0"
 end

data/lib/plutonium.rb

@@ -1,5 +1,6 @@
 require "zeitwerk"
 
+# Zeitwerk loader setup for the Plutonium gem
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: false)
 loader.ignore("#{__dir__}/generators")
 loader.ignore("#{__dir__}/plutonium/railtie.rb")
@@ -9,37 +10,47 @@ loader.setup
 require_relative "plutonium/railtie" if defined?(Rails::Railtie)
 
 module Plutonium
+  # Custom error class for the Plutonium module
   class Error < StandardError; end
 
-  def self.root
-    Pathname.new File.expand_path("../", __dir__)
-  end
-
-  def self.lib_root
-    root.join("lib", "plutonium")
-  end
-
-  def self.logger
-    Rails.logger
-  end
-
-  def self.application_name
-    @application_name || Rails.application.class.module_parent.name
-  end
-
-  def self.application_name=(application_name)
-    @application_name = application_name
-  end
-
-  def self.development?
-    ActiveModel::Type::Boolean.new.cast(ENV["PLUTONIUM_DEV"]).present?
-  end
-
-  def self.eager_load_rails!
-    return if Rails.env.production? && defined?(@rails_eager_loaded)
-
-    Rails.application.eager_load! unless Rails.application.config.eager_load
-    @rails_eager_loaded = true
+  class << self
+    # @return [Pathname] the root directory of the gem
+    def root
+      Pathname.new(File.expand_path("..", __dir__))
+    end
+
+    # @return [Pathname] the root directory of the lib folder of the gem
+    def lib_root
+      root.join("lib", "plutonium")
+    end
+
+    # @return [Logger] the Rails logger
+    def logger
+      Rails.logger
+    end
+
+    # @return [String] the name of the application
+    def application_name
+      @application_name || Rails.application.class.module_parent_name
+    end
+
+    # @param [String] application_name the name of the application
+    # @return [void]
+    attr_writer :application_name
+
+    # @return [Boolean] whether the gem is in development mode
+    def development?
+      ActiveModel::Type::Boolean.new.cast(ENV["PLUTONIUM_DEV"]).present?
+    end
+
+    # Eager loads Rails application if not already eager loaded
+    # @return [void]
+    def eager_load_rails!
+      return if Rails.env.production? && defined?(@rails_eager_loaded)
+
+      Rails.application.eager_load! unless Rails.application.config.eager_load
+      @rails_eager_loaded = true
+    end
   end
 end
 

data/sig/plutonium.rbs

@@ -1,4 +1,12 @@
+# plutonium.rbs
 module Plutonium
-  VERSION: String
-  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+  class Error < StandardError; end
+
+  def self.root: () -> Pathname
+  def self.lib_root: () -> Pathname
+  def self.logger: () -> Logger
+  def self.application_name: () -> String
+  def self.application_name=: (String) -> void
+  def self.development?: () -> bool
+  def self.eager_load_rails!: () -> void
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: plutonium
 version: !ruby/object:Gem::Version
-  version: 0.12.13
+  version: 0.13.0
 platform: ruby
 authors:
 - Stefan Froelich
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-12 00:00:00.000000000 Z
+date: 2024-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -198,6 +198,118 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.23.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: brakeman
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundle-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: combustion
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Plutonium extends Rails' capabilities with a powerful, generator-driven
   toolkit designed to supercharge your development process. It transforms the way
   you build applications with Rails, optimizing for rapid application development.
@@ -216,6 +328,7 @@ files:
 - ".vscode/extensions.json"
 - ".vscode/launch.json"
 - ".vscode/settings.json"
+- Appraisals
 - CHANGELOG.md
 - LICENSE.txt
 - README copy.md
@@ -844,12 +957,15 @@ files:
 - app/views/rodauth/webauthn_remove.html.erb
 - app/views/rodauth/webauthn_setup.html.erb
 - brakeman.ignore
+- config.ru
 - config/initializers/hotwire_turbo_monkey_patches.rb
 - config/initializers/pagy.rb
 - config/initializers/rabl.rb
 - config/initializers/simple_form.rb
 - esbuild.config.js
 - exe/pug
+- gemfiles/rails_7.gemfile
+- gemfiles/rails_7.gemfile.lock
 - lib/active_model/validations/array_validator.rb
 - lib/active_model/validations/attached_validator.rb
 - lib/active_model/validations/url_validator.rb
@@ -972,25 +1088,6 @@ files:
 - lib/generators/pu/rodauth/migration/active_record/verify_account.erb
 - lib/generators/pu/rodauth/migration/active_record/verify_login_change.erb
 - lib/generators/pu/rodauth/migration/active_record/webauthn.erb
-- lib/generators/pu/rodauth/migration/sequel/account_expiration.erb
-- lib/generators/pu/rodauth/migration/sequel/active_sessions.erb
-- lib/generators/pu/rodauth/migration/sequel/audit_logging.erb
-- lib/generators/pu/rodauth/migration/sequel/base.erb
-- lib/generators/pu/rodauth/migration/sequel/disallow_password_reuse.erb
-- lib/generators/pu/rodauth/migration/sequel/email_auth.erb
-- lib/generators/pu/rodauth/migration/sequel/jwt_refresh.erb
-- lib/generators/pu/rodauth/migration/sequel/lockout.erb
-- lib/generators/pu/rodauth/migration/sequel/otp.erb
-- lib/generators/pu/rodauth/migration/sequel/password_expiration.erb
-- lib/generators/pu/rodauth/migration/sequel/recovery_codes.erb
-- lib/generators/pu/rodauth/migration/sequel/remember.erb
-- lib/generators/pu/rodauth/migration/sequel/reset_password.erb
-- lib/generators/pu/rodauth/migration/sequel/separate_passwords.erb
-- lib/generators/pu/rodauth/migration/sequel/single_session.erb
-- lib/generators/pu/rodauth/migration/sequel/sms_codes.erb
-- lib/generators/pu/rodauth/migration/sequel/verify_account.erb
-- lib/generators/pu/rodauth/migration/sequel/verify_login_change.erb
-- lib/generators/pu/rodauth/migration/sequel/webauthn.erb
 - lib/generators/pu/rodauth/migration_generator.rb
 - lib/generators/pu/rodauth/templates/INSTRUCTIONS
 - lib/generators/pu/rodauth/templates/app/controllers/plugin_controller.rb.tt

data/lib/generators/pu/rodauth/migration/sequel/account_expiration.erb

@@ -1,7 +0,0 @@
-# Used by the account expiration feature
-create_table :<%= table_prefix %>_activity_times do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  DateTime :last_activity_at, null: false
-  DateTime :last_login_at, null: false
-  DateTime :expired_at
-end

data/lib/generators/pu/rodauth/migration/sequel/active_sessions.erb

@@ -1,8 +0,0 @@
-# Used by the active sessions feature
-create_table :<%= table_prefix %>_active_session_keys do
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :session_id
-  Time :created_at, null: false, default: Sequel::CURRENT_TIMESTAMP
-  Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
-  primary_key [:<%= table_prefix %>_id, :session_id]
-end

data/lib/generators/pu/rodauth/migration/sequel/audit_logging.erb

@@ -1,17 +0,0 @@
-# Used by the audit logging feature
-create_table :<%= table_prefix %>_authentication_audit_logs do
-  primary_key :id, type: :Bignum
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, null: false, type: :Bignum
-  DateTime :at, null: false, default: Sequel::CURRENT_TIMESTAMP
-  String :message, null: false
-<% case db.database_type -%>
-<% when :postgres -%>
-  jsonb :metadata
-<% when :sqlite, :mysql -%>
-  json :metadata
-<% else -%>
-  String :metadata
-<% end -%>
-  index [:<%= table_prefix %>_id, :at], name: :<%= table_prefix %>_audit_<%= table_prefix %>_at_idx
-  index :at, name: :<%= table_prefix %>_audit_at_idx
-end

data/lib/generators/pu/rodauth/migration/sequel/base.erb

@@ -1,25 +0,0 @@
-<% if db.database_type == :postgres -%>
-begin
-  run "CREATE EXTENSION IF NOT EXISTS citext"
-rescue NoMethodError # migration is being reverted
-end
-
-<% end -%>
-create_table :<%= table_prefix.pluralize %> do
-  primary_key :id, type: :Bignum
-<% if db.database_type == :postgres -%>
-  citext :email, null: false
-  constraint :valid_email, email: /^[^,;@ \r\n]+@[^,@; \r\n]+\.[^,@; \r\n]+$/
-<% else -%>
-  String :email, null: false
-<% end -%>
-  Integer :status, null: false, default: 1
-<% if db.supports_partial_indexes? -%>
-  index :email, unique: true, where: { status: [1, 2] }
-<% else -%>
-  index :email, unique: true
-<% end -%>
-<% unless separate_passwords? -%>
-  String :password_hash
-<% end -%>
-end

data/lib/generators/pu/rodauth/migration/sequel/disallow_password_reuse.erb

@@ -1,6 +0,0 @@
-# Used by the disallow password reuse feature
-create_table :<%= table_prefix %>_previous_password_hashes do
-  primary_key :id, type: :Bignum
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :password_hash, null: false
-end

data/lib/generators/pu/rodauth/migration/sequel/email_auth.erb

@@ -1,7 +0,0 @@
-# Used by the email auth feature
-create_table :<%= table_prefix %>_email_auth_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-  DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/jwt_refresh.erb

@@ -1,8 +0,0 @@
-# Used by the jwt refresh feature
-create_table :<%= table_prefix %>_jwt_refresh_keys do
-  primary_key :id, type: :Bignum
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, null: false, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-  index :<%= table_prefix %>_id, name: :<%= table_prefix %>_jwt_rk_<%= table_prefix %>_id_idx
-end

data/lib/generators/pu/rodauth/migration/sequel/lockout.erb

@@ -1,11 +0,0 @@
-# Used by the lockout feature
-create_table :<%= table_prefix %>_login_failures do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  Integer :number, null: false, default: 1
-end
-create_table :<%= table_prefix %>_lockouts do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-  DateTime :email_last_sent
-end

data/lib/generators/pu/rodauth/migration/sequel/otp.erb

@@ -1,7 +0,0 @@
-# Used by the otp feature
-create_table :<%= table_prefix %>_otp_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  Integer :num_failures, null: false, default: 0
-  Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/password_expiration.erb

@@ -1,5 +0,0 @@
-# Used by the password expiration feature
-create_table :<%= table_prefix %>_password_change_times do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  DateTime :changed_at, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/recovery_codes.erb

@@ -1,6 +0,0 @@
-# Used by the recovery codes feature
-create_table :<%= table_prefix %>_recovery_codes do
-  foreign_key :id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :code
-  primary_key [:id, :code]
-end

data/lib/generators/pu/rodauth/migration/sequel/remember.erb

@@ -1,6 +0,0 @@
-# Used by the remember me feature
-create_table :<%= table_prefix %>_remember_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-end

data/lib/generators/pu/rodauth/migration/sequel/reset_password.erb

@@ -1,7 +0,0 @@
-# Used by the password reset feature
-create_table :<%= table_prefix %>_password_reset_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :deadline, null: false
-  DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/separate_passwords.erb

@@ -1,6 +0,0 @@
-# Stores password hashes separate from the account table
-create_table :<%= table_prefix %>_password_hashes do
-  primary_key :id, type: :Bignum
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :password_hash, null: false
-end

data/lib/generators/pu/rodauth/migration/sequel/single_session.erb

@@ -1,5 +0,0 @@
-# Used by the single session feature
-create_table :<%= table_prefix %>_session_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-end

data/lib/generators/pu/rodauth/migration/sequel/sms_codes.erb

@@ -1,8 +0,0 @@
-# Used by the sms codes feature
-create_table :<%= table_prefix %>_sms_codes do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :phone_number, null: false
-  Integer :num_failures
-  String :code
-  DateTime :code_issued_at, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/verify_account.erb

@@ -1,7 +0,0 @@
-# Used by the account verification feature
-create_table :<%= table_prefix %>_verification_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  DateTime :requested_at, null: false, default: Sequel::CURRENT_TIMESTAMP
-  DateTime :email_last_sent, null: false, default: Sequel::CURRENT_TIMESTAMP
-end

data/lib/generators/pu/rodauth/migration/sequel/verify_login_change.erb

@@ -1,7 +0,0 @@
-# Used by the verify login change feature
-create_table :<%= table_prefix %>_login_change_keys do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :key, null: false
-  String :login, null: false
-  DateTime :deadline, null: false
-end

data/lib/generators/pu/rodauth/migration/sequel/webauthn.erb

@@ -1,13 +0,0 @@
-# Used by the webauthn feature
-create_table :<%= table_prefix %>_webauthn_user_ids do
-  foreign_key :id, :<%= table_prefix.pluralize %>, primary_key: true, type: :Bignum
-  String :webauthn_id, null: false
-end
-create_table :<%= table_prefix %>_webauthn_keys do
-  foreign_key :<%= table_prefix %>_id, :<%= table_prefix.pluralize %>, type: :Bignum
-  String :webauthn_id
-  String :public_key, null: false
-  Integer :sign_count, null: false
-  Time :last_use, null: false, default: Sequel::CURRENT_TIMESTAMP
-  primary_key [:<%= table_prefix %>_id, :webauthn_id]
-end