alchemy_cms 6.1.2 → 7.0.0.pre.a

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

@@ -30,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
@@ -107,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,14 +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 ||= begin
-        Alchemy::Page.
-          contentpages.
-          language_roots.
-          where(language: Language.current).
-          includes(page_includes).
-          first
-      end
+      @page ||= Alchemy::Page
+        .contentpages
+        .language_roots
+        .where(language: Language.current)
+        .includes(page_includes)
+        .first
+
       render template: "alchemy/welcome", layout: false if signup_required?
     end
 
@@ -127,13 +126,11 @@ module Alchemy
     def load_page
       page_not_found! unless Language.current
 
-      @page ||= begin
-        Alchemy::Page.
-          contentpages.
-          where(language: Language.current).
-          includes(page_includes).
-          find_by(urlname: params[:urlname])
-      end
+      @page ||= Alchemy::Page
+        .contentpages
+        .where(language: Language.current)
+        .includes(page_includes)
+        .find_by(urlname: params[:urlname])
     end
 
     def enforce_locale
@@ -178,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.
     #
@@ -187,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
 
@@ -230,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

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.
       #

data/app/helpers/alchemy/elements_block_helper.rb

@@ -24,69 +24,32 @@ module Alchemy
     # Block-level helper class for element views.
     #
     class ElementViewHelper < BlockHelper
-      # Renders one of the element's contents.
+      # Renders one of the element's ingredients.
       #
       # If the element uses +ingredients+ it renders the ingredient record.
       #
       def render(name, options = {}, html_options = {})
-        renderable = element.ingredient_by_role(name) || Alchemy::Deprecation.silence { content(name) }
+        renderable = element.ingredient_by_role(name)
         return if renderable.nil?
 
-        if Alchemy::DEPRECATED_ESSENCE_CLASSES.include?(renderable.try(:essence)&.class&.name)
-          Alchemy::Deprecation.warn(
-            "Using a '#{renderable.essence.class.name.demodulize}' content is deprecated. " \
-            "Please use a '#{Alchemy::DEPRECATED_ESSENCE_CLASS_MAPPING[renderable.essence.class.name].demodulize}' ingredient instead."
-          )
-        end
-
         helpers.render(renderable, {
           options: options,
           html_options: html_options,
         })
       end
 
-      # Returns one of the element's contents (ie. essence instances).
-      #
-      def content(name)
-        element.content_by_name(name)
-      end
-
-      deprecate content: "Use `ingredient_by_role` instead", deprecator: Alchemy::Deprecation
-
-      # Returns the ingredient of one of the element's contents.
-      #
-      # If the element uses +ingredients+ it returns the +value+ of the ingredient record.
-      #
-      def ingredient(name)
-        element.ingredient(name)
-      end
-
       # Returns the value of one of the element's ingredients.
       #
       def value(name)
         element.value_for(name)
       end
 
-      # Returns true if the given content or ingredient has a value.
+      # Returns true if the given ingredient has a value.
       #
       def has?(name)
-        if element.ingredient_definitions.any?
-          element.has_value_for?(name)
-        else
-          Alchemy::Deprecation.silence do
-            element.has_ingredient?(name)
-          end
-        end
+        element.has_value_for?(name)
       end
 
-      # Return's the given content's essence.
-      #
-      def essence(name)
-        content(name).try(:essence)
-      end
-
-      deprecate essence: "Use `ingredient_by_role` instead", deprecator: Alchemy::Deprecation
-
       # Return's the ingredient record by given role.
       #
       def ingredient_by_role(role)
@@ -129,7 +92,7 @@ module Alchemy
     #   The HTML tag to be used for the wrapping element.
     # @option options :id (the element's dom_id)
     #   The wrapper tag's DOM ID.
-    # @option options :class (the element's essence name)
+    # @option options :class (the element's name)
     #   The wrapper tag's DOM class.
     # @option options :tags_formatter
     #   A lambda used for formatting the element's tags (see Alchemy::ElementsHelper::element_tags_attributes). Set to +false+ to not include tags in the wrapper element.

data/app/helpers/alchemy/elements_helper.rb

@@ -112,9 +112,9 @@ module Alchemy
     #
     #   # elements.yml
     #   - name: headline
-    #     contents:
-    #     - name: text
-    #       type: EssenceText
+    #     ingredients:
+    #       - role: text
+    #         type: Text
     #
     # Then your element view partial has to be named like:
     #
@@ -166,14 +166,6 @@ module Alchemy
       render "alchemy/elements/view_not_found", name: element.name
     end
 
-    # Returns a string for the id attribute of a html element for the given element
-    # @deprecated
-    def element_dom_id(element)
-      element&.dom_id
-    end
-
-    deprecate element_dom_id: "element.dom_id", deprecator: Alchemy::Deprecation
-
     # Renders the HTML tag attributes required for preview mode.
     def element_preview_code(element)
       tag_builder.tag_options(element_preview_code_attributes(element))

data/app/helpers/alchemy/pages_helper.rb

@@ -5,10 +5,6 @@ module Alchemy
     include Alchemy::BaseHelper
     include Alchemy::ElementsHelper
 
-    def picture_essence_caption(content)
-      content.try(:essence).try(:caption)
-    end
-
     # Renders links to language root pages of all published languages.
     #
     # @option options linkname [String] ('name')

data/app/models/alchemy/attachment.rb

@@ -30,9 +30,12 @@ module Alchemy
 
     stampable stamper_class_name: Alchemy.user_class.name
 
-    has_many :essence_files, class_name: "Alchemy::EssenceFile", foreign_key: "attachment_id"
-    has_many :contents, through: :essence_files
-    has_many :elements, through: :contents
+    has_many :file_ingredients,
+      class_name: "Alchemy::Ingredients::File",
+      foreign_key: "related_object_id",
+      inverse_of: :related_object
+
+    has_many :elements, through: :file_ingredients
     has_many :pages, through: :elements
 
     scope :by_file_type, ->(file_type) { where(file_mime_type: file_type) }

data/app/models/alchemy/base_record.rb

@@ -5,6 +5,8 @@ module Alchemy
   end
 
   class BaseRecord < ActiveRecord::Base
+    extend Alchemy::SearchableResource
+
     self.abstract_class = true
   end
 end

data/app/models/alchemy/eager_loading.rb

@@ -28,7 +28,6 @@ module Alchemy
                 :tags,
                 {
                   ingredients: :related_object,
-                  contents: :essence,
                 },
               ],
             },

data/app/models/alchemy/element/element_ingredients.rb

@@ -37,13 +37,6 @@ module Alchemy
         ingredients_by_type(type).first
       end
 
-      # All ingredients from element by given role.
-      def ingredients_by_role(role)
-        ingredients.select do |ingredient|
-          ingredient.role == Ingredient.normalize_type(role)
-        end
-      end
-
       # All ingredients from element by given type.
       def ingredients_by_type(type)
         ingredients.select do |ingredient|
@@ -133,7 +126,7 @@ module Alchemy
       # == Error message translation fallbacks
       #
       # In order to not translate every single ingredient for every element
-      # you can provide default error messages per content name:
+      # you can provide default error messages per ingredient role:
       #
       # === Example
       #

data/app/models/alchemy/element/presenters.rb

@@ -38,16 +38,15 @@ module Alchemy
 
       # Returns a preview text for element.
       #
-      # It's taken from the first Content found in the +elements.yml+ definition file.
+      # It's taken from the first Ingredient found in the +elements.yml+ definition file.
       #
-      # You can flag a Content as +as_element_title+ to take this as preview.
+      # You can flag a Ingredient as +as_element_title+ to take this as preview.
       #
       # @param maxlength [Fixnum] (60)
       #   Length of characters after the text will be cut off.
       #
       def preview_text(maxlength = 60)
         preview_text_from_preview_ingredient(maxlength) ||
-          preview_text_from_preview_content(maxlength) ||
           preview_text_from_nested_elements(maxlength)
       end
 
@@ -61,14 +60,14 @@ module Alchemy
       #
       #     - name: funky_element
       #       display_name: Funky Element
-      #       contents:
-      #       - name: headline
-      #         type: EssenceText
-      #       - name: text
-      #         type EssenceRichtext
-      #         as_element_title: true
+      #       ingredients:
+      #         - role: headline
+      #           type: Text
+      #         - role: text
+      #           type: Richtext
+      #           as_element_title: true
       #
-      # With "I want to tell you a funky story" as stripped_body for the EssenceRichtext Content produces:
+      # With "I want to tell you a funky story" as stripped_body for the Richtext ingredient produces:
       #
       #     Funky Element: I want to tell ...
       #
@@ -85,17 +84,6 @@ module Alchemy
         self.class.dom_id_class.new(self).call
       end
 
-      # The content that's used for element's preview text.
-      #
-      # It tries to find one of element's contents that is defined +as_element_title+.
-      # Takes element's first content if no content is defined +as_element_title+.
-      #
-      # @return (Alchemy::Content)
-      #
-      def preview_content
-        @_preview_content ||= contents.detect(&:preview_content?) || contents.first
-      end
-
       # The ingredient that's used for element's preview text.
       #
       # It tries to find one of element's ingredients that is defined +as_element_title+.
@@ -115,10 +103,6 @@ module Alchemy
         all_nested_elements.first.preview_text(maxlength)
       end
 
-      def preview_text_from_preview_content(maxlength)
-        preview_content.try!(:preview_text, maxlength)
-      end
-
       def preview_text_from_preview_ingredient(maxlength)
         preview_ingredient&.preview_text(maxlength)
       end