alchemy_cms 6.1.10 → 7.0.0.pre.a

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

@@ -17,12 +17,6 @@ module Alchemy
         public_until ? public_until - Time.current : nil
       end
 
-      def taggable?
-        definition["taggable"] == true
-      end
-
-      deprecate :taggable?, deprecator: Alchemy::Deprecation
-
       def rootpage?
         !new_record? && parent_id.blank?
       end
@@ -33,10 +27,6 @@ module Alchemy
         folded_pages.where(user_id: user_id, folded: true).any?
       end
 
-      def contains_feed?
-        definition["feed"]
-      end
-
       # Returns an Array of Alchemy roles which are able to edit this template
       #
       #     # config/alchemy/page_layouts.yml

data/app/models/alchemy/page.rb

@@ -121,8 +121,6 @@ module Alchemy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
     has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
-    has_many :page_essences, class_name: "Alchemy::EssencePage", foreign_key: :page_id, inverse_of: :ingredient_association, dependent: :nullify
-
     before_validation :set_language,
       if: -> { language.nil? }
 
@@ -165,14 +163,6 @@ module Alchemy
     # site_name accessor
     delegate :name, to: :site, prefix: true, allow_nil: true
 
-    # Old public_on and public_until attributes for historical reasons
-    #
-    # These attributes now exist on the page versions
-    #
-    attr_readonly :legacy_public_on, :legacy_public_until
-    deprecate :legacy_public_on, deprecator: Alchemy::Deprecation
-    deprecate :legacy_public_until, deprecator: Alchemy::Deprecation
-
     # Class methods
     #
     class << self

data/app/models/alchemy/picture/transformations.rb

@@ -33,36 +33,6 @@ module Alchemy
       image_file.thumbnail(upsample ? size : "#{size}>")
     end
 
-    # Returns true if picture's width is greater than it's height
-    #
-    def landscape_format?
-      image_file.landscape?
-    end
-
-    alias_method :landscape?, :landscape_format?
-    deprecate landscape_format?: "Use image_file.landscape? instead", deprecator: Alchemy::Deprecation
-    deprecate landscape?: "Use image_file.landscape? instead", deprecator: Alchemy::Deprecation
-
-    # Returns true if picture's width is smaller than it's height
-    #
-    def portrait_format?
-      image_file.portrait?
-    end
-
-    alias_method :portrait?, :portrait_format?
-    deprecate portrait_format?: "Use image_file.portrait? instead", deprecator: Alchemy::Deprecation
-    deprecate portrait?: "Use image_file.portrait? instead", deprecator: Alchemy::Deprecation
-
-    # Returns true if picture's width and height is equal
-    #
-    def square_format?
-      image_file.aspect_ratio == 1.0
-    end
-
-    alias_method :square?, :square_format?
-    deprecate square_format?: "Use image_file.aspect_ratio instead", deprecator: Alchemy::Deprecation
-    deprecate square?: "Use image_file.aspect_ratio instead", deprecator: Alchemy::Deprecation
-
     # Returns true if the class we're included in has a meaningful render_size attribute
     #
     def render_size?

data/app/models/alchemy/picture/url.rb

@@ -36,7 +36,7 @@ module Alchemy
         else
           uid = PictureThumb::Uid.call(signature, variant)
           ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do
-            PictureThumb.generator_class.call(variant, signature, uid)
+            PictureThumb::Create.call(variant, signature, uid)
           end
           uid
         end

data/app/models/alchemy/picture.rb

@@ -47,17 +47,16 @@ module Alchemy
     include Alchemy::TouchElements
     include Calculations
 
-    has_many :essence_pictures,
-      class_name: "Alchemy::EssencePicture",
-      foreign_key: "picture_id",
-      inverse_of: :ingredient_association
+    has_many :picture_ingredients,
+      class_name: "Alchemy::Ingredients::Picture",
+      foreign_key: "related_object_id",
+      inverse_of: :related_object
 
-    has_many :contents, through: :essence_pictures
-    has_many :elements, through: :contents
+    has_many :elements, through: :picture_ingredients
     has_many :pages, through: :elements
     has_many :thumbs, class_name: "Alchemy::PictureThumb", dependent: :destroy
 
-    # Raise error, if picture is in use (aka. assigned to an EssencePicture)
+    # Raise error, if picture is in use (aka. assigned to an Picture ingredient)
     #
     # === CAUTION
     #
@@ -114,7 +113,10 @@ module Alchemy
 
     scope :named, ->(name) { where("#{table_name}.name LIKE ?", "%#{name}%") }
     scope :recent, -> { where("#{table_name}.created_at > ?", Time.current - 24.hours).order(:created_at) }
-    scope :deletable, -> { where("#{table_name}.id NOT IN (SELECT picture_id FROM #{EssencePicture.table_name})") }
+    scope :deletable,
+      -> {
+        where("#{table_name}.id NOT IN (SELECT related_object_id FROM alchemy_ingredients WHERE related_object_type = 'Alchemy::Picture')")
+      }
     scope :without_tag, -> { left_outer_joins(:taggings).where(gutentag_taggings: { id: nil }) }
     scope :by_file_format, ->(format) { where(image_file_format: format) }
 
@@ -136,15 +138,14 @@ module Alchemy
       end
 
       def alchemy_resource_filters
-        @_file_formats ||= distinct.pluck(:image_file_format).compact.presence || []
         [
           {
             name: :by_file_format,
-            values: @_file_formats,
+            values: distinct.pluck(:image_file_format),
           },
           {
             name: :misc,
-            values: %w(recent last_upload without_tag deletable),
+            values: %w(recent last_upload without_tag),
           },
         ]
       end
@@ -280,10 +281,10 @@ module Alchemy
       pages.any? && pages.not_restricted.blank?
     end
 
-    # Returns true if picture is not assigned to any EssencePicture.
+    # Returns true if picture is not assigned to any Picture ingredient.
     #
     def deletable?
-      essence_pictures.empty?
+      picture_ingredients.empty?
     end
 
     # A size String from original image file values.

data/app/models/alchemy/picture_thumb/create.rb

@@ -2,9 +2,11 @@
 
 module Alchemy
   class PictureThumb < BaseRecord
-    # Stores the render result of a Alchemy::PictureVariant
-    # in the configured Dragonfly datastore
-    # (Default: Dragonfly::FileDataStore)
+    # Creates a Alchemy::PictureThumb
+    #
+    # Stores the processes result of a Alchemy::PictureVariant
+    # in the configured +Alchemy::PictureThumb.storage_class+
+    # (Default: {Alchemy::PictureThumb::FileStore})
     #
     class Create
       class << self
@@ -24,26 +26,13 @@ module Alchemy
             thumb.uid = uid
           end
           begin
-            # process the image
-            image = variant.image
-            # store the processed image
-            image.to_file(server_path(uid)).close
-          rescue RuntimeError => e
+            Alchemy::PictureThumb.storage_class.call(variant, uid)
+          rescue StandardError => e
             ErrorTracking.notification_handler.call(e)
             # destroy the thumb if processing or storing fails
             @thumb&.destroy
           end
         end
-
-        private
-
-        # Alchemys dragonfly datastore config seperates the storage path from the public server
-        # path for security reasons. The Dragonfly FileDataStorage does not support that,
-        # so we need to build the path on our own.
-        def server_path(uid)
-          dragonfly_app = ::Dragonfly.app(:alchemy_pictures)
-          "#{dragonfly_app.datastore.server_root}/#{uid}"
-        end
       end
     end
   end

data/app/models/alchemy/picture_thumb/file_store.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Alchemy
+  class PictureThumb < BaseRecord
+    # Stores the render result of a Alchemy::PictureVariant
+    # in the configured Dragonfly datastore
+    # (Default: Dragonfly::FileDataStore)
+    #
+    class FileStore
+      class << self
+        # @param [Alchemy::PictureVariant] variant the to be rendered image
+        # @param [String] uid The Unique Image Identifier the image is stored at
+        #
+        def call(variant, uid)
+          # process the image
+          image = variant.image
+          # store the processed image
+          image.to_file(server_path(uid)).close
+        end
+
+        private
+
+        # Alchemys dragonfly datastore config seperates the storage path from the public server
+        # path for security reasons. The Dragonfly FileDataStorage does not support that,
+        # so we need to build the path on our own.
+        def server_path(uid)
+          dragonfly_app = ::Dragonfly.app(:alchemy_pictures)
+          "#{dragonfly_app.datastore.server_root}/#{uid}"
+        end
+      end
+    end
+  end
+end

data/app/models/alchemy/picture_thumb.rb

@@ -7,7 +7,7 @@ module Alchemy
   # different thumbnail store (ie. a remote file storage).
   #
   #     config/initializers/alchemy.rb
-  #     Alchemy::PictureThumb.generator_class = My::ThumbnailGenerator
+  #     Alchemy::PictureThumb.storage_class = My::ThumbnailStore
   #
   class PictureThumb < BaseRecord
     belongs_to :picture, class_name: "Alchemy::Picture"
@@ -16,18 +16,18 @@ module Alchemy
     validates :uid, presence: true
 
     class << self
-      # Thumbnail generator class
+      # Thumbnail storage class
       #
-      # @see Alchemy::PictureThumb::Create
-      def generator_class
-        @_generator_class ||= Alchemy::PictureThumb::Create
+      # @see Alchemy::PictureThumb::FileStore
+      def storage_class
+        @_storage_class ||= Alchemy::PictureThumb::FileStore
       end
 
-      # Set a thumbnail generator class
+      # Set a thumbnail storage class
       #
-      # @see Alchemy::PictureThumb::Create
-      def generator_class=(klass)
-        @_generator_class = klass
+      # @see Alchemy::PictureThumb::FileStore
+      def storage_class=(klass)
+        @_storage_class = klass
       end
 
       # Upfront generation of picture thumbnails
@@ -49,7 +49,7 @@ module Alchemy
           next if thumb
 
           uid = Alchemy::PictureThumb::Uid.call(signature, variant)
-          generator_class.call(variant, signature, uid)
+          Alchemy::PictureThumb::Create.call(variant, signature, uid)
         end
       end
     end

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

@@ -20,7 +20,7 @@ module Alchemy
     #
     # === Example:
     #
-    #   essence_picture.picture_url(size: '200x300', crop: true, format: 'gif')
+    #   picture_view.picture_url(size: '200x300', crop: true, format: 'gif')
     #   # '/pictures/1/show/200x300/crop/cats.gif?sh=765rfghj'
     #
     # @option options size [String]
@@ -100,7 +100,7 @@ module Alchemy
       ).to_h
     end
 
-    # Show image cropping link for content
+    # Show image cropping link for ingredient
     def allow_image_cropping?
       settings[:crop] && picture &&
         picture.can_be_cropped_to?(
@@ -115,8 +115,6 @@ module Alchemy
       return nil unless settings[:crop] && settings[:size]
 
       mask = inferred_dimensions_from_string(settings[:size])
-      return if mask.nil?
-
       zoom = thumbnail_zoom_factor(mask)
       return nil if zoom.zero?
 
@@ -152,8 +150,6 @@ module Alchemy
       width, height = dimensions_from_string(string)
       ratio = image_file_width.to_f / image_file_height.to_i
 
-      return if ratio.nan?
-
       if width.zero? && ratio.is_a?(Float)
         width = height * ratio
       end

data/app/serializers/alchemy/element_serializer.rb

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

data/app/services/alchemy/delete_elements.rb

@@ -3,6 +3,7 @@
 module Alchemy
   class DeleteElements
     class WouldLeaveOrphansError < StandardError; end
+
     attr_reader :elements
 
     def initialize(elements)
@@ -14,13 +15,6 @@ module Alchemy
         raise WouldLeaveOrphansError
       end
 
-      contents = Alchemy::Content.where(element_id: elements.map(&:id))
-      contents.group_by(&:essence_type)
-        .transform_values! { |value| value.map(&:essence_id) }
-        .each do |class_name, ids|
-          class_name.constantize.where(id: ids).delete_all
-        end
-      contents.delete_all
       Gutentag::Tagging.where(taggable: elements).delete_all
       delete_elements
     end

data/app/services/alchemy/duplicate_element.rb

@@ -25,7 +25,6 @@ module Alchemy
         .except(*SKIPPED_ATTRIBUTES_ON_COPY)
         .merge(differences)
         .merge(
-          autogenerate_contents: false,
           autogenerate_ingredients: false,
           autogenerate_nested_elements: false,
           tags: source_element.tags,
@@ -35,17 +34,13 @@ module Alchemy
       new_element.ingredients = source_element.ingredients.map(&:dup)
       new_element.save!
 
-      source_element.contents.map do |content|
-        Content.copy(content, element: new_element)
-      end
-
       nested_elements = repository.children_of(source_element)
       Element.acts_as_list_no_update do
         nested_elements.each.with_index(1) do |nested_element, position|
           self.class.new(nested_element, repository: repository).call(
             parent_element: new_element,
             page_version: new_element.page_version,
-            position: position
+            position: position,
           )
         end
       end

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

@@ -20,7 +20,7 @@
 
     <% if element.editable? %>
       <%= form_for [alchemy, :admin, element], remote: true,
-        html: {id: "element_#{element.id}_form".html_safe, class: 'element-content'} do |f| %>
+        html: {id: "element_#{element.id}_form".html_safe, class: 'element-body'} do |f| %>
 
         <div id="element_<%= element.id %>_errors" class="element_errors"></div>
 
@@ -31,35 +31,18 @@
 
             <!-- Each ingredient group -->
             <% element.ingredients.select { |i| i.definition[:group] }.group_by { |i| i.definition[:group] }.each do |group, ingredients| %>
-              <div class="content-group">
-                <%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
+              <div class="ingredient-group">
+                <%= link_to '#', id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}_header", class: 'ingredient-group-header', data: { toggle_ingredient_group: true } do %>
                   <%= element.translated_group group %>
-                  <i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
+                  <i class="ingredient-group-expand icon fa-fw fa-angle-down fas"></i>
                 <% end %>
-                <%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
+                <%= content_tag :div, id: "element_#{element.id}_ingredient_group_#{group.parameterize.underscore}", class: 'ingredient-group-ingredients' do %>
                   <%= render ingredients, element_form: f %>
                 <% end %>
               </div>
             <% end %>
           </div>
         <% end %>
-        <!-- Contents -->
-        <div id="element_<%= element.id %>_content" class="element-content-editors">
-          <%= render element.contents.select { |c| !c.definition[:group] } %>
-
-          <!-- Each content group -->
-          <% element.contents.select { |c| c.definition[:group] }.group_by { |c| c.definition[:group] }.each do |group, contents| %>
-            <div class="content-group">
-              <%= link_to '#', id: "element_#{element.id}_content_group_#{group.parameterize.underscore}_header", class: 'content-group-header', data: { toggle_content_group: true } do %>
-                <%= element.translated_group group %>
-                <i class="content-group-expand icon fa-fw fa-angle-down fas"></i>
-              <% end %>
-              <%= content_tag :div, id: "element_#{element.id}_content_group_#{group.parameterize.underscore}", class: 'content-group-contents' do %>
-                <%= render contents, element_form: f %>
-              <% end %>
-            </div>
-          <% end %>
-        </div>
 
         <% if element.taggable? %>
           <div class="autocomplete_tag_list">

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

@@ -34,7 +34,7 @@
 
   Alchemy.growl('<%= Alchemy.t(:successfully_added_element) %>');
   Alchemy.closeCurrentDialog();
-  Alchemy.Tinymce.init(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.init(<%= @element.richtext_ingredients_ids.to_json %>);
   Alchemy.PreviewWindow.refresh(function() {
     Alchemy.ElementEditors.focusElementPreview(<%= @element.id %>);
   });

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

@@ -14,12 +14,12 @@
 
   <% if @element.folded? -%>
 
-  Alchemy.Tinymce.remove(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.remove(<%= @element.richtext_ingredients_ids.to_json %>);
 
   <% else -%>
 
   $el.trigger('FocusElementEditor.Alchemy');
-  Alchemy.Tinymce.init(<%= (@element.richtext_contents_ids + @element.richtext_ingredients_ids).to_json %>);
+  Alchemy.Tinymce.init(<%= @element.richtext_ingredients_ids.to_json %>);
   Alchemy.GUI.initElement($el);
   Alchemy.SortableElements(
     <%= @page.id %>,

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

@@ -1,5 +1,5 @@
 (function() {
-<% if @parent_element && @parent_element.contents.empty? %>
+<% if @parent_element && @parent_element.ingredients.empty? %>
   var $parent = $('#element_<%= @parent_element.id %>');
   Alchemy.ElementEditors.setTitle(
     $parent,

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

@@ -1,7 +1,7 @@
 (function() {
   var $el = $('#element_<%= @element.id %>');
   var $errors = $('#element_<%= @element.id %>_errors');
-  $('> .element-content .content_editor, > .element-content .ingredient-editor', $el).removeClass('validation_failed');
+  $('> .element-body .ingredient-editor', $el).removeClass('validation_failed');
 
 <%- if @element_validated -%>
 
@@ -20,7 +20,6 @@
   Alchemy.growl('<%= j @notice %>', 'warn');
   $errors.html('<%= j @error_message %><ul><li><%== j @error_messages.join("</li><li>") %></li></ul>');
   $errors.show();
-  $('<%= @element.contents_with_errors.map { |content| "#" + content.dom_id }.join(", ") %>').addClass('validation_failed');
   $('<%== @element.ingredients_with_errors.map { |ingredient| "[data-ingredient-id=\"#{ingredient.id}\"]" }.join(", ") %>').addClass('validation_failed');
   Alchemy.Buttons.enable($el);
 

data/app/views/alchemy/admin/pages/_external_link.html.erb

@@ -8,8 +8,8 @@
     <ul></ul>
   </div>
   <div class="input text">
-    <label for="external_url" class="control-label">URL</label>
-    <%= text_field_tag "external_url" %>
+    <label for="external_link" class="control-label">URL</label>
+    <%= text_field_tag "external_link" %>
   </div>
   <div class="input text">
     <label for="external_link_title" class="control-label">

data/app/views/alchemy/admin/pages/_file_link.html.erb

@@ -3,10 +3,10 @@
     <h3><%= Alchemy.t(:choose_file_to_link) %></h3>
   <% end %>
   <div class="input select">
-    <label for="public_filename" class="control-label">
+    <label for="file_link" class="control-label">
       <%= Alchemy.t(:file) %>
     </label>
-    <%= select_tag "public_filename",
+    <%= select_tag "file_link",
       options_for_select(@attachments),
       prompt: Alchemy.t('Please choose'),
       class: "alchemy_selectbox" %>

data/app/views/alchemy/admin/pages/_internal_link.html.erb

@@ -4,10 +4,10 @@
     <p><%= Alchemy.t(:internal_link_page_elements_explanation) %></p>
   <% end %>
   <div class="input select">
-    <label for="page_urlname" class="control-label">
+    <label for="internal_link" class="control-label">
       <%= Alchemy.t(:page) %>
     </label>
-    <input type="text" id="page_urlname" class="alchemy_selectbox full_width">
+    <input type="text" id="internal_link" class="alchemy_selectbox full_width">
   </div>
   <div class="input select">
     <label for="element_anchor" class="control-label">

data/app/views/alchemy/admin/pages/_table.html.erb

@@ -25,9 +25,3 @@
     <%= render partial: "table_row", collection: @pages, as: "page" %>
   </tbody>
 </table>
-
-<script type="text/javascript">
-  $(function() {
-    Alchemy.PagePublicationFields();
-  });
-</script>

data/app/views/alchemy/admin/pages/_tinymce_custom_config.html.erb

@@ -1,11 +1,8 @@
 <script>
   // Populate custom tinymce configurations
-  <% (
-    Alchemy::Tinymce.custom_config_contents(@page) +
-    Alchemy::Tinymce.custom_config_ingredients(@page)
-  ).each do |content| %>
-  Alchemy.Tinymce.customConfigs["<%= content['element'] %>_<%= content['name'] || content['role'] %>"] = {
-    <% content.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
+  <% Alchemy::Tinymce.custom_config_ingredients(@page).each do |ingredient| %>
+  Alchemy.Tinymce.customConfigs["<%= ingredient['element'] %>_<%= ingredient['role'] %>"] = {
+    <% ingredient.fetch('settings', {}).fetch('tinymce', {}).each do |k, v| %>
     <%= k %>: <%== v.to_json %>,
     <% end %>
   };

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

@@ -197,7 +197,7 @@
       Alchemy.SortableElements(<%= @page.id %>, '<%= form_authenticity_token %>');
       Alchemy.ElementEditors.init();
       Alchemy.SelectBox('.element-editor');
-      Alchemy.Tinymce.init(<%= (@page.richtext_contents_ids + @page.richtext_ingredients_ids).to_json %>);
+      Alchemy.Tinymce.init(<%= @page.richtext_ingredients_ids.to_json %>);
       $('#fixed-elements').tabs().tabs('paging', {
         follow: true,
         followOnSelect: true,

data/app/views/alchemy/admin/pictures/_filter_and_size_bar.html.erb

@@ -8,9 +8,7 @@
       redirect_url: alchemy.admin_pictures_path(
         size: search_filter_params[:size],
         filter: { misc: 'last_upload' },
-        form_field_id: @form_field_id,
-        content_id: @content.try(:id),
-        element_id: @element.try(:id)
+        form_field_id: @form_field_id
       ) %>
     <div class="toolbar_spacer"></div>
   <% end %>

data/app/views/alchemy/admin/pictures/_infos.html.erb

@@ -22,7 +22,7 @@
   <div id="pictures_page_list">
     <% if @assignments.any? %>
       <ul>
-        <% @assignments.group_by(&:page).each do |page, essence_pictures| %>
+        <% @assignments.group_by(&:page).each do |page, picture_ingredients| %>
           <% if page %>
             <li>
               <h3>
@@ -30,20 +30,18 @@
                 <p><%= link_to page.name, edit_admin_page_path(page) %></p>
               </h3>
               <ul class="list">
-                <% essence_pictures.group_by(&:element).each do |element, essence_pictures| %>
+                <% picture_ingredients.group_by(&:element).each do |element, picture_ingredients| %>
                   <li class="<%= cycle('even', 'odd') %>">
                     <% page_link = link_to element.display_name_with_preview_text,
                                    edit_admin_page_path(page, anchor: "element_#{element.id}") %>
-                    <% pictures = essence_pictures.collect do |e|
-                                    e.content.name_for_label
-                                  end.to_sentence %>
+                    <% ingredients = picture_ingredients.collect(&:translated_role).to_sentence %>
                     <% if element.public? %>
                       <%= render_icon('window-maximize', style: 'regular') %>
                     <% else %>
                       <%= render_icon('window-close') %>
                     <% end %>
                     <p>
-                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: pictures) %>
+                      <%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
                     </p>
                   </li>
                 <% end %>

data/app/views/alchemy/admin/resources/_per_page_select.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag url_for, method: :get, class: 'per-page-select-form' do |f| %>
   <% search_filter_params.reject { |k, _| k == 'page' || k == 'per_page' }.each do |key, value| %>
-    <% if value.respond_to?(:keys) %>
+    <% if value.is_a? Hash %>
       <% value.each do |k, v| %>
         <%= hidden_field_tag "#{key}[#{k}]", v, id: nil %>
       <% end %>

data/app/views/alchemy/ingredients/_boolean_editor.html.erb

@@ -3,7 +3,7 @@
   data: boolean_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, boolean_editor.ingredient) do |f| %>
     <%= f.label :value, style: "display: inline-block" do %>
-      <%= f.check_box :value, id: nil %>
+      <%= f.check_box :value, id: boolean_editor.form_field_id %>
       <%= render_ingredient_role(boolean_editor) %>
     <% end %>
     <%= render_hint_for(boolean_editor) %>

data/app/views/alchemy/ingredients/_headline_editor.html.erb

@@ -6,7 +6,7 @@
   data: headline_editor.data_attributes do %>
   <%= element_form.fields_for(:ingredients, headline_editor.ingredient) do |f| %>
     <%= ingredient_label(headline_editor) %>
-    <%= f.text_field :value, id: nil %>
+    <%= f.text_field :value, id: headline_editor.form_field_id %>
 
     <% if headline_editor.settings[:anchor] %>
       <%= render "alchemy/ingredients/shared/anchor", ingredient_editor: headline_editor %>