kaze 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d47e0df09c4dc843e721f9df107ffcf181cab7f3922233b9b82ca6ecd1eafa20
-  data.tar.gz: a932b205c852cf2825867f11b9a4d0c7f580a798be9b14c96b2745a705109105
+  metadata.gz: d575337712c9b2651ca597a59bb56dfea851cf552ff3d1e4878d2182b6bff4a5
+  data.tar.gz: 8e91a3772f93eba05dbe2e656a087c015789ccf75b70b5132fd2ba419009effc
 SHA512:
-  metadata.gz: 5ab37093d08694cbdacd55fab7328c8c1c8042996605dffd16b48d709007377c5479c8a95085e611ff195961caee9b64815b13e9323134a981d81f11e776e3c2
-  data.tar.gz: beb37ead1dd42947264d72f58a93b113795a0361cf9979d7f5166273702b2c515c262a67be9be218f5dc185a0f9897367c34bc0fc3167d1076aa5483558a00b8
+  metadata.gz: a2562af016d65f894dd72e473a4b159bbf27799018872f4c5b4d29c8fb3290af031c3f5b2f487a3f2ef8552ed95247c2ad2a78cdbb31c62a91583376e1ca051c
+  data.tar.gz: 5d110365415c3d2878dbfb8c4f364af7200f5cfba500731ced7c47fbdde0680d9d27ac28e4c1c681f8804d28c397d5754fcde08ec4d6ecb7a973c313ebe5127b

data/lib/kaze/commands/install_command.rb

@@ -62,18 +62,32 @@ class Kaze::Commands::InstallCommand < Thor
     end
   end
 
+  def install_tests
+    ensure_directory_exists("#{Dir.pwd}/test/factories")
+    ensure_directory_exists("#{Dir.pwd}/test/integration")
+    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/test/test_helper.rb", "#{Dir.pwd}/test/test_helper.rb")
+    FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/default/test/factories", "#{Dir.pwd}/test/factories")
+    FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/default/test/integration", "#{Dir.pwd}/test/integration")
+  end
+
   def ensure_directory_exists(path)
     FileUtils.mkdir_p(path) unless File.directory?(path)
   end
 
   def run_command(command)
     Open3.popen3(command) do |stdin, stdout, stderr, wait_thr|
-      Thread.new do
-        stdout.each { |line| say line }
+      stdout_thread = Thread.new do
+        while (line = stdout.gets) do
+          say line
+        end
       end
-      Thread.new do
-        stderr.each { |line| say line, :red }
+      stderr_thread = Thread.new do
+        while (line = stderr.gets) do
+          say line, :red
+        end
       end
+      stdout_thread.join
+      stderr_thread.join
       wait_thr.value
     end
   end

data/lib/kaze/commands/installs_hotwire_stack.rb

@@ -6,6 +6,7 @@ module Kaze::Commands::InstallsHotwireStack
     return unless remove_gems([ 'sprockets-rails', 'stimulus-rails' ])
     return unless install_gems([ 'propshaft', 'view_component', 'tailwindcss-rails', 'turbo-rails', 'dotenv', 'bcrypt' ])
     return unless install_gems([ 'hotwire-livereload' ], 'development')
+    return unless install_gems([ 'factory_bot_rails', 'faker' ], 'development, test')
 
     # Controllers...
     FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/hotwire/app/controllers", "#{Dir.pwd}/app/controllers")
@@ -37,10 +38,12 @@ module Kaze::Commands::InstallsHotwireStack
     ensure_directory_exists("#{Dir.pwd}/app/components")
     FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/hotwire/app/components", "#{Dir.pwd}/app/components")
     ensure_directory_exists("#{Dir.pwd}/app/javascript")
-    FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/hotwire/app/javascript", "#{Dir.pwd}/app/javascript")
+    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/hotwire/app/javascript/application.js", "#{Dir.pwd}/app/javascript/application.js")
+    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/hotwire/app/javascript/alpinejs.stub", "#{Dir.pwd}/app/javascript/alpinejs.js")
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/hotwire/config/importmap.rb", "#{Dir.pwd}/config/importmap.rb")
 
     # Tests...
+    install_tests
 
     # Routes...
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/config/routes.rb", "#{Dir.pwd}/config/routes.rb")
@@ -53,7 +56,7 @@ module Kaze::Commands::InstallsHotwireStack
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/app/assets/stylesheets/application.tailwind.css", "#{Dir.pwd}/app/assets/stylesheets/application.tailwind.css")
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/hotwire/config/tailwind.config.js", "#{Dir.pwd}/config/tailwind.config.js")
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/bin/dev", "#{Dir.pwd}/bin/dev")
-    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/hotwire/Procfile.dev", "#{Dir.pwd}/Procfile.dev")
+    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/Procfile.dev", "#{Dir.pwd}/Procfile.dev")
     run_command('rails tailwindcss:build')
 
     say ''

data/lib/kaze/commands/installs_inertia_stacks.rb

@@ -5,6 +5,7 @@ module Kaze::Commands::InstallsInertiaStacks
     # Gems...
     return unless remove_gems([ 'sprockets-rails', 'turbo-rails', 'stimulus-rails' ])
     return unless install_gems([ 'propshaft', 'tailwindcss-rails', 'inertia_rails', 'vite_rails', 'dotenv', 'bcrypt', 'js-routes' ])
+    return unless install_gems([ 'factory_bot_rails', 'faker' ], 'development, test')
 
     # NPM Packages...
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/inertia-react-ts/package.json", "#{Dir.pwd}/package.json")
@@ -40,6 +41,8 @@ module Kaze::Commands::InstallsInertiaStacks
     FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/inertia-react-ts/app/javascript", "#{Dir.pwd}/app/javascript")
 
     # Tests...
+    install_tests
+    FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/inertia-common/test/integration", "#{Dir.pwd}/test/integration")
 
     # Routes...
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/config/routes.rb", "#{Dir.pwd}/config/routes.rb")
@@ -56,8 +59,10 @@ module Kaze::Commands::InstallsInertiaStacks
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/inertia-react-ts/vite.config.ts", "#{Dir.pwd}/vite.config.ts")
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/bin/dev", "#{Dir.pwd}/bin/dev")
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/inertia-common/bin/vite", "#{Dir.pwd}/bin/vite")
-    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/inertia-common/Procfile.dev", "#{Dir.pwd}/Procfile.dev")
+    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/Procfile.dev", "#{Dir.pwd}/Procfile.dev")
+    File.write("#{Dir.pwd}/Procfile.dev", "#{File.read("#{Dir.pwd}/Procfile.dev")}\nvite: bin/vite dev\n")
     run_command('rails generate js_routes:middleware')
+    run_command('rails tailwindcss:build')
 
     say ''
     say 'Installing and building Node dependencies.', :magenta
@@ -78,8 +83,9 @@ module Kaze::Commands::InstallsInertiaStacks
 
   def install_inertia_vue_stack
     # Gems...
-    return unless remove_gems([ 'sprockets-rails' ])
+    return unless remove_gems([ 'sprockets-rails', 'turbo-rails', 'stimulus-rails' ])
     return unless install_gems([ 'propshaft', 'tailwindcss-rails', 'inertia_rails', 'vite_rails', 'dotenv', 'bcrypt', 'js-routes' ])
+    return unless install_gems([ 'factory_bot_rails', 'faker' ], 'development, test')
 
     # NPM Packages...
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/inertia-vue-ts/package.json", "#{Dir.pwd}/package.json")
@@ -115,6 +121,8 @@ module Kaze::Commands::InstallsInertiaStacks
     FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/inertia-vue-ts/app/javascript", "#{Dir.pwd}/app/javascript")
 
     # Tests...
+    install_tests
+    FileUtils.copy_entry("#{File.dirname(__FILE__)}/../../../stubs/inertia-common/test/integration", "#{Dir.pwd}/test/integration")
 
     # Routes...
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/config/routes.rb", "#{Dir.pwd}/config/routes.rb")
@@ -131,8 +139,10 @@ module Kaze::Commands::InstallsInertiaStacks
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/inertia-vue-ts/vite.config.ts", "#{Dir.pwd}/vite.config.ts")
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/bin/dev", "#{Dir.pwd}/bin/dev")
     FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/inertia-common/bin/vite", "#{Dir.pwd}/bin/vite")
-    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/inertia-common/Procfile.dev", "#{Dir.pwd}/Procfile.dev")
+    FileUtils.copy_file("#{File.dirname(__FILE__)}/../../../stubs/default/Procfile.dev", "#{Dir.pwd}/Procfile.dev")
+    File.write("#{Dir.pwd}/Procfile.dev", "#{File.read("#{Dir.pwd}/Procfile.dev")}\nvite: bin/vite dev\n")
     run_command('rails generate js_routes:middleware')
+    run_command('rails tailwindcss:build')
 
     say ''
     say 'Installing and building Node dependencies.', :magenta

data/lib/kaze/version.rb

@@ -1,3 +1,3 @@
 module Kaze
-  VERSION = "0.5.0"
+  VERSION = '0.7.0'
 end

data/stubs/default/app/forms/auth/login_form.rb

@@ -5,14 +5,8 @@ class Auth::LoginForm < ApplicationForm
   validates :password, presence: true
 
   def authenticate
-    return nil if invalid?
+    return if invalid?
 
-    user = User.authenticate_by(email: email, password: password)
-
-    return user if user.present?
-
-    errors.add(:email, message: 'These credentials do not match our records.')
-
-    nil
+    errors.add(:email, message: 'These credentials do not match our records.') unless Current.auth.attempt(email: email, password: password)
   end
 end

data/stubs/default/app/forms/update_profile_information_form.rb

@@ -2,5 +2,5 @@ class UpdateProfileInformationForm < ApplicationForm
   attr_accessor :name, :email
 
   validates :name,  presence: true
-  validates :email, presence: true, lowercase: true, email: true, uniqueness: { model: User, attribute: :email, conditions: -> { where.not(id: Current.user.id) } }
+  validates :email, presence: true, lowercase: true, email: true, uniqueness: { model: User, attribute: :email, conditions: -> { where.not(id: Current.auth.user.id) } }
 end

data/stubs/default/app/models/auth.rb

@@ -0,0 +1,57 @@
+class Auth
+  attr_reader :name, :session, :user
+
+  def initialize(name, session)
+    @name = name
+    @session = session
+  end
+
+  def get_user
+    return @user unless @user.nil?
+
+    id = @session[get_name]
+
+    @user = User.find_by(id: id) unless id.nil?
+
+    @user
+  end
+
+  def get_name
+    "login_#{@name}_#{Digest::SHA1.hexdigest(self.class.name)}"
+  end
+
+  def check?
+    not get_user.nil?
+  end
+
+  def attempt(credentials = {})
+    user = User.authenticate_by(credentials)
+
+    return false if user.nil?
+
+    login user
+
+    true
+  end
+
+  def login(user)
+    update_session user.id
+
+    set_user user
+  end
+
+  def set_user(user)
+    @user = user
+  end
+
+  def logout
+    @session[get_name] = nil
+    @user = nil
+  end
+
+  private
+
+  def update_session(id)
+    @session[get_name] = id
+  end
+end

data/stubs/default/app/models/current.rb

@@ -1,3 +1,3 @@
 class Current < ActiveSupport::CurrentAttributes
-  attribute :user
+  attribute :auth
 end

data/stubs/default/app/validators/current_password_validator.rb

@@ -1,5 +1,5 @@
 class CurrentPasswordValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    record.errors.add attribute, 'The password is incorrect.' unless Current.user&.authenticate(value)
+    record.errors.add attribute, 'The password is incorrect.' unless Current.auth.user&.authenticate(value)
   end
 end