administration-zero 0.0.9 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1262058b2e76e6b4e80b03390f07439cdf2c5734de1eb3ae2e3dcd79d30ded52
-  data.tar.gz: 0c5a2ea1b24df7f367d6b37144370f9df0df0e071de0ae2acf08a6fe6d21270c
+  metadata.gz: 7acbcb69df24a8f4cc70e5679ddee87b6ae96a031fa16eefdbe364aca086127e
+  data.tar.gz: 494132b0b91cf59fde8afb705768824af1aa6ec7ccae6cbaa00aa1ff385595f9
 SHA512:
-  metadata.gz: 58cb7fe33173e0a58f62684b65ff9477526956e366411a5e2427a4093f3b01cf86ec2ec5908c9529c7e5ef0edd1da522bca552f2ab3bc1f731ad902d7d5ffab7
-  data.tar.gz: d3bec811c90c09b6b051a50fefdc09aafbed7290d14d06d739839376c19c1c2f037dfe80298801d929e477cfa5288872bbe2cdcf0ae30f3dc6cb916119f0e548
+  metadata.gz: bab4269085274c79c172220c6f19e3e5c061f75f63e46efddc45dca0208f59aa8c78fa6b1c88862585fe1b4d9fef0b503bb531ff9d3bdda5bf64271052b5f2c7
+  data.tar.gz: fab03417c2685ece0c56a4d5d169ebdb6fb2c78d708987618074ae12120cb2fa3a183f3a72561e484e4b5e3b79ce888ed87ba0daf18a22bbcc59af3690a1d047

data/.rubocop.yml

@@ -0,0 +1,15 @@
+inherit_from: https://raw.githubusercontent.com/rails/rails/master/.rubocop.yml
+
+Performance:
+  Exclude:
+    - 'test/**/*'
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/StringLiterals:
+  Enabled: true
+  EnforcedStyle: double_quotes
+  Include:
+    - 'app/**/*'
+    - 'test/**/*'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    administration-zero (0.0.9)
+    administration-zero (0.0.12)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -11,6 +11,7 @@ The purpose of administration zero is to generate a pre-built administration pan
 - [Sortable and filterable](https://github.com/activerecord-hackery/ransack)
 - [Exportable data](https://github.com/westonganger/spreadsheet_architect)
 - [Toastr for flash messages](https://getbootstrap.com/docs/5.1/components/toasts)
+- Determine time zone automatically
 - Easy authentication system
 - Admin scaffolds
 
@@ -27,13 +28,13 @@ Then run `bundle install`
 You'll need to create a model to be administrated, if you don't have one. for this example let's use the following:
 
 ```
-$ rails generate model posts title:string body:text published:boolean
+rails generate model posts title:string body:text published:boolean
 ```
 
 ## Usage
 
 ```
-$ rails generate admin:install
+rails generate admin:install
 ```
 
 Then run `bundle install` again
@@ -44,13 +45,11 @@ Then run `rails db:migrate db:seed`, you can access the admin panel in `/admin`,
 Now you're ready to generate your admin scaffolds.
 
 ```
-$ rails generate admin:scaffold posts title:string body:text published:boolean
+rails generate admin:scaffold posts title:string body:text published:boolean
 ```
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
 To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing

data/lib/administration_zero/version.rb

@@ -1,3 +1,3 @@
 module AdministrationZero
-  VERSION = "0.0.9"
+  VERSION = "0.0.12"
 end

data/lib/generators/admin/install/install_generator.rb

@@ -21,12 +21,11 @@ module Admin
 
       def create_models
         directory "models/admin", "app/models/admin"
-        copy_file "models/admin_user.rb", "app/models/admin_user.rb"
         copy_file "models/application_record.rb", "app/models/application_record.rb", force: true
       end
 
       def create_fixture_file
-        copy_file "test_unit/admin_users.yml", "test/fixtures/admin_users.yml"
+        copy_file "test_unit/admin_users.yml", "test/fixtures/admin/users.yml"
       end
 
       def create_controllers

data/lib/generators/admin/install/templates/controllers/admin/application_controller.rb

@@ -1,10 +1,15 @@
 class Admin::ApplicationController < ActionController::Base
   include Pagy::Backend
 
+  before_action :set_time_zone
   before_action :authenticate
 
+  def set_time_zone
+    Time.zone = cookies[:time_zone]
+  end
+
   def authenticate
-    if admin_user = AdminUser.find_by_id(session[:admin_user_id])
+    if admin_user = Admin::User.find_by_id(session[:admin_user_id])
       Admin::Current.user = admin_user
     else
       redirect_to admin_sign_in_path

data/lib/generators/admin/install/templates/controllers/admin/password_resets_controller.rb

@@ -12,8 +12,8 @@ class Admin::PasswordResetsController < Admin::ApplicationController
   end
 
   def create
-    if @admin_user = AdminUser.find_by(email: params[:email])
-      Admin::UserMailer.with(admin_user: @admin_user).password_reset_provision.deliver_later
+    if @admin_user = Admin::User.find_by(email: params[:email])
+      Admin::UserMailer.with(admin_user: @admin_user).password_reset.deliver_later
       redirect_to admin_sign_in_path, notice: "Check your email for reset instructions"
     else
       redirect_to new_admin_password_reset_path, alert: "Sorry, we didn't recognize that email address"
@@ -30,7 +30,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
 
   private
     def set_admin_user
-      @admin_user = AdminUser.find_signed!(params[:token], purpose: :password_reset)
+      @admin_user = Admin::User.find_signed!(params[:token], purpose: :password_reset)
     rescue
       redirect_to new_admin_password_reset_path, alert: "That password reset link is invalid"
     end

data/lib/generators/admin/install/templates/controllers/admin/sessions_controller.rb

@@ -4,16 +4,14 @@ class Admin::SessionsController < Admin::ApplicationController
   layout "admin/authentication"
 
   def new
-    @admin_user = AdminUser.new
+    @admin_user = Admin::User.new
   end
 
   def create
-    @admin_user = AdminUser.find_by(email: params[:email])
+    @admin_user = Admin::User.find_by(email: params[:email])
 
     if @admin_user && @admin_user.authenticate(params[:password])
-      session[:admin_user_id] = @admin_user.id
-
-      redirect_to admin_path
+      session[:admin_user_id] = @admin_user.id; redirect_to(admin_path)
     else
       redirect_to admin_sign_in_path(email_hint: params[:email]), alert: "That email or password is incorrect"
     end

data/lib/generators/admin/install/templates/controllers/admin/users_controller.rb

@@ -2,7 +2,7 @@ class Admin::UsersController < Admin::ApplicationController
   before_action :set_admin_user, only: %i[ show edit update destroy ]
 
   def index
-    @search = AdminUser.all.ransack(params[:q])
+    @search = Admin::User.all.ransack(params[:q])
 
     respond_to do |format|
       format.html { @pagy, @admin_users = pagy(@search.result) }
@@ -14,14 +14,14 @@ class Admin::UsersController < Admin::ApplicationController
   end
 
   def new
-    @admin_user = AdminUser.new
+    @admin_user = Admin::User.new
   end
 
   def edit
   end
 
   def create
-    @admin_user = AdminUser.new(admin_user_params)
+    @admin_user = Admin::User.new(admin_user_params)
 
     if @admin_user.save
       redirect_to @admin_user, notice: "User was successfully created."
@@ -45,7 +45,7 @@ class Admin::UsersController < Admin::ApplicationController
 
   private
     def set_admin_user
-      @admin_user = AdminUser.find(params[:id])
+      @admin_user = Admin::User.find(params[:id])
     end
 
     def admin_user_params

data/lib/generators/admin/install/templates/erb/admin/application/_flash_messages.html.erb

@@ -1,11 +1,11 @@
-<% flash.each do |type, message| %>
-  <% if ["notice", "alert"].include?(type) %>
-    <div class="position-fixed start-50 translate-middle-x" style="z-index: 1030; top: 8rem;">
-      <div class="toast hide text-center text-white bg-dark border-0" data-controller="flash-message">
-        <div class="toast-body">
-          <%= message %>
-        </div>
+<% message = notice || alert %>
+
+<% if message %>
+  <div class="position-fixed start-50 translate-middle-x" style="z-index: 1030; top: 8rem;">
+    <div class="toast hide text-center text-white bg-dark border-0" data-controller="flash-message">
+      <div class="toast-body">
+        <%= message %>
       </div>
     </div>
-  <% end %>
+  </div>
 <% end %>

data/lib/generators/admin/install/templates/erb/admin/application/_javascript_tags.html.erb

@@ -1,6 +1,20 @@
 <!-- Tabler Core -->
 <script src="https://unpkg.com/@tabler/core@1.0.0-beta9/dist/js/tabler.min.js"></script>
 
+<!-- set time zone cookie -->
+<script>
+  const { timeZone } = new Intl.DateTimeFormat().resolvedOptions();
+  setCookie("time_zone", timeZone);
+
+  function setCookie(name, value) {
+    const twentyYears  = 20 * 365 * 24 * 60 * 60 * 1000;
+    const body = [ name, value ].map(encodeURIComponent).join("=");
+    const expires = new Date(Date.now() + twentyYears).toUTCString();
+    const cookie = `${body}; path=/; expires=${expires}`;
+    document.cookie = cookie;
+  }
+</script>
+
 <!-- bring back data-confirm -->
 <script>
   document.addEventListener("click", (event) => {

data/lib/generators/admin/install/templates/erb/admin/application/_page_header_breadcrumb.html.erb

@@ -6,7 +6,7 @@
       <%= yield %>
     </ol>
   </div>
-  <h2 class="page-title">
+  <h1 class="page-title">
     <span class="text-truncate"><%= title %></span>
-  </h2>
+  </h1>
 </div>

data/lib/generators/admin/install/templates/erb/admin/application/_secondary_navbar.html.erb

@@ -19,7 +19,7 @@
                 <svg xmlns="http://www.w3.org/2000/svg" class="icon" width="24" height="24" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round"><path stroke="none" d="M0 0h24v24H0z" fill="none"></path><circle cx="9" cy="7" r="4"></circle><path d="M3 21v-2a4 4 0 0 1 4 -4h4a4 4 0 0 1 4 4v2"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path><path d="M21 21v-2a4 4 0 0 0 -3 -3.85"></path></svg>
               </span>
               <span class="nav-link-title">
-                Admin users
+                Users
               </span>
             <% end %>
           </li>

data/lib/generators/admin/install/templates/erb/admin/password_resets/edit.html.erb

@@ -1,6 +1,6 @@
 <%= form_with(url: admin_password_reset_path, method: :patch, class: "card card-md") do |form| %>
   <div class="card-body">
-    <h2 class="card-title text-center mb-4">Reset password</h2>
+    <h1 class="card-title text-center mb-4">Reset password</h1>
 
     <%= hidden_field_tag :token, params[:token] %>
 

data/lib/generators/admin/install/templates/erb/admin/password_resets/new.html.erb

@@ -1,6 +1,6 @@
 <%= form_with(url: admin_password_reset_path, class: "card card-md") do |form| %>
   <div class="card-body">
-    <h2 class="card-title text-center mb-4">Forgot password</h2>
+    <h1 class="card-title text-center mb-4">Forgot password</h1>
     <p class="text-muted mb-4">Enter your email address and your password will be reset and emailed to you.</p>
     <div class="mb-3">
       <%= form.label :email, class: "form-label" %>

data/lib/generators/admin/install/templates/erb/admin/sessions/new.html.erb

@@ -1,6 +1,6 @@
 <%= form_with(url: admin_sign_in_path, class: "card card-md") do |form| %>
   <div class="card-body">
-    <h2 class="card-title text-center mb-4">Login to your account</h2>
+    <h1 class="card-title text-center mb-4">Login to your account</h1>
     <div class="mb-3">
       <%= form.label :email, class: "form-label" %>
       <%= form.email_field :email, value: params[:email_hint], placeholder: "Enter email", autofocus: true, required: true, autocomplete: "email", class:"form-control" %>

data/lib/generators/admin/install/templates/erb/admin/user_mailer/password_reset.html.erb

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  </head>
+  <body>
+    <p>Hey there,</p>
+    <p>Can't remember your password for <strong><%= @admin_user.email %></strong>? That's OK, it happens. Just hit the link below to set a new one.</p>
+    <p><%= link_to "Reset my password", edit_admin_password_reset_url(token: @signed_id) %></p>
+    <p>If you did not request a password reset you can safely ignore this email, it expires in 20 minutes. Only someone with access to this email account can reset your password.</p>
+    <hr>
+    <p>Have questions or need help? Just reply to this email and our support team will help you sort it out.</p>
+  </body>
+</html>

data/lib/generators/admin/install/templates/erb/admin/users/edit.html.erb

@@ -1,7 +1,7 @@
 <%= render "page_header" do %>
-  <%= render "page_header_breadcrumb", title: "Editing admin user" do %>
+  <%= render "page_header_breadcrumb", title: "Editing user" do %>
     <li class="breadcrumb-item"><%= link_to "Admin", admin_path %></li>
-    <li class="breadcrumb-item"><%= link_to "Admin users", admin_users_path %></li>
+    <li class="breadcrumb-item"><%= link_to "Users", admin_users_path %></li>
     <li class="breadcrumb-item"><%= link_to @admin_user.email, @admin_user %></li>
   <% end %>
 <% end %>

data/lib/generators/admin/install/templates/erb/admin/users/index.html.erb

@@ -1,11 +1,11 @@
 <%= render "page_header" do %>
-  <%= render "page_header_breadcrumb", title: "Admin users" do %>
+  <%= render "page_header_breadcrumb", title: "Users" do %>
     <li class="breadcrumb-item"><%= link_to "Admin", admin_path %></li>
   <% end %>
 
   <%= render "page_header_actions" do %>
     <%= link_to "Filters", "#offcanvas_filters", "data-bs-toggle": "offcanvas", class: "btn btn-light" %>
-    <%= link_to "New admin user", new_admin_user_path, class: "btn btn-primary" %>
+    <%= link_to "New user", new_admin_user_path, class: "btn btn-primary" %>
   <% end %>
 <% end %>
 
@@ -41,7 +41,7 @@
       <div class="card-footer d-flex align-items-center fs-5">
         <div class="d-none d-md-block">
           <div>Download: <%= link_to "CSV", admin_users_path(format: :csv, q: request.params[:q]) %></div>
-          <%== pagy_info @pagy %>
+          <%= raw pagy_info(@pagy) %>
         </div>
         <div class="ms-auto">
           <%= render "pagination", pagy: @pagy %>

data/lib/generators/admin/install/templates/erb/admin/users/new.html.erb

@@ -1,7 +1,7 @@
 <%= render "page_header" do %>
-  <%= render "page_header_breadcrumb", title: "New admin user" do %>
+  <%= render "page_header_breadcrumb", title: "New user" do %>
     <li class="breadcrumb-item"><%= link_to "Admin", admin_path %></li>
-    <li class="breadcrumb-item"><%= link_to "Admin users", admin_users_path %></li>
+    <li class="breadcrumb-item"><%= link_to "Users", admin_users_path %></li>
   <% end %>
 <% end %>
 

data/lib/generators/admin/install/templates/erb/admin/users/show.html.erb

@@ -1,12 +1,12 @@
 <%= render "page_header" do %>
   <%= render "page_header_breadcrumb", title: @admin_user.email do %>
     <li class="breadcrumb-item"><%= link_to "Admin", admin_path %></li>
-    <li class="breadcrumb-item"><%= link_to "Admin users", admin_users_path %></li>
+    <li class="breadcrumb-item"><%= link_to "Users", admin_users_path %></li>
   <% end %>
 
   <%= render "page_header_actions" do %>
-    <%= link_to "Edit admin user", edit_admin_user_path(@admin_user), class: "btn btn-primary" %>
-    <%= button_to "Delete admin user", @admin_user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-light" %>
+    <%= link_to "Edit user", edit_admin_user_path(@admin_user), class: "btn btn-primary" %>
+    <%= button_to "Delete user", @admin_user, method: :delete, "data-confirm": "Are you sure?", form_class: "d-inline", class: "btn btn-light" %>
   <% end %>
 <% end %>
 
@@ -14,7 +14,7 @@
   <div class="container-xl">
     <div class="card">
       <div class="card-header">
-        <h3 class="card-title">Admin user details</h3>
+        <h3 class="card-title">User details</h3>
       </div>
       <div class="card-body">
         <dl class="row">

data/lib/generators/admin/install/templates/helpers/admin/application_helper.rb

@@ -2,7 +2,7 @@ module Admin::ApplicationHelper
   include Pagy::Frontend
 
   def title
-    content_for(:title) || Rails.application.class.to_s.split('::').first
+    content_for(:title) || Rails.application.class.to_s.split("::").first
   end
 
   def active_nav_item(controller, actions = %w( index show new edit create update))

data/lib/generators/admin/install/templates/mailers/admin/application_mailer.rb

@@ -0,0 +1,3 @@
+class Admin::ApplicationMailer < ActionMailer::Base
+  default from: "from@example.com"
+end

data/lib/generators/admin/install/templates/mailers/admin/user_mailer.rb

@@ -1,5 +1,5 @@
-class Admin::UserMailer < ApplicationMailer
-  def password_reset_provision
+class Admin::UserMailer < Admin::ApplicationMailer
+  def password_reset
     @admin_user = params[:admin_user]
     @signed_id = @admin_user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
 

data/lib/generators/admin/install/templates/migrations/create_admin_users.rb.tt

@@ -1,8 +1,8 @@
 class <%= migration_class_name %> < ActiveRecord::Migration[<%= ActiveRecord::Migration.current_version %>]
   def change
     create_table :admin_users do |t|
-      t.string :email
-      t.string :password_digest
+      t.string :email, null: false
+      t.string :password_digest, null: false
 
       t.timestamps
     end

data/lib/generators/admin/install/templates/models/admin/application_record.rb

@@ -0,0 +1,3 @@
+class Admin::ApplicationRecord < ActiveRecord::Base
+  include SpreadsheetArchitect; self.abstract_class = true; self.table_name_prefix = "admin_"
+end

data/lib/generators/admin/install/templates/models/admin/current.rb

@@ -1,3 +1,3 @@
 class Admin::Current < ActiveSupport::CurrentAttributes
-  attribute :user
+  attribute :user; resets { Time.zone = nil }
 end

data/lib/generators/admin/install/templates/models/admin/user.rb

@@ -0,0 +1,10 @@
+class Admin::User < Admin::ApplicationRecord
+  has_secure_password
+
+  validates :email, presence: true, uniqueness: true, format: { with: URI::MailTo::EMAIL_REGEXP }
+  validates :password, allow_nil: true, length: { minimum: 12 }, format: { with: /(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])/ }
+
+  before_validation do
+    self.email = email.try(:downcase).try(:strip)
+  end
+end

data/lib/generators/admin/install/templates/seeds.rb

@@ -6,4 +6,4 @@
 #   movies = Movie.create([{ name: "Star Wars" }, { name: "Lord of the Rings" }])
 #   Character.create(name: "Luke", movie: movies.first)
 
-AdminUser.create(email: "admin@example.com", password: "Password9957", password_confirmation: "Password9957")
+Admin::User.create(email: "admin@example.com", password: "Password9957", password_confirmation: "Password9957")

data/lib/generators/admin/install/templates/test_unit/application_system_test_case.rb

@@ -3,13 +3,13 @@ require "test_helper"
 class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
   driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
 
-  def admin_sign_in_as(user)
+  def sign_in_admin_as(user)
     visit admin_sign_in_url
     fill_in :email, with: user.email
     fill_in :password, with: "Secret1*3*5*"
     click_on "Sign in"
     assert_current_path admin_url
 
-    return user
+    user
   end
 end

data/lib/generators/admin/install/templates/test_unit/controllers/admin/home_controller_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Admin::HomeControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @admin_user = admin_sign_in_as(admin_users(:lazaro_nixon))
+    @admin_user = sign_in_admin_as(admin_users(:lazaro_nixon))
   end
 
   test "should get index" do

data/lib/generators/admin/install/templates/test_unit/controllers/admin/password_resets_controller_test.rb

@@ -18,7 +18,7 @@ class Admin::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should send a password reset email" do
-    assert_enqueued_email_with Admin::UserMailer, :password_reset_provision, args: { admin_user: @admin_user } do
+    assert_enqueued_email_with Admin::UserMailer, :password_reset, args: { admin_user: @admin_user } do
       post admin_password_reset_url, params: { email: @admin_user.email }
     end
 

data/lib/generators/admin/install/templates/test_unit/controllers/admin/sessions_controller_test.rb

@@ -28,7 +28,7 @@ class Admin::SessionsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should sign out" do
-    admin_sign_in_as @admin_user
+    sign_in_admin_as @admin_user
 
     delete admin_sign_out_url
     assert_redirected_to admin_sign_in_url

data/lib/generators/admin/install/templates/test_unit/controllers/admin/users_controller_test.rb

@@ -2,7 +2,7 @@ require "test_helper"
 
 class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
   setup do
-    @admin_user = admin_sign_in_as(admin_users(:lazaro_nixon))
+    @admin_user = sign_in_admin_as(admin_users(:lazaro_nixon))
   end
 
   test "should get index" do
@@ -16,11 +16,11 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should create admin_user" do
-    assert_difference("AdminUser.count") do
-      post admin_users_url, params: { admin_user: { email: "lazaronixon@hey.com", password: "Secret1*3*5*", password_confirmation: "Secret1*3*5*"} }
+    assert_difference("Admin::User.count") do
+      post admin_users_url, params: { admin_user: { email: "lazaronixon@hey.com", password: "Secret1*3*5*", password_confirmation: "Secret1*3*5*" } }
     end
 
-    assert_redirected_to admin_user_url(AdminUser.last)
+    assert_redirected_to admin_user_url(Admin::User.last)
   end
 
   test "should show admin_user" do
@@ -39,7 +39,7 @@ class Admin::UsersControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should destroy admin_user" do
-    assert_difference("AdminUser.count", -1) do
+    assert_difference("Admin::User.count", -1) do
       delete admin_user_url(@admin_user)
     end
 

data/lib/generators/admin/install/templates/test_unit/system/admin/sessions_test.rb

@@ -15,7 +15,7 @@ class Admin::SessionsTest < ApplicationSystemTestCase
   end
 
   test "signing out" do
-    admin_sign_in_as @admin_user
+    sign_in_admin_as @admin_user
     click_on "Paweł Kuna"
     click_on "Logout"
 

data/lib/generators/admin/install/templates/test_unit/system/admin/users_test.rb

@@ -2,41 +2,41 @@ require "application_system_test_case"
 
 class Admin::UsersTest < ApplicationSystemTestCase
   setup do
-    @admin_user = admin_sign_in_as(admin_users(:lazaro_nixon))
+    @admin_user = sign_in_admin_as(admin_users(:lazaro_nixon))
   end
 
   test "visiting the index" do
     visit admin_users_url
-    assert_selector "h2", text: "Admin users"
+    assert_selector "h2", text: "Users"
   end
 
   test "should create user" do
     visit admin_users_url
-    click_on "New admin user"
+    click_on "New user"
 
     fill_in "Email", with: "lazaronixon@hey.com"
     fill_in "Password", with: "Secret1*3*5*"
     fill_in "Password confirmation", with: "Secret1*3*5*"
-    click_on "Create Admin user"
+    click_on "Create User"
 
     assert_text "User was successfully created"
   end
 
-  test "should update User" do
+  test "should update user" do
     visit admin_user_url(@admin_user)
-    click_on "Edit admin user"
+    click_on "Edit user"
 
     fill_in "Email", with: @admin_user.email
     fill_in "Password", with: "NewSecret1*3*5*"
     fill_in "Password confirmation", with: "NewSecret1*3*5*"
-    click_on "Update Admin user"
+    click_on "Update User"
 
     assert_text "User was successfully updated"
   end
 
-  test "should destroy User" do
+  test "should destroy user" do
     visit admin_user_url(@admin_user)
-    page.accept_confirm { click_on "Delete admin user" }
+    page.accept_confirm { click_on "Delete user" }
 
     assert_text "User was successfully destroyed"
   end

data/lib/generators/admin/install/templates/test_unit/test_helper.rb

@@ -10,7 +10,7 @@ class ActiveSupport::TestCase
   fixtures :all
 
   # Add more helper methods to be used by all tests here...
-  def admin_sign_in_as(user)
+  def sign_in_admin_as(user)
     post(admin_sign_in_url, params: { email: user.email, password: "Secret1*3*5*" }); user
   end
 end

data/lib/generators/admin/scaffold/templates/erb/index.html.erb.tt

@@ -49,7 +49,7 @@
       <div class="card-footer d-flex align-items-center fs-5">
         <div class="d-none d-md-block">
           <div>Download: <%%= link_to "CSV", <%= index_helper(type: :path) %>(format: :csv, q: request.params[:q]) %></div>
-          <%%== pagy_info @pagy %>
+          <%%= raw pagy_info(@pagy) %>
         </div>
         <div class="ms-auto">
           <%%= render "pagination", pagy: @pagy %>

data/lib/generators/admin/scaffold/templates/functional_test.rb.tt

@@ -6,7 +6,7 @@ class <%= controller_class_name %>ControllerTest < ActionDispatch::IntegrationTe
 
   <%- end -%>
   setup do
-    @admin_user = admin_sign_in_as admin_users(:lazaro_nixon)
+    @admin_user = sign_in_admin_as admin_users(:lazaro_nixon)
     @<%= singular_table_name %> = <%= fixture_name %>(:one)
   end
 

data/lib/generators/admin/scaffold/templates/system_test.rb.tt

@@ -2,7 +2,7 @@ require "application_system_test_case"
 
 class <%= class_name.pluralize %>Test < ApplicationSystemTestCase
   setup do
-    @admin_user = admin_sign_in_as(admin_users(:lazaro_nixon))
+    @admin_user = sign_in_admin_as(admin_users(:lazaro_nixon))
     @<%= singular_table_name %> = <%= fixture_name %>(:one)
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administration-zero
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.12
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -19,6 +19,7 @@ extra_rdoc_files: []
 files:
 - ".documentation/screenshot.png"
 - ".gitignore"
+- ".rubocop.yml"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -51,8 +52,8 @@ files:
 - lib/generators/admin/install/templates/erb/admin/password_resets/edit.html.erb
 - lib/generators/admin/install/templates/erb/admin/password_resets/new.html.erb
 - lib/generators/admin/install/templates/erb/admin/sessions/new.html.erb
-- lib/generators/admin/install/templates/erb/admin/user_mailer/password_reset_provision.html.erb
-- lib/generators/admin/install/templates/erb/admin/user_mailer/password_reset_provision.text.erb
+- lib/generators/admin/install/templates/erb/admin/user_mailer/password_reset.html.erb
+- lib/generators/admin/install/templates/erb/admin/user_mailer/password_reset.text.erb
 - lib/generators/admin/install/templates/erb/admin/users/_form.html.erb
 - lib/generators/admin/install/templates/erb/admin/users/edit.html.erb
 - lib/generators/admin/install/templates/erb/admin/users/index.html.erb
@@ -63,10 +64,12 @@ files:
 - lib/generators/admin/install/templates/helpers/admin/application_helper.rb
 - lib/generators/admin/install/templates/images/admin/000m.jpg
 - lib/generators/admin/install/templates/images/admin/logo.svg
+- lib/generators/admin/install/templates/mailers/admin/application_mailer.rb
 - lib/generators/admin/install/templates/mailers/admin/user_mailer.rb
 - lib/generators/admin/install/templates/migrations/create_admin_users.rb.tt
+- lib/generators/admin/install/templates/models/admin/application_record.rb
 - lib/generators/admin/install/templates/models/admin/current.rb
-- lib/generators/admin/install/templates/models/admin_user.rb
+- lib/generators/admin/install/templates/models/admin/user.rb
 - lib/generators/admin/install/templates/models/application_record.rb
 - lib/generators/admin/install/templates/seeds.rb
 - lib/generators/admin/install/templates/test_unit/admin_users.yml

data/lib/generators/admin/install/templates/erb/admin/user_mailer/password_reset_provision.html.erb

@@ -1,11 +0,0 @@
-<p>Hey there,</p>
-
-<p>Can't remember your password for <strong><%= @admin_user.email %></strong>? That's OK, it happens. Just hit the link below to set a new one.</p>
-
-<p><%= link_to "Reset my password", edit_admin_password_reset_url(token: @signed_id) %></p>
-
-<p>If you did not request a password reset you can safely ignore this email, it expires in 20 minutes. Only someone with access to this email account can reset your password.</p>
-
-<hr>
-
-<p>Have questions or need help? Just reply to this email and our support team will help you sort it out.</p>

data/lib/generators/admin/install/templates/models/admin_user.rb

@@ -1,15 +0,0 @@
-class AdminUser < ApplicationRecord
-  include SpreadsheetArchitect
-
-  has_secure_password
-
-  validates :email, presence: true, uniqueness: true
-  validates_format_of :email, with: /\A[^@\s]+@[^@\s]+\z/
-
-  validates_length_of :password, minimum: 12, allow_nil: true
-  validates_format_of :password, with: /(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])/, allow_nil: true, message: "might easily be guessed"
-
-  before_validation do
-    self.email = email.downcase.strip
-  end
-end