maquina-generators 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a581a9d09b983644b89ffae641f2fe08678a6a6d0f71125937f05354624a4887
-  data.tar.gz: 1b002af208c383174877f552055e64435099709fbfd997d228aca8ec15df39aa
+  metadata.gz: ca10b8ebcd86d74709ad16f64e6366457b53fc9a55da72a997f9084c5819d267
+  data.tar.gz: 3147bb48486e66744e0b2af74ab06368a7b6e782a77b8c3946069f6c6178d76f
 SHA512:
-  metadata.gz: a7319c61cce5ffcef0376b918f4ff706170c678309f79814379a2ef89ffa15a77c71e9e369fda32168842c514cd1303403acf1a8542194fbd1394c0937f2cd3d
-  data.tar.gz: 17634bc69f8cb7acb1eb0b1a2ec28e79461daeb480ad869c41731c6c6334fcf4840574711e8ce4c75da459419b30a70f020a8cd053fc940f562276fc5acb44cf
+  metadata.gz: 6d3ab8cb8656f06fa0c1ced220473bf6bfc76c7931ea70133a91405fdc28b866d2f840f35ced6f9056a382b812a4c03898e2b94ec40f7ab76c39297900789b39
+  data.tar.gz: 7c5cec9099144f5a9216afe62df79d5c5561d23886accd332017d2e491bf29fe25d787129288f743ec0784d19ff9c85cfe15274f00976c60c554fe018d84007e

data/lib/generators/maquina/clave/clave_generator.rb

@@ -34,6 +34,7 @@ module Maquina
 
       # 1. Models
       def create_models
+        template "app/models/account.rb.tt", "app/models/account.rb"
         template "app/models/current.rb.tt", "app/models/current.rb"
         template "app/models/session.rb.tt", "app/models/session.rb"
         template "app/models/email_verification.rb.tt", "app/models/email_verification.rb"
@@ -146,6 +147,8 @@ module Maquina
 
       # 12. Migrations
       def add_migrations
+        migration_template "migration_create_accounts.rb.tt",
+          "db/migrate/create_accounts.rb"
         migration_template "migration_create_users.rb.tt",
           "db/migrate/create_users.rb"
         migration_template "migration_create_sessions.rb.tt",

data/lib/generators/maquina/clave/templates/app/controllers/registration/verifications_controller.rb.tt

@@ -34,10 +34,15 @@ class Registration::VerificationsController < ApplicationController
       return
     end
 
-    user = User.create!(
-      email_address: @verification.email,
-      locale: @verification.locale || I18n.default_locale.to_s
-    )
+    user = nil
+    ActiveRecord::Base.transaction do
+      account = Account.create!
+      user = account.users.create!(
+        email_address: @verification.email,
+        locale: @verification.locale || I18n.default_locale.to_s,
+        role: :admin
+      )
+    end
 
     @verification.mark_verified!
     session.delete(:pending_verification_id)

data/lib/generators/maquina/clave/templates/app/models/account.rb.tt

@@ -0,0 +1,5 @@
+class Account < ApplicationRecord
+  has_many :users, dependent: :destroy
+
+  validates :name, allow_blank: true, length: { maximum: 100 }
+end

data/lib/generators/maquina/clave/templates/app/models/current.rb.tt

@@ -1,4 +1,5 @@
 class Current < ActiveSupport::CurrentAttributes
   attribute :session
   delegate :user, to: :session, allow_nil: true
+  delegate :account, to: :user, allow_nil: true
 end

data/lib/generators/maquina/clave/templates/app/models/user.rb.tt

@@ -1,9 +1,13 @@
 class User < ApplicationRecord
+  belongs_to :account
   has_many :sessions, dependent: :destroy
 
+  enum :role, {member: "member", admin: "admin"}, default: "member"
+
   normalizes :email_address, with: ->(e) { e.strip.downcase }
 
   validates :email_address, uniqueness: true
+  validates :name, allow_blank: true, length: { maximum: 100 }
   validate :email_cannot_contain_plus
 
   scope :active, -> { where(blocked_at: nil) }

data/lib/generators/maquina/clave/templates/migration_create_accounts.rb.tt

@@ -0,0 +1,9 @@
+class CreateAccounts < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :accounts do |t|
+      t.string :name, null: false
+
+      t.timestamps
+    end
+  end
+end

data/lib/generators/maquina/clave/templates/migration_create_users.rb.tt

@@ -1,8 +1,10 @@
 class CreateUsers < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table :users do |t|
+      t.references :account, null: false, foreign_key: true
       t.string :email_address, null: false
       t.string :name
+      t.string :role, null: false, default: "member"
       t.string :locale
       t.datetime :blocked_at
       t.text :blocked_reason

data/lib/generators/maquina/registration/templates/app/models/account.rb.tt

@@ -1,5 +1,5 @@
 class Account < ApplicationRecord
   has_many :users, dependent: :destroy
 
-  validates :name, presence: true
+  validates :name, allow_blank: true, length: { maximum: 100 }
 end

data/lib/generators/maquina/registration/templates/app/models/user.rb.tt

@@ -6,7 +6,7 @@ class User < ApplicationRecord
 
   normalizes :email_address, with: ->(e) { e.strip.downcase }
 
-  validates :name, presence: true
+  validates :name, allow_blank: true, length: { maximum: 100 }
 
   enum :role, {member: "member", admin: "admin"}, default: "member"
 end

data/lib/generators/maquina/registration/templates/app/views/registrations/new.html.erb.tt

@@ -8,8 +8,8 @@
       <%%= form_with url: registrations_path, method: :post, class: "space-y-6" do |form| %>
         <div>
           <%%= form.label :account_name, t(".account_name"), class: "block text-sm font-medium text-foreground mb-2", data: { component: "label" } %>
+          <span class="text-xs text-muted-foreground"><%%= t(".optional") %></span>
           <%%= form.text_field :account_name,
-                               required: true,
                                autofocus: true,
                                value: @account_name,
                                placeholder: t(".account_name_placeholder"),
@@ -19,8 +19,8 @@
 
         <div>
           <%%= form.label :name, t(".name"), class: "block text-sm font-medium text-foreground mb-2", data: { component: "label" } %>
+          <span class="text-xs text-muted-foreground"><%%= t(".optional") %></span>
           <%%= form.text_field :name,
-                               required: true,
                                value: @user.name,
                                placeholder: t(".name_placeholder"),
                                data: { component: "input" },

data/lib/generators/maquina/registration/templates/config/locales/registration.en.yml

@@ -15,6 +15,7 @@ en:
       submit: "Sign up"
       have_account: "Already have an account?"
       sign_in: "Sign in"
+      optional: "(optional)"
     create:
       success: "Your account has been created. Welcome!"
       rate_limited: "Too many attempts. Please wait a few minutes and try again."

data/lib/generators/maquina/registration/templates/config/locales/registration.es.yml

@@ -15,6 +15,7 @@ es:
       submit: "Registrarse"
       have_account: "Ya tienes cuenta?"
       sign_in: "Inicia sesion"
+      optional: "(opcional)"
     create:
       success: "Tu cuenta ha sido creada. Bienvenido!"
       rate_limited: "Demasiados intentos. Por favor, espera unos minutos e intenta de nuevo."

data/lib/maquina_generators/version.rb

@@ -1,3 +1,3 @@
 module MaquinaGenerators
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/generators/maquina/clave_generator_test.rb

@@ -30,10 +30,15 @@ class Maquina::Generators::ClaveGeneratorTest < Rails::Generators::TestCase
   test "generates model files" do
     run_generator
 
+    assert_file "app/models/account.rb", /class Account < ApplicationRecord/
+    assert_file "app/models/account.rb", /has_many :users/
     assert_file "app/models/current.rb", /class Current < ActiveSupport::CurrentAttributes/
+    assert_file "app/models/current.rb", /delegate :account, to: :user/
     assert_file "app/models/session.rb", /class Session < ApplicationRecord/
     assert_file "app/models/email_verification.rb", /class EmailVerification < ApplicationRecord/
     assert_file "app/models/user.rb", /class User < ApplicationRecord/
+    assert_file "app/models/user.rb", /belongs_to :account/
+    assert_file "app/models/user.rb", /enum :role/
   end
 
   test "generates controller files" do
@@ -107,7 +112,11 @@ class Maquina::Generators::ClaveGeneratorTest < Rails::Generators::TestCase
   test "generates migrations" do
     run_generator
 
-    assert_migration "db/migrate/create_users.rb"
+    assert_migration "db/migrate/create_accounts.rb"
+    assert_migration "db/migrate/create_users.rb" do |migration|
+      assert_match(/t\.references :account, null: false, foreign_key: true/, migration)
+      assert_match(/t\.string :role, null: false, default: "member"/, migration)
+    end
     assert_migration "db/migrate/create_sessions.rb"
     assert_migration "db/migrate/create_email_verifications.rb"
   end

data/test/generators/maquina/registration_generator_test.rb

@@ -32,7 +32,7 @@ class Maquina::Generators::RegistrationGeneratorTest < Rails::Generators::TestCa
 
     assert_file "app/models/account.rb", /class Account < ApplicationRecord/
     assert_file "app/models/account.rb", /has_many :users/
-    assert_file "app/models/account.rb", /validates :name, presence: true/
+    assert_file "app/models/account.rb", /validates :name, allow_blank: true/
   end
 
   test "generates user model with account association and role" do
@@ -42,7 +42,7 @@ class Maquina::Generators::RegistrationGeneratorTest < Rails::Generators::TestCa
     assert_file "app/models/user.rb", /has_secure_password/
     assert_file "app/models/user.rb", /belongs_to :account/
     assert_file "app/models/user.rb", /enum :role/
-    assert_file "app/models/user.rb", /validates :name, presence: true/
+    assert_file "app/models/user.rb", /validates :name, allow_blank: true/
   end
 
   test "generates current model with account delegation" do

data/test/tmp/config/application.rb

@@ -3,10 +3,7 @@ require "rails/all"
 
 module TestApp
   class Application < Rails::Application
-
-    # Use Solid Queue as the Active Job backend in all environments except test
-    config.active_job.queue_adapter = :solid_queue unless Rails.env.test?
-    config.solid_queue.connects_to = {database: {writing: :queue}}
     config.load_defaults 7.2
+    config.active_job.queue_adapter = :solid_queue unless Rails.env.test?
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maquina-generators
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mario Alberto Chavez
@@ -84,6 +84,7 @@ files:
 - lib/generators/maquina/clave/templates/app/helpers/authentication_helper.rb.tt
 - lib/generators/maquina/clave/templates/app/jobs/authentication_cleanup_job.rb.tt
 - lib/generators/maquina/clave/templates/app/mailers/verification_mailer.rb.tt
+- lib/generators/maquina/clave/templates/app/models/account.rb.tt
 - lib/generators/maquina/clave/templates/app/models/current.rb.tt
 - lib/generators/maquina/clave/templates/app/models/email_verification.rb.tt
 - lib/generators/maquina/clave/templates/app/models/session.rb.tt
@@ -96,6 +97,7 @@ files:
 - lib/generators/maquina/clave/templates/app/views/verification_mailer/verification_code.text.erb.tt
 - lib/generators/maquina/clave/templates/config/locales/clave.en.yml
 - lib/generators/maquina/clave/templates/config/locales/clave.es.yml
+- lib/generators/maquina/clave/templates/migration_create_accounts.rb.tt
 - lib/generators/maquina/clave/templates/migration_create_email_verifications.rb.tt
 - lib/generators/maquina/clave/templates/migration_create_sessions.rb.tt
 - lib/generators/maquina/clave/templates/migration_create_users.rb.tt