rodauth-rails 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 496b2621170adf123079ae52341d3f6d0b3a120c3fa9f81e1bd26886735c6808
-  data.tar.gz: eb1001f7835561714a134649b989c9cb0f09a5091e4b8d009650134f03d60470
+  metadata.gz: 4d36f5274c33c95aab970521c38b77e9ac47242cc248e181f122b8ef518e5017
+  data.tar.gz: d52e7ec12ebde869a023d6123b5550b061bb4210bc44bd4f4fa8200e592cf94d
 SHA512:
-  metadata.gz: e6681a10e0d724656c2b27be02a59eebc107f8a13ebf39b5732696da9df6c6631fe8ac23601db12bb568923b339ee790800b96bb3a3c71a9978c8aa02becea9d
-  data.tar.gz: e802cd53015dc736395e5cdf1e7f2df3cb0174075da18af1ca5317867e33ad79d695c7d01d22acc2f581d33b578c2da88af0c91259db79bae85183a9316a2334
+  metadata.gz: f8162dd61a98976e3b06d6cee8575197f284e3415c8edcfa30ceed005fbedfe18f3d1c739253ce967434c35dc1ce01b246bd535069daaec92d71c807f2c91ac5
+  data.tar.gz: cb6fe07c7cdb2a7d310ec1dcd60f35170fc478230b33d8cb193797b4db824c519ac4f2de588ff2f176ca96b7746ea7573a116e4497436eccaa640f073c8927ac

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 1.5.2 (2022-07-03)
+
+* Bump Rodauth dependency version to 2.25+ (@janko)
+
+* Generate fixture file for accounts on `rodauth:install` (@benkoshy)
+
+* Fix error about undefined `controller_path` method in `newrelic_rpm` gem instrumentation (@janko)
+
+* Don't display disabled routes in `rodauth:routes` (@janko)
+
+* Display HTTP verbs of endpoints in `rodauth:routes` rake task (@janko)
+
 ## 1.5.1 (2022-06-19)
 
 * Fix syntax for creating `citext` PG extension in Sequel base migration (@Empact)

data/README.md

@@ -110,18 +110,18 @@ $ rails rodauth:routes
 ```
 Routes handled by RodauthApp:
 
-  /login                   rodauth.login_path
-  /create-account          rodauth.create_account_path
-  /verify-account-resend   rodauth.verify_account_resend_path
-  /verify-account          rodauth.verify_account_path
-  /change-password         rodauth.change_password_path
-  /change-login            rodauth.change_login_path
-  /logout                  rodauth.logout_path
-  /remember                rodauth.remember_path
-  /reset-password-request  rodauth.reset_password_request_path
-  /reset-password          rodauth.reset_password_path
-  /verify-login-change     rodauth.verify_login_change_path
-  /close-account           rodauth.close_account_path
+  GET/POST  /login                   rodauth.login_path
+  GET/POST  /create-account          rodauth.create_account_path
+  GET/POST  /verify-account-resend   rodauth.verify_account_resend_path
+  GET/POST  /verify-account          rodauth.verify_account_path
+  GET/POST  /change-password         rodauth.change_password_path
+  GET/POST  /change-login            rodauth.change_login_path
+  GET/POST  /logout                  rodauth.logout_path
+  GET/POST  /remember                rodauth.remember_path
+  GET/POST  /reset-password-request  rodauth.reset_password_request_path
+  GET/POST  /reset-password          rodauth.reset_password_path
+  GET/POST  /verify-login-change     rodauth.verify_login_change_path
+  GET/POST  /close-account           rodauth.close_account_path
 ```
 
 Using this information, you can add some basic authentication links to your
@@ -381,6 +381,7 @@ class RodauthController < ApplicationController
     when rodauth.login_path,
          rodauth.create_account_path,
          rodauth.verify_account_path,
+         rodauth.verify_account_resend_path,
          rodauth.reset_password_path,
          rodauth.reset_password_request_path
       "authentication"

data/lib/generators/rodauth/install_generator.rb

@@ -70,6 +70,13 @@ module Rodauth
           end
         end
 
+        def create_fixtures
+          test_unit_options = ::Rails.application.config.generators.options[:test_unit]
+          if test_unit_options[:fixture] && test_unit_options[:fixture_replacement].nil?
+            template "app/test/fixtures/accounts.yml"
+          end
+        end
+
         def show_instructions
           readme "INSTRUCTIONS" if behavior == :invoke
         end

data/lib/generators/rodauth/templates/app/test/fixtures/accounts.yml

@@ -0,0 +1,10 @@
+# Read about fixtures at https://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
+one:
+  email: freddie@queen.com
+  password_hash: <%%= BCrypt::Password.create("password", cost: BCrypt::Engine::MIN_COST) %>
+  status: 2
+
+two:
+  email: brian@queen.com
+  password_hash: <%%= BCrypt::Password.create("password", cost: BCrypt::Engine::MIN_COST) %>
+  status: 2

data/lib/rodauth/rails/app.rb

@@ -59,6 +59,12 @@ module Rodauth
         rodauth(name) or fail ArgumentError, "unknown rodauth configuration: #{name.inspect}"
       end
 
+      # The newrelic_rpm gem expects this when we pass the roda class as
+      # :controller in instrumentation payload.
+      def self.controller_path
+        name.underscore
+      end
+
       module RequestMethods
         def rodauth(name = nil)
           prefix = scope.rodauth(name).prefix

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

@@ -32,7 +32,7 @@ module Rodauth
           request = rails_request
 
           raw_payload = {
-            controller: scope.class.superclass.name,
+            controller: self.class.roda_class.name,
             action: "call",
             request: request,
             params: request.filtered_parameters,

data/lib/rodauth/rails/tasks.rake

@@ -6,20 +6,34 @@ namespace :rodauth do
 
     app.opts[:rodauths].each do |configuration_name, auth_class|
       rodauth = auth_class.allocate
+      only_json = rodauth.method(:only_json?).owner != Rodauth::Base && rodauth.only_json?
+
+      routes = auth_class.route_hash.map do |path, handle_method|
+        file_path, start_line = rodauth.method(:"_#{handle_method}").source_location
+        lines = File.foreach(file_path).to_a
+        indentation = lines[start_line - 1][/^\s+/]
+        verbs = []
+
+        lines[start_line..-1].each do |code|
+          verbs << :GET if code.include?("r.get") && !only_json
+          verbs << :POST if code.include?("r.post")
+          break if code.start_with?("#{indentation}end")
+        end
 
-      routes = auth_class.routes.map do |handle_method|
         path_method = "#{handle_method.to_s.sub(/\Ahandle_/, "")}_path"
 
         [
-          rodauth.public_send(path_method),
+          verbs.join("/"),
+          "#{rodauth.prefix}#{path}",
           "rodauth#{configuration_name && "(:#{configuration_name})"}.#{path_method}",
         ]
       end
 
-      padding = routes.map { |path, _| path.length }.max
+      verbs_padding = routes.map { |verbs, _, _| verbs.length }.max
+      path_padding = routes.map { |_, path, _| path.length }.max
 
-      route_lines = routes.map do |path, code|
-        "#{path.ljust(padding)}  #{code}"
+      route_lines = routes.map do |verbs, path, code|
+        "#{verbs.ljust(verbs_padding)}  #{path.ljust(path_padding)}  #{code}"
       end
 
       puts "\n  #{route_lines.join("\n  ")}" unless route_lines.empty?

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "1.5.1"
+    VERSION = "1.5.2"
   end
 end

data/rodauth-rails.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "railties", ">= 4.2", "< 8"
-  spec.add_dependency "rodauth", "~> 2.23"
+  spec.add_dependency "rodauth", "~> 2.25"
   spec.add_dependency "roda", "~> 3.55"
   spec.add_dependency "sequel-activerecord_connection", "~> 1.1"
   spec.add_dependency "rodauth-model", "~> 0.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-19 00:00:00.000000000 Z
+date: 2022-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.23'
+        version: '2.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.23'
+        version: '2.25'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +224,7 @@ files:
 - lib/generators/rodauth/templates/app/misc/rodauth_app.rb
 - lib/generators/rodauth/templates/app/misc/rodauth_main.rb
 - lib/generators/rodauth/templates/app/models/account.rb
+- lib/generators/rodauth/templates/app/test/fixtures/accounts.yml
 - lib/generators/rodauth/templates/app/views/rodauth/_email_auth_request_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form.html.erb
 - lib/generators/rodauth/templates/app/views/rodauth/_login_form_footer.html.erb