rodauth-model 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91293093585a6bb8cc89572b0a646e7c467791760d1bb3d042447a88865bdfbe
-  data.tar.gz: 4660747afb36a135a67d7d3da9018ec4e9d98e9d900e5677713c6cbca76cc36c
+  metadata.gz: 239885866a591579de9572aeef88130ee45bebcdd2950b590471d9b2e2de14ad
+  data.tar.gz: 4b507ce9b6fe74cda28363956504f60781e0ed2177c0f30aac287f6a4b65fdac
 SHA512:
-  metadata.gz: 78e60ba11059f42980909f23b3862bc25d1ac921f34e4124430034d4c61a7d69f79524f1d73447c3310a691819f426a52f51427a398792663b78a70833754979
-  data.tar.gz: 257afaa7f30a76cdfe633586a70c9dafba41c9653e9b346ba9a839ecaa86f4846854ffa332217bfbee1c859839748e79dc8b1755cbb0ee986be0c0815897c7e7
+  metadata.gz: d0ef6938063f04122115959b51d833c8f84441526e721493a5af518c7758dcabcf4022b7a0701e6dc69ba098b4519fd35126952b15b56ac3465d0e18ad31f9fa
+  data.tar.gz: bbf525d94b4533f11485428f258fd3963e79b896a2dfeebc9240565ae25e5e12d5c5eeb86fa6e96ad05d4075cb2a8f03b3c289246d1c4569d5f3e11ea7aafabe

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.5.0 (2026-06-29)
+
+* Don't define the password hash association when no password feature is enabled, which previously failed on `Account#destroy` for setups such as OmniAuth-only authentication (@janko)
+
+## 0.4.0 (2024-12-16)
+
+* Add `password?` model method that returns whether a password is set (@janko)
+
+* Drop support for Ruby 2.3 and 2.4 (@janko)
+
 ## 0.3.0 (2024-10-12)
 
 * Add support for OTP Unlock feature (@janko)

data/README.md

@@ -41,8 +41,12 @@ account.password_hash #=> "$2a$12$k/Ub1I2iomi84RacqY89Hu4.M0vK7klRnRtzorDyvOkVI.
 account.password_hash #=> #<Account::PasswordHash...> (record from `account_password_hashes` table)
 account.password_hash.password_hash #=> "$2a$12$k/Ub1..." (inaccessible when using database authentication functions)
 
+# whether a password is set
+account.password? #=> true
+
 account.password = nil # clears password hash
 account.password_hash #=> nil
+account.password? #=> false
 ```
 
 Note that the password attribute doesn't come with validations, making it unsuitable for forms. It was primarily intended to allow easily creating accounts in development console and in tests.
@@ -112,6 +116,7 @@ Below is a list of all associations defined depending on the features loaded:
 | lockout                 | `:lockout`                   | `has_one`  | `Lockout`                | `account_lockouts`                  |
 | lockout                 | `:login_failure`             | `has_one`  | `LoginFailure`           | `account_login_failures`            |
 | otp                     | `:otp_key`                   | `has_one`  | `OtpKey`                 | `account_otp_keys`                  |
+| otp_unlock              | `:otp_unlock`                | `has_one`  | `OtpUnlock`              | `account_otp_unlocks`               |
 | password_expiration     | `:password_change_time`      | `has_one`  | `PasswordChangeTime`     | `account_password_change_times`     |
 | recovery_codes          | `:recovery_codes`            | `has_many` | `RecoveryCode`           | `account_recovery_codes`            |
 | remember                | `:remember_key`              | `has_one`  | `RememberKey`            | `account_remember_keys`             |
@@ -123,7 +128,8 @@ Below is a list of all associations defined depending on the features loaded:
 | webauthn                | `:webauthn_keys`             | `has_many` | `WebauthnKey`            | `account_webauthn_keys`             |
 | webauthn                | `:webauthn_user_id`          | `has_one`  | `WebauthnUserId`         | `account_webauthn_user_ids`         |
 
-Note that some Rodauth tables use composite primary keys, which Active Record doesn't support out of the box. For associations to work properly in Active Record, you might need to add the [composite_primary_keys] gem to your Gemfile. On Sequel, associations will work without any changes, because Sequel supports composite primary keys.
+> [!NOTE]
+> Some Rodauth tables use composite primary keys, which are supported in Active Record 7.1+. If you're on an older version of Active Record, you might need to add the [composite_primary_keys] gem to your Gemfile. Sequel has always natively supported composite primary keys.
 
 ## Extending associations
 
@@ -146,7 +152,7 @@ if defined?(Rodauth::Model)
 end
 ```
 
-The `Rodauth::Model.register_association` method receives the feature name and a block, which is evaluted in the context of a Rodauth instance and should return the association definition with the following items:
+The `Rodauth::Model.register_association` method receives the feature name and a block, which is evaluated in the context of a Rodauth instance and should return the association definition with the following items:
 
 * `:name` – association name
 * `:type` – relationship type (`:one` for one-to-one, `:many` for one-to-many)

data/lib/rodauth/model/active_record.rb

@@ -32,10 +32,18 @@ module Rodauth
             end
           end
         end
+
+        define_method(:password?) do
+          if rodauth.account_password_hash_column
+            !!public_send(rodauth.account_password_hash_column)
+          else
+            !!password_hash
+          end
+        end
       end
 
       def define_associations(model)
-        define_password_hash_association(model) unless rodauth.account_password_hash_column
+        define_password_hash_association(model) if password_hash_association?
 
         feature_associations.each do |association|
           association[:type] = ASSOCIATION_TYPES.fetch(association[:type])

data/lib/rodauth/model/sequel.rb

@@ -14,7 +14,7 @@ module Rodauth
       def define_methods(model)
         rodauth = @auth_class.allocate.freeze
 
-        unless rodauth.account_password_hash_column
+        if password_hash_association?
           model.plugin :nested_attributes
           model.nested_attributes :password_hash, destroy: true
         end
@@ -42,12 +42,20 @@ module Rodauth
             self.password_hash_attributes = attributes
           end
         end
+
+        define_method(:password?) do
+          if rodauth.account_password_hash_column
+            !!public_send(rodauth.account_password_hash_column)
+          else
+            !!password_hash
+          end
+        end
       end
 
       def define_associations(model)
         model.plugin :association_dependencies
 
-        define_password_hash_association(model) unless rodauth.account_password_hash_column
+        define_password_hash_association(model) if password_hash_association?
 
         feature_associations.each do |association|
           association[:type] = ASSOCIATION_TYPES.fetch(association[:type])

data/lib/rodauth/model.rb

@@ -52,6 +52,15 @@ module Rodauth
         .map { |block| rodauth.instance_exec(&block) }
     end
 
+    # The password hash is stored in a separate table only when Rodauth is
+    # configured to manage passwords (i.e. when a password-handling feature is
+    # enabled). Without this check we'd define an association against a table
+    # that doesn't exist, which would fail on Account#destroy.
+    def password_hash_association?
+      !rodauth.account_password_hash_column &&
+        rodauth.features.include?(:login_password_requirements_base)
+    end
+
     def rodauth
       @auth_class.allocate
     end

data/rodauth-model.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = "rodauth-model"
-  spec.version       = "0.3.0"
+  spec.version       = "0.5.0"
   spec.authors       = ["Janko Marohnić"]
   spec.email         = ["janko@hey.com"]
 
@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.summary       = spec.description
   spec.homepage      = "https://github.com/janko/rodauth-model"
   spec.license       = "MIT"
-  spec.required_ruby_version = ">= 2.3"
+  spec.required_ruby_version = ">= 2.5"
 
   spec.metadata["source_code_uri"] = "https://github.com/janko/rodauth-model"
 
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-hooks"
   spec.add_development_dependency "bcrypt"
-  spec.add_development_dependency "jwt"
+  spec.add_development_dependency "jwt", "< 2.10"
   spec.add_development_dependency "rotp"
   spec.add_development_dependency "rqrcode"
   spec.add_development_dependency "webauthn" unless RUBY_ENGINE == "jruby"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-model
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Janko Marohnić
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rodauth
@@ -70,16 +69,16 @@ dependencies:
   name: jwt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.10'
 - !ruby/object:Gem::Dependency
   name: rotp
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +143,6 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/janko/rodauth-model
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -152,15 +150,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 4.0.13
 specification_version: 4
 summary: Provides model mixin for Active Record and Sequel that defines password attribute
   and associations based on Rodauth configuration.