lotus_admin 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f317d0e84d10ab899a19609c0e03378afb506fab67024def6db274083e7a3cc6
-  data.tar.gz: 7aa186d47a96b63045c87c6c7d2a4e76db95b412f7e8acb38b709f3b6baf0819
+  metadata.gz: 0c9e4993cb32ec7a89ecade49298a80692670bc6e8153621ff8b7a3cd45e0228
+  data.tar.gz: 7dcb22bdec0562583224701e9ec891c06da97e3f07abdc2b4200babdc371a6e7
 SHA512:
-  metadata.gz: 5c73a2575a6b9beca6f25d9345282d46a444709b3656ccdf91a4b430284417e42510cd4d5f503536aaf6016fb3aec20a7b23b2a96f0ed24a81bc80c6262cbef6
-  data.tar.gz: 8f1604d2da4ef998d6d5f09f95d12aad05b151fc0a138fcc50d8c5cd3e7ce51c9da5a4ca013a92a75dc19d1aa34080e653cfdfb2ab46c12b3964936acd208785
+  metadata.gz: beb934c43516b3df224028237c5e9be65ffe0860ef29e44d401b32115cd6ba691fb23e592a04f7ad26e114a9967fbc4388c883856e1a5e757166a4134bb9548d
+  data.tar.gz: 38d23815c520035b15a1a87dc55447d008bcc88bf0666865846444bc366a56443bebfa5f262144030c2a9b794f4067ee9b650d9c734791ded083ece367f502c2

data/README.md

@@ -37,7 +37,7 @@ $ bundle
 Add to your routes
 ```ruby
 # config/routes.rb
-mount LotusAdmin::Engine, at: 'admin'
+LotusAdmin.router.install(self, at: 'admin')
 ```
 
 Seed an administrator account, optional.

data/app/controllers/concerns/lotus_admin/devise_controllers.rb

@@ -2,6 +2,9 @@ module LotusAdmin::DeviseControllers
   extend ActiveSupport::Concern
 
   included do
+    helper LotusAdmin::ApplicationHelper
+    helper LotusAdmin::FormHelpers
+
     layout 'lotus_admin/devise'
   end
 end

data/app/views/administrators/_links.html.haml

@@ -2,9 +2,6 @@
   - if controller_name != 'sessions'
     = link_to "Log in", new_session_path(resource_name)
     %br/
-  - if devise_mapping.registerable? && controller_name != 'registrations'
-    = link_to "Sign up", new_registration_path(resource_name)
-    %br/
   - if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
     = link_to "Forgot your password?", new_password_path(resource_name)
     %br/

data/app/views/layouts/lotus_admin/_sidebar.html.haml

@@ -14,7 +14,7 @@
           Edit My Profile
 
       %li
-        = link_to destroy_administrator_session_path, data: { method: :delete } do
+        = link_to destroy_session_path(current_administrator), data: { method: :delete } do
           %i.zmdi.zmdi-time-restore
           Logout
 

data/config/routes.rb

@@ -1,11 +1,9 @@
 LotusAdmin::Engine.routes.draw do
-  devise_for :administrators, class_name: LotusAdmin.configuration.user_class_name
-
   authenticate :administrator do
     resources :users
     resource :profile, only: [:edit, :update]
 
-    LotusAdmin.install_routes!(self)
+    LotusAdmin.router.resources(self)
 
     root to: 'dashboard#show'
   end

data/lib/lotus_admin/configuration.rb

@@ -4,11 +4,7 @@ module LotusAdmin
     attr_accessor :action_mailer_default_sender_address
 
     def routes(&block)
-      routing_options.push(block)
-    end
-
-    def routing_options
-      @routing_options ||= []
+      LotusAdmin.router.define(&block)
     end
 
     def filter_search_btn_css_classes
@@ -27,11 +23,5 @@ module LotusAdmin
     def user_class
       @user_class ||= user_class_name.constantize
     end
-
-    def install_routes!(router)
-      routing_options.each do |routes|
-        router.instance_eval(&routes)
-      end
-    end
   end
 end

data/lib/lotus_admin/router.rb

@@ -0,0 +1,45 @@
+module LotusAdmin
+  class Router
+    def install(router, at: 'admin')
+      router.devise_for :administrators, devise_config
+
+      router.mount LotusAdmin::Engine, at: at
+    end
+
+    def resources(router)
+      resource_routes.each do |routes|
+        router.instance_eval(&routes)
+      end
+    end
+
+    def define(&block)
+      resource_routes.push(block)
+    end
+
+    def resource_routes
+      @resource_routes ||= []
+    end
+
+    private
+
+    def devise_config
+      {
+        class_name: user_class_name,
+        skip: :registrations,
+        controllers: devise_controllers
+      }
+    end
+
+    def devise_controllers
+      {
+        confirmations: 'lotus_admin/confirmations',
+        sessions: 'lotus_admin/sessions',
+        passwords: 'lotus_admin/passwords'
+      }
+    end
+
+    def user_class_name
+      LotusAdmin.configuration.user_class_name
+    end
+  end
+end

data/lib/lotus_admin/version.rb

@@ -1,3 +1,3 @@
 module LotusAdmin
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

data/lib/lotus_admin.rb

@@ -19,6 +19,7 @@ require 'kaminari'
 require 'ransack'
 
 require 'lotus_admin/configuration'
+require 'lotus_admin/router'
 
 module LotusAdmin
   module_function
@@ -31,7 +32,7 @@ module LotusAdmin
     @configuration ||= Configuration.new
   end
 
-  def install_routes!(router)
-    configuration.install_routes!(router)
+  def router
+    @router ||= Router.new
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lotus_admin
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Matt Millsaps-Brewer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -435,6 +435,7 @@ files:
 - lib/lotus_admin.rb
 - lib/lotus_admin/configuration.rb
 - lib/lotus_admin/engine.rb
+- lib/lotus_admin/router.rb
 - lib/lotus_admin/version.rb
 - lib/tasks/lotus_admin_tasks.rake
 - lib/templates/erb/scaffold/_form.html.erb