alchemy_cms 6.1.9 → 7.0.0.pre.a

data/app/assets/stylesheets/alchemy/elements.scss

@@ -275,11 +275,10 @@
       }
     }
 
-    .element-content {
+    .element-body {
       margin: 4px 8px;
     }
 
-    .content_editor,
     .ingredient-editor,
     .picture_thumbnail {
       width: 100%;
@@ -303,7 +302,7 @@
     }
   }
 
-  .element-content {
+  .element-body {
     margin: 2 * $default-padding;
   }
 
@@ -414,7 +413,7 @@
   }
 }
 
-.content-group {
+.ingredient-group {
   width: 100%;
   padding: $default-padding 0;
   position: relative;
@@ -425,7 +424,7 @@
     padding-bottom: 0;
   }
 
-  .content-group-header {
+  .ingredient-group-header {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -434,22 +433,21 @@
     padding: $default-padding 1px;
   }
 
-  .content-group-contents {
+  .ingredient-group-ingredients {
     display: none;
   }
 
   &.expanded {
-    .content-group-contents {
+    .ingredient-group-ingredients {
       display: block;
     }
 
-    .content-group-expand {
+    .ingredient-group-expand {
       @extend .fa-angle-up;
     }
   }
 }
 
-.element-content-editors,
 .element-ingredient-editors {
   display: flex;
   flex-wrap: wrap;
@@ -467,7 +465,7 @@
   min-height: 100px;
 }
 
-.linkable_essence_tools {
+.ingredient_link_buttons {
   display: flex;
   position: absolute;
   bottom: 2 * $default-margin;
@@ -495,7 +493,7 @@
       background-color: $form-field-disabled-bg-color;
     }
 
-    &.linked.link-essence {
+    &.linked.link-ingredient {
       @include linked-button(
         $border-radius: 0,
         $line-height: 30px,
@@ -507,7 +505,7 @@
       }
     }
 
-    &.linked.unlink-essence {
+    &.linked.unlink-ingredient {
       @include linked-button(
         $border-radius: 0 $default-border-radius $default-border-radius 0,
         $line-height: 30px,
@@ -519,7 +517,7 @@
       }
     }
 
-    &.unlink-essence {
+    &.unlink-ingredient {
       border-left-width: 0;
       @extend .right-rounded-border;
     }
@@ -561,7 +559,6 @@
   }
 }
 
-.essence_picture,
 .ingredient-editor.picture {
   position: relative;
 
@@ -586,7 +583,7 @@
     }
   }
 
-  .essence_picture_css_class {
+  .picture_ingredient_css_class {
     position: absolute;
     z-index: 1;
     bottom: 24px;
@@ -639,9 +636,6 @@
   }
 }
 
-.content_editor.essence_audio,
-.content_editor.essence_file,
-.content_editor.essence_video,
 .ingredient-editor.audio,
 .ingredient-editor.file,
 .ingredient-editor.video {
@@ -681,8 +675,7 @@
   }
 }
 
-.file_tools,
-.essence_file_tools {
+.file_tools {
   display: flex;
   align-items: center;
   margin-left: auto;
@@ -717,7 +710,6 @@ select.long {
   padding: 0;
 }
 
-.content_editor,
 .ingredient-editor {
   width: 100%;
   padding: $default-padding 0;
@@ -828,7 +820,6 @@ select.long {
     }
   }
 
-  &.essence_select,
   &.select {
     label {
       margin-bottom: 2 * $default-margin;
@@ -843,8 +834,7 @@ select.long {
     }
   }
 
-  select.ingredient-editor-select,
-  select.essence_editor_select {
+  select.ingredient-editor-select {
     border-radius: $default-border-radius;
     background: white;
     border: 1px solid $button-border-color;
@@ -871,13 +861,11 @@ select.long {
     }
   }
 
-  &.essence_picture,
   &.picture {
     width: 50%;
     padding-left: 1px; // Compensate the box shadow
     padding-right: $default-padding;
 
-    + .essence_picture,
     + .picture {
       padding-left: $default-padding;
       padding-right: 1px; // Compensate the box shadow
@@ -885,10 +873,6 @@ select.long {
   }
 }
 
-.content_rtf_text_area {
-  display: none;
-}
-
 div.pictures_for_element {
   overflow: auto;
   margin-top: 4px;
@@ -898,7 +882,7 @@ textarea.has_tinymce {
   visibility: hidden;
 }
 
-.essence_html textarea {
+.ingredient-editor.html textarea {
   font-family: $mono-font-family;
   resize: vertical;
   font-size: $form-field-font-size;
@@ -928,8 +912,6 @@ textarea.has_tinymce {
   }
 }
 
-.content_editor .hint-with-icon,
-.content_editor .with-hint,
 .ingredient-editor .hint-with-icon,
 .ingredient-editor .with-hint,
 .element-handle .hint-with-icon {
@@ -946,7 +928,7 @@ textarea.has_tinymce {
 }
 
 .is-fixed {
-  &.with-contents {
+  &.with-ingredients {
     > .element-footer {
       border-top: 0;
       border-bottom: 1px solid $medium-gray;
@@ -992,7 +974,6 @@ textarea.has_tinymce {
 }
 
 .ingredient-date--label,
-.essence_date--label,
 .edit-ingredient-anchor-link {
   position: absolute;
   right: 2 * $default-padding;

data/app/assets/stylesheets/alchemy/forms.scss

@@ -249,10 +249,6 @@ form {
   }
 }
 
-textarea#essence_picture_caption {
-  height: 61px;
-}
-
 // styles for link overlay selects
 .window_form {
   td.checkbox {

data/app/assets/stylesheets/alchemy/node-select.scss

@@ -35,9 +35,9 @@
 }
 
 // The container of the rendered node is slightly larger than other a line of
-// text, as it would be for the Alchemy::EssencePage. Reducing the padding here from 0.6em
+// text, as it would be for the Alchemy::Ingredients::Page. Reducing the padding here from 0.6em
 // to 0.4em centers the content nicely.
-.essence_node {
+.ingredient-editor.node {
   .select2-container.alchemy_selectbox .select2-choice {
     padding: 0.4em 0.75em;
   }

data/app/controllers/alchemy/admin/attachments_controller.rb

@@ -78,7 +78,6 @@ module Alchemy
         @_search_filter_params ||= params.except(*COMMON_SEARCH_FILTER_EXCLUDES + [:attachment]).permit(
           *common_search_filter_includes + [
             :form_field_id,
-            :content_id,
           ]
         )
       end

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -49,22 +49,21 @@ module Alchemy
         end
       end
 
-      # Updates the element.
-      #
-      # And update all contents in the elements by calling update_contents.
+      # Updates the element and all ingredients in the element.
       #
       def update
         @page = @element.page
 
-        if element_params.key?(:ingredients_attributes)
-          update_element_with_ingredients
+        if @element.update(element_params)
+          @element_validated = true
         else
-          update_element_with_contents
+          element_update_error
+          @error_messages = @element.ingredient_error_messages
         end
       end
 
       def destroy
-        @richtext_ids = @element.richtext_contents_ids + @element.richtext_ingredients_ids
+        @richtext_ids = @element.richtext_ingredients_ids
         @element.destroy
         @notice = Alchemy.t("Successfully deleted element") % { element: @element.display_name }
       end
@@ -103,14 +102,12 @@ module Alchemy
       def element_includes
         [
           {
-            contents: :essence,
             ingredients: :related_object,
           },
           :tags,
           {
             all_nested_elements: [
               {
-                contents: :essence,
                 ingredients: :related_object,
               },
               :tags,
@@ -152,10 +149,6 @@ module Alchemy
         element
       end
 
-      def contents_params
-        params.fetch(:contents, {}).permit!
-      end
-
       def element_params
         params.fetch(:element, {}).permit(:tag_list, ingredients_attributes: {})
       end
@@ -164,28 +157,10 @@ module Alchemy
         params.require(:element).permit(:name, :page_version_id, :parent_element_id)
       end
 
-      def update_element_with_ingredients
-        if @element.update(element_params)
-          @element_validated = true
-        else
-          element_update_error
-          @error_messages = @element.ingredient_error_messages
-        end
-      end
-
-      def update_element_with_contents
-        if @element.update_contents(contents_params)
-          @element_validated = @element.update(element_params)
-        else
-          element_update_error
-          @error_messages = @element.essence_error_messages
-        end
-      end
-
       def element_update_error
         @element_validated = false
         @notice = Alchemy.t("Validation failed")
-        @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:content_validations_headline)}</p>".html_safe
+        @error_message = "<h2>#{@notice}</h2><p>#{Alchemy.t(:ingredient_validations_headline)}</p>".html_safe
       end
     end
   end

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -94,7 +94,7 @@ module Alchemy
         end
       end
 
-      # Edit the content of the page and all its elements and contents.
+      # Edit the content of the page and all its elements and ingredients.
       #
       # Locks the page to current user to prevent other users from editing it meanwhile.
       #

data/app/controllers/alchemy/admin/pictures_controller.rb

@@ -32,7 +32,7 @@ module Alchemy
         @query = Picture.ransack(params[:q])
         @previous = filtered_pictures.where("name < ?", @picture.name).last
         @next = filtered_pictures.where("name > ?", @picture.name).first
-        @assignments = @picture.essence_pictures.joins(content: { element: :page })
+        @assignments = @picture.picture_ingredients.joins(element: :page)
 
         render action: "show"
       end

data/app/controllers/alchemy/admin/resources_controller.rb

@@ -103,7 +103,7 @@ module Alchemy
       def resource_filters
         return unless resource_has_filters
 
-        @_resource_filters ||= deprecated_resource_filters || resource_model.alchemy_resource_filters
+        @_resource_filters ||= resource_model.alchemy_resource_filters
       end
 
       def resource_filters_for_select
@@ -114,23 +114,6 @@ module Alchemy
 
       protected
 
-      def deprecated_resource_filters
-        if resource_has_deprecated_filters
-          Alchemy::Deprecation.warn(
-            "#{resource_model}.alchemy_resource_filters is using a legacy data structure. " \
-            "Please use an Array of Hashes instead. i.e. [{ name: 'foo', values: ['bar', 'baz'] }, ...] " \
-            "where values are scopes. With Alchemy 6.1 only the new structure will be supported."
-          )
-
-          @_resource_filters ||= [
-            {
-              name: :misc,
-              values: resource_model.alchemy_resource_filters,
-            },
-          ]
-        end
-      end
-
       def apply_filters(items)
         sanitize_filter_params!
 

data/app/controllers/alchemy/api/elements_controller.rb

@@ -47,14 +47,12 @@ module Alchemy
         {
           nested_elements: [
             {
-              contents: :essence,
               ingredients: :related_object,
             },
             :tags,
           ],
         },
         {
-          contents: :essence,
           ingredients: :related_object,
         },
         :tags,

data/app/controllers/alchemy/api/pages_controller.rb

@@ -8,7 +8,9 @@ module Alchemy
     # Returns all pages as json object
     #
     def index
+      language = Alchemy::Language.find_by(id: params[:language_id]) || Alchemy::Language.current
       @pages = Alchemy::Page.accessible_by(current_ability, :index)
+      @pages = @pages.where(language: language)
       @pages = @pages.includes(*page_includes)
       @pages = @pages.ransack(params[:q]).result
 
@@ -28,11 +30,13 @@ module Alchemy
     def nested
       @page = Page.find_by(id: params[:page_id]) || Language.current_root_page
 
-      render json: PageTreeSerializer.new(@page,
+      render json: PageTreeSerializer.new(
+        @page,
         ability: current_ability,
         user: current_alchemy_user,
         elements: params[:elements],
-        full: true)
+        full: true,
+      )
     end
 
     # Returns a json object for page
@@ -105,13 +109,13 @@ module Alchemy
             {
               nested_elements: [
                 {
-                  contents: :essence,
+                  ingredients: :related_object,
                 },
                 :tags,
               ],
             },
             {
-              contents: :essence,
+              ingredients: :related_object,
             },
             :tags,
           ],

data/app/controllers/alchemy/messages_controller.rb

@@ -11,15 +11,15 @@ module Alchemy
   # Make an Element with this options inside your @elements.yml file:
   #
   #   - name: contactform
-  #     contents:
-  #     - name: mail_to
-  #       type: EssenceText
-  #     - name: subject
-  #       type: EssenceText
-  #     - name: mail_from
-  #       type: EssenceText
-  #     - name: success_page
-  #       type: EssencePage
+  #     ingredients:
+  #       - role: mail_to
+  #         type: Text
+  #       - role: subject
+  #         type: Text
+  #       - role: mail_from
+  #         type: Text
+  #       - role: success_page
+  #         type: Page
   #
   # The fields +mail_to+, +mail_from+, +subject+ and +success_page+ are recommended.
   # The +Alchemy::MessagesController+ uses them to send your mails. So your customer has full controll of these values inside his contactform element.

data/app/controllers/alchemy/pages_controller.rb

@@ -104,7 +104,13 @@ module Alchemy
     # If no index page and no admin users are present we show the "Welcome to Alchemy" page.
     #
     def load_index_page
-      @page ||= Language.current_root_page
+      @page ||= Alchemy::Page
+        .contentpages
+        .language_roots
+        .where(language: Language.current)
+        .includes(page_includes)
+        .first
+
       render template: "alchemy/welcome", layout: false if signup_required?
     end
 
@@ -120,10 +126,11 @@ module Alchemy
     def load_page
       page_not_found! unless Language.current
 
-      @page ||= Language.current.pages.contentpages.find_by(
-        urlname: params[:urlname],
-        language_code: params[:locale] || Language.current.code,
-      )
+      @page ||= Alchemy::Page
+        .contentpages
+        .where(language: Language.current)
+        .includes(page_includes)
+        .find_by(urlname: params[:urlname])
     end
 
     def enforce_locale
@@ -168,7 +175,7 @@ module Alchemy
 
     # == Renders the page :show template
     #
-    # Handles html and rss requests (for pages containing a feed)
+    # Handles html requests
     #
     # Omits the layout, if the request is a XHR request.
     #
@@ -177,14 +184,6 @@ module Alchemy
         format.html do
           render action: :show, layout: !request.xhr?
         end
-
-        format.rss do
-          if @page.contains_feed?
-            render action: :show, layout: false, handlers: [:builder]
-          else
-            render xml: { error: "Not found" }, status: 404
-          end
-        end
       end
     end
 
@@ -220,10 +219,12 @@ module Alchemy
     # or the cache is stale, because it's been republished by the user.
     #
     def render_fresh_page?
-      must_not_cache? || stale?(etag: page_etag,
-                                last_modified: @page.published_at,
-                                public: !@page.restricted,
-                                template: "pages/show")
+      must_not_cache? || stale?(
+        etag: page_etag,
+        last_modified: @page.published_at,
+        public: !@page.restricted,
+        template: "pages/show",
+      )
     end
 
     # don't cache pages if we have flash message to display or the page has caching disabled
@@ -234,5 +235,9 @@ module Alchemy
     def page_not_found!
       not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
     end
+
+    def page_includes
+      Alchemy::EagerLoading.page_includes(version: :public_version)
+    end
   end
 end

data/app/decorators/alchemy/element_editor.rb

@@ -8,17 +8,6 @@ module Alchemy
       "alchemy/admin/elements/element"
     end
 
-    # Returns content editor instances for defined contents
-    #
-    # Creates contents on demand if the content is not yet present on the element
-    #
-    # @return Array<Alchemy::ContentEditor>
-    def contents
-      element.definition.fetch(:contents, []).map do |content|
-        Alchemy::ContentEditor.new(find_or_create_content(content[:name]))
-      end
-    end
-
     # Returns ingredient editor instances for defined ingredients
     #
     # Creates ingredient on demand if the ingredient is not yet present on the element
@@ -36,7 +25,7 @@ module Alchemy
       element.definition.fetch(:ingredients, []).any?
     end
 
-    # Returns the translated content/ingredient group for displaying in admin editor group headings
+    # Returns the translated ingredient group for displaying in admin editor group headings
     #
     # Translate it in your locale yml file:
     #
@@ -63,7 +52,7 @@ module Alchemy
     def css_classes
       [
         "element-editor",
-        content_definitions.present? ? "with-contents" : "without-contents",
+        ingredient_definitions.present? ? "with-ingredients" : "without-ingredients",
         nestable_elements.any? ? "nestable" : "not-nestable",
         taggable? ? "taggable" : "not-taggable",
         folded ? "folded" : "expanded",
@@ -78,12 +67,13 @@ module Alchemy
     def editable?
       return false if folded?
 
-      content_definitions.present? || ingredient_definitions.any? || taggable?
+      ingredient_definitions.any? || taggable?
     end
 
     # Fixes Rails partial renderer calling to_model on the object
     # which reveals the delegated element instead of this decorator.
-    def respond_to?(method_name)
+    def respond_to?(*args, **kwargs)
+      method_name = args.first
       return false if method_name == :to_model
 
       super
@@ -124,26 +114,16 @@ module Alchemy
       when String
         definition["deprecated"]
       when TrueClass
-        Alchemy.t(name,
-                  scope: :element_deprecation_notices,
-                  default: Alchemy.t(:element_deprecated))
+        Alchemy.t(
+          name,
+          scope: :element_deprecation_notices,
+          default: Alchemy.t(:element_deprecated),
+        )
       end
     end
 
     private
 
-    def find_or_create_content(name)
-      find_content(name) || create_content(name)
-    end
-
-    def find_content(name)
-      element.contents.find { |content| content.name == name }
-    end
-
-    def create_content(name)
-      Alchemy::Content.create(element: element, name: name)
-    end
-
     def find_or_create_ingredient(definition)
       element.ingredients.detect { |i| i.role == definition[:role] } ||
         element.ingredients.create!(

data/app/helpers/alchemy/admin/elements_helper.rb

@@ -4,8 +4,6 @@ module Alchemy
   module Admin
     module ElementsHelper
       include Alchemy::Admin::IngredientsHelper
-      include Alchemy::Admin::ContentsHelper
-      include Alchemy::Admin::EssencesHelper
 
       # Returns an elements array for select helper.
       #