rodauth-rails 1.5.4 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c63496f359a15bb061b6b419a609cbe63c24991e156731721d9f077ecf9deac4
-  data.tar.gz: 68212d9c722391c8c79f8bf8c48f8a05a39410ea0d97396876a6c2f5e92f103a
+  metadata.gz: b9640fa912cb535846cd94b3df3361e9763f2267107205287783885e587e774b
+  data.tar.gz: d135e8e958f0210b22fe694ba2a77e6d4fde74df339b8ec06440ac0f83771c90
 SHA512:
-  metadata.gz: 3632843dbd0214b73fa23134a0f2b42ec3b8f1c33430af1c776c685956ccf50e475840993299bff9863491456a369ad42b7e688e3ed03b783e51f4585d6be621
-  data.tar.gz: 6c123e024a51d3c2ba6b224b64c1f21d3b46363523d5b498e93fbe659052489660a61a3dd83da5080a07067d9052a82450da17a7bf156e9c905b2aa81ca861f6
+  metadata.gz: 1067a2467e0f7dacbfe3a703d6f1e4ad561c9dc7a72fbe3942a20b43b8892211c2509ec3b71c47ba30bf16bea0f7163f8ecb82a5aceaabb23f01a5705d256d12
+  data.tar.gz: ce2464227d1c0a5e5bc3452f05c392787b61fd6b3c530a89c99047c69a4bcceabf08778aaa169c57fa39dbae80efdb455b334881f04b069099fab7b666dc1cfe

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 1.5.5 (2022-08-04)
+
+* Don't raise `ArgumentError` when calling `#current_account` without being logged in (@benkoshy)
+
+* Abort `rodauth:views` generator when unknown feature was specified (@janko)
+
+* Abort `rodauth:migration` generator when unknown feature was specified (@janko)
+
 ## 1.5.4 (2022-07-21)
 
 * Generate account fixtures in `spec/fixtures` directory when using RSpec (@benkoshy)

data/README.md

@@ -14,7 +14,7 @@ Provides Rails integration for the [Rodauth] authentication framework.
 🎥 Screencasts:
 
 * [Rails Authentication with Rodauth](https://www.youtube.com/watch?v=2hDpNikacf0)
-* [Multifactor Authentication via TOTP with Rodauth](https://www.youtube.com/watch?v=9ON-kgXpz2A)
+* [Multifactor Authentication with Rodauth](https://www.youtube.com/watch?v=9ON-kgXpz2A&list=PLkGQXZLACDTGKsaRWstkHQdm2CUmT3SZ-) ([TOTP](https://youtu.be/9ON-kgXpz2A), [Recovery Codes](https://youtu.be/lkFCcE1Q5-w))
 
 📚 Articles:
 
@@ -1180,7 +1180,7 @@ License](https://opensource.org/licenses/MIT).
 
 Everyone interacting in the rodauth-rails project's codebases, issue trackers,
 chat rooms and mailing lists is expected to follow the [code of
-conduct](https://github.com/janko/rodauth-rails/blob/master/CODE_OF_CONDUCT.md).
+conduct](CODE_OF_CONDUCT.md).
 
 [Rodauth]: https://github.com/jeremyevans/rodauth
 [Sequel]: https://github.com/jeremyevans/sequel

data/lib/generators/rodauth/install_generator.rb

@@ -88,8 +88,8 @@ module Rodauth
         private
 
         def migration_features
-          features = [:base, :reset_password, :verify_account, :verify_login_change]
-          features << :remember unless jwt?
+          features = ["base", "reset_password", "verify_account", "verify_login_change"]
+          features << "remember" unless jwt?
           features
         end
 

data/lib/generators/rodauth/migration_generator.rb

@@ -17,7 +17,7 @@ module Rodauth
           desc: "Name of the generated migration file"
 
         def create_rodauth_migration
-          return if features.empty?
+          validate_features or return
 
           migration_template "db/migrate/create_rodauth.rb", File.join(db_migrate_path, "#{migration_name}.rb")
         end
@@ -30,7 +30,6 @@ module Rodauth
 
         def migration_content
           features
-            .select { |feature| File.exist?(migration_chunk(feature)) }
             .map { |feature| File.read(migration_chunk(feature)) }
             .map { |content| erb_eval(content) }
             .join("\n")
@@ -45,19 +44,37 @@ module Rodauth
           end
         end
 
+        def migration_chunk(feature)
+          "#{MIGRATION_DIR}/#{feature}.erb"
+        end
+
+        def validate_features
+          if features.empty?
+            say "No features specified!", :yellow
+            false
+          elsif (features - valid_features).any?
+            say "No available migration for feature(s): #{(features - valid_features).join(", ")}", :red
+            false
+          else
+            true
+          end
+        end
+
+        def valid_features
+          Dir["#{MIGRATION_DIR}/*.erb"].map { |filename| File.basename(filename, ".erb") }
+        end
+
         if defined?(::ActiveRecord::Railtie) # Active Record
           include ::ActiveRecord::Generators::Migration
 
+          MIGRATION_DIR = "#{__dir__}/migration/active_record"
+
           def db_migrate_path
             return "db/migrate" unless ActiveRecord.version >= Gem::Version.new("5.0")
 
             super
           end
 
-          def migration_chunk(feature)
-            "#{__dir__}/migration/active_record/#{feature}.erb"
-          end
-
           def migration_version
             return unless ActiveRecord.version >= Gem::Version.new("5.0")
 
@@ -95,6 +112,8 @@ module Rodauth
         else # Sequel
           include ::Rails::Generators::Migration
 
+          MIGRATION_DIR = "#{__dir__}/migration/sequel"
+
           def self.next_migration_number(dirname)
             next_migration_number = current_migration_number(dirname) + 1
             [Time.now.utc.strftime('%Y%m%d%H%M%S'), format('%.14d', next_migration_number)].max
@@ -104,10 +123,6 @@ module Rodauth
             "db/migrate"
           end
 
-          def migration_chunk(feature)
-            "#{__dir__}/migration/sequel/#{feature}.erb"
-          end
-
           def db
             db = ::Sequel::DATABASES.first if defined?(::Sequel)
             db or fail Rodauth::Rails::Error, "missing Sequel database connection"

data/lib/generators/rodauth/views_generator.rb

@@ -46,10 +46,7 @@ module Rodauth
         }
 
         def create_views
-          views = features.inject([]) do |list, feature|
-            list |= VIEWS[feature] || []
-            list |= VIEWS[DEPENDENCIES[feature]] || []
-          end
+          validate_features or return
 
           views.each do |view|
             copy_file "app/views/rodauth/#{view}.html.erb", "app/views/#{directory}/#{view}.html.erb" do |content|
@@ -63,13 +60,29 @@ module Rodauth
 
         private
 
+        def views
+          features.inject([]) do |list, feature|
+            list |= VIEWS.fetch(feature)
+            list |= VIEWS[DEPENDENCIES[feature]] || []
+          end
+        end
+
+        def validate_features
+          if (features - VIEWS.keys).any?
+            say "No available view template for feature(s): #{(features - VIEWS.keys).join(", ")}", :error
+            false
+          else
+            true
+          end
+        end
+
         def features
           if options[:all]
             VIEWS.keys
           elsif selected_features
             selected_features.map(&:to_sym)
           else
-            rodauth_configuration.features
+            rodauth_configuration.features & VIEWS.keys
           end
         end
 

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

@@ -9,10 +9,12 @@ module Rodauth
         end
 
         def rails_account
+          return unless logged_in?
+
           account_from_session unless account
 
           unless account
-            clear_session if logged_in?
+            clear_session
             return
           end
 

data/lib/rodauth/rails/version.rb

@@ -1,5 +1,5 @@
 module Rodauth
   module Rails
-    VERSION = "1.5.4"
+    VERSION = "1.5.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rodauth-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.5
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-21 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties