alchemy_cms 4.3.2 → 4.4.0

data/app/models/alchemy/essence_picture.rb

@@ -25,9 +25,13 @@
 
 module Alchemy
   class EssencePicture < BaseRecord
-    acts_as_essence ingredient_column: 'picture'
+    acts_as_essence ingredient_column: :picture, belongs_to: {
+      class_name: 'Alchemy::Picture',
+      foreign_key: :picture_id,
+      inverse_of: :essence_pictures,
+      optional: true
+    }
 
-    belongs_to :picture, optional: true
     delegate :image_file_width, :image_file_height, :image_file, to: :picture
     before_save :fix_crop_values
     before_save :replace_newlines
@@ -75,7 +79,8 @@ module Alchemy
       {
         format: picture.default_render_format,
         crop_from: crop_from.presence,
-        crop_size: crop_size.presence
+        crop_size: crop_size.presence,
+        size: content.settings[:size]
       }.with_indifferent_access
     end
 

data/app/models/alchemy/language.rb

@@ -20,6 +20,8 @@
 #  locale         :string
 #
 
+require_dependency 'alchemy/site'
+
 module Alchemy
   class Language < BaseRecord
     belongs_to :site
@@ -57,10 +59,16 @@ module Alchemy
 
     scope :published,       -> { where(public: true) }
     scope :with_root_page,  -> { joins(:pages).where(Page.table_name => {language_root: true}) }
-    scope :on_site,         ->(s) { s ? where(site_id: s.id) : all }
-    scope :on_current_site, -> { on_site(Site.current) }
 
     class << self
+      def on_site(site)
+        site ? where(site_id: site.id) : all
+      end
+
+      def on_current_site
+        on_site(Site.current)
+      end
+
       # Store the current language in the current thread.
       def current=(language)
         RequestStore.store[:alchemy_current_language] = language

data/app/models/alchemy/node.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class Node < BaseRecord
+    VALID_URL_REGEX = /\A(\/|\D[a-z\+\d\.\-]+:)/
+
+    acts_as_nested_set scope: 'language_id', touch: true
+    stampable stamper_class_name: Alchemy.user_class_name
+
+    belongs_to :language, class_name: 'Alchemy::Language'
+    belongs_to :page, class_name: 'Alchemy::Page', optional: true, inverse_of: :nodes
+
+    validates :name, presence: true, if: -> { page.nil? }
+    validates :url, format: { with: VALID_URL_REGEX }, unless: -> { url.nil? }
+
+    # Returns the name
+    #
+    # Either the value is stored in the database
+    # or, if attached, the values comes from a page.
+    def name
+      read_attribute(:name).presence || page&.name
+    end
+
+    class << self
+      # Returns all root nodes for current language
+      def language_root_nodes
+        raise 'No language found' if Language.current.nil?
+        roots.where(language_id: Language.current.id)
+      end
+    end
+
+    # Returns the url
+    #
+    # Either the value is stored in the database, aka. an external url.
+    # Or, if attached, the values comes from a page.
+    def url
+      page && "/#{page.urlname}" || read_attribute(:url).presence
+    end
+
+    def to_partial_path
+      "#{view_folder_name}/wrapper"
+    end
+
+    def view_folder_name
+      "alchemy/menus/#{name.parameterize.underscore}"
+    end
+  end
+end

data/app/models/alchemy/page.rb

@@ -79,7 +79,8 @@ module Alchemy
       :title,
       :urlname,
       :visible,
-      :layoutpage
+      :layoutpage,
+      :menu_id
     ]
 
     acts_as_nested_set(dependent: :destroy)
@@ -88,10 +89,29 @@ module Alchemy
 
     belongs_to :language, optional: true
 
+    belongs_to :creator,
+      primary_key: Alchemy.user_class.primary_key,
+      class_name: Alchemy.user_class_name,
+      foreign_key: :creator_id,
+      optional: true
+
+    belongs_to :updater,
+      primary_key: Alchemy.user_class.primary_key,
+      class_name: Alchemy.user_class_name,
+      foreign_key: :updater_id,
+      optional: true
+
+    belongs_to :locker,
+      primary_key: Alchemy.user_class.primary_key,
+      class_name: Alchemy.user_class_name,
+      foreign_key: :locked_by,
+      optional: true
+
     has_one :site, through: :language
     has_many :site_languages, through: :site, source: :languages
     has_many :folded_pages
     has_many :legacy_urls, class_name: 'Alchemy::LegacyPageUrl'
+    has_many :nodes, class_name: 'Alchemy::Node', inverse_of: :page
 
     validates_presence_of :language, on: :create, unless: :root
     validates_presence_of :page_layout, unless: :systempage?
@@ -125,16 +145,22 @@ module Alchemy
       if: :should_create_legacy_url?,
       unless: :redirects_to_external?
 
+    after_update :attach_to_menu!,
+      if: :should_attach_to_menu?
+
+    after_update -> { nodes.update_all(updated_at: Time.current) }
+
     # Concerns
     include Alchemy::Page::PageScopes
     include Alchemy::Page::PageNatures
     include Alchemy::Page::PageNaming
-    include Alchemy::Page::PageUsers
     include Alchemy::Page::PageElements
 
     # site_name accessor
     delegate :name, to: :site, prefix: true, allow_nil: true
 
+    attr_accessor :menu_id
+
     # Class methods
     #
     class << self
@@ -387,7 +413,7 @@ module Alchemy
 
     def set_restrictions_to_child_pages
       descendants.each do |child|
-        child.update_attributes(restricted: restricted?)
+        child.update(restricted: restricted?)
       end
     end
 
@@ -488,6 +514,39 @@ module Alchemy
       attribute_fixed?(:public_until) ? fixed_attributes[:public_until] : self[:public_until]
     end
 
+    # Returns the name of the creator of this page.
+    #
+    # If no creator could be found or associated user model
+    # does not respond to +#name+ it returns +'unknown'+
+    #
+    def creator_name
+      creator.try(:name) || Alchemy.t('unknown')
+    end
+
+    # Returns the name of the last updater of this page.
+    #
+    # If no updater could be found or associated user model
+    # does not respond to +#name+ it returns +'unknown'+
+    #
+    def updater_name
+      updater.try(:name) || Alchemy.t('unknown')
+    end
+
+    # Returns the name of the user currently editing this page.
+    #
+    # If no locker could be found or associated user model
+    # does not respond to +#name+ it returns +'unknown'+
+    #
+    def locker_name
+      locker.try(:name) || Alchemy.t('unknown')
+    end
+
+    # Menus (aka. root nodes) this page is attached to
+    #
+    def menus
+      @_menus ||= nodes.map(&:root)
+    end
+
     private
 
     def set_fixed_attributes
@@ -533,5 +592,17 @@ module Alchemy
     def set_published_at
       self.published_at = Time.current
     end
+
+    def attach_to_menu!
+      Alchemy::Node.find(menu_id).children.create!(
+        language_id: language_id,
+        page_id: id,
+        name: name
+      )
+    end
+
+    def should_attach_to_menu?
+      menu_id && nodes.none?
+    end
   end
 end

data/app/models/alchemy/page/page_elements.rb

@@ -9,16 +9,24 @@ module Alchemy
 
       has_many :all_elements,
         -> { order(:position) },
-        class_name: 'Alchemy::Element'
+        class_name: 'Alchemy::Element',
+        inverse_of: :page
       has_many :elements,
         -> { order(:position).not_nested.unfixed.available },
-        class_name: 'Alchemy::Element'
+        class_name: 'Alchemy::Element',
+        inverse_of: :page
       has_many :trashed_elements,
         -> { Element.trashed.order(:position) },
-        class_name: 'Alchemy::Element'
+        class_name: 'Alchemy::Element',
+        inverse_of: :page
       has_many :fixed_elements,
         -> { order(:position).fixed.available },
-        class_name: 'Alchemy::Element'
+        class_name: 'Alchemy::Element',
+        inverse_of: :page
+      has_many :dependent_destroyable_elements,
+        -> { not_nested },
+        class_name: 'Alchemy::Element',
+        dependent: :destroy
       has_many :contents, through: :elements
       has_and_belongs_to_many :to_be_swept_elements, -> { distinct },
         class_name: 'Alchemy::Element',

data/app/models/alchemy/page/page_natures.rb

@@ -55,19 +55,24 @@ module Alchemy
     end
 
     # Returns true or false if the pages definition for config/alchemy/page_layouts.yml contains redirects_to_external: true
+    # @deprecated Please use a menu node with an external url instead.
     def redirects_to_external?
       !!definition["redirects_to_external"]
     end
+    deprecate redirects_to_external?: 'Please use a menu node with an external url instead.', deprecator: Alchemy::Deprecation
 
+    # @deprecated
     def has_controller?
       !PageLayout.get(page_layout).nil? && !PageLayout.get(page_layout)["controller"].blank?
     end
+    deprecate :has_controller?, deprecator: Alchemy::Deprecation
 
     # True if page locked_at timestamp and locked_by id are set
     def locked?
       locked_by? && locked_at?
     end
 
+    # @deprecated Please use a menu node with an url pointing to your controller path instead.
     def controller_and_action
       if has_controller?
         {
@@ -76,6 +81,7 @@ module Alchemy
         }
       end
     end
+    deprecate controller_and_action: 'Please use a menu node with an url pointing to your controller path instead.', deprecator: Alchemy::Deprecation
 
     # Returns a Hash describing the status of the Page.
     #

data/app/models/alchemy/page/page_scopes.rb

@@ -17,7 +17,7 @@ module Alchemy
 
       # All locked pages
       #
-      scope :locked, -> { where.not(locked_at: nil, locked_by: nil) }
+      scope :locked, -> { where.not(locked_at: nil).where.not(locked_by: nil) }
 
       # All pages locked by given user
       #

data/app/models/alchemy/picture.rb

@@ -30,7 +30,11 @@ module Alchemy
     include Alchemy::Picture::Transformations
     include Alchemy::Picture::Url
 
-    has_many :essence_pictures, class_name: 'Alchemy::EssencePicture', foreign_key: 'picture_id'
+    has_many :essence_pictures,
+      class_name: 'Alchemy::EssencePicture',
+      foreign_key: 'picture_id',
+      inverse_of: :ingredient_association
+
     has_many :contents, through: :essence_pictures
     has_many :elements, through: :contents
     has_many :pages, through: :elements

data/app/models/concerns/alchemy/content_touching.rb

@@ -17,7 +17,7 @@ module Alchemy
     #
     def touch_contents
       return unless respond_to?(:contents)
-      contents.each(&:touch)
+      contents.update_all(updated_at: Time.current)
     end
   end
 end

data/app/serializers/alchemy/element_serializer.rb

@@ -10,12 +10,18 @@ module Alchemy
       :created_at,
       :updated_at,
       :ingredients,
-      :content_ids
+      :content_ids,
+      :dom_id,
+      :display_name
 
     has_many :nested_elements
 
     def ingredients
       object.contents.collect(&:serialize)
     end
+
+    def display_name
+      object.display_name_with_preview_text
+    end
   end
 end

data/app/serializers/alchemy/page_serializer.rb

@@ -16,9 +16,5 @@ module Alchemy
       :status
 
     has_many :elements
-
-    def elements
-      object.elements.published
-    end
   end
 end

data/app/views/alchemy/_menubar.html.erb

@@ -4,7 +4,7 @@
       <li><%= link_to Alchemy.t(:to_alchemy), alchemy.admin_dashboard_url %></li>
       <li><%= link_to Alchemy.t(:edit_page), alchemy.edit_admin_page_url(@page) %></li>
       <li>
-        <%= form_tag Alchemy.logout_path, method: 'delete' do %>
+        <%= form_tag Alchemy.logout_path, method: Alchemy.logout_method do %>
           <%= button_tag Alchemy.t(:logout) %>
         <% end %>
       </li>

data/app/views/alchemy/admin/elements/_element.html.erb

@@ -16,7 +16,23 @@
       <div id="element_<%= element.id %>_errors" class="element_errors"></div>
 
       <div id="element_<%= element.id %>_content" class="element-content-editors">
-        <%== render_editor(element) %>
+        <% element.definition[:message].tap do |message| %>
+          <%= render_message(:info, sanitize(message)) if message %>
+        <% end %>
+        <% element.definition[:warning].tap do |warning| %>
+          <%= render_message(:warning, sanitize(warning)) if warning %>
+        <% end %>
+        <% if lookup_context.exists?("#{element.name}_editor", ["alchemy/elements"], true) %>
+          <%= render_editor(element) %>
+        <% else %>
+          <%= element_editor_for(element) do %>
+            <% element.contents.each do |content| %>
+              <%= render "alchemy/essences/#{content.essence_partial_name}_editor", {
+                content: content
+              } %>
+            <% end %>
+          <% end %>
+        <% end %>
       </div>
 
       <% if element.taggable? %>
@@ -38,7 +54,7 @@
               'droppable-elements' => element.nestable_elements.join(' ')
             } do %>
         <%= render partial: 'alchemy/admin/elements/element',
-           collection: element.all_nested_elements.not_trashed %>
+           collection: element.all_nested_elements %>
       <% end %>
 
       <% if element.expanded? || element.fixed? %>

data/app/views/alchemy/admin/leave.html.erb

@@ -5,7 +5,7 @@
   <label><%= Alchemy.t("Do you want to") %></label>
   <%= link_to Alchemy.t('stay logged in'), alchemy.root_path, class: 'button secondary' %>
 </p>
-<%= form_tag Alchemy.logout_path, method: 'delete', class: 'buttons' do %>
+<%= form_tag Alchemy.logout_path, method: Alchemy.logout_method, class: 'buttons' do %>
   <label><%= Alchemy.t('or to completely') %></label>
   <%= button_tag Alchemy.t(:logout), autofocus: true %>
 <% end %>

data/app/views/alchemy/admin/nodes/_form.html.erb

@@ -0,0 +1,39 @@
+<%= alchemy_form_for([:admin, node]) do |f| %>
+  <%= f.input :name, input_html: {
+    autofocus: true,
+    value: node.page && node.read_attribute(:name).blank? ? nil : node.name,
+    placeholder: node.page ? node.page.name : nil
+  } %>
+  <% unless node.root? %>
+    <%= f.input :page_id, label: Alchemy::Page.model_name.human, input_html: { class: 'alchemy_selectbox' } %>
+    <%= f.input :url, input_html: { disabled: node.page }, hint: Alchemy.t(:node_url_hint) %>
+    <%= f.input :title %>
+    <%= f.input :nofollow %>
+    <%= f.input :external %>
+    <%= f.hidden_field :parent_id %>
+  <% end %>
+  <%= f.hidden_field :language_id %>
+  <%= f.submit button_label %>
+<% end %>
+
+<script>
+  $('#node_page_id').alchemyPageSelect({
+    placeholder: "<%= Alchemy.t(:search_page) %>",
+    url: "<%= alchemy.api_pages_path %>",
+    <% if node.page %>
+    initialSelection: {
+      id: <%= node.page_id %>,
+      text: "<%= node.page.name %>",
+      url: "/<%= node.page.urlname %>"
+    }
+    <% end %>
+  }).on('change', function(e) {
+    if (e.val === '') {
+      $('#node_name').removeAttr('placeholder')
+      $('#node_url').val('').prop('disabled', false)
+    } else {
+      $('#node_name').attr('placeholder', e.added.name)
+      $('#node_url').val('/' + e.added.urlname).prop('disabled', true)
+    }
+  })
+</script>