Render nodes (AlchemyCMS#1831)

* Allow directly rendering nodes We can use Rails' model rendering mechanism to render nodes by changing `to_partial_path` to not point to the wrapper, but to the node itself. This yields a few simplifications. * Adapt generator partials to not use node_partial_path This is now `node.to_partial_path`. * Actually render node when rendering an EssenceNode
mickenorlen · May 14, 2020 · f25b8e5 · f25b8e5
1 parent f58f4f9
commit f25b8e5
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 34 deletions.
diff --git a/app/helpers/alchemy/pages_helper.rb b/app/helpers/alchemy/pages_helper.rb
@@ -90,11 +90,7 @@ def render_menu(name, options = {})
         return
       end
 
-      options = {
-        node_partial_name: "#{root_node.view_folder_name}/node",
-      }.merge(options)
-
-      render(root_node.to_partial_path, menu: root_node, node: root_node, options: options)
+      render("alchemy/menus/#{name}/wrapper", menu: root_node, options: options)
     rescue ActionView::MissingTemplate => e
       warning <<~WARN
         Menu partial not found for #{name}.

diff --git a/app/models/alchemy/node.rb b/app/models/alchemy/node.rb
@@ -71,11 +71,11 @@ def url
     end
 
     def to_partial_path
-      "#{view_folder_name}/wrapper"
+      "alchemy/menus/#{menu_type}/node"
     end
 
-    def view_folder_name
-      "alchemy/menus/#{name.parameterize.underscore}"
+    def menu_type
+      root.name.parameterize.underscore
     end
 
     def check_if_related_essence_nodes_present

diff --git a/app/views/alchemy/essences/_essence_node_view.html.erb b/app/views/alchemy/essences/_essence_node_view.html.erb
@@ -1,2 +1 @@
-<%# The content object holds the essence %>
-<%= content.ingredient %>
+<%= render content.ingredient if content.ingredient %>
diff --git a/lib/generators/alchemy/menus/templates/wrapper.html.erb b/lib/generators/alchemy/menus/templates/wrapper.html.erb
@@ -1,6 +1,6 @@
 <%% cache menu do %>
   <ul class="nav">
-    <%%= render partial: options[:node_partial_name],
+    <%%= render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),
       locals: { options: options },
       as: 'node' %>

diff --git a/lib/generators/alchemy/menus/templates/wrapper.html.haml b/lib/generators/alchemy/menus/templates/wrapper.html.haml
@@ -1,6 +1,6 @@
 - cache menu do
   %ul.nav
-    = render partial: options[:node_partial_name],
+    = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),
       locals: { options: options },
       as: 'node'
diff --git a/lib/generators/alchemy/menus/templates/wrapper.html.slim b/lib/generators/alchemy/menus/templates/wrapper.html.slim
@@ -1,6 +1,6 @@
 - cache menu do
   ul.nav
-    = render partial: options[:node_partial_name],
+    = render partial: menu.to_partial_path,
       collection: menu.children.includes(:page, :children),
       locals: { options: options },
       as: 'node'
diff --git a/spec/dummy/app/views/alchemy/menus/footer_navigation/_wrapper.html.erb b/spec/dummy/app/views/alchemy/menus/footer_navigation/_wrapper.html.erb
@@ -1,6 +1,6 @@
 <ul class="nav">
-  <%= render partial: options[:node_partial_name],
-    collection: node.children.includes(:page, :children),
+  <%= render partial: menu.to_partial_path,
+    collection: menu.children.includes(:page, :children),
     locals: { options: options },
     as: 'node' %>
 </ul>
diff --git a/...hemy/menus/main_navigation/_node.html.erb → ...ws/alchemy/menus/main_menu/_node.html.erb b/...hemy/menus/main_navigation/_node.html.erb → ...ws/alchemy/menus/main_menu/_node.html.erb
diff --git a/spec/dummy/app/views/alchemy/menus/main_menu/_wrapper.html.erb b/spec/dummy/app/views/alchemy/menus/main_menu/_wrapper.html.erb
@@ -0,0 +1,6 @@
+<ul class="nav">
+  <%= render partial: menu.to_partial_path,
+    collection: menu.children.includes(:page, :children),
+    locals: { options: options },
+    as: "node" %>
+</ul>
diff --git a/spec/dummy/app/views/alchemy/menus/main_navigation/_wrapper.html.erb b/spec/dummy/app/views/alchemy/menus/main_navigation/_wrapper.html.erb
diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb
@@ -8,7 +8,7 @@
 </head>
 <body>
   <nav>
-    <%= render_menu('Main Navigation') %>
+    <%= render_menu('main_menu') %>
   </nav>
   <%= yield %>
   <%= render "alchemy/edit_mode" %>

diff --git a/spec/features/admin/page_editing_feature_spec.rb b/spec/features/admin/page_editing_feature_spec.rb
@@ -110,7 +110,7 @@
       end
 
       context "with menu available" do
-        let!(:menu) { create(:alchemy_node, name: "Main Navigation") }
+        let!(:menu) { create(:alchemy_node, name: "main_menu") }
         let!(:node) { create(:alchemy_node, url: "/page-1", parent: menu) }
 
         it "navigation links are not clickable" do

diff --git a/spec/features/page_feature_spec.rb b/spec/features/page_feature_spec.rb
@@ -138,7 +138,7 @@
 
   describe "navigation rendering" do
     context "with menu available" do
-      let(:menu) { create(:alchemy_node, name: "Main Navigation") }
+      let(:menu) { create(:alchemy_node, name: "main_menu") }
       let(:page1) { create(:alchemy_page, :public, visible: true, name: "Page 1") }
       let(:page2) { create(:alchemy_page, :public, visible: true, name: "Page 2") }
       let!(:node1) { create(:alchemy_node, page: page1, parent: menu) }

diff --git a/spec/helpers/alchemy/pages_helper_spec.rb b/spec/helpers/alchemy/pages_helper_spec.rb
@@ -42,7 +42,7 @@ module Alchemy
     describe "#render_menu" do
       subject { helper.render_menu(name) }
 
-      let(:name) { "Main Navigation" }
+      let(:name) { "main_menu" }
 
       context "if menu exists" do
         let(:menu) { create(:alchemy_node, name: name) }

diff --git a/spec/models/alchemy/node_spec.rb b/spec/models/alchemy/node_spec.rb
@@ -123,15 +123,7 @@ module Alchemy
       let(:node) { build(:alchemy_node, name: "Main Menu") }
 
       it "returns the path to the menu wrapper partial" do
-        expect(node.to_partial_path).to eq("alchemy/menus/main_menu/wrapper")
-      end
-    end
-
-    describe "#view_folder_name" do
-      let(:node) { build(:alchemy_node, name: "Main Menu") }
-
-      it "returns the path to the menu view folder" do
-        expect(node.view_folder_name).to eq("alchemy/menus/main_menu")
+        expect(node.to_partial_path).to eq("alchemy/menus/main_menu/node")
       end
     end
   end