Merge branch 'main' into authorization

.github/workflows/rspec.yml

@@ -0,0 +1,30 @@
+name: RSpec
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: [ rails-5.2, rails-6.0, rails-6.1 ]
+        ruby: [ '2.7' ]
+        include:
+          - gemfile: rails-6.1
+            ruby: '3.0'
+          - gemfile: rails-7.0
+            ruby: '2.7'
+          - gemfile: rails-7.0
+            ruby: '3.0'
+          - gemfile: rails-7.1
+            ruby: '3.2'
+    runs-on: ubuntu-latest
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rake

.gitignore

@@ -13,3 +13,5 @@
 /spec/dummy/*.sqlite3-journal
 /spec/dummy/log/*.log
 /spec/dummy/tmp/*
+*.sqlite3-shm
+*.sqlite3-wal

.rspec

@@ -1,3 +1,2 @@
---require spec_helper
 --format documentation
 --color

Gemfile

@@ -4,20 +4,19 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem "rspec-rails", "~> 5.0"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
 
   gem "sqlite3", "~> 1.4"
 end
 
+gem "rails", "~> 7.1.0"
 gem "sassc-rails"
 
 gem "devise"
 gem "cancancan"
 gem "pundit"
 
-gem "rake", "~> 12.0"
-
 gem "trestle", github: "TrestleAdmin/trestle"

README.md

@@ -1,7 +1,7 @@
 # Trestle Authentication & Authorization (trestle-auth)
 
 [![RubyGem](https://img.shields.io/gem/v/trestle-auth.svg?style=flat&colorB=4065a9)](https://rubygems.org/gems/trestle-auth)
-[![Travis](https://img.shields.io/travis/TrestleAdmin/trestle-auth.svg?style=flat)](https://travis-ci.org/TrestleAdmin/trestle-auth)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/TrestleAdmin/trestle-auth/rspec.yml?style=flat)](https://github.com/TrestleAdmin/trestle-auth/actions)
 [![Coveralls](https://img.shields.io/coveralls/TrestleAdmin/trestle-auth.svg?style=flat)](https://coveralls.io/github/TrestleAdmin/trestle-auth)
 
 > Authentication & authorization plugin for the Trestle admin framework

app/views/trestle/auth/sessions/new.html.erb

@@ -11,5 +11,9 @@
     </div>
   <% end -%>
 
+  <%= hook("auth.login.form.before") %>
+
   <%= render "form", f: f %>
+
+  <%= hook("auth.login.form.after") %>
 <% end %>

config/locales/vi.yml

@@ -0,0 +1,15 @@
+vi:
+  admin:
+    auth:
+      my_account: "Tài Khoản Của Tôi"
+      login: "Đăng Nhập"
+      logout: "Đăng Xuất"
+      error: "Thông tin đăng nhập không hợp lệ!"
+      remember_me: "Ghi nhớ phiên đăng nhập"
+
+    auth/account:
+      titles:
+        edit: "Tài Khoản Của Tôi"
+
+      breadcrumbs:
+        index: "Tài Khoản Của Tôi"

gemfiles/rails-5.2.gemfile

@@ -1,23 +1,21 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem "rspec-rails", "~> 5.0"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
-
-  gem "sqlite3", "~> 1.3.13"
 end
 
 gem "rails", "~> 5.2.0"
+
+gem "sqlite3", "~> 1.3.13"
 gem "sassc-rails"
 
 gem "devise"
 gem "cancancan"
 gem "pundit"
 
-gem "rake", "~> 12.0"
-
 gem "trestle", github: "TrestleAdmin/trestle"
 
 gemspec path: "../"

gemfiles/rails-6.0.gemfile

@@ -1,21 +1,21 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem "coveralls", require: false
-  gem "capybara"
+  gem "rspec-rails"
 
-  gem "sqlite3", "~> 1.4"
+  gem "coveralls_reborn", require: false
+  gem "capybara"
 end
 
 gem "rails", "~> 6.0.0"
+
+gem "sqlite3", "~> 1.4"
 gem "sassc-rails"
 
 gem "devise"
 gem "cancancan"
 gem "pundit"
 
-gem "rake", "~> 12.0"
-
 gem "trestle", github: "TrestleAdmin/trestle"
 
 gemspec path: "../"

gemfiles/rails-6.1.gemfile

@@ -3,22 +3,19 @@ source 'https://rubygems.org'
 group :test do
   gem "rspec-rails", "~> 5.0"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
-
-  gem "sqlite3", "~> 1.4"
-  gem "devise"
 end
 
 gem "rails", "~> 6.1.0"
+
+gem "sqlite3", "~> 1.4"
 gem "sassc-rails"
 
 gem "devise"
 gem "cancancan"
 gem "pundit"
 
-gem "rake", "~> 12.0"
-
 gem "trestle", github: "TrestleAdmin/trestle"
 
 gemspec path: "../"

gemfiles/rails-7.0.gemfile

@@ -1,24 +1,21 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem "rspec-rails", "~> 5.0"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
-
-  gem "sqlite3", "~> 1.4"
-  gem "devise"
 end
 
 gem "rails", "~> 7.0.0"
+
+gem "sqlite3", "~> 1.4"
 gem "sassc-rails"
 
 gem "devise"
 gem "cancancan"
 gem "pundit"
 
-gem "rake", "~> 12.0"
-
 gem "trestle", github: "TrestleAdmin/trestle"
 
 gemspec path: "../"

gemfiles/rails-5.0.gemfile → gemfiles/rails-7.1.gemfile

@@ -1,23 +1,21 @@
 source 'https://rubygems.org'
 
 group :test do
-  gem "rspec-rails", "~> 4.1.2"
+  gem "rspec-rails"
 
-  gem "coveralls", require: false
+  gem "coveralls_reborn", require: false
   gem "capybara"
-
-  gem "sqlite3", "~> 1.3.13"
 end
 
-gem "rails", "~> 5.0.0"
+gem "rails", "~> 7.1.0"
+
+gem "sqlite3", "~> 1.4"
 gem "sassc-rails"
 
 gem "devise"
 gem "cancancan"
 gem "pundit"
 
-gem "rake", "~> 12.0"
-
 gem "trestle", github: "TrestleAdmin/trestle"
 
 gemspec path: "../"

lib/trestle/auth/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Auth
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
   end
 end

package.json

@@ -1,6 +1,6 @@
 {
   "name": "trestle-auth",
-  "version": "0.3.0",
+  "version": "0.4.4",
   "description": "Authentication plugin for the Trestle admin framework",
   "repository": "https://github.com/TrestleAdmin/trestle-auth.git",
   "author": "Sam Pohlenz <sam@sampohlenz.com>",
@@ -19,7 +19,7 @@
     "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^3.0.2",
     "mini-css-extract-plugin": "^2.0.0",
-    "node-sass": "^6.0.1",
+    "node-sass": "^7.0.0",
     "postcss-loader": "^6.1.1",
     "sass-loader": "^12.1.0",
     "webpack": "^5.42.0",

spec/dummy/config/application.rb

@@ -6,9 +6,9 @@
 require "action_controller/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
+require "action_mailer/railtie"
 # require "active_job/railtie"
 # require "active_storage/engine"
-# require "action_mailer/railtie"
 # require "action_cable/engine"
 # require "rails/test_unit/railtie"
 
@@ -17,18 +17,7 @@
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for current Rails version.
-    case Rails.version.split(".").first(2).join(".")
-    when '7.0'
-      config.load_defaults 7.0
-    when '6.1'
-      config.load_defaults 6.1
-    when '6.0'
-      config.load_defaults 6.0
-    when '5.2'
-      config.load_defaults 5.2
-    when '5.1'
-      config.load_defaults 5.1
-    end
+    config.load_defaults Rails::VERSION::STRING.to_f
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration can go into files in config/initializers