orthodox 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c76ea98111b9b984963beba14eb62daea017a646a34057c726b73b44fc3805c
-  data.tar.gz: 5d712ea97e53c4247eae89c6875a0e6fec64edb8b88123483762dbd9251837e3
+  metadata.gz: bb884d4b62c5307e6c2ac517eb1dc6ebc7c2601ef9c15b3c3f81306f3d15920e
+  data.tar.gz: a8b07923a477e78af67e1dbd28e136d9cafe7f035926c701b451da5b429f9808
 SHA512:
-  metadata.gz: 0b230ca3b3d30e942336fddb247f2fbe722c00b983985df52c1e2f799e25d030fb1e9404bdfe1813a80c2752413545e1fa0b15dd3b570af35d034af61d3de4c6
-  data.tar.gz: 249654ccbfa5844af6c3862a8efcabca77339554ee77b7a55fa30a64d07cb5faaaf69da69f8443c53346c719f34254997b2ae47de5b41c1bbf0335b958de64f0
+  metadata.gz: 184a9b18ccad9deb40190f4584c12df441a43348ed0571a4f561611947534bfb27754148c1de3bd551f90d42cf8528c514b5c5403c50de22d314c0a0c61b6c6b
+  data.tar.gz: a9bee7c8a03ac3f4f290ddc13c0a181572ace2990db3db6b7747068c04895072eb272de26dc8359416f60fb9a81c8b69a86086e15a3acd2c8cd1b371ceba2447

data/lib/generators/authentication/authentication_generator.rb

@@ -1,41 +1,41 @@
 class AuthenticationGenerator < Rails::Generators::NamedBase
   source_root File.expand_path('templates', __dir__)
-  
+
   desc "Creates authentication views, controllers and models for a given Model"
-  
+
   class_option :skip_views, type: :boolean, default: false
 
   class_option :skip_tests, type: :boolean, default: false
-  
+
   class_option :two_factor, type: :boolean, default: false
-  
+
   class_option :js, type: :boolean, default: false
-  
-  
+
+
   def create_controllers
-    generate "base_controller", class_name
-    template "controllers/sessions_controller.rb.erb", 
+    generate "base_controller", plural_name
+    template "controllers/sessions_controller.rb.erb",
              "app/controllers/#{plural_file_name}/sessions_controller.rb"
-    template "controllers/password_resets_controller.rb.erb", 
+    template "controllers/password_resets_controller.rb.erb",
             "app/controllers/#{plural_file_name}/password_resets_controller.rb"
 
-    if options[:two_factor]             
-      template "controllers/tfa_sessions_controller.rb.erb", 
+    if options[:two_factor]
+      template "controllers/tfa_sessions_controller.rb.erb",
                "app/controllers/#{plural_file_name}/tfa_sessions_controller.rb"
-              
-      template "controllers/tfas_controller.rb.erb", 
+
+      template "controllers/tfas_controller.rb.erb",
                "app/controllers/#{plural_file_name}/tfas_controller.rb"
     end
   end
 
   def extend_controllers
-    inject_into_class "app/controllers/#{plural_name}/base_controller.rb", 
-                      "#{plural_class_name}::BaseController", 
+    inject_into_class "app/controllers/#{plural_name}/base_controller.rb",
+                      "#{plural_class_name}::BaseController",
                       "  authenticate_model :#{singular_name}, tfa: #{options[:two_factor]}\n"
     include_module_in_controller("#{plural_name}/base_controller", "Authentication")
-    
+
   end
-  
+
   def ensure_helpers
     if options[:two_factor]
       copy_file "helpers/otp_credentials_helper.rb", "app/helpers/otp_credentials_helper.rb"
@@ -47,7 +47,7 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
       copy_file "javascript/tfa_forms.js", "app/javascript/packs/tfa_forms.js"
     end
   end
-  
+
   def create_mailer
     generate "mailer", "#{class_name}Mailer"
     inject_into_class "app/mailers/#{singular_name}_mailer.rb", "#{class_name}Mailer", <<~RUBY
@@ -56,47 +56,47 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
       @#{singular_name} = #{singular_name}
       mail(to: #{singular_name}.email, subject: "Reset your password")
     end
-    
+
     RUBY
     template "views/mailers/password_reset_link.html.slim.erb",
              "app/views/#{singular_name}_mailer/password_reset_link.html.slim"
   end
-      
+
   def create_models
     copy_file "models/password_reset_token.rb", "app/models/password_reset_token.rb"
     if options[:two_factor]
       template "models/otp_credential.rb.erb", "app/models/otp_credential.rb"
-    end    
+    end
   end
-  
+
   def extend_models
     include_module_in_model(class_name, "Authenticateable")
-    include_module_in_model(class_name, "PasswordResetable")    
+    include_module_in_model(class_name, "PasswordResetable")
     if options[:two_factor]
       include_module_in_model(class_name, "Otpable")
     end
   end
-  
+
   def create_form_objects
-    template "models/session.rb.erb", "app/models/#{singular_name}_session.rb" 
+    template "models/session.rb.erb", "app/models/#{singular_name}_session.rb"
     if options[:two_factor]
       copy_file "models/tfa_session.rb", "app/models/tfa_session.rb"
-    end   
+    end
   end
-  
+
   def ensure_concerns
-    template "controllers/concerns/authentication.rb.erb", 
+    template "controllers/concerns/authentication.rb.erb",
              "app/controllers/concerns/authentication.rb"
-    copy_file "models/concerns/authenticateable.rb", 
-              "app/models/concerns/authenticateable.rb"    
-    copy_file "models/concerns/password_resetable.rb", 
-              "app/models/concerns/password_resetable.rb"    
+    copy_file "models/concerns/authenticateable.rb",
+              "app/models/concerns/authenticateable.rb"
+    copy_file "models/concerns/password_resetable.rb",
+              "app/models/concerns/password_resetable.rb"
 
     if options[:two_factor]
-      copy_file "controllers/concerns/two_factor_authentication.rb", 
-                "app/controllers/concerns/two_factor_authentication.rb"    
-      
-      copy_file "models/concerns/otpable.rb", "app/models/concerns/otpable.rb"    
+      copy_file "controllers/concerns/two_factor_authentication.rb",
+                "app/controllers/concerns/two_factor_authentication.rb"
+
+      copy_file "models/concerns/otpable.rb", "app/models/concerns/otpable.rb"
     end
   end
 
@@ -111,64 +111,64 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
                               secret:string{32} \
                               authable:references{polymorphic} \
                               recovery_codes:json"
-    end    
+    end
   end
-  
+
   def create_view_templates
     return if options[:skip_views]
-    template "views/sessions/new.html.slim.erb", 
-             "app/views/#{plural_name}/sessions/new.html.slim"    
+    template "views/sessions/new.html.slim.erb",
+             "app/views/#{plural_name}/sessions/new.html.slim"
+
+    template "views/password_resets/new.html.slim.erb",
+             "app/views/#{plural_name}/password_resets/new.html.slim"
 
-    template "views/password_resets/new.html.slim.erb", 
-             "app/views/#{plural_name}/password_resets/new.html.slim"    
+    template "views/password_resets/edit.html.slim.erb",
+             "app/views/#{plural_name}/password_resets/edit.html.slim"
 
-    template "views/password_resets/edit.html.slim.erb", 
-             "app/views/#{plural_name}/password_resets/edit.html.slim"    
-             
     if options[:two_factor]
-      template "views/tfa_sessions/new.html.slim.erb", 
-               "app/views/#{plural_name}/tfa_sessions/new.html.slim"      
-      template "views/tfas/show.html.slim.erb", 
-               "app/views/#{plural_name}/tfas/show.html.slim"      
-               
+      template "views/tfa_sessions/new.html.slim.erb",
+               "app/views/#{plural_name}/tfa_sessions/new.html.slim"
+      template "views/tfas/show.html.slim.erb",
+               "app/views/#{plural_name}/tfas/show.html.slim"
+
     end
   end
-  
+
   def create_specs
     return if options[:skip_tests]
-    
+
     copy_file "spec/support/factory_bot.rb", "spec/support/factory_bot.rb"
-    
-    template "spec/system/authentication_spec.rb.erb", 
-             "spec/system/#{plural_name}/authentication_spec.rb" 
-
-    template "spec/system/password_resets_spec.rb.erb", 
-             "spec/system/#{plural_name}/password_resets_spec.rb" 
-             
-    template "spec/models/session_spec.rb.erb", 
-            "spec/models/#{singular_name}_session_spec.rb" 
-    
-    copy_file "spec/models/password_reset_token_spec.rb", 
+
+    template "spec/system/authentication_spec.rb.erb",
+             "spec/system/#{plural_name}/authentication_spec.rb"
+
+    template "spec/system/password_resets_spec.rb.erb",
+             "spec/system/#{plural_name}/password_resets_spec.rb"
+
+    template "spec/models/session_spec.rb.erb",
+            "spec/models/#{singular_name}_session_spec.rb"
+
+    copy_file "spec/models/password_reset_token_spec.rb",
               "spec/models/password_reset_token_spec.rb"
-    
+
     if options[:two_factor]
-      copy_file "spec/support/authentication_helpers.rb", 
+      copy_file "spec/support/authentication_helpers.rb",
                 "spec/support/authentication_helpers.rb"
       template "spec/models/tfa_session_spec.rb.erb", "spec/models/tfa_session_spec.rb"
-      copy_file "spec/models/otp_credential_spec.rb", 
-                "spec/models/otp_credential_spec.rb"      
-      template "spec/system/tfa_authentication_spec.rb.erb", 
-               "spec/system/#{plural_name}/tfa_authentication_spec.rb" 
-      
+      copy_file "spec/models/otp_credential_spec.rb",
+                "spec/models/otp_credential_spec.rb"
+      template "spec/system/tfa_authentication_spec.rb.erb",
+               "spec/system/#{plural_name}/tfa_authentication_spec.rb"
+
     end
   end
-  
+
   def create_factories
     generate "factory_bot:model", "otp_credential"
     generate "factory_bot:model", "password_reset_token"
-    generate "factory_bot:model", "#{singular_name}_session email:email password:password"    
+    generate "factory_bot:model", "#{singular_name}_session email:email password:password"
   end
-  
+
   def ensure_gems
     gem "validates_email_format_of", version: "~> 1.6"
     gem "slim-rails"
@@ -179,39 +179,39 @@ class AuthenticationGenerator < Rails::Generators::NamedBase
       gem "rqrcode", require: false
     end
   end
-  
+
   def create_routes
     route <<~RUBY
     namespace :#{plural_name} do
-    
+
       resource :session, only: [:new, :create, :destroy]
-    
+
       #{"resource :tfa_session, only: [:new, :create]" if options[:two_factor]}
-    
+
       resource :tfa, only: [:create, :show, :destroy]
-        
+
       resources :password_resets, only: [:new, :create, :edit, :update], param: :token
-    
+
     end
     RUBY
   end
-  
+
   private
-  
+
   def plural_class_name
     class_name.pluralize
   end
 
   def include_module_in_controller(controller_name, module_name)
     class_name = controller_name.classify
-    inject_into_class "app/controllers/#{controller_name}.rb", class_name, 
+    inject_into_class "app/controllers/#{controller_name}.rb", class_name,
                       "  include #{module_name}\n"
-    
+
   end
-  
+
   def include_module_in_model(model_name, module_name)
-    inject_into_class "app/models/#{model_name.underscore}.rb", model_name, 
+    inject_into_class "app/models/#{model_name.underscore}.rb", model_name,
                       "  include #{module_name}\n"
-    
+
   end
 end

data/lib/orthodox/version.rb

@@ -1,3 +1,3 @@
 module Orthodox
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: orthodox
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Bodacious