five-two-nw-olivander 0.2.0.0 → 0.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ab27ddf5bd9a9840334c5012d983da406ff25bb6a1352e9ecb7ea09bcb6e86
-  data.tar.gz: 042da3a6287c67e8643236e8bd32ceb72264d25f389ebc775e9d11de180b4390
+  metadata.gz: 5d247c42715b68ca77e28f0b8d99f48b466d042ba197aad6a0fa5694d344d7d3
+  data.tar.gz: 5d4f1e94e9c1d85378a0586481ecf276b34d65364fb341e95ae9020f437293f2
 SHA512:
-  metadata.gz: a4528a86c47018a50553a2576d7c8c9fdec267956cc738890046d7a617f619575a0e4067802a23bed2d8c6a6250c26a900ea3f91df788b001c0c7d1426f30c86
-  data.tar.gz: 8c8ee8c14ad71c1b559547258b9cf59f5208cfc5ef2fcbed09acb657a12d511503cdcc5109422a02e850d3cf2965e34eebe79bb697b9255b5b3074f671493d36
+  metadata.gz: 336beef33e5b2f9b3242a654d9de9b5cb2b19ef30b25b62ccb0b2bbb74753afbdddf027a289ec6dc65d873e9a53acab6998983f0394aa8162a1c516976c8f8f7
+  data.tar.gz: aee825f87643bebac907ccfdf499b1f8d76f1a8e4049f58fa35856eaea663f8d175f808f7b04aa56b1ff0b704f7e1a7c322d6568e945b555c01423c0e6ec29e9

data/app/datatables/olivander/datatable.rb

@@ -24,8 +24,7 @@ module Olivander
       column_attributes &&= only if only.size.positive?
       column_attributes -= except if except.size.positive?
       resources_sym = klazz.table_name.to_sym
-      bulk_action_list = self::ROUTE_BUILDER.resources[resources_sym]&.datatable_bulk_actions || []
-
+      bulk_action_list = Olivander::CurrentContext.application_context.route_builder.resources[resources_sym]&.datatable_bulk_actions || []
       default_hidden = %w[
         id created updated created_at updated_at
         deleted_at current_user current_action

data/app/helpers/olivander/application_helper.rb

@@ -34,10 +34,10 @@ module Olivander
       user.avatar_path
     end
 
-    def authorized_resource_actions(route_builder, resource, for_action: :show)
+    def authorized_resource_actions(resource, for_action: :show)
       raw_name = resource.is_a?(Class) ? resource.name : resource.class.name
       plural_name = raw_name.demodulize.underscore.pluralize
-      routed_resource = route_builder.resources[plural_name.to_sym]
+      routed_resource = Olivander::CurrentContext.application_context.route_builder.resources[plural_name.to_sym]
       return [] if routed_resource.nil?
 
       actions = if resource.is_a?(Class)
@@ -69,8 +69,8 @@ module Olivander
       respond_to?('can?') ? can?(action, resource) : true
     end
 
-    def resource_form_actions(route_builder, resource, for_action: :show)
-      render partial: 'resource_form_actions', locals: { actions: authorized_resource_actions(route_builder, resource, for_action: for_action).select(&:show_in_form) }
+    def resource_form_actions(resource, for_action: :show)
+      render partial: 'resource_form_actions', locals: { actions: authorized_resource_actions(resource, for_action: for_action).select(&:show_in_form) }
     end
 
     def resource_form_action_label(resource, action)
@@ -95,11 +95,11 @@ module Olivander
     end
 
     def current_user
-      controller.respond_to?(:current_user) ? controller.current_user : nil
+      Olivander::CurrentContext.user || OpenStruct.new({ display_name: 'No User Set' })
     end
 
     def current_ability
-      controller.respond_to?(:current_ability) ? controller.current_ability : nil
+      Olivander::CurrentContext.ability
     end
 
     def resource_attributes(resource, effective_resource)
@@ -130,7 +130,7 @@ module Olivander
     end
 
     def sidebar_context_name
-      [@context.name, sidebar_context_suffix&.upcase].reject{ |x| x.blank? or x == 'PRODUCTION' }.join(' ')
+      [Olivander::CurrentContext.application_context.name, sidebar_context_suffix&.upcase].reject{ |x| x.blank? or x == 'PRODUCTION' }.join(' ')
     end
 
     def sidebar_context_suffix
@@ -144,7 +144,7 @@ module Olivander
     end
 
     def sidebar_background_class
-      @context.sidebar_background_class ||
+      Olivander::CurrentContext.application_context.sidebar_background_class ||
         ENV['SIDEBAR_BACKGROUND_CLASS'] ||
         (is_dev_environment? ? 'bg-danger' : 'bg-info')
     end

data/app/views/application/_form.html.haml

@@ -4,7 +4,7 @@
     .card-header
       %h3.card-title= @resource.to_s.blank? ? @resource.model_name.human : @resource
       .card-tools
-        = resource_form_actions(@context.route_builder, @resource, for_action: action_name.to_sym)
+        = resource_form_actions(@resource, for_action: action_name.to_sym)
     .card-body
       =f.error_notification
       =f.error_notification message: f.object.errors[:base].to_sentence if f.object.errors[:base].present?

data/app/views/application/index.html.haml

@@ -33,7 +33,7 @@
       .card-header
         %h3.card-title= page_title
         .card-tools
-          = resource_form_actions(@context.route_builder, resource.klass, for_action: :index)
+          = resource_form_actions(resource.klass, for_action: :index)
       .card-body
         - if @datatable
           = content_for :datatable

data/app/views/application/show.html.haml

@@ -10,7 +10,7 @@
         .card-header
           %h3.card-title= @resource.to_s
           .card-tools
-            = resource_form_actions(@context.route_builder, @resource, for_action: action_name.to_sym)
+            = resource_form_actions(@resource, for_action: action_name.to_sym)
         .card-body
           = render_optional_partial 'show_inside_before'
           = render Olivander::Components::ResourceShowComponent.new(@resource, [])

data/app/views/effective/resource/_actions_dropleft.html.haml

@@ -1,10 +1,9 @@
-- route_builder = @context&.route_builder || datatable.class::ROUTE_BUILDER
 -# = dropdown(variation: :dropleft, btn_class: btn_class) do
--#   - authorized_resource_actions(route_builder, resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
+-#   - authorized_resource_actions(resource, for_action: action_name).select{ |x| x.show_in_datatable }.each do |a|
 -#     - path = a.path_helper.is_a?(Proc) ? a.path_helper.call(resource) : send(a.path_helper, resource.id)
 -#     - data = a.turbo_frame.present? ? { turbo: true, turbo_frame: a.turbo_frame } : {}
 -#     = dropdown_link_to resource_form_action_label(resource, a.sym), path, data: data
-- actions = authorized_resource_actions(route_builder, resource, for_action: action_name).select{ |x| x.show_in_datatable }
+- actions = authorized_resource_actions(resource, for_action: action_name).select{ |x| x.show_in_datatable }
 - crud_actions = actions.select{ |a| a.crud_action }
 - non_crud_actions = actions.select{ |a| !a.crud_action }
 .btn-group

data/app/views/layouts/olivander/adminlte/_footer.html.haml

@@ -2,7 +2,7 @@
   %strong
     Copyright © #{Date.current.year}
     = succeed "." do
-      = link_to @context.company.name, @context.company.url
+      = link_to Olivander::CurrentContext.application_context.company.name, Olivander::CurrentContext.application_context.company.url
   All rights reserved.
   .float-right.d-none.d-sm-inline-block
     .text-small

data/app/views/layouts/olivander/adminlte/_navbar.html.haml

@@ -5,7 +5,7 @@
     %li.nav-item
       %a.nav-link{"data-widget" => "pushmenu", :href => "#", :role => "button", 'data-enable-remember': "true"}
         %i.fas.fa-bars
-    - @context.visible_modules.each do |menu_item|
+    - Olivander::CurrentContext.application_context.visible_modules.each do |menu_item|
       %li.nav-item.d-none.d-sm-inline-block
         = link_to menu_item.text, menu_item.href, class: 'nav-link'
   / Right navbar links
@@ -113,7 +113,7 @@
         %li.user-footer
           = link_to user_path(current_user), class: 'btn btn-default btn-flat' do
             Profile
-          = link_to @context.sign_out_path, method: :delete, class: 'btn btn-default btn-flat float-right' do
+          = link_to Olivander::CurrentContext.application_context.sign_out_path, method: :delete, class: 'btn btn-default btn-flat float-right' do
             Sign out
     %li.nav-item
       %a.nav-link{title: 'Full Screen Mode', "data-widget" => "fullscreen", :href => "#", :role => "button"}

data/app/views/layouts/olivander/adminlte/_sidebar.html.haml

@@ -2,7 +2,7 @@
 %aside.main-sidebar.sidebar-dark-primary.elevation-4{ data: { controller: 'left-nav' }}
   / Brand Logo
   %a.brand-link{ href: "/", class: sidebar_background_class }
-    %img.brand-image.img-circle.elevation-3{:alt => @context.logo.alt, :src => @context.logo.url, :style => "opacity: .8"}/
+    %img.brand-image.img-circle.elevation-3{:alt => Olivander::CurrentContext.application_context.logo.alt, :src => Olivander::CurrentContext.application_context.logo.url, :style => "opacity: .8"}/
     %span.brand-text.font-weight-light= sidebar_context_name
   / Sidebar
   .sidebar
@@ -16,7 +16,7 @@
     / Sidebar Menu
     %nav.mt-2
       %ul.nav.nav-pills.nav-sidebar.nav-compact.flex-column{"data-accordion" => "false", "data-widget" => "treeview", :role => "menu"}
-        - @context.menu_items.each do |menu_item|
+        - Olivander::CurrentContext.application_context.menu_items.each do |menu_item|
           = render Olivander::Components::MenuItemComponent.new(menu_item)
 
 

data/app/views/layouts/olivander/adminlte/login.html.haml

@@ -4,7 +4,7 @@
   %body.hold-transition.login-page
     .login-box
       -# .login-logo
-      -#   %img.brand-image.img-circle.elevation-3{:alt => @context.logo.alt, :src => @context.logo.url, :style => "opacity: .8"}
+      -#   %img.brand-image.img-circle.elevation-3{:alt => Olivander::CurrentContext.application_context.logo.alt, :src => Olivander::CurrentContext.application_context.logo.url, :style => "opacity: .8"}
       .card
         .card-header.text-center{ class: sidebar_background_class }
           %a.h1{ href: '/' }

data/app/views/layouts/olivander/adminlte/main.html.haml

@@ -1,6 +1,5 @@
 !!!
 %html
-  - @context ||= Olivander::ApplicationContext.default
   = render partial: 'layouts/olivander/adminlte/head'
   - sidebar_collapse = cookies['lte.pushmenu.collapsed'] == 'true' ? 'sidebar-collapse' : ''
   %body.hold-transition.sidebar-mini.layout-fixed{ class: sidebar_collapse }

data/lib/olivander/application_context.rb

@@ -5,6 +5,11 @@ module Olivander
     def self.default
       ctx = ApplicationContext.new
       ctx.company.name = 'Company Name'
+      begin
+        ctx.route_builder = RouteBuilder.new
+      rescue
+        ctx.route_builder = OpenStruct.new(resources: [])
+      end
       ctx
     end
 
@@ -51,4 +56,13 @@ module Olivander
       end
     end
   end
+
+  class CurrentContext < ActiveSupport::CurrentAttributes
+    attribute :application_context
+    attribute :user, :ability
+
+    def application_context
+      @application_context ||= ::Olivander::ApplicationContext.default
+    end
+  end
 end

data/lib/olivander/version.rb

@@ -1,3 +1,3 @@
 module Olivander
-  VERSION = '0.2.0.0'.freeze
+  VERSION = '0.2.0.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.0
+  version: 0.2.0.1
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-12 00:00:00.000000000 Z
+date: 2024-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick