alchemy-devise 5.0.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bceaf41fec555e993944005a9fd8b3999c8d6cfe02c9d95d194907ed1315327f
-  data.tar.gz: be271d71719f1b1f3e54e91d20e8b4750f269eeaa984da3ea96e4e49242a9814
+  metadata.gz: ac9f1d9cb0e0ae6c8785fae335c084f35bc99fd57f0f0ecb8fbb69af31a0acf8
+  data.tar.gz: 7a25e4e8233588c7daaeded0550cfe16c01d529f32e8f20c5319afd62a8d2f3a
 SHA512:
-  metadata.gz: 611103643240ab89a34a77e0b280180f6dd10cedf5fa59f1cae96c384cd4f8141d331841d71e2b52b7990dc17b41b797bea868e0e3d91ba1ab2d7c6294170d99
-  data.tar.gz: 8567891ceb7104874d92f681bd2cc2e24946d3d4adf80063d02b4b1289cccf70498a74975c8526dad727fd5d54c64bba0af4a19d0df90d747360502efd16bbb0
+  metadata.gz: aef2756070f8c8316ee71ff1d14c3c01f9d00864f4f57178bbf4261552cf69e95c9e3e453a4ae2841557a2c8633bdaf2979d9eaf9149bbaac341098be3e07a92
+  data.tar.gz: 2dc752cea79c75090d0bea21c409eba342e135a08a9f0d17bd547e12fdbc557b1e68b27379fd41130294f1bc83df738da13a9a02390a4b6d8d51eaf77ee87380

data/README.md

@@ -1,8 +1,8 @@
 ## Devise based authentication for AlchemyCMS
 
-[![Build Status](https://secure.travis-ci.org/AlchemyCMS/alchemy-devise.svg?branch=master)](http://travis-ci.org/AlchemyCMS/alchemy-devise)
+[![Build Status](https://github.com/AlchemyCMS/alchemy-devise/workflows/CI/badge.svg?branch=main)](https://github.com/AlchemyCMS/alchemy-devise/actions)
 
-[![Gem Version](https://badge.fury.io/rb/alchemy-devise.svg)](http://badge.fury.io/rb/alchemy-devise) [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/coverage) [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/gpa.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise) [![security](https://hakiri.io/github/AlchemyCMS/alchemy-devise/master.svg)](https://hakiri.io/github/AlchemyCMS/alchemy-devise/master)
+[![Gem Version](https://badge.fury.io/rb/alchemy-devise.svg)](http://badge.fury.io/rb/alchemy-devise) [![Test Coverage](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/coverage.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/coverage) [![Code Climate](https://codeclimate.com/github/AlchemyCMS/alchemy-devise/badges/gpa.svg)](https://codeclimate.com/github/AlchemyCMS/alchemy-devise) [![security](https://hakiri.io/github/AlchemyCMS/alchemy-devise/main.svg)](https://hakiri.io/github/AlchemyCMS/alchemy-devise/main)
 
 AlchemyCMS has no authentication in its core. So it is possible to bring your own authentication and use it to authorize users in AlchemyCMS. If you don't have your own authentication, you can use this gem.
 

data/app/controllers/alchemy/admin/passwords_controller.rb

@@ -1,3 +1,7 @@
+# frozen_string_literal: true
+
+require "alchemy/version"
+
 module Alchemy
   module Admin
     class PasswordsController < ::Devise::PasswordsController

data/app/controllers/alchemy/admin/user_sessions_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_dependency "alchemy/version"
+require "alchemy/version"
 
 module Alchemy
   module Admin

data/app/views/alchemy/admin/users/index.html.erb

@@ -1,22 +1,21 @@
-<%= toolbar(
-  buttons: [
-    {
-      icon: :plus,
-      label: Alchemy.t(:create_user),
-      url: alchemy.new_admin_user_path,
+<%= content_for :toolbar do %>
+  <%= toolbar_button(
+    icon: :plus,
+    label: Alchemy.t(:create_user),
+    url: alchemy.new_admin_user_path,
+    title: Alchemy.t(:create_user),
+    hotkey: 'alt+n',
+    dialog_options: {
       title: Alchemy.t(:create_user),
-      hotkey: 'alt+n',
-      dialog_options: {
-        title: Alchemy.t(:create_user),
-        size: "430x560"
-      },
-      if_permitted_to: [:create, Alchemy::User]
-    }
-  ]
-) %>
+      size: "430x560"
+    },
+    if_permitted_to: [:create, Alchemy::User]
+  ) %>
+  <%= render "alchemy/admin/partials/search_form" %>
+<% end %>
 
 <div id="archive_all" class="resources-table-wrapper">
-  <%= resources_header %>
+  <%= render "alchemy/admin/resources/table_header" %>
 <% if @users.any? %>
 
   <table class="list" id="user_list">

data/config/initializers/alchemy.rb

@@ -1,26 +1,24 @@
-require 'alchemy/devise/ability'
+# frozen_string_literal: true
 
-Alchemy.register_ability(Alchemy::Devise::Ability)
+Rails.application.config.to_prepare do
+  require "alchemy/devise/ability"
 
-Alchemy::Modules.register_module({
-  name: 'users',
-  engine_name: 'alchemy',
-  position: 4.1,
-  navigation: {
-    name: 'modules.users',
-    controller: 'alchemy/admin/users',
-    action: 'index',
-    icon: 'users'
-  }
-})
+  Alchemy.register_ability(Alchemy::Devise::Ability)
 
-Alchemy.user_class_name = 'Alchemy::User'
-Alchemy.signup_path     = '/admin/signup'
-Alchemy.login_path      = '/admin/login'
-Alchemy.logout_path     = '/admin/logout'
+  Alchemy::Modules.register_module({
+    name: "users",
+    engine_name: "alchemy",
+    position: 4.1,
+    navigation: {
+      name: "modules.users",
+      controller: "/alchemy/admin/users",
+      action: "index",
+      icon: "users",
+    },
+  })
 
-if Alchemy.respond_to?(:logout_method)
-  Rails.application.config.after_initialize do
-    Alchemy.logout_method = Devise.sign_out_via
-  end
+  Alchemy.signup_path = "/admin/signup"
+  Alchemy.login_path = "/admin/login"
+  Alchemy.logout_path = "/admin/logout"
+  Alchemy.logout_method = Devise.sign_out_via
 end

data/lib/alchemy/devise/ability.rb

@@ -10,16 +10,16 @@ module Alchemy
         can :create, Alchemy::User if Alchemy::User.count == 0
 
         if member? || author? || editor?
-          can [:show, :update], Alchemy.user_class, id: user.id
+          can [:show, :update], Alchemy::User, id: user.id
         end
 
         if editor? || admin?
           can :index, :alchemy_admin_users
-          can :read, Alchemy.user_class
+          can :read, Alchemy::User
         end
 
         if admin?
-          can :manage, Alchemy.user_class
+          can :manage, Alchemy::User
         end
       end
 

data/lib/alchemy/devise/engine.rb

@@ -7,6 +7,10 @@ module Alchemy
       isolate_namespace Alchemy
       engine_name 'alchemy_devise'
 
+      initializer "alchemy_devise.user_class", before: "alchemy.userstamp" do
+        Alchemy.user_class_name = "Alchemy::User"
+      end
+
       initializer 'alchemy_devise.assets' do |app|
         app.config.assets.precompile += [
           'alchemy-devise.css'

data/lib/alchemy/devise/version.rb

@@ -1,5 +1,5 @@
 module Alchemy
   module Devise
-    VERSION = "5.0.0"
+    VERSION = "6.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alchemy-devise
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-22 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: alchemy_cms
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 5.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -210,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Devise based user authentication for AlchemyCMS.