alchemy_cms 4.6.1 → 5.0.0.beta1

data/app/serializers/alchemy/essence_date_serializer.rb

@@ -2,9 +2,9 @@
 
 module Alchemy
   class EssenceDateSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :date,
-      :created_at,
-      :updated_at
+    )
   end
 end

data/app/serializers/alchemy/essence_file_serializer.rb

@@ -2,9 +2,11 @@
 
 module Alchemy
   class EssenceFileSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :title,
-      :css_class
+      :css_class,
+    )
 
     has_one :attachment
   end

data/app/serializers/alchemy/essence_html_serializer.rb

@@ -2,9 +2,9 @@
 
 module Alchemy
   class EssenceHtmlSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :source,
-      :created_at,
-      :updated_at
+    )
   end
 end

data/app/serializers/alchemy/essence_link_serializer.rb

@@ -2,12 +2,12 @@
 
 module Alchemy
   class EssenceLinkSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :link,
       :link_title,
       :link_target,
       :link_class_name,
-      :created_at,
-      :updated_at
+    )
   end
 end

data/app/serializers/alchemy/essence_picture_serializer.rb

@@ -2,25 +2,26 @@
 
 module Alchemy
   class EssencePictureSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :picture_id,
       :caption,
       :title,
       :alt_tag,
       :css_class,
       :link,
-      :created_at,
-      :updated_at
+    )
 
     has_one :picture
 
     def link
       return if object.link.blank?
+
       {
         url: object.link,
         css_class: object.link_class_name,
         title: object.link_title,
-        target: object.link_target
+        target: object.link_target,
       }
     end
   end

data/app/serializers/alchemy/essence_richtext_serializer.rb

@@ -2,10 +2,10 @@
 
 module Alchemy
   class EssenceRichtextSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :body,
       :stripped_body,
-      :created_at,
-      :updated_at
+    )
   end
 end

data/app/serializers/alchemy/essence_select_serializer.rb

@@ -2,9 +2,9 @@
 
 module Alchemy
   class EssenceSelectSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :value,
-      :created_at,
-      :updated_at
+    )
   end
 end

data/app/serializers/alchemy/essence_text_serializer.rb

@@ -2,19 +2,20 @@
 
 module Alchemy
   class EssenceTextSerializer < ActiveModel::Serializer
-    attributes :id,
+    attributes(
+      :id,
       :body,
       :link,
-      :created_at,
-      :updated_at
+    )
 
     def link
       return if object.link.blank?
+
       {
         url: object.link,
         title: object.link_title,
         css_class: object.link_class_name,
-        target: object.link_target
+        target: object.link_target,
       }
     end
   end

data/app/serializers/alchemy/node_serializer.rb

@@ -8,5 +8,7 @@ module Alchemy
       :rgt,
       :url,
       :parent_id
+
+    has_many :ancestors, record_type: :node, serializer: self
   end
 end

data/app/serializers/alchemy/page_tree_serializer.rb

@@ -3,13 +3,13 @@
 module Alchemy
   class PageTreeSerializer < BaseSerializer
     def attributes
-      {'pages' => nil}
+      {"pages" => nil}
     end
 
     def pages
       tree = []
       path = [{id: object.parent_id, children: tree}]
-      page_list = object.self_and_descendants.includes({ language: :site }, :locker)
+      page_list = object.self_and_descendants
       base_level = object.level - 1
       # Load folded pages in advance
       folded_user_pages = FoldedPage.folded_for_user(opts[:user]).pluck(:page_id)
@@ -53,18 +53,15 @@ module Alchemy
         id: page.id,
         name: page.name,
         public: page.public?,
-        visible: page.visible?,
         restricted: page.restricted?,
         page_layout: page.page_layout,
         slug: page.slug,
-        redirects_to_external: page.definition['redirects_to_external'],
         urlname: page.urlname,
-        external_urlname: page.definition['redirects_to_external'] ? page.external_urlname : nil,
         url_path: page.url_path,
         level: level,
         root: page.depth == 1,
         root_or_leaf: page.depth == 1 || !has_children,
-        children: []
+        children: [],
       }
 
       if opts[:elements]
@@ -76,9 +73,9 @@ module Alchemy
           definition_missing: page.definition.blank?,
           folded: folded,
           locked: page.locked?,
-          locked_notice: page.locked? ? Alchemy.t('This page is locked', name: page.locker_name) : nil,
+          locked_notice: page.locked? ? Alchemy.t("This page is locked", name: page.locker_name) : nil,
           permissions: page_permissions(page, opts[:ability]),
-          status_titles: page_status_titles(page)
+          status_titles: page_status_titles(page),
         })
       else
         p_hash
@@ -86,10 +83,10 @@ module Alchemy
     end
 
     def page_elements(page)
-      if opts[:elements] == 'true'
+      if opts[:elements] == "true"
         page.elements
       else
-        page.elements.named(opts[:elements].split(',') || [])
+        page.elements.named(opts[:elements].split(",") || [])
       end
     end
 
@@ -100,15 +97,14 @@ module Alchemy
         copy: ability.can?(:copy, page),
         destroy: ability.can?(:destroy, page),
         create: ability.can?(:create, Alchemy::Page),
-        edit_content: ability.can?(:edit_content, page)
+        edit_content: ability.can?(:edit_content, page),
       }
     end
 
     def page_status_titles(page)
       {
         public: page.status_title(:public),
-        visible: page.status_title(:visible),
-        restricted: page.status_title(:restricted)
+        restricted: page.status_title(:restricted),
       }
     end
   end

data/app/views/alchemy/admin/attachments/_archive_overlay.html.erb

@@ -7,8 +7,7 @@
       in_dialog: true,
       redirect_url: admin_attachments_path(
         element_id: @element.try(:id),
-        content_id: @content.try(:id),
-        options: options_from_params
+        content_id: @content.try(:id)
       ) %>
   <% end %>
   <%= render 'alchemy/admin/partials/remote_search_form' %>

data/app/views/alchemy/admin/attachments/_file_to_assign.html.erb

@@ -1,8 +1,7 @@
 <li class="assign_file_file <%= cycle('even', 'odd') %>">
   <%= link_to alchemy.assign_admin_essence_files_path(
       attachment_id: file_to_assign.id,
-      content_id: @content.id,
-      options: options_from_params
+      content_id: @content.id
     ),
     remote: true,
     method: 'put' do %>

data/app/views/alchemy/admin/attachments/_files_list.html.erb

@@ -11,11 +11,11 @@
     <thead>
       <tr>
         <th class="icon"></th>
-        <th class="name"><%= sort_link(@query, :name, hide_indicator: true) %></th>
-        <th class="file_name"><%= sort_link(@query, :file_name, hide_indicator: true) %></th>
+        <th class="name"><%= sort_link(@query, :name) %></th>
+        <th class="file_name"><%= sort_link(@query, :file_name) %></th>
         <th class="file_type"><%= Alchemy::Attachment.human_attribute_name('file_mime_type') %></th>
-        <th class="file_size"><%= sort_link(@query, :file_size, hide_indicator: true) %></th>
-        <th class="date"><%= sort_link(@query, :created_at, hide_indicator: true) %></th>
+        <th class="file_size"><%= sort_link(@query, :file_size) %></th>
+        <th class="date"><%= sort_link(@query, :created_at, default_order: 'desc') %></th>
         <th class="tools"></th>
       </tr>
     </thead>

data/app/views/alchemy/admin/contents/create.js.erb

@@ -1,6 +1,4 @@
-var editor_html = '<%= j(render "alchemy/essences/#{@content.essence_partial_name}_editor", {
-  content: @content, options: options_from_params, html_options: @html_options
-}) %>';
+var editor_html = '<%= j render(Alchemy::ContentEditor.new(@content)) %>';
 
 $("[data-element-<%= @content.element_id %>-missing-content=\"<%= @content.name %>\"]").replaceWith(editor_html);
 

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

@@ -1,7 +1,7 @@
 <%= content_tag :div,
   id: "element_#{element.id}",
   data: {'element-id' => element.id, 'element-name' => element.name},
-  class: element_editor_classes(element) do %>
+  class: element.css_classes do %>
 
   <% unless element.fixed? %>
     <%= render 'alchemy/admin/elements/element_header', element: element %>
@@ -18,24 +18,14 @@
       <%= render_message(:warning, sanitize(warning)) if warning %>
     <% end %>
 
-    <% if element_editable?(element) %>
+    <% if element.editable? %>
       <%= form_for [alchemy, :admin, element], remote: true,
         html: {id: "element_#{element.id}_form".html_safe, class: 'element-content'} do |f| %>
 
         <div id="element_<%= element.id %>_errors" class="element_errors"></div>
 
         <div id="element_<%= element.id %>_content" class="element-content-editors">
-          <% 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 %>
+          <%= render element.contents.map { |content| Alchemy::ContentEditor.new(content) } %>
         </div>
 
         <% if element.taggable? %>
@@ -53,11 +43,12 @@
   <% if element.nestable_elements.any? %>
     <div class="nestable-elements">
       <%= content_tag :div,
-            class: "nested-elements", data: {
-              'droppable-elements' => element.nestable_elements.join(' ')
-            } do %>
-        <%= render partial: 'alchemy/admin/elements/element',
-           collection: element.all_nested_elements %>
+        class: "nested-elements", data: {
+          'droppable-elements' => element.nestable_elements.join(' ')
+        } do %>
+        <%= render element.all_nested_elements.map { |element|
+          Alchemy::ElementEditor.new(element)
+        } %>
       <% end %>
 
       <% if element.expanded? || element.fixed? %>

data/app/views/alchemy/admin/elements/create.js.erb

@@ -1,7 +1,7 @@
 (function() {
   var $el;
   var $element_area;
-  var element_html = '<%= j render("element", element: @element, draggable: true) %>';
+  var element_html = '<%= j render(Alchemy::ElementEditor.new(@element)) %>';
 
 <%- if @cut_element_id -%>
   $('.element-editor[data-element-id="<%= @cut_element_id %>"]').remove();

data/app/views/alchemy/admin/elements/fold.js.erb

@@ -8,7 +8,7 @@
 
 <% else -%>
 
-  $el.replaceWith('<%= j render(partial: "element", object: @element) %>');
+  $el.replaceWith('<%= j render(Alchemy::ElementEditor.new(@element)) %>');
   $el = $('#element_<%= @element.id %>');
   $('#element_area .sortable-elements').sortable('refresh');
 

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

@@ -15,19 +15,19 @@
       <% end %>
     </ul>
     <div id="main-content-elements" class="sortable-elements" data-droppable-elements="<%= @page.element_definition_names.join(' ') %>">
-      <%= render partial: 'alchemy/admin/elements/element', collection: @elements %>
+      <%= render @elements.map { |element| Alchemy::ElementEditor.new(element) } %>
     </div>
     <% @fixed_elements.each do |element| %>
       <div
         id="fixed-element-<%= element.id %>"
         class="sortable-elements"
         data-droppable-elements="<%= element.nestable_elements.join(' ') %>">
-        <%= render 'alchemy/admin/elements/element', element: element %>
+        <%= render Alchemy::ElementEditor.new(element) %>
       </div>
     <% end %>
   </div>
 <% else %>
   <div id="main-content-elements" class="sortable-elements" data-droppable-elements="<%= @page.element_definition_names.join(' ') %>">
-    <%= render partial: 'alchemy/admin/elements/element', collection: @elements %>
+    <%= render @elements.map { |element| Alchemy::ElementEditor.new(element) } %>
   </div>
 <% end %>

data/app/views/alchemy/admin/essence_files/assign.js.erb

@@ -1,8 +1,3 @@
-$('#<%= @content.dom_id %>').replaceWith('<%= j(
-  render "alchemy/essences/essence_file_editor",
-    formats: [:html],
-    content: @content,
-    options: options_from_params
-) %>');
+$('#<%= @content.dom_id %>').replaceWith('<%= j render(Alchemy::ContentEditor.new(@content)) %>');
 Alchemy.closeCurrentDialog();
 Alchemy.setElementDirty($('#element_<%= @content.element.id %>'));

data/app/views/alchemy/admin/essence_files/edit.html.erb

@@ -1,4 +1,4 @@
-<% css_classes = @content.settings_value(:css_classes, local_assigns.fetch(:options, {})) %>
+<% css_classes = @content.settings[:css_classes] %>
 
 <%= alchemy_form_for [:admin, @essence_file] do |f| %>
   <%= f.input :link_text %>

data/app/views/alchemy/admin/essence_pictures/assign.js.erb

@@ -1,10 +1,4 @@
 $('#picture_to_assign_<%= @picture.id %> a').attr('href', '#').off('click');
-$('#<%= @content.dom_id -%>').replaceWith('<%= j(
-  render(
-    "alchemy/essences/essence_picture_editor",
-    content: @content,
-    options: options_from_params
-  )
-) %>');
+$('#<%= @content.dom_id -%>').replaceWith('<%= j render(Alchemy::ContentEditor.new(@content)) %>');
 Alchemy.closeCurrentDialog();
 Alchemy.setElementDirty('#element_<%= @content.element.id %>');

data/app/views/alchemy/admin/essence_pictures/crop.html.erb

@@ -12,7 +12,7 @@
   </div>
   <%= form_for(
     @essence_picture,
-    url: alchemy.admin_essence_picture_path(@essence_picture, options: options_from_params),
+    url: alchemy.admin_essence_picture_path(@essence_picture),
     id: 'image_cropper_form',
     remote: true
   ) do |f| %>

data/app/views/alchemy/admin/essence_pictures/edit.html.erb

@@ -1,20 +1,20 @@
 <%= alchemy_form_for @essence_picture,
-    url: alchemy.admin_essence_picture_path(@essence_picture, options: options_from_params) do |f| %>
+    url: alchemy.admin_essence_picture_path(@essence_picture) do |f| %>
   <%= hidden_field_tag 'content_id', @content.id %>
-  <%= f.input :caption, as: options_from_params[:caption_as_textarea] ? 'text' : 'string' %>
+  <%= f.input :caption, as: @content.settings[:caption_as_textarea] ? 'text' : 'string' %>
   <%= f.input :title %>
   <%= f.input :alt_tag %>
-  <%- if options_from_params[:sizes].present? -%>
+  <%- if @content.settings[:sizes].present? -%>
     <%= f.input :render_size,
       collection: [
-        [Alchemy.t('Layout default'), options_from_params[:size]]
-      ] + options_from_params[:sizes].to_a,
+        [Alchemy.t('Layout default'), @content.settings[:size]]
+      ] + @content.settings[:sizes].to_a,
       include_blank: false,
       input_html: {class: 'alchemy_selectbox'} %>
   <%- end -%>
-  <%- if options_from_params[:css_classes].present? -%>
+  <%- if @content.settings[:css_classes].present? -%>
     <%= f.input :css_class,
-      collection: options_from_params[:css_classes],
+      collection: @content.settings[:css_classes],
       include_blank: Alchemy.t('None'),
       input_html: {class: 'alchemy_selectbox'} %>
   <%- else -%>

data/app/views/alchemy/admin/essence_pictures/update.js.erb

@@ -3,7 +3,7 @@
   Alchemy.closeCurrentDialog();
   Alchemy.setElementDirty('#element_<%= @content.element.id %>');
 <% if @content.ingredient %>
-  $('.thumbnail_background img', '#<%= @content.dom_id %>').replaceWith('<%= essence_picture_thumbnail(@content, options_from_params) %>');
+  $('.thumbnail_background img', '#<%= @content.dom_id %>').replaceWith('<%= essence_picture_thumbnail(@content) %>');
   Alchemy.ImageLoader('#<%= @content.dom_id %> .thumbnail_background');
 <% end %>
 })(jQuery);