administration-zero 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 663bd62eb687f4ebb0a1cd879bc3dae595bc726c7cc29a91431f5e82f133033a
-  data.tar.gz: 0ca18a859d138db6b2f50383a1c561df8131466ece26093cfd797184e359f86b
+  metadata.gz: dfad604f4745dd7570ce2d3312be76883c4628d78b68f9cf73e895524e3a5b09
+  data.tar.gz: 8075becb0053683c3829418f3638203ec18e68c8457889e991d0f00330272c79
 SHA512:
-  metadata.gz: f4d3486f4dcb59a2fb0aa41d4968106fc4cf6f8569f85610823cb0d832da093d380366ebb4a8ecdaf9aac5767635e2d9d557343b34b3189dc667f9566cccd7bf
-  data.tar.gz: 65eebeed7cbf48951eed8a0feef6242b2b32f37302726f0a4f9b74b20bb456564ad18d1ab8bb4b3e9dfa5f56269ed09eba1b7e881ebb77cc0497ef5264956f9c
+  metadata.gz: 232ad1c394f2587baab5d9756a9bbd5a5aeb7a2367a62e650a7005ac8f65159d9394871295005aaa54834e69c53ce272d8366faec645498981b81f1770d88403
+  data.tar.gz: e19a765822a158ff63482d267ab4d3e231ca5024f21abf239ac783f4818d3629c6731bb1967c5a7b674992ea404b0b38efdecf341f1e8da92e71a07577878aee

data/Gemfile.lock

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

data/lib/administration_zero/version.rb

@@ -1,3 +1,3 @@
 module AdministrationZero
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

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

@@ -13,7 +13,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
 
   def create
     if @admin_user = Admin::User.find_by(email: params[:email])
-      Admin::UserMailer.with(admin_user: @admin_user).password_reset_provision.deliver_later
+      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"

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

@@ -12,7 +12,6 @@ class Admin::SessionsController < Admin::ApplicationController
 
     if @admin_user && @admin_user.authenticate(params[:password])
       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"

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

@@ -1,4 +1,6 @@
-<% flash.each do |name, message| %>
+<% 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">

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/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/mailers/admin/application_mailer.rb

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

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

@@ -1,5 +1,5 @@
 class Admin::UserMailer < Admin::ApplicationMailer
-  def password_reset_provision
+  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

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

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

@@ -1,13 +1,10 @@
 class Admin::User < Admin::ApplicationRecord
   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"
+  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.downcase.strip
+    self.email = email.try(:downcase).try(:strip)
   end
 end

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

@@ -3,7 +3,7 @@ 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*"

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

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,7 +2,7 @@ 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

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/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.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-21 00:00:00.000000000 Z
+date: 2022-05-08 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -52,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

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>