administration-zero 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70d7f8e45906155c94abff9d0806c85fdf9c22ad45179a3cc96bf117bbc4aa53
-  data.tar.gz: b3ffdb6e02eb904ea4198c6e30a31c1e2913d1078c6c41c7bcde2f3d0be64cd4
+  metadata.gz: 0055b7410852864619289bb38808d842640bd4287e74569218f777e511e86423
+  data.tar.gz: 87b8eeee5181729f9b598a811e9f9482924713722375879eb6fc050c177a4cf8
 SHA512:
-  metadata.gz: d25cd7127b720c6f88d70c8563dfdd69d9e62a96fd693777ab0832ccdf700b0ec914fd3246c8c380f7af0813a5da0ea6c74a1a3ffea629ce267bba71759eb95d
-  data.tar.gz: b147a78d2bbfdfa5b4c93cea8dfa239e5d76eb2f8c788e947c1d31fc3d63c1e172c8c085684bab3a35d4c10042ca0050d572f42ae5c0dfc596f5e7540e513ccc
+  metadata.gz: f131a63aa42f5f354d89bbbb12a4a88599e2fe7bb10540e0855fee072324f845c3b14d68e47940acd3eae25ee4e20985c4004071b01ad8ad986ddd31a836d33c
+  data.tar.gz: 3c9af28115f6768cc7f92693bb078c406e960b3a332fe81275b309de2fec537cf9ab8e139c5ce2a2a3dea25e76ff020aa6464c803674cdabb0dd18b8cb08d809

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+## [Unreleased]
+
+## [1.0.5] - 2024-01-17
+- Added ransackable_attributes to Admin::User
+- Updated dependencies
+- Fixed scaffold with boolean columns
+- Updated authentication
+- Removed system tests

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    administration-zero (1.0.4)
+    administration-zero (1.0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -10,6 +10,7 @@ GEM
 
 PLATFORMS
   x86_64-darwin-21
+  x86_64-darwin-23
 
 DEPENDENCIES
   administration-zero!

data/lib/administration_zero/version.rb

@@ -1,3 +1,3 @@
 module AdministrationZero
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

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

@@ -70,9 +70,7 @@ module Admin
 
       def create_test_files
         directory "test_unit/controllers", "test/controllers"
-        directory "test_unit/system", "test/system"
         copy_file "test_unit/test_helper.rb", "test/test_helper.rb", force: true
-        copy_file "test_unit/application_system_test_case.rb", "test/application_system_test_case.rb", force: true
       end
     end
   end

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

@@ -30,8 +30,8 @@ class Admin::PasswordResetsController < Admin::BaseController
 
   private
     def set_user
-      @user = Admin::User.find_signed!(params[:token], purpose: :password_reset)
-    rescue
+      @user = Admin::User.find_by_token_for!(:password_reset, params[:token])
+    rescue StandardError
       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

@@ -8,10 +8,8 @@ class Admin::SessionsController < Admin::BaseController
   end
 
   def create
-    @user = Admin::User.find_by(email: params[:email])
-
-    if @user && @user.authenticate(params[:password])
-      session[:admin_user_id] = @user.id; redirect_to(admin_path)
+    if user = Admin::User.authenticate_by(email: params[:email], password: params[:password])
+      session[:admin_user_id] = 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/erb/admin/base/_javascript_tags.html.erb

@@ -1,9 +1,9 @@
-<script src="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/js/tabler.min.js"></script>
-<script src="https://cdn.jsdelivr.net/npm/@rails/ujs@7.0.6/lib/assets/compiled/rails-ujs.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta24/dist/js/tabler.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/@rails/ujs@7.1.3-4/app/assets/javascripts/rails-ujs.min.js"></script>
 
 <!-- Stimulus -->
 <script type="module">
-  import { Application, Controller } from "https://cdn.jsdelivr.net/npm/@hotwired/stimulus@3.2.1/+esm"
+  import { Application, Controller } from "https://cdn.jsdelivr.net/npm/@hotwired/stimulus@3.2.2/+esm"
   window.Stimulus = Application.start()
 
   Stimulus.register("flash-message", class extends Controller {

data/lib/generators/admin/install/templates/erb/admin/base/_stylesheet_link_tags.html.erb

@@ -1,5 +1,5 @@
 <!-- Tabler Core -->
-<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta19/dist/css/tabler.min.css">
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@tabler/core@1.0.0-beta24/dist/css/tabler.min.css">
 
 <!-- Customize tabler here -->
 <style>body {

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

@@ -1,7 +1,7 @@
 class Admin::UserMailer < Admin::ApplicationMailer
   def password_reset
     @user = params[:user]
-    @signed_id = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
+    @signed_id = @user.generate_token_for(:password_reset)
 
     mail to: @user.email, subject: "Reset your password"
   end

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

@@ -1,10 +1,16 @@
 class Admin::User < Admin::ApplicationRecord
   has_secure_password
 
+  generates_token_for :password_reset, expires_in: 20.minutes do
+    password_salt.last(10)
+  end
+
   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 if: -> { email.present? } do
-    self.email = email.downcase.strip
+  normalizes :email, with: -> { _1.strip.downcase }
+
+  def self.ransackable_attributes(auth_object = nil)
+    %w[email created_at]
   end
 end

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

@@ -3,8 +3,7 @@ require "test_helper"
 class Admin::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   setup do
     @user = admin_users(:lazaro_nixon)
-    @sid = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
-    @sid_exp = @user.signed_id(purpose: :password_reset, expires_in: 0.minutes)
+    @sid = @user.generate_token_for(:password_reset)
   end
 
   test "should get new" do
@@ -18,7 +17,7 @@ class Admin::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should send a password reset email" do
-    assert_enqueued_email_with Admin::UserMailer, :password_reset, args: { user: @user } do
+    assert_enqueued_email_with Admin::UserMailer, :password_reset, params: { user: @user } do
       post admin_password_reset_url, params: { email: @user.email }
     end
 
@@ -40,7 +39,8 @@ class Admin::PasswordResetsControllerTest < ActionDispatch::IntegrationTest
   end
 
   test "should not update password with expired token" do
-    patch admin_password_reset_url, params: { token: @sid_exp, password: "Secret6*4*2*", password_confirmation: "Secret6*4*2*" }
+    travel 30.minutes
+    patch admin_password_reset_url, params: { token: @sid, password: "Secret6*4*2*", password_confirmation: "Secret6*4*2*" }
 
     assert_redirected_to new_admin_password_reset_url
     assert_equal "That password reset link is invalid", flash[:alert]

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

@@ -18,7 +18,7 @@
       <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, multiple: true, class: "form-control" %>
       <%%= tag.div <%= singular_name %>.errors[:<%= attribute.column_name %>].first, class: "invalid-feedback" %>
     </div>
-<% elsif attribute.field_type == :check_box -%>
+<% elsif attribute.field_type == :checkbox -%>
     <%%= form.label :<%= attribute.column_name %>, class: "form-check-label col-md-3 col-form-label" %>
     <div class="col-md px-0">
       <%%= form.<%= attribute.field_type %> :<%= attribute.column_name %>, class: "form-check-input" %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administration-zero
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-31 00:00:00.000000000 Z
+date: 2025-01-17 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -71,14 +71,10 @@ files:
 - 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
-- lib/generators/admin/install/templates/test_unit/application_system_test_case.rb
 - lib/generators/admin/install/templates/test_unit/controllers/admin/home_controller_test.rb
 - lib/generators/admin/install/templates/test_unit/controllers/admin/password_resets_controller_test.rb
 - lib/generators/admin/install/templates/test_unit/controllers/admin/sessions_controller_test.rb
 - lib/generators/admin/install/templates/test_unit/controllers/admin/users_controller_test.rb
-- lib/generators/admin/install/templates/test_unit/system/admin/password_resets_test.rb
-- lib/generators/admin/install/templates/test_unit/system/admin/sessions_test.rb
-- lib/generators/admin/install/templates/test_unit/system/admin/users_test.rb
 - lib/generators/admin/install/templates/test_unit/test_helper.rb
 - lib/generators/admin/scaffold/USAGE
 - lib/generators/admin/scaffold/scaffold_generator.rb
@@ -112,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: An administration system generator for Rails applications

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

@@ -1,15 +0,0 @@
-require "test_helper"
-
-class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
-  driven_by :selenium, using: :chrome, screen_size: [1400, 1400]
-
-  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
-
-    user
-  end
-end

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

@@ -1,28 +0,0 @@
-require "application_system_test_case"
-
-class Admin::PasswordResetsTest < ApplicationSystemTestCase
-  setup do
-    @user = admin_users(:lazaro_nixon)
-    @sid = @user.signed_id(purpose: :password_reset, expires_in: 20.minutes)
-  end
-
-  test "sending a password reset email" do
-    visit admin_sign_in_url
-    click_on "I forgot password"
-
-    fill_in "Email", with: @user.email
-    click_on "Send me new password"
-
-    assert_text "Check your email for reset instructions"
-  end
-
-  test "updating password" do
-    visit edit_admin_password_reset_url(token: @sid)
-
-    fill_in "New password", with: "Secret6*4*2*"
-    fill_in "Confirm new password", with: "Secret6*4*2*"
-    click_on "Save changes"
-
-    assert_text "Your password was reset successfully. Please sign in"
-  end
-end

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

@@ -1,24 +0,0 @@
-require "application_system_test_case"
-
-class Admin::SessionsTest < ApplicationSystemTestCase
-  setup do
-    @user = admin_users(:lazaro_nixon)
-  end
-
-  test "signing in" do
-    visit admin_sign_in_url
-    fill_in "Email", with: @user.email
-    fill_in "Password", with: "Secret1*3*5*"
-    click_on "Sign in"
-
-    assert_selector "h1", text: "Admin::Home#index"
-  end
-
-  test "signing out" do
-    sign_in_admin_as @user
-    click_on "Paweł Kuna"
-    click_on "Logout"
-
-    assert_selector "h1", text: "Login to your account"
-  end
-end

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

@@ -1,43 +0,0 @@
-require "application_system_test_case"
-
-class Admin::UsersTest < ApplicationSystemTestCase
-  setup do
-    @user = sign_in_admin_as(admin_users(:lazaro_nixon))
-  end
-
-  test "visiting the index" do
-    visit admin_users_url
-    assert_selector "h1", text: "Users"
-  end
-
-  test "should create user" do
-    visit admin_users_url
-    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 User"
-
-    assert_text "User was successfully created"
-  end
-
-  test "should update user" do
-    visit admin_user_url(@user)
-    click_on "Edit user"
-
-    fill_in "Email", with: @user.email
-    fill_in "Password", with: "NewSecret1*3*5*"
-    fill_in "Password confirmation", with: "NewSecret1*3*5*"
-    click_on "Update User"
-
-    assert_text "User was successfully updated"
-  end
-
-  test "should destroy user" do
-    visit admin_user_url(@user)
-    page.accept_confirm { click_on "Delete user" }
-
-    assert_text "User was successfully destroyed"
-  end
-end