five-two-nw-olivander 0.2.0.31 → 0.2.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1527b1808409e4c9fd29465a1c0744806daa5084e78117072eef5df8948526c
-  data.tar.gz: 768af4436b656b56a64c1e614d8eaf8b2107d5a12af485c5101e05b64b62e8a7
+  metadata.gz: a2488764b16b7943eac6350511c32575af3e60d154eac16a3cd2b834f849fdfc
+  data.tar.gz: 56f377cfc38c89759ff1047036217b8e6f536b9f97081ff34ea5200bfeacb335
 SHA512:
-  metadata.gz: 7c8682757f8441cf012c6204b32f7168b93bcbddf890c3f79793235cf8b3038dfd0c68c67b62536a0af12fcc66eeb50b759294682a7592f796deaa3998d7c5cb
-  data.tar.gz: 895aa1992d3e2583d7380f145fa02f6c89fc9b700d9f378f95f85ab3cb7a3830f4b1b22b12923295da4145dc84ff7b478b804232d4c32ed289a08584308c7ba7
+  metadata.gz: dcbd6cf9861cfbfa95455a2f38ac26c9273ca5f46459602f87770295fff0b2c427d1343245e6204481765e71115449a5dbf8db3467b7edb256167d4443749b45
+  data.tar.gz: 874a8a647b8bc5e860b79793775ee9778a918dda189367efa9885c8e9948370a1f5a41f0aa4b082259a192d11fe2f3404a9192ccfc1da21f4626386d2a14bfe3

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

@@ -67,9 +67,10 @@ module Olivander
                          .filter{ |x| x.foreign_key == inc || x.name == inc }
                          .each do |r|
                 begin
-                  resource_field(r.name, r.association_class.name.demodulize.underscore.to_sym, editable: editable && !r.options.keys.include?(:through))
+                  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 && !r.options.keys.include?(:through))
+                  resource_field(r.name, :association, editable: editable && !uneditable_association?(r, type))
                 end
               end
 
@@ -82,6 +83,13 @@ module Olivander
           end
         end
 
+        def self.uneditable_association?(r, type)
+          return false unless r.options.keys.include?(:through)
+
+          # this collection may prove to be larger than one...
+          %i[has_one_through_association].include?(type)
+        end
+
         def self.resource_field_group(key = :default, editable: true, &block)
           self.resource_field_group_collection ||= []
           self.current_resource_field_group = resource_field_group_collection.select{ |x| x.key == key}.first

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

@@ -21,7 +21,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
 
@@ -75,31 +75,31 @@ module Olivander
 
     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")
+      return O18n.t("activerecord.actions.#{key}.#{action}-tooltip") if I18n.exists?("activerecord.actions.#{key}.#{action}-tooltip")
+      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")
+      return O18n.t("activerecord.actions.#{key}.#{action}-icon") if I18n.exists?("activerecord.actions.#{key}.#{action}-icon")
+      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
@@ -128,7 +128,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

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/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.31'
+  VERSION = '0.2.0.33'
 end

metadata

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