alchemy_cms 6.0.0.pre.rc7 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d81ddf40cd98c283ac6b58332e03e6ed4094de86671f0dc80692a0de5c8292ea
-  data.tar.gz: 1115141343d2e2310001c8ee1e58f9d8070a4c34c770226f9647a6fa09f05d7d
+  metadata.gz: 7302c6c464ed0c57f1b2113a1d7334eb4234e80ee75a68f43579895207c8c406
+  data.tar.gz: 26bd58edc3af02af5c418f082584cbfa897a16f26a670db08f147072df827a71
 SHA512:
-  metadata.gz: f80e8e421037e50315254799456626f6b82ee4f30922d30920b2cec73ee7783a85fccf74b1a66a9a310fc2ca668844ad4d0daaa0b03ecca77cb4f4a1bb28c1e4
-  data.tar.gz: 2898baf39517e918cfdf0b99f6d79ad61836e74083922e2c496dcebb539c057ea558b03040578eba16040313bff647d0dbdb6a27221cbdfd8b1c7e8a7e69e395
+  metadata.gz: edc87ff799f4940275d70cfc24f89c4af6dd7ef4f5e77eb3982d6a85a221cf158afa05874f7c996f7c2326fef6b4131a5b15b167daea7ae6b4c39a060ecbd28d
+  data.tar.gz: b2a2d119a9c10c098b579a03548f9c26d49e61104be1d3058cd1d8e7329f432078258ee5f7f5e67f62d78bdf661588a72232f28e12e48ee9cb33568ae2625bfc

data/.github/workflows/ci.yml

@@ -11,13 +11,28 @@ jobs:
         rails:
           - "6.0"
           - "6.1"
+          - "7.0"
         ruby:
           - "2.6"
           - "2.7"
           - "3.0"
+          - "3.1"
         database:
           - mysql
           - postgresql
+        exclude:
+          - rails: "6.0"
+            ruby: "3.1"
+            database: mysql
+          - rails: "6.0"
+            ruby: "3.1"
+            database: postgresql
+          - rails: "7.0"
+            ruby: "2.6"
+            database: mysql
+          - rails: "7.0"
+            ruby: "2.6"
+            database: postgresql
     env:
       DB: ${{ matrix.database }}
       DB_USER: alchemy_user

data/CHANGELOG.md

@@ -1,3 +1,41 @@
+## 6.0.2 (2022-04-27)
+
+- Remove JSON decode from ingredient data store [#2323](https://github.com/AlchemyCMS/alchemy_cms/pull/2323) ([tvdeyen](https://github.com/tvdeyen))
+- Eagerload at the controller or job layer [#2313](https://github.com/AlchemyCMS/alchemy_cms/pull/2313) ([mamhoff](https://github.com/mamhoff))
+
+## 6.0.1 (2022-04-26)
+
+- Allow passing a different partial to `render_element` [#2322](https://github.com/AlchemyCMS/alchemy_cms/pull/2322) ([mamhoff](https://github.com/mamhoff))
+- Allow render_elements to take a block [#2321](https://github.com/AlchemyCMS/alchemy_cms/pull/2321) ([mamhoff](https://github.com/mamhoff))
+- Remove old unused root_page ivar [#2320](https://github.com/AlchemyCMS/alchemy_cms/pull/2320) ([tvdeyen](https://github.com/tvdeyen))
+- Raise on non-existing locale [#2319](https://github.com/AlchemyCMS/alchemy_cms/pull/2319) ([mamhoff](https://github.com/mamhoff))
+- chore: Remove unnecessary puts from spec [#2318](https://github.com/AlchemyCMS/alchemy_cms/pull/2318) ([tvdeyen](https://github.com/tvdeyen))
+- Fix gif resizing [#2315](https://github.com/AlchemyCMS/alchemy_cms/pull/2315) ([kulturbande](https://github.com/kulturbande))
+- Refactor: Use page version's element repository rather than a new one [#2312](https://github.com/AlchemyCMS/alchemy_cms/pull/2312) ([mamhoff](https://github.com/mamhoff))
+- Deprecate Alchemy::Element.available [#2309](https://github.com/AlchemyCMS/alchemy_cms/pull/2309) ([mamhoff](https://github.com/mamhoff))
+- Explicitly set "store" for MariaDB [#2308](https://github.com/AlchemyCMS/alchemy_cms/pull/2308) ([mamhoff](https://github.com/mamhoff))
+- Set preview mode earlier [#2307](https://github.com/AlchemyCMS/alchemy_cms/pull/2307) ([mamhoff](https://github.com/mamhoff))
+- Fix updating the public_on date on persisted pages [#2305](https://github.com/AlchemyCMS/alchemy_cms/pull/2305) ([mamhoff](https://github.com/mamhoff))
+- Allow opting out of Turbolinks in non-Alchemy controllers [#2302](https://github.com/AlchemyCMS/alchemy_cms/pull/2302) ([dssjoblom](https://github.com/dssjoblom))
+- Explicitly validate uniqueness without case sensitivity [#2300](https://github.com/AlchemyCMS/alchemy_cms/pull/2300) ([mamhoff](https://github.com/mamhoff))
+- Fix frozen string error when mixing template engines [#2299](https://github.com/AlchemyCMS/alchemy_cms/pull/2299) ([gr8bit](https://github.com/gr8bit))
+- Do not flatten gifs if converted to webp [#2293](https://github.com/AlchemyCMS/alchemy_cms/pull/2293) ([tvdeyen](https://github.com/tvdeyen))
+- Allow pasting into parent element with only one nested element type [#2292](https://github.com/AlchemyCMS/alchemy_cms/pull/2292) ([dbwinger](https://github.com/dbwinger))
+- Restrict Node select to the site/language of the page being edited [#2277](https://github.com/AlchemyCMS/alchemy_cms/pull/2277) ([dbwinger](https://github.com/dbwinger))
+- Add Ruby 3.1 support [#2229](https://github.com/AlchemyCMS/alchemy_cms/pull/2229) ([tvdeyen](https://github.com/tvdeyen))
+
+## 6.0.0 (2022-04-11)
+
+- [ruby - main] Allow ransack version 3.0.1 [#2287](https://github.com/AlchemyCMS/alchemy_cms/pull/2287) ([depfu](https://github.com/apps/depfu))
+- Fix image loader [#2285](https://github.com/AlchemyCMS/alchemy_cms/pull/2285) ([tvdeyen](https://github.com/tvdeyen))
+- Don't delete locals in render_element so they can be used by all elements in render_elements [#2283](https://github.com/AlchemyCMS/alchemy_cms/pull/2283) ([dbwinger](https://github.com/dbwinger))
+- Don't hardcode URLs in Javascript  [#2282](https://github.com/AlchemyCMS/alchemy_cms/pull/2282) ([dssjoblom](https://github.com/dssjoblom))
+- [ruby - main] Allow ransack 3.0.0 [#2278](https://github.com/AlchemyCMS/alchemy_cms/pull/2278) ([depfu](https://github.com/apps/depfu))
+- Show site and language name on page select in Link dialog [#2276](https://github.com/AlchemyCMS/alchemy_cms/pull/2276) ([dbwinger](https://github.com/dbwinger))
+- Allow webp as image file format [#2274](https://github.com/AlchemyCMS/alchemy_cms/pull/2274) ([tvdeyen](https://github.com/tvdeyen))
+- Rails 7 Support [#2225](https://github.com/AlchemyCMS/alchemy_cms/pull/2225) ([tvdeyen](https://github.com/tvdeyen))
+- Support AR enums in resource models [#2210](https://github.com/AlchemyCMS/alchemy_cms/pull/2210) ([robinboening](https://github.com/robinboening))
+
 ## 6.0.0-rc7 (2022-03-28)
 
 - fix(Sitemap): Use response data [#2272](https://github.com/AlchemyCMS/alchemy_cms/pull/2272) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -3,11 +3,13 @@ source "https://rubygems.org"
 
 gemspec
 
-rails_version = ENV.fetch("RAILS_VERSION", 6.1).to_f
+rails_version = ENV.fetch("RAILS_VERSION", 7.0).to_f
 # Necessary until a new 6.1.5 version has been released
 # https://github.com/rails/rails/pull/44691
 if rails_version.to_s.match?(/6.1/)
   gem "rails", git: "https://github.com/rails/rails", branch: "6-1-stable"
+elsif rails_version.to_s.match?(/7.0/)
+  gem "rails", git: "https://github.com/rails/rails", branch: "7-0-stable"
 else
   gem "rails", "~> #{rails_version}.0"
 end
@@ -46,3 +48,15 @@ group :development, :test do
     gem "brakeman", require: false
   end
 end
+
+# Ruby 3.1 split out the net-smtp gem
+# Necessary until https://github.com/mikel/mail/pull/1439
+# got merged and released.
+if Gem.ruby_version >= Gem::Version.new("3.1.0")
+  if rails_version.to_s.match?(/6.1/)
+    # Rails 6.1 needs this as well
+    gem "net-pop", "~> 0.1.0", require: false
+    gem "net-imap", "~> 0.2.0", require: false
+  end
+  gem "net-smtp", "~> 0.3.0", require: false
+end

data/README.md

@@ -18,7 +18,7 @@ Alchemy is an open source CMS engine written in Ruby on Rails.
 
 Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [guidelines](https://guides.alchemy-cms.com).
 
-**CAUTION: This main branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (5.2-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/5.2-stable).**
+**CAUTION: This main branch is a development branch that *can* contain bugs. For productive environments you should use the [current Ruby gem version](https://rubygems.org/gems/alchemy_cms), or the [latest stable branch (6.0-stable)](https://github.com/AlchemyCMS/alchemy_cms/tree/6.0-stable).**
 
 
 ## ✅ Features
@@ -27,6 +27,7 @@ Read more about Alchemy on the [website](https://alchemy-cms.com) and in the [gu
 - A rich RESTful API
 - Intuitive admin interface with live preview
 - Multi language and multi domain
+- Page versioning
 - SEO friendly urls
 - User Access Control
 - Build in contact form mailer
@@ -51,9 +52,9 @@ or visit the existing demo at https://alchemy-demo.herokuapp.com
 
 ## 🚂 Rails Version
 
-**This version of AlchemyCMS runs with Rails 6.0**
+**This version of AlchemyCMS runs with Rails 7.0, 6.1 and 6.0**
 
-* For a Rails 5.2 compatible version use the [`5.2-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/5.2-stable).
+* For a Rails 5.2 compatible version use the [`5.3-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/5.3-stable).
 * For a Rails 5.0 or 5.1 compatible version use the [`4.5-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/4.5-stable).
 * For a Rails 4.2 compatible version use the [`3.6-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.6-stable).
 * For a Rails 4.0/4.1 compatible version use the [`3.1-stable` branch](https://github.com/AlchemyCMS/alchemy_cms/tree/3.1-stable).

data/alchemy_cms.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |gem|
     activesupport
     railties
   ].each do |rails_gem|
-    gem.add_runtime_dependency rails_gem, [">= 6.0", "< 6.2"]
+    gem.add_runtime_dependency rails_gem, [">= 6.0", "< 7.1"]
   end
 
   gem.add_runtime_dependency "active_model_serializers", ["~> 0.10.0"]
@@ -46,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "kaminari", ["~> 1.1"]
   gem.add_runtime_dependency "originator", ["~> 3.1"]
   gem.add_runtime_dependency "non-stupid-digest-assets", ["~> 1.0.8"]
-  gem.add_runtime_dependency "ransack", [">= 1.8", "<= 2.6.0"] # 2.4.2 dropped Ruby 2.5 support in a patch level release
+  gem.add_runtime_dependency "ransack", [">= 1.8", "< 4.0"]
   gem.add_runtime_dependency "request_store", ["~> 1.2"]
   gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]
   gem.add_runtime_dependency "sassc-rails", ["~> 2.1"]

data/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee

@@ -87,6 +87,8 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
               name: page.name
               url_path: page.url_path
               page_id: page.id
+              language: page.language
+              site: page.site
           more: meta.page * meta.per_page < meta.total_count
       initSelection: ($element, callback) =>
         urlname = $element.val()

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

@@ -65,6 +65,11 @@ div#image_assign_filter_and_image_sizing {
     width: 100%;
     height: 100%;
     object-fit: contain;
+
+    &[src$=".svg"] {
+      width: auto;
+      height: auto;
+    }
   }
 
   .picture_name {

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

@@ -545,6 +545,10 @@
     font-size: 4em;
     color: $medium-gray;
     vertical-align: top;
+
+    &.error {
+      font-size: 1.2em;
+    }
   }
 
   .essence_picture_css_class {

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

@@ -12,6 +12,7 @@ module Alchemy
         elements = @page_version.elements.order(:position).includes(*element_includes)
         @elements = elements.not_nested.unfixed
         @fixed_elements = elements.not_nested.fixed
+        load_clipboard_items
       end
 
       def new
@@ -20,8 +21,7 @@ module Alchemy
         @parent_element = Element.find_by(id: params[:parent_element_id])
         @elements = @page.available_elements_within_current_scope(@parent_element)
         @element = @page_version.elements.build
-        @clipboard = get_clipboard("elements")
-        @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
+        load_clipboard_items
       end
 
       # Creates a element as discribed in config/alchemy/elements.yml on page via AJAX.
@@ -44,8 +44,7 @@ module Alchemy
         else
           @element.page_version = @page_version
           @elements = @page.available_element_definitions
-          @clipboard = get_clipboard("elements")
-          @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
+          load_clipboard_items
           render :new
         end
       end
@@ -106,18 +105,14 @@ module Alchemy
       def element_includes
         [
           {
-            contents: {
-              essence: :ingredient_association,
-            },
+            contents: :essence,
             ingredients: :related_object,
           },
           :tags,
           {
             all_nested_elements: [
               {
-                contents: {
-                  essence: :ingredient_association,
-                },
+                contents: :essence,
                 ingredients: :related_object,
               },
               :tags,
@@ -130,19 +125,27 @@ module Alchemy
         @element = Element.find(params[:id])
       end
 
+      def load_clipboard_items
+        @clipboard = get_clipboard("elements")
+        @clipboard_items = Element.all_from_clipboard_for_page(@clipboard, @page)
+      end
+
       def element_from_clipboard
         @element_from_clipboard ||= begin
-            @clipboard = get_clipboard("elements")
-            @clipboard.detect { |item| item["id"].to_i == params[:paste_from_clipboard].to_i }
-          end
+          @clipboard = get_clipboard("elements")
+          @clipboard.detect { |item| item["id"].to_i == params[:paste_from_clipboard].to_i }
+        end
       end
 
       def paste_element_from_clipboard
         @source_element = Element.find(element_from_clipboard["id"])
-        element = Element.copy(@source_element, {
-          parent_element_id: create_element_params[:parent_element_id],
-          page_version_id: @page_version.id,
-        })
+        element = Element.copy(
+          @source_element,
+          {
+            parent_element_id: create_element_params[:parent_element_id],
+            page_version_id: @page_version.id,
+          }
+        )
         if element_from_clipboard["action"] == "cut"
           @cut_element_id = @source_element.id
           @clipboard.delete_if { |item| item["id"] == @source_element.id.to_s }

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

@@ -23,9 +23,7 @@ module Alchemy
       before_action :set_root_page,
         only: [:index, :show, :order]
 
-      before_action :run_on_page_layout_callbacks,
-        if: :run_on_page_layout_callbacks?,
-        only: [:show]
+      before_action :set_preview_mode, only: [:show]
 
       before_action :load_languages_and_layouts,
         unless: -> { @page_root },
@@ -35,6 +33,10 @@ module Alchemy
 
       before_action :set_page_version, only: [:show, :edit]
 
+      before_action :run_on_page_layout_callbacks,
+        if: :run_on_page_layout_callbacks?,
+        only: [:show]
+
       def index
         @query = @current_language.pages.contentpages.ransack(search_filter_params[:q])
 
@@ -64,7 +66,6 @@ module Alchemy
       # Used by page preview iframe in Page#edit view.
       #
       def show
-        @preview_mode = true
         Page.current_preview = @page
         # Setting the locale to pages language, so the page content has it's correct translations.
         ::I18n.locale = @page.language.locale
@@ -179,9 +180,12 @@ module Alchemy
         @pages_locked_by_user = Page.from_current_site.locked_by(current_alchemy_user)
         respond_to do |format|
           format.js
-          format.html {
-            redirect_to params[:redirect_to].blank? ? admin_pages_path : params[:redirect_to]
-          }
+          format.html do
+            redirect_to(
+              params[:redirect_to].presence || admin_pages_path,
+              allow_other_host: true,
+            )
+          end
         end
       end
 
@@ -394,6 +398,10 @@ module Alchemy
         @languages_with_page_tree = Language.on_current_site.with_root_page
         @page_layouts = PageLayout.layouts_for_select(@language.id)
       end
+
+      def set_preview_mode
+        @preview_mode = true
+      end
     end
   end
 end

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

@@ -5,17 +5,18 @@ module Alchemy
     layout false
     respond_to :json
 
-    rescue_from CanCan::AccessDenied,         with: :render_not_authorized
+    rescue_from CanCan::AccessDenied, with: :render_not_authorized
     rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+    rescue_from ActionController::RoutingError, with: :render_not_found
 
     private
 
     def render_not_authorized
-      render json: {error: "Not authorized"}, status: 403
+      render json: { error: "Not authorized" }, status: 403
     end
 
     def render_not_found
-      render json: {error: "Record not found"}, status: 404
+      render json: { error: "Record not found" }, status: 404
     end
   end
 end

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

@@ -46,11 +46,7 @@ module Alchemy
     private
 
     def content_includes
-      [
-        {
-          essence: :ingredient_association,
-        },
-      ]
+      %i[essence]
     end
   end
 end

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

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

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

@@ -8,6 +8,7 @@ module Alchemy
     def index
       @nodes = Node.all
       @nodes = @nodes.includes(:parent)
+      @nodes = @nodes.where(language_id: params[:language_id]) if params[:language_id]
       @nodes = @nodes.ransack(params[:filter]).result
 
       if params[:page]

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

@@ -112,17 +112,13 @@ module Alchemy
             {
               nested_elements: [
                 {
-                  contents: {
-                    essence: :ingredient_association,
-                  },
+                  contents: :essence,
                 },
                 :tags,
               ],
             },
             {
-              contents: {
-                essence: :ingredient_association,
-              },
+              contents: :essence,
             },
             :tags,
           ],

data/app/controllers/alchemy/base_controller.rb

@@ -9,6 +9,13 @@ module Alchemy
     include Alchemy::ControllerActions
     include Alchemy::Modules
 
+    # Include Turbolinks explicitly in case Alchemy is embedded into a
+    # larger application that doesn't work with Turbolinks. The app
+    # can then set config.turbolinks.auto_include = false so that
+    # Turbolinks is not included in the app controllers.
+    include Turbolinks::Controller
+    ::ActionDispatch::Assertions.include ::Turbolinks::Assertions
+
     protect_from_forgery
 
     before_action :mailer_set_url_options

data/app/controllers/alchemy/messages_controller.rb

@@ -62,7 +62,6 @@ module Alchemy
       end
 
       @page = @element.page
-      @root_page = @page.get_language_root
       if @message.valid?
         MessagesMailer.contact_form_mail(@message, mail_to, mail_from, subject).deliver
         redirect_to_success_page
@@ -122,8 +121,6 @@ module Alchemy
       if @page.blank?
         raise "Page for page_layout #{mailer_config["page_layout_name"]} not found"
       end
-
-      @root_page = @page.get_language_root
     end
 
     def message_params

data/app/controllers/alchemy/pages_controller.rb

@@ -32,9 +32,6 @@ module Alchemy
       if: :locale_prefix_missing?,
       only: [:index, :show]
 
-    # We only need to set the +@root_page+ if we are sure that no more redirects happen.
-    before_action :set_root_page, only: [:index, :show]
-
     # Page layout callbacks need to run after all other callbacks
     before_action :run_on_page_layout_callbacks,
       if: :run_on_page_layout_callbacks?,
@@ -199,10 +196,6 @@ module Alchemy
       end
     end
 
-    def set_root_page
-      @root_page ||= Language.current_root_page
-    end
-
     def signup_required?
       if Alchemy.user_class.respond_to?(:admins)
         Alchemy.user_class.admins.empty? && @page.nil?

data/app/helpers/alchemy/elements_helper.rb

@@ -70,7 +70,7 @@ module Alchemy
     #   A class instance that will return elements that get rendered.
     #   Use this for your custom element loading logic in views.
     #
-    def render_elements(options = {})
+    def render_elements(options = {}, &blk)
       options = {
         from_page: @page,
         render_format: "html",
@@ -86,11 +86,12 @@ module Alchemy
 
       elements = finder.elements(page_version: page_version)
 
-      buff = []
-      elements.each_with_index do |element, i|
-        buff << render_element(element, options, i + 1)
-      end
-      buff.join(options[:separator]).html_safe
+      default_rendering = ->(element, i) { render_element(element, options, i + 1) }
+      if block_given?
+        elements.map.with_index(&blk)
+      else
+        elements.map.with_index(&default_rendering)
+      end.join(options[:separator]).html_safe
     end
 
     # This helper renders a {Alchemy::Element} view partial.
@@ -125,7 +126,7 @@ module Alchemy
     #
     # == Usage
     #
-    #   <%= render_element(Alchemy::Element.available.named(:headline).first) %>
+    #   <%= render_element(Alchemy::Element.published.named(:headline).first) %>
     #
     # @param [Alchemy::Element] element
     #   The element you want to render the view for
@@ -146,11 +147,15 @@ module Alchemy
 
       element.store_page(@page)
 
-      render element, {
-        element: element,
-        counter: counter,
-        options: options,
-      }.merge(options.delete(:locals) || {})
+      render(
+        partial: options[:partial] || element.to_partial_path,
+        object: element,
+        locals: {
+          element: element,
+          counter: counter,
+          options: options.except(:locals, :partial),
+        }.merge(options[:locals] || {}),
+      )
     rescue ActionView::MissingTemplate => e
       warning(%(
         Element view partial not found for #{element.name}.\n

data/app/models/alchemy/element.rb

@@ -70,7 +70,7 @@ module Alchemy
       dependent: :destroy
 
     has_many :nested_elements,
-      -> { order(:position).available },
+      -> { order(:position).published },
       class_name: "Alchemy::Element",
       foreign_key: :parent_element_id,
       dependent: :destroy,
@@ -159,7 +159,7 @@ module Alchemy
       end
 
       def all_from_clipboard(clipboard)
-        return [] if clipboard.nil?
+        return none if clipboard.nil?
 
         where(id: clipboard.collect { |e| e["id"] })
       end
@@ -167,12 +167,19 @@ module Alchemy
       # All elements in clipboard that could be placed on page
       #
       def all_from_clipboard_for_page(clipboard, page)
-        return [] if clipboard.nil? || page.nil?
+        return none if clipboard.nil? || page.nil?
 
-        all_from_clipboard(clipboard).select { |ce|
-          page.available_element_names.include?(ce.name)
-        }
+        all_from_clipboard(clipboard).where(name: page.available_element_names)
       end
+
+      # All elements in clipboard that could be placed as a child of `parent_element`
+      def all_from_clipboard_for_parent_element(clipboard, parent_element)
+        return none if clipboard.nil? || parent_element.nil?
+
+        all_from_clipboard(clipboard).where(name: parent_element.definition["nestable_elements"])
+      end
+
+      deprecate available: :published, deprecator: Alchemy::Deprecation
     end
 
     # Returns next public element from same page.

data/app/models/alchemy/ingredient_validator.rb

@@ -88,7 +88,7 @@ module Alchemy
 
     def duplicates
       ingredient.class
-        .joins(:element).merge(Alchemy::Element.available)
+        .joins(:element).merge(Alchemy::Element.published)
         .where(Alchemy::Element.table_name => { name: ingredient.element.name })
         .where(value: ingredient.value)
         .where.not(id: ingredient.id)

data/app/models/alchemy/language.rb

@@ -38,7 +38,7 @@ module Alchemy
 
     validates :language_code,
       presence: true,
-      uniqueness: { scope: [:site_id, :country_code] },
+      uniqueness: { scope: [:site_id, :country_code], case_sensitive: false },
       format: { with: /\A[a-z]{2}\z/, if: -> { language_code.present? } }
 
     validates :country_code,

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

@@ -15,8 +15,8 @@ module Alchemy
           source: :elements,
         ) do
           has_many :all_elements
-          has_many :elements, -> { not_nested.unfixed.available }
-          has_many :fixed_elements, -> { fixed.available }
+          has_many :elements, -> { not_nested.unfixed.published }
+          has_many :fixed_elements, -> { fixed.published }
         end
 
         has_many :contents, through: :elements

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

@@ -15,7 +15,7 @@ module Alchemy
         validates :name,
           presence: true
         validates :urlname,
-          uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? } },
+          uniqueness: { scope: [:language_id, :layoutpage], if: -> { urlname.present? }, case_sensitive: false },
           exclusion: { in: RESERVED_URLNAMES },
           length: { minimum: 3, if: -> { urlname.present? } }
 

data/app/models/alchemy/page.rb

@@ -117,7 +117,7 @@ module Alchemy
     has_many :nodes, class_name: "Alchemy::Node", inverse_of: :page
     has_many :versions, class_name: "Alchemy::PageVersion", inverse_of: :page, dependent: :destroy
     has_one :draft_version, -> { drafts }, class_name: "Alchemy::PageVersion"
-    has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion"
+    has_one :public_version, -> { published }, class_name: "Alchemy::PageVersion", autosave: -> { persisted? }
 
     before_validation :set_language,
       if: -> { language.nil? }

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

@@ -30,7 +30,7 @@ module Alchemy
     # Returns the rendered resized image using imagemagick directly.
     #
     def resize(size, upsample = false)
-      image_file.thumb(upsample ? size : "#{size}>")
+      image_file.thumbnail(upsample ? size : "#{size}>")
     end
 
     # Returns true if picture's width is greater than it's height
@@ -119,7 +119,7 @@ module Alchemy
       if is_smaller_than?(dimensions) && upsample == false
         dimensions = reduce_to_image(dimensions)
       end
-      image_file.thumb("#{dimensions_to_string(dimensions)}#")
+      image_file.thumbnail("#{dimensions_to_string(dimensions)}#")
     end
 
     # Use imagemagick to custom crop an image. Uses -thumbnail for better performance when resizing.