five-two-nw-olivander 0.2.0.32 → 0.2.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3aa4679fd3ac4496649900ee060cb20b1826f8e1b43c4757d548a9d5b77b6e4c
-  data.tar.gz: 61615323b1201dbd021800a5525062036bc80aab414c36028aa4e43c8ab1e2d0
+  metadata.gz: 20309038b9a2b17f545f6c06658c87f41fc20a565b8d39b6c079894add49c644
+  data.tar.gz: 5c6429e2fdd1204b7324b36a7c4cd118ea136229b23a56f9ded5cab92fab801a
 SHA512:
-  metadata.gz: 50bc6dc97b5826eef4ec98b15e20f11560a758f4b9c82b42e04d6962bc492cb697caa9094264ded682f0afdfc3195122953313595809f6a428aef461b9b68ea9
-  data.tar.gz: 577a779f683e1a5a5719747dc74f585633628186025770629b0e847c99fbfe47a573a045fbe1775cb15e0a75ed54c89b536a6bc7d5b1bfeb9bec9bfb6e090902
+  metadata.gz: 248d5ca6b004d3f76c47b0a70e5268ec26970df86e7a0e45ba2879cf07468b0f9c71fb045321ccd76c7dea764252fc40a865de5a19a3b14c1f657045f6dedb39
+  data.tar.gz: 884dd31cca4c245d24b227ca9ae2d7854d36059df578a70bb1325f76758ad87a1eb0b987273db88757d4e332028d277b5d659593dacc6f6b851762c6454f5663

data/app/components/olivander/components/resource_form_component.html.haml

@@ -4,14 +4,15 @@
     - rfg.sections.each do |section|
       .row
         - section.fields.each do |field|
+          - label = field_label_for(@resource.class, field.sym)
           %div{ class: section.column_class }
             - if association?(field)
               - collection = collection_for(field)
               - if one_through?(field)
-                = @f.input        field.sym, collection: [collection].flatten, disabled: !field.editable, input_html: { data: association_data_hash_for(field) }, selected: collection
+                = @f.input        field.sym, label: label, collection: [collection].flatten, disabled: !field.editable, input_html: { data: association_data_hash_for(field) }, selected: collection
               - else
-                = @f.association  field.sym, collection: [collection].flatten, disabled: !field.editable, input_html: { data: association_data_hash_for(field) }
+                = @f.association  field.sym, label: label, collection: [collection].flatten, disabled: !field.editable, input_html: { data: association_data_hash_for(field) }
             - elsif boolean?(field)
-              = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, input_html: { data: input_data_hash_for(field) }
+              = @f.input field.sym, label: label, disabled: !field.editable, as: field.type.to_sym, input_html: { data: input_data_hash_for(field) }
             - else 
-              = @f.input field.sym, disabled: !field.editable, as: field.type.to_sym, picker_options: input_picker_options_for(field), input_html: { rows: 10, data: input_data_hash_for(field) }
+              = @f.input field.sym, label: label, disabled: !field.editable, as: field.type.to_sym, picker_options: input_picker_options_for(field), input_html: { rows: 10, data: input_data_hash_for(field) }

data/app/components/olivander/components/resource_form_component.rb

@@ -2,6 +2,7 @@
 
 class Olivander::Components::ResourceFormComponent < ViewComponent::Base
   delegate :resource_field_group_label, to: :helpers
+  delegate :field_label_for, to: :helpers
 
   def initialize(resource, form_builder)
     @resource = resource
@@ -16,7 +17,8 @@ class Olivander::Components::ResourceFormComponent < ViewComponent::Base
   def association_data_hash_for(field)
     {
       collection_path: collection_path_for(field),
-      controller: "association-#{@resource.class.name.underscore.dasherize.gsub('/', '-')}-#{field.sym} input-control-association",
+      controller: "association-#{@resource.class.name.underscore.dasherize.gsub('/',
+                                                                                '-')}-#{field.sym} input-control-association",
       taggable: taggable?(field),
       tag_field_name: tag_field_name(field)
     }
@@ -24,7 +26,8 @@ class Olivander::Components::ResourceFormComponent < ViewComponent::Base
 
   def input_data_hash_for(field)
     {
-      controller: "input-#{@resource.class.name.underscore.dasherize.gsub('/', '-')}-#{field.sym} input-control-#{field.type}",
+      controller: "input-#{@resource.class.name.underscore.dasherize.gsub('/',
+                                                                          '-')}-#{field.sym} input-control-#{field.type}"
     }
   end
 
@@ -53,11 +56,9 @@ class Olivander::Components::ResourceFormComponent < ViewComponent::Base
   end
 
   def collection_path_for(field)
-    begin
-      polymorphic_path(@resource.class.reflect_on_association(field.sym).klass, format: :json)
-    rescue
-      ''
-    end
+    polymorphic_path(@resource.class.reflect_on_association(field.sym).klass, format: :json)
+  rescue StandardError
+    ''
   end
 
   def association?(field)

data/app/controllers/concerns/olivander/resources/auto_form_attributes.rb

@@ -66,8 +66,8 @@ module Olivander
               reflections.map{ |x| x[1] }
                          .filter{ |x| x.foreign_key == inc || x.name == inc }
                          .each do |r|
-                type = r.association_class.name.demodulize.underscore.to_sym
                 begin
+                  type = r.association_class.name.demodulize.underscore.to_sym
                   resource_field(r.name, type, editable: editable && !uneditable_association?(r, type))
                 rescue NotImplementedError
                   resource_field(r.name, :association, editable: editable && !uneditable_association?(r, type))

data/app/controllers/concerns/olivander/resources/route_builder.rb

@@ -48,7 +48,7 @@ module Olivander
 
       def confirmation_message
         return confirm_with if confirm_with.present?
-        return I18n.t('activerecord.actions.delete-confirmation') if verb == :delete
+        return O18n.t('activerecord.actions.delete-confirmation') if verb == :delete
 
         nil
       end

data/app/helpers/olivander/application_helper.rb

@@ -2,15 +2,16 @@ module Olivander
   module ApplicationHelper
     def chart_column_class_num(label, count, min)
       return "col-#{label}-#{min}" if count >= 12
+
       modded = count % 12
       divisor = modded.zero? ? 1 : modded
-      "col-#{label}-#{[12/divisor, min].max}"
-  
+      "col-#{label}-#{[12 / divisor, min].max}"
+
       divisor = count
-      result = 12/divisor
+      result = 12 / divisor
       while result < min
-        divisor = divisor/2
-        result = 12/divisor
+        divisor /= 2
+        result = 12 / divisor
       end
       "col-#{label}-#{result}"
     end
@@ -21,7 +22,7 @@ module Olivander
 
       controller_key = controller.class.name.underscore
       key = "page_titles.#{controller_key}.#{action_name}"
-      return I18n.t(key) if I18n.exists?(key)
+      return O18n.t(key) if I18n.exists?(key)
 
       return @page_title if @page_title
 
@@ -35,21 +36,20 @@ module Olivander
     end
 
     def authorized_resource_actions(resource, for_action: :show)
-      raw_name = resource.is_a?(Class) ? resource.name : resource.class.name
+      action_resource = action_resource_for(resource)
+      raw_name = action_resource.name
       plural_name = raw_name.demodulize.underscore.pluralize
       routed_resource = Olivander::CurrentContext.application_context.route_builder.resources[plural_name.to_sym]
       return [] if routed_resource.nil?
 
       actions = if resource.is_a?(Class)
                   routed_resource.unpersisted_crud_actions | routed_resource.collection_actions.reject(&:crud_action)
+                elsif resource.persisted?
+                  routed_resource.persisted_crud_actions | routed_resource.member_actions.reject(&:crud_action)
                 else
-                  if resource.persisted?
-                    routed_resource.persisted_crud_actions | routed_resource.member_actions.reject(&:crud_action)
-                  else
-                    []
-                  end
+                  []
                 end
-      actions = actions.select{ |a| authorized_resource_action?(a.sym, resource, for_action) }
+      actions = actions.select { |a| authorized_resource_action?(a.sym, action_resource, for_action) }
       preferred = %i[show edit destroy]
       [].tap do |arr|
         preferred.each do |p|
@@ -57,12 +57,17 @@ module Olivander
             arr << a if a.sym == p
           end
         end
-        actions.reject{ |x| preferred.include?(x.sym) }.each do |a|
+        actions.reject { |x| preferred.include?(x.sym) }.each do |a|
           arr << a
         end
       end
     end
 
+    def action_resource_for(resource)
+      klazz = resource.is_a?(Class) ? resource : resource.class
+      klazz.respond_to?(:action_resource) ? klazz.action_resource : klazz
+    end
+
     def authorized_resource_action?(action, resource, except = nil)
       return false if action == except
 
@@ -70,36 +75,41 @@ module Olivander
     end
 
     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) }
+      render partial: 'resource_form_actions',
+             locals: { actions: authorized_resource_actions(resource, for_action: for_action).select(&:show_in_form) }
     end
 
     def resource_form_action_tooltip(resource, action)
       key = resource.class.name.underscore
-      return I18n.t("activerecord.actions.#{key}.#{action}-tooltip") if I18n.exists?("activerecord.actions.#{key}.#{action}-tooltip")
-      return I18n.t("activerecord.actions.#{action}-tooltip") if I18n.exists?("activerecord.actions.#{action}-tooltip")
+      if I18n.exists?("activerecord.actions.#{key}.#{action}-tooltip")
+        return O18n.t("activerecord.actions.#{key}.#{action}-tooltip")
+      end
+      return O18n.t("activerecord.actions.#{action}-tooltip") if I18n.exists?("activerecord.actions.#{action}-tooltip")
 
       action.to_s.titleize
     end
 
     def resource_form_action_label(resource, action)
       key = resource.class.name.underscore
-      return I18n.t("activerecord.actions.#{key}.#{action}") if I18n.exists?("activerecord.actions.#{key}.#{action}")
-      return I18n.t("activerecord.actions.#{action}") if I18n.exists?("activerecord.actions.#{action}")
+      return O18n.t("activerecord.actions.#{key}.#{action}") if I18n.exists?("activerecord.actions.#{key}.#{action}")
+      return O18n.t("activerecord.actions.#{action}") if I18n.exists?("activerecord.actions.#{action}")
 
       action.to_s.titleize
     end
 
     def resource_form_action_icon(resource, action)
       key = resource.class.name.underscore
-      return I18n.t("activerecord.actions.#{key}.#{action}-icon") if I18n.exists?("activerecord.actions.#{key}.#{action}-icon")
-      return I18n.t("activerecord.actions.#{action}-icon") if I18n.exists?("activerecord.actions.#{action}-icon")
+      if I18n.exists?("activerecord.actions.#{key}.#{action}-icon")
+        return O18n.t("activerecord.actions.#{key}.#{action}-icon")
+      end
+      return O18n.t("activerecord.actions.#{action}-icon") if I18n.exists?("activerecord.actions.#{action}-icon")
 
       action.to_s.titleize
     end
 
     def resource_field_group_label(resource_class, key)
       i18n_key = "activerecord.attributes.#{resource_class.name.underscore}.resource_field_groups.#{key}"
-      I18n.exists?(i18n_key) ? I18n.t(i18n_key) : key.to_s.titleize
+      I18n.exists?(i18n_key) ? O18n.t(i18n_key) : key.to_s.titleize
     end
 
     def current_user
@@ -111,7 +121,7 @@ module Olivander
     end
 
     def resource_attributes(resource, effective_resource)
-      er_attributes = effective_resource&.model_attributes&.collect{ |x| x[0] }
+      er_attributes = effective_resource&.model_attributes&.collect { |x| x[0] }
       return er_attributes if er_attributes.present? && er_attributes.size.positive?
 
       resource.auto_form_attributes
@@ -119,7 +129,6 @@ module Olivander
 
     def render_optional_partial(partial, locals: {})
       render partial: partial, locals: locals
-
     rescue ActionView::MissingTemplate
       Rails.logger.debug "did not find partial: #{partial}"
       nil
@@ -128,7 +137,7 @@ module Olivander
     def field_label_for(resource_class, sym)
       sym_s = sym.to_s.gsub('.', '_')
       i18n_key = "activerecord.attributes.#{resource_class.name.underscore}.#{sym_s}"
-      return I18n.t(i18n_key) if I18n.exists?(i18n_key)
+      return O18n.t(i18n_key) if I18n.exists?(i18n_key)
 
       sym.to_s.titleize
     end
@@ -138,7 +147,9 @@ module Olivander
     end
 
     def sidebar_context_name
-      [Olivander::CurrentContext.application_context.name, sidebar_context_suffix&.upcase].reject{ |x| x.blank? or x == 'PRODUCTION' }.join(' ')
+      [Olivander::CurrentContext.application_context.name, sidebar_context_suffix&.upcase].reject do |x|
+        x.blank? or x == 'PRODUCTION'
+      end.join(' ')
     end
 
     def sidebar_context_suffix
@@ -166,31 +177,31 @@ module Olivander
       favicon_link_tag(image_path(favicon_path))
     end
 
-    def flash_class key
+    def flash_class(key)
       case key
-      when "error"
-        "danger"
-      when "notice"
-        "info"
-      when "alert"
-        "danger"
+      when 'error'
+        'danger'
+      when 'notice'
+        'info'
+      when 'alert'
+        'danger'
       else
         key
       end
     end
 
-    def flash_icon key
+    def flash_icon(key)
       case key
-      when "error"
-        "fas fa-exclamation-circle"
-      when "notice"
-        "fas fa-info-circle"
-      when "alert"
-        "fas fa-info-circle"
-      when "success"
-        "fas fa-check-circle"
+      when 'error'
+        'fas fa-exclamation-circle'
+      when 'notice'
+        'fas fa-info-circle'
+      when 'alert'
+        'fas fa-info-circle'
+      when 'success'
+        'fas fa-check-circle'
       else
-        "fas fa-question-circle"
+        'fas fa-question-circle'
       end
     end
 
@@ -209,7 +220,7 @@ module Olivander
             builder.footer_buttons.call
           end
         end
-      end 
+      end
     end
   end
 end

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

@@ -12,6 +12,6 @@
       = render Olivander::Components::ResourceFormComponent.new(@resource, f)
       = render_optional_partial 'form_inside_after', locals: {f: f}
     .card-footer.text-right
-      = link_to 'Cancel', @_effective_resource.action_path(:index), class: 'btn btn-secondary'
+      = link_to 'Cancel', @cancel_path || @_effective_resource.action_path(:index), class: 'btn btn-secondary'
       - unless read_only
         = f.button :submit, class: 'btn btn-primary'

data/lib/o18n.rb

@@ -6,13 +6,13 @@ class O18n
 
   def self.t(*args, **kwargs)
     value = I18n.t(*args, **kwargs)
-    value.gsub(ENV_REGEX) {
-      envar = ENV[$1]
-      unless envar.blank?
-        I18n.exists?(envar) ? I18n.t(envar) : envar
+    value.gsub(ENV_REGEX) do
+      envar = ENV[Regexp.last_match(1)]
+      if envar.blank?
+        Regexp.last_match(1).titleize
       else
-        $1.titleize
+        I18n.exists?(envar) ? I18n.t(envar) : envar
       end
-    }
+    end
   end
 end

data/lib/olivander/menus/menu_item.rb

@@ -77,9 +77,9 @@ module Olivander
         return nil unless raw
 
         if key && I18n.exists?(key)
-          I18n.t(key)
+          O18n.t(key)
         elsif fallback && I18n.exists?(fallback)
-          I18n.t(fallback)
+          O18n.t(fallback)
         else
           raw.titleize
         end
@@ -88,12 +88,12 @@ module Olivander
 
     class Badge
       attr_accessor :text, :badge_class
-  
+
       def initialize(text = nil, badge_class = nil)
         @text = text
         @badge_class = badge_class
       end
-  
+
       def with_proc
         yield(self)
         self

data/lib/olivander/version.rb

@@ -2,5 +2,5 @@
 
 # needed for gem
 module Olivander
-  VERSION = '0.2.0.32'
+  VERSION = '0.2.0.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: five-two-nw-olivander
 version: !ruby/object:Gem::Version
-  version: 0.2.0.32
+  version: 0.2.0.35
 platform: ruby
 authors:
 - Eric Dennis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-19 00:00:00.000000000 Z
+date: 2024-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick