alchemy_cms 4.3.2 → 4.4.0

data/lib/alchemy/permissions.rb

@@ -95,6 +95,7 @@ module Alchemy
           :alchemy_admin_attachments,
           :alchemy_admin_dashboard,
           :alchemy_admin_layoutpages,
+          :alchemy_admin_nodes,
           :alchemy_admin_pages,
           :alchemy_admin_pictures,
           :alchemy_admin_tags,
@@ -116,6 +117,7 @@ module Alchemy
         can :manage,                Alchemy::EssenceFile
         can :manage,                Alchemy::EssencePicture
         can :manage,                Alchemy::LegacyPageUrl
+        can :manage,                Alchemy::Node
         can :read,                  Alchemy::Picture
         can [:read, :autocomplete], Alchemy::Tag
         can(:edit_content,          Alchemy::Page) { |p| p.editable_by?(@user) }

data/lib/alchemy/tasks/tidy.rb

@@ -45,7 +45,7 @@ module Alchemy
 
       def remove_orphaned_elements
         puts "\n## Removing orphaned elements"
-        elements = Alchemy::Element.unscoped.all
+        elements = Alchemy::Element.unscoped.not_nested
         if elements.any?
           orphaned_elements = elements.select do |element|
             element.page.nil? && element.page_id.present?

data/lib/alchemy/test_support/essence_shared_examples.rb

@@ -1,16 +1,33 @@
-require 'rails_helper'
+# frozen_string_literal: true
 
-shared_examples_for "an essence" do
+require 'shoulda-matchers'
+require 'alchemy/test_support/factories/page_factory'
+require 'alchemy/test_support/factories/element_factory'
+require 'alchemy/test_support/factories/content_factory'
+
+RSpec.shared_examples_for "an essence" do
   let(:element) { Alchemy::Element.new }
   let(:content) { Alchemy::Content.new(name: 'foo') }
   let(:content_definition) { {'name' => 'foo'} }
 
+  describe 'eager loading' do
+    before do
+      2.times { described_class.create! }
+    end
+
+    it 'does not throw error if eager loaded' do
+      expect {
+        described_class.all.includes(:ingredient_association).to_a
+      }.to_not raise_error
+    end
+  end
+
   it "touches the content after update" do
-    element = create(:alchemy_element)
-    content = create(:alchemy_content, element: element, essence: essence, essence_type: essence.class.name)
+    element = FactoryBot.create(:alchemy_element)
+    content = FactoryBot.create(:alchemy_content, element: element, essence: essence, essence_type: essence.class.name)
 
     content.update_column(:updated_at, 3.days.ago)
-    content.essence.update_attributes(essence.ingredient_column.to_sym => ingredient_value)
+    content.essence.update(essence.ingredient_column.to_sym => ingredient_value)
 
     content.reload
     expect(content.updated_at).to be_within(3.seconds).of(Time.current)
@@ -153,7 +170,7 @@ shared_examples_for "an essence" do
 
     describe 'uniqueness' do
       before do
-        allow(essence).to receive(:element).and_return(build_stubbed(:alchemy_element))
+        allow(essence).to receive(:element).and_return(FactoryBot.build_stubbed(:alchemy_element))
         essence.update(essence.ingredient_column.to_sym => ingredient_value)
       end
 
@@ -256,8 +273,8 @@ shared_examples_for "an essence" do
   end
 
   describe 'essence relations' do
-    let(:page)    { create(:alchemy_page, :restricted) }
-    let(:element) { create(:alchemy_element) }
+    let(:page)    { FactoryBot.create(:alchemy_page, :restricted) }
+    let(:element) { FactoryBot.create(:alchemy_element) }
 
     it "registers itself on page as essence relation" do
       expect(page.respond_to?(essence.class.model_name.route_key)).to be(true)

data/lib/alchemy/test_support/factories/essence_page_factory.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+require 'factory_bot'
+require 'alchemy/test_support/factories/page_factory'
+
+FactoryBot.define do
+  factory :alchemy_essence_page, class: 'Alchemy::EssencePage' do
+    page factory: :alchemy_page
+  end
+end

data/lib/alchemy/test_support/factories/essence_picture_factory.rb

@@ -1,10 +1,15 @@
 # frozen_string_literal: true
 
 require 'factory_bot'
+require 'alchemy/test_support/factories/content_factory'
 require 'alchemy/test_support/factories/picture_factory'
 
 FactoryBot.define do
   factory :alchemy_essence_picture, class: 'Alchemy::EssencePicture' do
     picture factory: :alchemy_picture
+
+    trait :with_content do
+      association :content, factory: :alchemy_content
+    end
   end
 end

data/lib/alchemy/test_support/factories/node_factory.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'factory_bot'
+require 'alchemy/test_support/factories/language_factory'
+require 'alchemy/test_support/factories/page_factory'
+
+FactoryBot.define do
+  factory :alchemy_node, class: 'Alchemy::Node' do
+    language { Alchemy::Language.default }
+    name { 'A Node' }
+
+    trait :with_page do
+      association :page, factory: :alchemy_page
+      name { nil }
+    end
+
+    trait :with_url do
+      url { 'https://example.com' }
+    end
+  end
+end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "4.3.2"
+  VERSION = "4.4.0"
 
   def self.version
     VERSION

data/lib/rails/generators/alchemy/elements/elements_generator.rb

@@ -19,7 +19,6 @@ module Alchemy
             raise "Element name '#{element['name']}' has wrong format. Only lowercase and non whitespace characters allowed."
           end
 
-          conditional_template "editor.html.#{template_engine}", "#{elements_dir}/_#{@element_name}_editor.html.#{template_engine}"
           conditional_template "view.html.#{template_engine}", "#{elements_dir}/_#{@element_name}_view.html.#{template_engine}"
         end
       end

data/lib/rails/generators/alchemy/elements/templates/view.html.erb

@@ -1,5 +1,5 @@
-<%%- cache(<%= @element_name %>_view) do -%>
-  <%%= element_view_for(<%= @element_name %>_view) do |el| -%>
+<%%- cache(<%= @element_name %>) do -%>
+  <%%= element_view_for(<%= @element_name %>) do |el| -%>
   <%- @contents.each do |content| -%>
     <%- if @contents.length > 1 -%>
     <div class="<%= content["name"] %>">
@@ -10,7 +10,7 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    <%%= render <%= @element_name %>_view.nested_elements %>
+    <%%= render <%= @element_name %>.nested_elements.available %>
   <%- end -%>
   <%%- end -%>
 <%%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.haml

@@ -1,5 +1,5 @@
-- cache(<%= @element_name -%>_view) do
-  = element_view_for(<%= @element_name -%>_view) do |el|
+- cache(<%= @element_name -%>) do
+  = element_view_for(<%= @element_name -%>) do |el|
   <%- @contents.each do |content| -%>
     <%- if @contents.length > 1 -%>
     .<%= content["name"] %>
@@ -9,5 +9,5 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    = render <%= @element_name -%>_view.nested_elements
+    = render <%= @element_name -%>.nested_elements.available
   <%- end -%>

data/lib/rails/generators/alchemy/elements/templates/view.html.slim

@@ -1,5 +1,5 @@
-- cache(<%= @element_name -%>_view) do
-  = element_view_for(<%= @element_name -%>_view) do |el|
+- cache(<%= @element_name -%>) do
+  = element_view_for(<%= @element_name -%>) do |el|
   <%- @contents.each do |content| -%>
     <%- if @contents.length > 1 -%>
     .<%= content["name"] %>
@@ -9,5 +9,5 @@
     <%- end -%>
   <%- end -%>
   <%- if @element['nestable_elements'].present? -%>
-    = render <%= @element_name -%>_view.nested_elements
+    = render <%= @element_name -%>.nested_elements.available
   <%- end -%>

data/lib/rails/generators/alchemy/install/files/{_article_view.html.erb → _article.html.erb}

@@ -1,5 +1,5 @@
-<%- cache(element) do -%>
-  <%= element_view_for(element, tag: 'article') do |el| -%>
+<%- cache(article) do -%>
+  <%= element_view_for(article, tag: 'article') do |el| -%>
     <h2><%= el.render :headline %></h2>
     <%= el.render :picture, size: '1200x600' %>
     <%= el.render :text %>

data/lib/rails/generators/alchemy/install/files/application.html.erb

@@ -1,13 +1,16 @@
 <!DOCTYPE html>
 <html lang="<%= @page.language_code %>">
-<head>
-  <%= render "alchemy/pages/meta_data" %>
-  <%= stylesheet_link_tag 'application', media: 'all' %>
-  <%= javascript_include_tag 'application' %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-  <%= yield %>
-  <%= render "alchemy/edit_mode" %>
-</body>
+  <head>
+    <%= render "alchemy/pages/meta_data" %>
+    <%= csrf_meta_tags %>
+    <%= csp_meta_tag %>
+
+    <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_pack_tag 'application', 'data-turbolinks-track': 'reload' %>
+  </head>
+
+  <body>
+    <%= yield %>
+    <%= render "alchemy/edit_mode" %>
+  </body>
 </html>

data/lib/rails/generators/alchemy/install/install_generator.rb

@@ -41,18 +41,9 @@ module Alchemy
           create_file "app/assets/stylesheets/application.css", "/*\n#{stylesheet_require} */\n"
         end
 
-        [
-          "_article_editor.html.erb",
-          "_article_view.html.erb"
-        ].each do |file|
-          copy_file file, "app/views/alchemy/elements/#{file}"
-        end
-
+        copy_file "_article.html.erb", "app/views/alchemy/elements/_article.html.erb"
         copy_file "_standard.html.erb", "app/views/alchemy/page_layouts/_standard.html.erb"
-
-        %w(de en es).each do |locale|
-          copy_file "alchemy.#{locale}.yml", "config/locales/alchemy.#{locale}.yml"
-        end
+        copy_file "alchemy.en.yml", "config/locales/alchemy.en.yml"
       end
 
       def copy_dragonfly_config

data/lib/rails/generators/alchemy/menus/menus_generator.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require_relative '../base'
+
+module Alchemy
+  module Generators
+    class MenusGenerator < Base
+      desc "This generator generates Alchemy menu partials."
+      source_root File.expand_path('templates', __dir__)
+
+      def create_partials
+        menus = Alchemy::Node.roots
+        return unless menus
+
+        menus.each do |menu|
+          conditional_template "wrapper.html.#{template_engine}",
+            "app/views/#{menu.view_folder_name}/_wrapper.html.#{template_engine}"
+          conditional_template "node.html.#{template_engine}",
+            "app/views/#{menu.view_folder_name}/_node.html.#{template_engine}"
+        end
+      end
+    end
+  end
+end

data/lib/rails/generators/alchemy/menus/templates/node.html.erb

@@ -0,0 +1,19 @@
+<%% cache node do %>
+  <%%= content_tag :li, class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do %>
+    <%%= link_to_if node.url,
+      node.name,
+      @preview_mode ? 'javascript: void(0)' : node.url,
+      class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
+      title: node.title,
+      target: node.external? ? '_blank' : nil,
+      rel: node.nofollow? ? 'nofollow' : nil %>
+    <%% if node.children.any? %>
+      <ul class="dropdown-menu">
+        <%%= render partial: options[:node_partial_name],
+          collection: node.children.includes(:page, :children),
+          locals: { options: options },
+          as: 'node' %>
+      </ul>
+    <%% end %>
+  <%% end %>
+<%% end %>

data/lib/rails/generators/alchemy/menus/templates/node.html.haml

@@ -0,0 +1,16 @@
+- cache node do
+  = content_tag :li,
+    class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
+    = link_to_if node.url,
+      node.name,
+      @preview_mode ? 'javascript: void(0)' : node.url,
+      class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
+      title: node.title,
+      target: node.external? ? '_blank' : nil,
+      rel: node.nofollow? ? 'nofollow' : nil
+      - if node.children.any?
+        %ul.dropdown-menu
+          = render partial: options[:node_partial_name],
+            collection: node.children.includes(:page, :children),
+            locals: { options: options },
+            as: 'node'

data/lib/rails/generators/alchemy/menus/templates/node.html.slim

@@ -0,0 +1,16 @@
+- cache node do
+  = content_tag :li,
+    class: ['nav-item', node.children.any? ? 'dropdown' : nil].compact do
+    = link_to_if node.url,
+      node.name,
+      @preview_mode ? 'javascript: void(0)' : node.url,
+      class: ['nav-link', current_page?(node.url) ? 'active' : nil].compact,
+      title: node.title,
+      target: node.external? ? '_blank' : nil,
+      rel: node.nofollow? ? 'nofollow' : nil
+      - if node.children.any?
+        ul.dropdown-menu
+          = render partial: options[:node_partial_name],
+            collection: node.children.includes(:page, :children),
+            locals: { options: options },
+            as: 'node'

data/lib/rails/generators/alchemy/menus/templates/wrapper.html.erb

@@ -0,0 +1,8 @@
+<%% cache menu do %>
+  <ul class="nav">
+    <%%= render partial: options[:node_partial_name],
+      collection: menu.children.includes(:page, :children),
+      locals: { options: options },
+      as: 'node' %>
+  </ul>
+<%% end %>

data/lib/rails/generators/alchemy/menus/templates/wrapper.html.haml

@@ -0,0 +1,6 @@
+- cache menu do
+  %ul.nav
+    = render partial: options[:node_partial_name],
+      collection: menu.children.includes(:page, :children),
+      locals: { options: options },
+      as: 'node' %>

data/lib/rails/generators/alchemy/menus/templates/wrapper.html.slim

@@ -0,0 +1,6 @@
+- cache menu do
+  ul.nav
+    = render partial: options[:node_partial_name],
+      collection: menu.children.includes(:page, :children),
+      locals: { options: options },
+      as: 'node' %>

data/lib/rails/generators/alchemy/views/views_generator.rb

@@ -3,7 +3,7 @@ require 'rails'
 module Alchemy
   module Generators
     class ViewsGenerator < ::Rails::Generators::Base
-      ALCHEMY_VIEWS = %w(breadcrumb language_links messages_mailer navigation)
+      ALCHEMY_VIEWS = %w(breadcrumb language_links messages_mailer)
 
       desc "Generates Alchemy views for #{ALCHEMY_VIEWS.to_sentence}."
 

data/lib/tasks/alchemy/convert.rake

@@ -31,5 +31,65 @@ namespace :alchemy do
         puts "Done."
       end
     end
+
+    namespace :page_trees do
+      desc "Converts the page tree into a menu."
+      task to_menus: [:environment] do
+        if Alchemy::Node.roots.exists?
+          abort "\n⨯ There are already menus present in your database. Aborting!"
+        end
+
+        def name_for_node(page)
+          if page.visible? && page.public? && !page.redirects_to_external?
+            nil
+          else
+            page.name
+          end
+        end
+
+        def page_for_node(page)
+          if page.visible? && page.public? && !page.redirects_to_external?
+            page
+          elsif Alchemy::Config.get(:redirect_to_public_child) && page.visible? && !page.public? && page.children.published.any?
+            page.children.published.first
+          end
+        end
+
+        def convert_to_nodes(children, node:)
+          children.each do |page|
+            has_children = page.children.any?
+            next unless page.visible || has_children
+
+            Alchemy::Deprecation.silence do
+              new_node = node.children.create!(
+                name: name_for_node(page),
+                page: page_for_node(page),
+                url: page.redirects_to_external? ? page.urlname : nil,
+                external: page.redirects_to_external? && Alchemy::Config.get(:open_external_links_in_new_tab),
+                language_id: page.language_id
+              )
+              print "."
+              if has_children
+                convert_to_nodes(page.children, node: new_node)
+              end
+            end
+          end
+        end
+
+        menu_count = Alchemy::Language.count
+        puts "\n- Converting #{menu_count} page #{'tree'.pluralize(menu_count)} into #{'menu'.pluralize(menu_count)}."
+        Alchemy::BaseRecord.transaction do
+          Alchemy::Language.all.each do |language|
+            locale = language.locale.presence || I18n.default_locale
+            menu_name = I18n.t('Main Navigation', scope: 'alchemy.menu_names', default: 'Main Navigation', locale: locale)
+            root_node = Alchemy::Node.create(language: language, name: menu_name)
+            language.pages.language_roots.each do |root_page|
+              convert_to_nodes(root_page.children, node: root_node)
+            end
+          end
+        end
+        puts "\n✓ Done."
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 4.3.2
+  version: 4.4.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2020-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -33,16 +33,22 @@ dependencies:
   name: acts_as_list
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
@@ -355,6 +361,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: turbolinks
   requirement: !ruby/object:Gem::Requirement
@@ -411,6 +437,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails-controller-testing
   requirement: !ruby/object:Gem::Requirement
@@ -454,19 +494,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0.beta2
 - !ruby/object:Gem::Dependency
-  name: selenium-webdriver
+  name: webdrivers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -493,12 +533,11 @@ files:
 - ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".localeapp/config.rb"
-- ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
@@ -509,6 +548,7 @@ files:
 - README.md
 - Rakefile
 - alchemy_cms.gemspec
+- app/assets/config/alchemy_manifest.js
 - app/assets/images/alchemy/alchemy-logo.png
 - app/assets/images/alchemy/alchemy-logo.svg
 - app/assets/images/alchemy/favicon.ico
@@ -552,8 +592,10 @@ files:
 - app/assets/javascripts/alchemy/alchemy.trash_window.js.coffee
 - app/assets/javascripts/alchemy/alchemy.uploader.js.coffee
 - app/assets/javascripts/alchemy/menubar.js.coffee
+- app/assets/javascripts/alchemy/page_select.js
 - app/assets/javascripts/alchemy/preview.js
 - app/assets/javascripts/alchemy/templates/index.js
+- app/assets/javascripts/alchemy/templates/page.hbs
 - app/assets/javascripts/alchemy/templates/spinner.hbs
 - app/assets/javascripts/tinymce/plugins/alchemy_link/plugin.min.js
 - app/assets/stylesheets/alchemy/_defaults.scss
@@ -581,10 +623,13 @@ files:
 - app/assets/stylesheets/alchemy/icons.scss
 - app/assets/stylesheets/alchemy/image_library.scss
 - app/assets/stylesheets/alchemy/jquery-ui.scss
+- app/assets/stylesheets/alchemy/labels.scss
 - app/assets/stylesheets/alchemy/lists.scss
 - app/assets/stylesheets/alchemy/menubar.scss
 - app/assets/stylesheets/alchemy/navigation.scss
+- app/assets/stylesheets/alchemy/nodes.scss
 - app/assets/stylesheets/alchemy/notices.scss
+- app/assets/stylesheets/alchemy/page-select.scss
 - app/assets/stylesheets/alchemy/pagination.scss
 - app/assets/stylesheets/alchemy/preview_window.scss
 - app/assets/stylesheets/alchemy/print.scss
@@ -623,6 +668,7 @@ files:
 - app/controllers/alchemy/admin/languages_controller.rb
 - app/controllers/alchemy/admin/layoutpages_controller.rb
 - app/controllers/alchemy/admin/legacy_page_urls_controller.rb
+- app/controllers/alchemy/admin/nodes_controller.rb
 - app/controllers/alchemy/admin/pages_controller.rb
 - app/controllers/alchemy/admin/pictures_controller.rb
 - app/controllers/alchemy/admin/resources_controller.rb
@@ -678,6 +724,7 @@ files:
 - app/models/alchemy/essence_file.rb
 - app/models/alchemy/essence_html.rb
 - app/models/alchemy/essence_link.rb
+- app/models/alchemy/essence_page.rb
 - app/models/alchemy/essence_picture.rb
 - app/models/alchemy/essence_picture_view.rb
 - app/models/alchemy/essence_richtext.rb
@@ -688,13 +735,13 @@ files:
 - app/models/alchemy/language/code.rb
 - app/models/alchemy/legacy_page_url.rb
 - app/models/alchemy/message.rb
+- app/models/alchemy/node.rb
 - app/models/alchemy/page.rb
 - app/models/alchemy/page/fixed_attributes.rb
 - app/models/alchemy/page/page_elements.rb
 - app/models/alchemy/page/page_naming.rb
 - app/models/alchemy/page/page_natures.rb
 - app/models/alchemy/page/page_scopes.rb
-- app/models/alchemy/page/page_users.rb
 - app/models/alchemy/picture.rb
 - app/models/alchemy/picture/transformations.rb
 - app/models/alchemy/picture/url.rb
@@ -757,7 +804,6 @@ files:
 - app/views/alchemy/admin/elements/create.js.erb
 - app/views/alchemy/admin/elements/fold.js.erb
 - app/views/alchemy/admin/elements/index.html.erb
-- app/views/alchemy/admin/elements/list.html.erb
 - app/views/alchemy/admin/elements/new.html.erb
 - app/views/alchemy/admin/elements/order.js.erb
 - app/views/alchemy/admin/elements/publish.js.erb
@@ -786,6 +832,12 @@ files:
 - app/views/alchemy/admin/legacy_page_urls/create.js.erb
 - app/views/alchemy/admin/legacy_page_urls/destroy.js.erb
 - app/views/alchemy/admin/legacy_page_urls/update.js.erb
+- app/views/alchemy/admin/nodes/_form.html.erb
+- app/views/alchemy/admin/nodes/_node.html.erb
+- app/views/alchemy/admin/nodes/edit.html.erb
+- app/views/alchemy/admin/nodes/index.html.erb
+- app/views/alchemy/admin/nodes/new.html.erb
+- app/views/alchemy/admin/pages/_anchor_link.html.erb
 - app/views/alchemy/admin/pages/_create_language_form.html.erb
 - app/views/alchemy/admin/pages/_current_page.html.erb
 - app/views/alchemy/admin/pages/_external_link.html.erb
@@ -794,9 +846,9 @@ files:
 - app/views/alchemy/admin/pages/_internal_link.html.erb
 - app/views/alchemy/admin/pages/_legacy_urls.html.erb
 - app/views/alchemy/admin/pages/_locked_page.html.erb
+- app/views/alchemy/admin/pages/_menu_fields.html.erb
 - app/views/alchemy/admin/pages/_new_page_form.html.erb
 - app/views/alchemy/admin/pages/_page.html.erb
-- app/views/alchemy/admin/pages/_page_for_links.html.erb
 - app/views/alchemy/admin/pages/_page_infos.html.erb
 - app/views/alchemy/admin/pages/_page_status.html.erb
 - app/views/alchemy/admin/pages/_publication_fields.html.erb
@@ -889,6 +941,8 @@ files:
 - app/views/alchemy/essences/_essence_html_view.html.erb
 - app/views/alchemy/essences/_essence_link_editor.html.erb
 - app/views/alchemy/essences/_essence_link_view.html.erb
+- app/views/alchemy/essences/_essence_page_editor.html.erb
+- app/views/alchemy/essences/_essence_page_view.html.erb
 - app/views/alchemy/essences/_essence_picture_editor.html.erb
 - app/views/alchemy/essences/_essence_picture_view.html.erb
 - app/views/alchemy/essences/_essence_richtext_editor.html.erb
@@ -938,6 +992,8 @@ files:
 - db/migrate/20180226123013_alchemy_four_point_zero.rb
 - db/migrate/20180227224537_migrate_tags_to_gutentag.rb
 - db/migrate/20180519204655_add_fixed_to_alchemy_elements.rb
+- db/migrate/20191016073858_create_alchemy_essence_pages.rb
+- db/migrate/20191029212236_create_alchemy_nodes.rb
 - lib/alchemy/ability_helper.rb
 - lib/alchemy/admin/locale.rb
 - lib/alchemy/auth_accessors.rb
@@ -981,9 +1037,11 @@ files:
 - lib/alchemy/test_support/factories/dummy_user_factory.rb
 - lib/alchemy/test_support/factories/element_factory.rb
 - lib/alchemy/test_support/factories/essence_file_factory.rb
+- lib/alchemy/test_support/factories/essence_page_factory.rb
 - lib/alchemy/test_support/factories/essence_picture_factory.rb
 - lib/alchemy/test_support/factories/essence_text_factory.rb
 - lib/alchemy/test_support/factories/language_factory.rb
+- lib/alchemy/test_support/factories/node_factory.rb
 - lib/alchemy/test_support/factories/page_factory.rb
 - lib/alchemy/test_support/factories/picture_factory.rb
 - lib/alchemy/test_support/factories/site_factory.rb
@@ -1007,21 +1065,15 @@ files:
 - lib/kaminari/scoped_pagination_url_helper.rb
 - lib/rails/generators/alchemy/base.rb
 - lib/rails/generators/alchemy/elements/elements_generator.rb
-- lib/rails/generators/alchemy/elements/templates/editor.html.erb
-- lib/rails/generators/alchemy/elements/templates/editor.html.haml
-- lib/rails/generators/alchemy/elements/templates/editor.html.slim
 - lib/rails/generators/alchemy/elements/templates/view.html.erb
 - lib/rails/generators/alchemy/elements/templates/view.html.haml
 - lib/rails/generators/alchemy/elements/templates/view.html.slim
 - lib/rails/generators/alchemy/essence/essence_generator.rb
 - lib/rails/generators/alchemy/essence/templates/editor.html.erb
 - lib/rails/generators/alchemy/essence/templates/view.html.erb
-- lib/rails/generators/alchemy/install/files/_article_editor.html.erb
-- lib/rails/generators/alchemy/install/files/_article_view.html.erb
+- lib/rails/generators/alchemy/install/files/_article.html.erb
 - lib/rails/generators/alchemy/install/files/_standard.html.erb
-- lib/rails/generators/alchemy/install/files/alchemy.de.yml
 - lib/rails/generators/alchemy/install/files/alchemy.en.yml
-- lib/rails/generators/alchemy/install/files/alchemy.es.yml
 - lib/rails/generators/alchemy/install/files/all.css
 - lib/rails/generators/alchemy/install/files/all.js
 - lib/rails/generators/alchemy/install/files/application.html.erb
@@ -1030,6 +1082,13 @@ files:
 - lib/rails/generators/alchemy/install/templates/dragonfly.rb.tt
 - lib/rails/generators/alchemy/install/templates/elements.yml.tt
 - lib/rails/generators/alchemy/install/templates/page_layouts.yml.tt
+- lib/rails/generators/alchemy/menus/menus_generator.rb
+- lib/rails/generators/alchemy/menus/templates/node.html.erb
+- lib/rails/generators/alchemy/menus/templates/node.html.haml
+- lib/rails/generators/alchemy/menus/templates/node.html.slim
+- lib/rails/generators/alchemy/menus/templates/wrapper.html.erb
+- lib/rails/generators/alchemy/menus/templates/wrapper.html.haml
+- lib/rails/generators/alchemy/menus/templates/wrapper.html.slim
 - lib/rails/generators/alchemy/module/module_generator.rb
 - lib/rails/generators/alchemy/module/templates/ability.rb.tt
 - lib/rails/generators/alchemy/module/templates/controller.rb.tt
@@ -1129,7 +1188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails 5