katalyst-navigation 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6424bb96df0ceb96b40aa6d225dbe12461784edb41c1b83863435a56db02fd68
-  data.tar.gz: 6a46bbd339f8c171fe7a9791ad94281c6e0cb6f846f8bab04bd62edb8e8c339c
+  metadata.gz: 368bcecb2264a1a536d2bbeb6c05f2dfa6762dcd693a215db21ef93db4da26f8
+  data.tar.gz: 83ef6762cddd830df2acc4ef1404c8037211c4de4b3dbe5d8b5501bb4cf42fd7
 SHA512:
-  metadata.gz: 173290becb5111777b887baeefe3a93642d8b154cb6463fd0a84a83e0246be7159568cc836d3eb2ca4ca7b9d7a2b616eff69c284d7abbaa93f7f2a26e0f81f76
-  data.tar.gz: cad3f1cf87f00b7868aac073b71d192345b341feb73a0d28de332fccd932278988c256cc9228d2f30eadc55b2de0c4070d8a263c323e235b22f18f087bbc9abb
+  metadata.gz: a4e9965e0b7e49c055e405d90dd13dcb764f2b4b1b0fb62191347eb066e784dea5c1ee069b9a848fe283d87da1241fa840663d8152a92fe2b1f73607bae11b9b
+  data.tar.gz: df13a7692f558a2eb5937a4e85d7137540d175ca6be500a743bfbd1caa53fc4fbba1be0acc27cc6bedf665009a8ff58439bc1d2fc35ae76028059ec0ea0614f4

data/app/controllers/katalyst/navigation/items_controller.rb

@@ -41,8 +41,17 @@ module Katalyst
         params[:type] || Link.name
       end
 
+      def item_params_type
+        type = params.require(:item).fetch(:type, "")
+        if Katalyst::Navigation.config.items.include?(type)
+          type.safe_constantize
+        else
+          Item
+        end
+      end
+
       def item_params
-        params.require(:item).permit(%i[title url visible http_method new_tab type])
+        params.require(:item).permit(item_params_type.permitted_params)
       end
 
       def set_menu

data/app/helpers/katalyst/navigation/editor_helper.rb

@@ -4,11 +4,10 @@ module Katalyst
   module Navigation
     module EditorHelper
       def navigation_editor_new_items(menu)
-        [
-          Heading.new(menu: menu),
-          Link.new(menu: menu),
-          Button.new(menu: menu),
-        ]
+        Katalyst::Navigation.config.items.map do |item_class|
+          item_class = item_class.is_a?(String) ? item_class.safe_constantize : item_class
+          item_class.new(menu: menu)
+        end
       end
 
       def navigation_editor_menu(menu:, **options, &block)

data/app/helpers/katalyst/navigation/frontend/builder.rb

@@ -1,22 +1,23 @@
 # frozen_string_literal: true
 
+# rubocop:disable Rails/HelperInstanceVariable
 module Katalyst
   module Navigation
     module Frontend
       class Builder
-        attr_accessor :template, :menu_options, :list_options, :item_options
+        attr_accessor :template
 
         delegate_missing_to :@template
 
         def initialize(template, list: {}, item: {}, **menu_options)
-          self.template     = template
-          self.menu_options = menu_options
-          self.list_options = list
-          self.item_options = item
+          self.template = template
+          @menu_options = menu_options.freeze
+          @list_options = list.freeze
+          @item_options = item.freeze
         end
 
         def render(tree)
-          tag.ul **menu_options do
+          tag.ul(**menu_options(tree)) do
             tree.each do |item|
               concat render_item(item)
             end
@@ -26,32 +27,47 @@ module Katalyst
         def render_item(item)
           return unless item.visible?
 
-          tag.li **item_options do
+          tag.li(**item_options(item)) do
             concat public_send("render_#{item.model_name.param_key}", item)
-            concat render_list(item.children) if item.children.any?
+            concat render_children(item) if item.children.any?
           end
         end
 
-        def render_list(items)
-          tag.ul **list_options do
-            items.each do |child|
+        def render_children(item)
+          tag.ul(**list_options(item)) do
+            item.children.each do |child|
               concat render_item(child)
             end
           end
         end
 
         def render_heading(heading)
-          tag.header { tag.p heading.title }
+          tag.span(heading.title)
         end
 
         def render_link(link)
-          link_to(link.title, link.url, item_options)
+          link_to(link.title, link.url)
         end
 
         def render_button(link)
-          link_to(link.title, link.url, **item_options, method: link.http_method)
+          link_to(link.title, link.url, method: link.http_method)
+        end
+
+        private
+
+        def menu_options(_tree)
+          @menu_options
+        end
+
+        def list_options(_item)
+          @list_options
+        end
+
+        def item_options(_item)
+          @item_options
         end
       end
     end
   end
 end
+# rubocop:enable Rails/HelperInstanceVariable

data/app/models/katalyst/navigation/button.rb

@@ -10,6 +10,10 @@ module Katalyst
 
       validates :title, :url, :http_method, presence: true
       validates :http_method, inclusion: { in: HTTP_METHODS.values.map(&:to_s) }
+
+      def self.permitted_params
+        super + %i[http_method]
+      end
     end
   end
 end

data/app/models/katalyst/navigation/item.rb

@@ -10,6 +10,16 @@ module Katalyst
 
       attr_accessor :parent, :children, :index, :depth
 
+      def self.permitted_params
+        %i[
+          title
+          url
+          visible
+          new_tab
+          type
+        ]
+      end
+
       def layout?
         is_a? Layout
       end

data/lib/katalyst/navigation/config.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require "active_support/configurable"
+
+module Katalyst
+  module Navigation
+    class Config
+      include ActiveSupport::Configurable
+
+      config_accessor(:items) do
+        %w[
+          Katalyst::Navigation::Heading
+          Katalyst::Navigation::Link
+          Katalyst::Navigation::Button
+        ]
+      end
+    end
+  end
+end

data/lib/katalyst/navigation/version.rb

@@ -2,6 +2,6 @@
 
 module Katalyst
   module Navigation
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/katalyst/navigation.rb

@@ -1,9 +1,19 @@
 # frozen_string_literal: true
 
+require "katalyst/navigation/config"
 require "katalyst/navigation/engine"
 require "katalyst/navigation/version"
 
 module Katalyst
   module Navigation # :nodoc:
+    extend self
+
+    def config
+      @config ||= Config.new
+    end
+
+    def configure
+      yield config
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katalyst-navigation
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Katalyst Interactive
@@ -78,6 +78,7 @@ files:
 - db/migrate/20220826034507_create_katalyst_navigation_items.rb
 - db/migrate/20220908044500_add_depth_limit_to_menus.rb
 - lib/katalyst/navigation.rb
+- lib/katalyst/navigation/config.rb
 - lib/katalyst/navigation/engine.rb
 - lib/katalyst/navigation/version.rb
 - lib/tasks/yarn.rake