alchemy_cms 6.0.9 → 6.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23531a0233f0633efb7c6c17b3bb79eb6a0fd5536e34766aa76840a43c594c9b
-  data.tar.gz: 3d8a8f2a8266b3fa5982de4009b9703d3ef3b585e1cb35ed2381daedfd110395
+  metadata.gz: 03cfa47992384280268b398c712c0d2fe88402482c1acd514406ba784e5e74d0
+  data.tar.gz: 9793cf56d7592cdd552009efac7f065d0ee1c6511b4d4d2e6307997c850c88d8
 SHA512:
-  metadata.gz: 8ceb3ac0a3f6f833f5c15bfe3bc91d1e42970a03f32c373941d57574405395906fcfa16e373f2cc6db71648a93cfa6e7d37f479dc230f716270aba6539dcc62d
-  data.tar.gz: 02d7428a535cef3b642edec8cdfb2cc7ed77360ea5033de128c2da899d28a24819cbe3026b2dd21a98f280faf505caa76745a103800a0401c5d96f42ae31fcd4
+  metadata.gz: d3600a98fec4301d4d5ed8dd156ecde606a1857cdd028e5c97318ca3284d19e54e13614e1192ef69bff3805037c325d8a57821efbebf449101cda575559c6874
+  data.tar.gz: e0d22ac66fb2b8d75a5bc3719372f12be3332dedad315f5f8758850407b7690a98d5eb24ac0b905199de40a7ba9f13930ef6c79c36304b02ee894f7410ad1273

data/.github/workflows/ci.yml

@@ -9,11 +9,9 @@ jobs:
       fail-fast: false
       matrix:
         rails:
-          - "6.0"
           - "6.1"
           - "7.0"
         ruby:
-          - "2.6"
           - "2.7"
           - "3.0"
           - "3.1"
@@ -21,25 +19,6 @@ jobs:
           - mysql
           - postgresql
           - mariadb
-        exclude:
-          - rails: "6.0"
-            ruby: "3.1"
-            database: mysql
-          - rails: "6.0"
-            ruby: "3.1"
-            database: postgresql
-          - rails: "6.0"
-            ruby: "3.1"
-            database: mariadb
-          - rails: "7.0"
-            ruby: "2.6"
-            database: mysql
-          - rails: "7.0"
-            ruby: "2.6"
-            database: postgresql
-          - rails: "7.0"
-            ruby: "2.6"
-            database: mariadb
     env:
       DB: ${{ matrix.database }}
       DB_USER: alchemy_user

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 6.0.10 (2022-09-04)
+
+- Deprecate essence classes [#2371](https://github.com/AlchemyCMS/alchemy_cms/pull/2371) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate full_url_for_element helper [#2368](https://github.com/AlchemyCMS/alchemy_cms/pull/2368) ([tvdeyen](https://github.com/tvdeyen))
+- Deprecate element_dom_id helper [#2368](https://github.com/AlchemyCMS/alchemy_cms/pull/2368) ([tvdeyen](https://github.com/tvdeyen))
+- Use position instead of id for element dom_id [#2368](https://github.com/AlchemyCMS/alchemy_cms/pull/2368) ([tvdeyen](https://github.com/tvdeyen))
+- Fix ingredient boolean preview text [#2367](https://github.com/AlchemyCMS/alchemy_cms/pull/2367) ([tvdeyen](https://github.com/tvdeyen))
+- Decide locale prefix with page language in show_alchemy_page_url helper [#2366](https://github.com/AlchemyCMS/alchemy_cms/pull/2366) ([tvdeyen](https://github.com/tvdeyen))
+- Use cache_key_with_version in page_etag [#2365](https://github.com/AlchemyCMS/alchemy_cms/pull/2365) ([tvdeyen](https://github.com/tvdeyen))
+- Fix author edit_content permissions [#2364](https://github.com/AlchemyCMS/alchemy_cms/pull/2364) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.0.9 (2022-07-25)
 
 - Allow Site managers to remove page locks [#2360](https://github.com/AlchemyCMS/alchemy_cms/pull/2360) ([mamhoff](https://github.com/mamhoff))

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

@@ -8,14 +8,9 @@ module Alchemy
     # Returns all pages as json object
     #
     def index
-      # Fix for cancancan not able to merge multiple AR scopes for logged in users
-      if can? :edit_content, Alchemy::Page
-        @pages = Alchemy::Page.all
-      else
-        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)
-      end
+      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
 

data/app/controllers/alchemy/pages_controller.rb

@@ -218,12 +218,12 @@ module Alchemy
     #
     # IMPORTANT:
     #
-    # If your user does not have a +cache_key+ method (i.e. it's not an ActiveRecord model),
+    # If your user does not have a +cache_key_with_version+ method (i.e. it's not an ActiveRecord model),
     # you have to ensure to implement it and return a unique identifier for that particular user.
     # Otherwise all users will see the same cached page, regardless of user's state.
     #
     def page_etag
-      @page.cache_key + current_alchemy_user.try(:cache_key).to_s
+      [@page, current_alchemy_user]
     end
 
     # We only render the page if either the cache is disabled for this page

data/app/helpers/alchemy/elements_block_helper.rb

@@ -29,9 +29,16 @@ module Alchemy
       # If the element uses +ingredients+ it renders the ingredient record.
       #
       def render(name, options = {}, html_options = {})
-        renderable = element.ingredient_by_role(name) || content(name)
+        renderable = element.ingredient_by_role(name) || Alchemy::Deprecation.silence { content(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,
@@ -66,7 +73,9 @@ module Alchemy
         if element.ingredient_definitions.any?
           element.has_value_for?(name)
         else
-          element.has_ingredient?(name)
+          Alchemy::Deprecation.silence do
+            element.has_ingredient?(name)
+          end
         end
       end
 
@@ -128,7 +137,7 @@ module Alchemy
     def element_view_for(element, options = {})
       options = {
         tag: :div,
-        id: element_dom_id(element),
+        id: element.dom_id,
         class: element.name,
         tags_formatter: ->(tags) { tags.join(" ") },
       }.merge(options)

data/app/helpers/alchemy/elements_helper.rb

@@ -167,12 +167,13 @@ module Alchemy
     end
 
     # Returns a string for the id attribute of a html element for the given element
+    # @deprecated
     def element_dom_id(element)
-      return "" if element.nil?
-
-      "#{element.name}_#{element.id}".html_safe
+      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/url_helper.rb

@@ -20,8 +20,8 @@ module Alchemy
     def show_page_path_params(page, optional_params = {})
       raise ArgumentError, "Page is nil" if page.nil?
 
-      url_params = {urlname: page.urlname}.update(optional_params)
-      prefix_locale? ? url_params.update(locale: page.language_code) : url_params
+      url_params = { urlname: page.urlname }.update(optional_params)
+      prefix_locale?(page.language_code) ? url_params.update(locale: page.language_code) : url_params
     end
 
     # Returns the path for downloading an alchemy attachment
@@ -35,8 +35,11 @@ module Alchemy
     end
 
     # Returns the full url containing host, page and anchor for the given element
+    # @deprecated
     def full_url_for_element(element)
-      "#{current_server}/#{element.page.urlname}##{element_dom_id(element)}"
+      "#{current_server}/#{element.page.urlname}##{element.dom_id}"
     end
+
+    deprecate :full_url_for_element, deprecator: Alchemy::Deprecation
   end
 end

data/app/models/alchemy/content.rb

@@ -19,6 +19,7 @@
 require_dependency "alchemy/content/factory"
 
 module Alchemy
+  # @deprecated
   class Content < BaseRecord
     include Alchemy::Logger
     include Alchemy::Hints

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

@@ -82,7 +82,7 @@ module Alchemy
       # Returns a dom id used for elements html id tag.
       #
       def dom_id
-        "#{name}_#{id}"
+        [parent_element&.dom_id, name, position].compact.join("-")
       end
 
       # The content that's used for element's preview text.

data/app/models/alchemy/essence_audio.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
+  # @deprecated
   class EssenceAudio < ActiveRecord::Base
     acts_as_essence(
       ingredient_column: :attachment,

data/app/models/alchemy/essence_boolean.rb

@@ -13,6 +13,7 @@
 # Stores boolean values.
 # Provides a checkbox in the editor views.
 module Alchemy
+  # @deprecated
   class EssenceBoolean < BaseRecord
     acts_as_essence ingredient_column: "value"
   end

data/app/models/alchemy/essence_date.rb

@@ -11,6 +11,7 @@
 #
 
 module Alchemy
+  # @deprecated
   class EssenceDate < BaseRecord
     acts_as_essence ingredient_column: "date"
 

data/app/models/alchemy/essence_file.rb

@@ -14,6 +14,7 @@
 #
 
 module Alchemy
+  # @deprecated
   class EssenceFile < BaseRecord
     belongs_to :attachment, optional: true
     acts_as_essence ingredient_column: "attachment"

data/app/models/alchemy/essence_headline.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
+  # @deprecated
   class EssenceHeadline < BaseRecord
     acts_as_essence
 

data/app/models/alchemy/essence_html.rb

@@ -11,6 +11,7 @@
 #
 
 module Alchemy
+  # @deprecated
   class EssenceHtml < BaseRecord
     acts_as_essence ingredient_column: "source"
 

data/app/models/alchemy/essence_link.rb

@@ -14,6 +14,7 @@
 #
 
 module Alchemy
+  # @deprecated
   class EssenceLink < BaseRecord
     acts_as_essence ingredient_column: "link"
   end

data/app/models/alchemy/essence_node.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
+  # @deprecated
   class EssenceNode < BaseRecord
     acts_as_essence(
       ingredient_column: :node,

data/app/models/alchemy/essence_page.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
+  # @deprecated
   class EssencePage < BaseRecord
     acts_as_essence(
       ingredient_column: :page,

data/app/models/alchemy/essence_picture.rb

@@ -22,6 +22,7 @@
 #
 
 module Alchemy
+  # @deprecated
   class EssencePicture < BaseRecord
     include Alchemy::PictureThumbnails
 

data/app/models/alchemy/essence_picture_view.rb

@@ -2,6 +2,7 @@
 
 module Alchemy
   # Renders an essence picture view
+  # @deprecated
   class EssencePictureView
     include ActionView::Helpers::AssetTagHelper
     include ActionView::Helpers::UrlHelper

data/app/models/alchemy/essence_richtext.rb

@@ -13,6 +13,7 @@
 #
 
 module Alchemy
+  # @deprecated
   class EssenceRichtext < BaseRecord
     acts_as_essence preview_text_column: "stripped_body"
 

data/app/models/alchemy/essence_select.rb

@@ -12,6 +12,7 @@
 
 # Provides a select box that stores string values.
 module Alchemy
+  # @deprecated
   class EssenceSelect < BaseRecord
     acts_as_essence ingredient_column: "value"
   end

data/app/models/alchemy/essence_text.rb

@@ -16,6 +16,7 @@
 #
 
 module Alchemy
+  # @deprecated
   class EssenceText < BaseRecord
     acts_as_essence
   end

data/app/models/alchemy/essence_video.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
+  # @deprecated
   class EssenceVideo < ActiveRecord::Base
     acts_as_essence(
       ingredient_column: :attachment,

data/app/models/alchemy/ingredients/boolean.rb

@@ -14,7 +14,9 @@ module Alchemy
       # Used by the Element#preview_text method.
       #
       def preview_text(_max_length = nil)
-        Alchemy.t(value, scope: "ingredient_values.boolean")
+        return if value.nil?
+
+        Alchemy.t(value.to_s, scope: "ingredient_values.boolean")
       end
     end
   end

data/app/views/alchemy/pages/show.rss.builder

@@ -13,8 +13,8 @@ xml.rss version: "2.0" do
         if element.has_ingredient?("date")
           xml.pubDate element.ingredient("date").to_s(:rfc822)
         end
-        xml.link show_alchemy_page_url(@page, anchor: element_dom_id(element))
-        xml.guid show_alchemy_page_url(@page, anchor: element_dom_id(element))
+        xml.link show_alchemy_page_url(@page, anchor: "##{element.dom_id}")
+        xml.guid show_alchemy_page_url(@page, anchor: "##{element.dom_id}")
       end
     end
   end

data/lib/alchemy/essence.rb

@@ -23,8 +23,12 @@ module Alchemy #:nodoc:
       #   The column the the validations run against.
       # @option options [String || Symbol] preview_text_column (ingredient_column)
       #   Specify the column for the preview_text method.
-      #
+      # @deprecated
       def acts_as_essence(options = {})
+        if !DEPRECATED_ESSENCE_CLASSES.include?(name)
+          Alchemy::Deprecation.warn "Please create a custom Alchemy::Ingredient for #{name} instead"
+        end
+
         register_as_essence_association!
 
         configuration = {

data/lib/alchemy/permissions.rb

@@ -121,7 +121,9 @@ module Alchemy
         can :manage, Alchemy::Node
         can [:read, :url], Alchemy::Picture
         can [:read, :autocomplete], Alchemy::Tag
-        can(:edit_content, Alchemy::Page) { |p| p.editable_by?(@user) }
+        can :edit_content, Alchemy::Page, Alchemy::Page.all do |page|
+          page.editable_by?(@user)
+        end
       end
     end
 

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.9"
+  VERSION = "6.0.10"
 
   def self.version
     VERSION

data/lib/alchemy.rb

@@ -5,6 +5,25 @@ require "alchemy/admin/preview_url"
 module Alchemy
   YAML_PERMITTED_CLASSES = %w[Symbol Date Regexp]
 
+  DEPRECATED_ESSENCE_CLASS_MAPPING = {
+    "Alchemy::EssenceAudio" => "Alchemy::Ingredients::Audio",
+    "Alchemy::EssenceBoolean" => "Alchemy::Ingredients::Boolean",
+    "Alchemy::EssenceDate" => "Alchemy::Ingredients::Date",
+    "Alchemy::EssenceFile" => "Alchemy::Ingredients::File",
+    "Alchemy::EssenceHeadline" => "Alchemy::Ingredients::Headline",
+    "Alchemy::EssenceHtml" => "Alchemy::Ingredients::Html",
+    "Alchemy::EssenceLink" => "Alchemy::Ingredients::Link",
+    "Alchemy::EssenceNode" => "Alchemy::Ingredients::Node",
+    "Alchemy::EssencePage" => "Alchemy::Ingredients::Page",
+    "Alchemy::EssencePicture" => "Alchemy::Ingredients::Picture",
+    "Alchemy::EssenceRichtext" => "Alchemy::Ingredients::Richtext",
+    "Alchemy::EssenceSelect" => "Alchemy::Ingredients::Select",
+    "Alchemy::EssenceText" => "Alchemy::Ingredients::Text",
+    "Alchemy::EssenceVideo" => "Alchemy::Ingredients::Video",
+  }
+
+  DEPRECATED_ESSENCE_CLASSES = DEPRECATED_ESSENCE_CLASS_MAPPING.keys
+
   # Define page preview sources
   #
   # A preview source is a Ruby class returning an URL

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.9",
+  "version": "6.0.10",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.0.9
+  version: 6.0.10
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-25 00:00:00.000000000 Z
+date: 2022-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1525,7 +1525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.1.6
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails