rodauth-rails 1.15.2 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4347261e8bb70c5e8f8cd218b0485d335eae250b8efc51677acb0bb7625e655b
-  data.tar.gz: d00e315a95b9c8659c29eec2e1722d95c6b77d7804682c3ad0c70058df1ee709
+  metadata.gz: cca905fd1f4b103aef68317cf45c2758d432b32c0f91a50e2f896c83750c4567
+  data.tar.gz: 3170987bb8ba8821d66c2ad46369be451069d3cac01d0bcc6aa7f3e149b150f1
 SHA512:
-  metadata.gz: 7218d821e3d83d779c40c1ae6a5a0aef7d1ff1e46bb207805f23daf1480f0cdbef19f7e24165d21fc8647bfe9c64973a162d83028a145df60e63c5d2b67ba915
-  data.tar.gz: c0a318f879f6cf35daade60784e7cc896d061d14c93281475d33831aa95e9377d3664cb3d7e86ab32ed99984ee9f477f37282c204860c8a8cf9ed5ee3cf7ad84
+  metadata.gz: 13108dbbf6bedd2201c58b4377defbc9a41fa893c874b5ac833c1fd63d3b2b418dc397c59a50cc1eede6739d5d4e6a9d682e10f5a061645f8cd0eae9ac2cb0cb
+  data.tar.gz: d0bec919f0fdadfb978b15c6da1e35ba18a823c27b4e75b715eac536bff8a9f886567b3ff918384594546ed4f31de4897bb886164ebbc0a622cadd7e01b45eb4

data/README.md

@@ -90,17 +90,15 @@ $ rails generate rodauth:install users
 If you want Rodauth endpoints to be exposed via [JSON API]:
 
 ```sh
-$ rails generate rodauth:install --json # regular authentication using the Rails session
+$ rails generate rodauth:install --json # cookied-based authentication
 # or
-$ rails generate rodauth:install --jwt # token authentication via the "Authorization" header
-$ bundle add jwt
+$ rails generate rodauth:install --jwt # token-based authentication
 ```
 
 To use Argon2 instead of bcrypt for password hashing:
 
 ```sh
 $ rails generate rodauth:install --argon2
-$ bundle add argon2
 ```
 
 ## Usage
@@ -672,6 +670,11 @@ $ rails middleware
 # run MyApp::Application.routes
 ```
 
+> [!NOTE]
+> If you're using a middleware that should be called before Rodauth routes, make sure that middleware is inserted *before* Rodauth.
+>
+> For example, if you're using [Rack::Attack] to throttle signups, make sure you put the `rack-attack` gem *above* `rodauth-rails` in the Gemfile, so that its middleware is inserted first.
+
 ### Roda app
 
 The [`Rodauth::Rails::App`](/lib/rodauth/rails/app.rb) class is a [Roda]
@@ -795,3 +798,4 @@ conduct](CODE_OF_CONDUCT.md).
 [inheritance]: http://rodauth.jeremyevans.net/rdoc/files/doc/guides/share_configuration_rdoc.html
 [library]: https://github.com/jeremyevans/rodauth#label-Using+Rodauth+as+a+Library
 [restoring defaults]: https://github.com/janko/rodauth-rails/wiki/Restoring-Rodauth-Defaults
+[Rack::Attack]: https://github.com/rack/rack-attack

data/lib/generators/rodauth/install_generator.rb

@@ -38,6 +38,22 @@ module Rodauth
           template "app/misc/rodauth_main.rb"
         end
 
+        def add_gems
+          if activerecord? && !sequel?
+            gem "sequel-activerecord_connection", "~> 2.0", comment: "Enables Sequel to use Active Record's database connection"
+            gem "after_commit_everywhere", "~> 1.1", comment: "Required for Sequel's transaction hooks to work in all cases (on Active Record < 7.2)" if ActiveRecord.version < Gem::Version.new("7.2")
+          end
+          if argon2?
+            gem "argon2", "~> 2.3", comment: "Used by Rodauth for password hashing"
+          else
+            gem "bcrypt", "~> 3.1", comment: "Used by Rodauth for password hashing"
+          end
+          if jwt?
+            gem "jwt", "~> 2.9", comment: "Used by Rodauth for JWT support"
+          end
+          gem "tilt", "~> 2.4", comment: "Used by Rodauth for rendering built-in view and email templates"
+        end
+
         def create_rodauth_controller
           template "app/controllers/rodauth_controller.rb"
         end
@@ -55,7 +71,7 @@ module Rodauth
         end
 
         def show_instructions
-          readme "INSTRUCTIONS" if behavior == :invoke && !api_only?
+          readme "INSTRUCTIONS" if behavior == :invoke && !json? && !jwt?
         end
 
         private

data/lib/generators/rodauth/mailer_generator.rb

@@ -83,11 +83,7 @@ module Rodauth
         end
 
         def erb_eval(content)
-          if ERB.version[/\d+\.\d+\.\d+/].to_s >= "2.2.0"
-            ERB.new(content, trim_mode: "-").result(binding)
-          else
-            ERB.new(content, 0, "-").result(binding)
-          end
+          ERB.new(content, trim_mode: "-").result(binding)
         end
 
         def emails

data/lib/generators/rodauth/migration/active_record/base.erb

@@ -7,6 +7,7 @@ create_table :<%= table_prefix.pluralize %><%= primary_key_type %> do |t|
 <% case activerecord_adapter -%>
 <% when "postgresql" -%>
   t.citext :email, null: false
+  t.check_constraint "email ~ '^[^,;@ \r\n]+@[^,@; \r\n]+\.[^,@; \r\n]+$'", name: "valid_email"
 <% else -%>
   t.string :email, null: false
 <% end -%>

data/lib/generators/rodauth/migration_generator.rb

@@ -54,11 +54,7 @@ module Rodauth
         end
 
         def erb_eval(content)
-          if ERB.version[/\d+\.\d+\.\d+/].to_s >= "2.2.0"
-            ERB.new(content, trim_mode: "-").result(binding)
-          else
-            ERB.new(content, 0, "-").result(binding)
-          end
+          ERB.new(content, trim_mode: "-").result(binding)
         end
 
         def migration_chunk(feature)
@@ -132,11 +128,7 @@ module Rodauth
           end
 
           def default_primary_key_type
-            if ActiveRecord.version >= Gem::Version.new("5.1") && activerecord_adapter != "sqlite3"
-              :bigint
-            else
-              :integer
-            end
+            activerecord_adapter == "sqlite3" ? :integer : :bigint
           end
 
           # Active Record 7+ sets default precision to 6 for timestamp columns,

data/lib/generators/rodauth/views_generator.rb

@@ -52,7 +52,6 @@ module Rodauth
             copy_file view_location(view), "app/views/#{directory}/#{view}.html.erb" do |content|
               content = content.gsub("rodauth.", "rodauth(:#{configuration_name}).") if configuration_name
               content = content.gsub("rodauth/", "#{directory}/")
-              content = form_helpers_compatibility(content) if ActionView.version < Gem::Version.new("5.1")
               content
             end
           end
@@ -103,16 +102,6 @@ module Rodauth
           options[:name]&.to_sym
         end
 
-        # We need to use the *_tag helpers on versions lower than Rails 5.1.
-        def form_helpers_compatibility(content)
-          content
-            .gsub(/form_with url: (.+) do \|form\|/, 'form_tag \1 do')
-            .gsub(/form\.(label|submit)/, '\1_tag')
-            .gsub(/form\.(email|password|text|telephone|hidden)_field (\S+), value:/, '\1_field_tag \2,')
-            .gsub(/form\.radio_button (\S+), (\S+),/, 'radio_button_tag \1, \2, false,')
-            .gsub(/form\.check_box (\S+), (.+) /, 'check_box_tag \1, "t", false, \2 ')
-        end
-
         def view_location(view)
           if tailwind?
             "app/views/rodauth/tailwind/#{view}.html.erb"

data/lib/rodauth/rails/controller_methods.rb

@@ -4,14 +4,10 @@ module Rodauth
       def self.included(controller)
         # ActionController::API doesn't have helper methods
         if controller.respond_to?(:helper_method)
-          controller.helper_method :rodauth, :current_account
+          controller.helper_method :rodauth
         end
       end
 
-      def current_account(name = nil)
-        rodauth(name).rails_account
-      end
-
       def rodauth(name = nil)
         request.env.fetch ["rodauth", *name].join(".")
       end

data/lib/rodauth/rails/feature/email.rb

@@ -12,20 +12,18 @@ module Rodauth
 
         # Create emails with ActionMailer which uses configured delivery method.
         def create_email_to(to, subject, body)
-          Mailer.create_email(to: to, from: email_from, subject: "#{email_subject_prefix}#{subject}", body: body)
+          Rodauth::Rails::Mailer.create_email(
+            to: to,
+            from: email_from,
+            subject: "#{email_subject_prefix}#{subject}",
+            body: body
+          )
         end
 
         # Delivers the given email.
         def send_email(email)
           email.deliver_now
         end
-
-        # ActionMailer subclass for correct email delivering.
-        class Mailer < ActionMailer::Base
-          def create_email(options)
-            mail(options)
-          end
-        end
       end
     end
   end

data/lib/rodauth/rails/feature/instrumentation.rb

@@ -80,7 +80,7 @@ module Rodauth
           response
         end
 
-        if ActionPack.version >= Gem::Version.new("8.0.0.beta1")
+        if ActionPack.version >= Gem::Version.new("8.0")
           def rails_benchmark(&block)
             ActiveSupport::Benchmark.realtime(:float_millisecond, &block)
           end

data/lib/rodauth/rails/mailer.rb

@@ -0,0 +1,9 @@
+module Rodauth
+  module Rails
+    class Mailer < ActionMailer::Base
+      def create_email(options)
+        mail(options)
+      end
+    end
+  end
+end

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "1.15.2"
+    VERSION = "2.0.1"
   end
 end

data/lib/rodauth/rails.rb

@@ -7,10 +7,10 @@ module Rodauth
     class Error < StandardError
     end
 
-    # This allows the developer to avoid loading Rodauth at boot time.
+    # This allows avoiding loading Rodauth at boot time.
     autoload :App, "rodauth/rails/app"
     autoload :Auth, "rodauth/rails/auth"
-    autoload :Model, "rodauth/rails/model"
+    autoload :Mailer, "rodauth/rails/mailer"
 
     @app = nil
     @middleware = true
@@ -66,15 +66,6 @@ module Rodauth
         end
       end
 
-      def authenticated(name = nil, &condition)
-        warn "Rodauth::Rails.authenticated has been deprecated in favor of Rodauth::Rails.authenticate, which additionally requires existence of the account record."
-        lambda do |request|
-          rodauth = request.env.fetch ["rodauth", *name].join(".")
-          rodauth.require_authentication
-          rodauth.authenticated? && (condition.nil? || condition.call(rodauth))
-        end
-      end
-
       if ::Rails.gem_version >= Gem::Version.new("5.2")
         def secret_key_base
           ::Rails.application.secret_key_base

data/rodauth-rails.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/janko/rodauth-rails"
   spec.license       = "MIT"
 
-  spec.required_ruby_version = ">= 2.5"
+  spec.required_ruby_version = ">= 2.6"
 
   spec.files         = Dir["README.md", "LICENSE.txt", "lib/**/*", "*.gemspec"]
   spec.require_paths = ["lib"]
@@ -19,11 +19,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "railties", ">= 5.0", "< 8.1"
   spec.add_dependency "rodauth", "~> 2.36"
   spec.add_dependency "roda", "~> 3.76"
-  spec.add_dependency "sequel-activerecord_connection", "~> 1.1"
   spec.add_dependency "rodauth-model", "~> 0.2"
-  spec.add_dependency "tilt"
-  spec.add_dependency "bcrypt"
 
+  spec.add_development_dependency "tilt"
+  spec.add_development_dependency "bcrypt", "~> 3.1"
   spec.add_development_dependency "jwt"
   spec.add_development_dependency "rotp"
   spec.add_development_dependency "rqrcode"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-08 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.76'
-- !ruby/object:Gem::Dependency
-  name: sequel-activerecord_connection
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rodauth-model
   requirement: !ruby/object:Gem::Requirement
@@ -93,7 +79,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -104,16 +90,16 @@ dependencies:
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+        version: '3.1'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -351,8 +337,8 @@ files:
 - lib/rodauth/rails/feature/instrumentation.rb
 - lib/rodauth/rails/feature/internal_request.rb
 - lib/rodauth/rails/feature/render.rb
+- lib/rodauth/rails/mailer.rb
 - lib/rodauth/rails/middleware.rb
-- lib/rodauth/rails/model.rb
 - lib/rodauth/rails/railtie.rb
 - lib/rodauth/rails/tasks.rake
 - lib/rodauth/rails/tasks/routes.rb
@@ -372,14 +358,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Provides Rails integration for Rodauth authentication framework.

data/lib/rodauth/rails/model.rb

@@ -1,6 +0,0 @@
-module Rodauth
-  module Rails
-    Model = Rodauth::Model
-    deprecate_constant :Model
-  end
-end