administration-zero 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1262058b2e76e6b4e80b03390f07439cdf2c5734de1eb3ae2e3dcd79d30ded52
-  data.tar.gz: 0c5a2ea1b24df7f367d6b37144370f9df0df0e071de0ae2acf08a6fe6d21270c
+  metadata.gz: 663bd62eb687f4ebb0a1cd879bc3dae595bc726c7cc29a91431f5e82f133033a
+  data.tar.gz: 0ca18a859d138db6b2f50383a1c561df8131466ece26093cfd797184e359f86b
 SHA512:
-  metadata.gz: 58cb7fe33173e0a58f62684b65ff9477526956e366411a5e2427a4093f3b01cf86ec2ec5908c9529c7e5ef0edd1da522bca552f2ab3bc1f731ad902d7d5ffab7
-  data.tar.gz: d3bec811c90c09b6b051a50fefdc09aafbed7290d14d06d739839376c19c1c2f037dfe80298801d929e477cfa5288872bbe2cdcf0ae30f3dc6cb916119f0e548
+  metadata.gz: f4d3486f4dcb59a2fb0aa41d4968106fc4cf6f8569f85610823cb0d832da093d380366ebb4a8ecdaf9aac5767635e2d9d557343b34b3189dc667f9566cccd7bf
+  data.tar.gz: 65eebeed7cbf48951eed8a0feef6242b2b32f37302726f0a4f9b74b20bb456564ad18d1ab8bb4b3e9dfa5f56269ed09eba1b7e881ebb77cc0497ef5264956f9c

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.10)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -27,13 +27,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 +44,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.10"
 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

@@ -4,7 +4,7 @@ class Admin::ApplicationController < ActionController::Base
   before_action :authenticate
 
   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,7 +12,7 @@ class Admin::PasswordResetsController < Admin::ApplicationController
   end
 
   def create
-    if @admin_user = AdminUser.find_by(email: params[:email])
+    if @admin_user = Admin::User.find_by(email: params[:email])
       Admin::UserMailer.with(admin_user: @admin_user).password_reset_provision.deliver_later
       redirect_to admin_sign_in_path, notice: "Check your email for reset instructions"
     else
@@ -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,11 +4,11 @@ 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

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,9 @@
-<% 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>
+<% flash.each do |name, 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/_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/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,4 @@
+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,4 +1,4 @@
-class Admin::UserMailer < ApplicationMailer
+class Admin::UserMailer < Admin::ApplicationMailer
   def password_reset_provision
     @admin_user = params[:admin_user]
     @signed_id = @admin_user.signed_id(purpose: :password_reset, expires_in: 20.minutes)

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

@@ -0,0 +1,6 @@
+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_user.rb → admin/user.rb}

@@ -1,6 +1,4 @@
-class AdminUser < ApplicationRecord
-  include SpreadsheetArchitect
-
+class Admin::User < Admin::ApplicationRecord
   has_secure_password
 
   validates :email, presence: true, uniqueness: true

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

@@ -10,6 +10,6 @@ class ApplicationSystemTestCase < ActionDispatch::SystemTestCase
     click_on "Sign in"
     assert_current_path admin_url
 
-    return user
+    user
   end
 end

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

@@ -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/users_test.rb

@@ -7,36 +7,36 @@ class Admin::UsersTest < ApplicationSystemTestCase
 
   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/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 %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: administration-zero
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Nixon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-21 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
@@ -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