alchemy_cms 6.0.0.pre.rc7 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d81ddf40cd98c283ac6b58332e03e6ed4094de86671f0dc80692a0de5c8292ea
-  data.tar.gz: 1115141343d2e2310001c8ee1e58f9d8070a4c34c770226f9647a6fa09f05d7d
+  metadata.gz: f1db98328d1be1d96ee705e68f64b757f33d0997e4f622626ca86e4e42511079
+  data.tar.gz: 563c9f02b864e170ac88a9d3f405c61b46da38fec41d0f4dfba0ff0c179407ba
 SHA512:
-  metadata.gz: f80e8e421037e50315254799456626f6b82ee4f30922d30920b2cec73ee7783a85fccf74b1a66a9a310fc2ca668844ad4d0daaa0b03ecca77cb4f4a1bb28c1e4
-  data.tar.gz: 2898baf39517e918cfdf0b99f6d79ad61836e74083922e2c496dcebb539c057ea558b03040578eba16040313bff647d0dbdb6a27221cbdfd8b1c7e8a7e69e395
+  metadata.gz: 524ab50512e3a7c377f3619f20c6ec812e1c12a933b94fb56d8bbc5b94b843cd9708451b77b96af8be7776bb0c733c90af549da76820109a0163a0338b8599dc
+  data.tar.gz: 7c8346e5b07d35e2ef471cb90aff4fe8e62e2050ef13d03436cb2492e0cb5a6d9a2003eefa0f4f55d0a61cfdcbda48596788956908964c71333ca0ebdfa1565d

data/.github/workflows/ci.yml

@@ -11,6 +11,7 @@ jobs:
         rails:
           - "6.0"
           - "6.1"
+          - "7.0"
         ruby:
           - "2.6"
           - "2.7"
@@ -18,6 +19,13 @@ jobs:
         database:
           - mysql
           - postgresql
+        exclude:
+          - 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,15 @@
+## 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

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

@@ -106,18 +106,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,

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

@@ -179,9 +179,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
 

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/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/helpers/alchemy/elements_helper.rb

@@ -149,8 +149,8 @@ module Alchemy
       render element, {
         element: element,
         counter: counter,
-        options: options,
-      }.merge(options.delete(:locals) || {})
+        options: options.except(:locals),
+      }.merge(options[:locals] || {})
     rescue ActionView::MissingTemplate => e
       warning(%(
         Element view partial not found for #{element.name}.\n

data/app/models/alchemy/picture.rb

@@ -28,7 +28,7 @@ module Alchemy
       large: "240x180",
     }.with_indifferent_access.freeze
 
-    CONVERTIBLE_FILE_FORMATS = %w(gif jpg jpeg png).freeze
+    CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
 
     TRANSFORMATION_OPTIONS = [
       :crop,

data/app/views/alchemy/admin/partials/_routes.html.erb

@@ -5,6 +5,10 @@
       return '<%= alchemy.admin_picture_path(id: 1) %>'.replace(/1/, id);
     },
 
+    url_admin_picture_path: function(id) {
+      return '<%= alchemy.url_admin_picture_path(id: 1) %>'.replace(/1/, id);
+    },
+
     fold_admin_element_path: function(id) {
       return '<%= alchemy.fold_admin_element_path(id: 1) %>'.replace(/1/, id);
     },

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

@@ -8,6 +8,11 @@
         input_html: {class: 'alchemy_selectbox'} %>
     <% elsif attribute[:type].in? %i[date time datetime] %>
       <%= f.datepicker attribute[:name], resource_attribute_field_options(attribute) %>
+    <% elsif attribute[:enum].present? %>
+      <%= f.input attribute[:name],
+        collection: attribute[:enum],
+        include_blank: Alchemy.t(:blank, scope: 'resources.relation_select'),
+        input_html: {class: 'alchemy_selectbox'} %>
     <% else %>
       <%= f.input attribute[:name], resource_attribute_field_options(attribute) %>
     <% end %>

data/config/alchemy/config.yml

@@ -173,6 +173,7 @@ uploader:
     - gif
     - png
     - svg
+    - webp
 
 # === Link Target Options
 #

data/lib/alchemy/engine.rb

@@ -37,7 +37,7 @@ module Alchemy
       end
     end
 
-    initializer "alchemy.userstamp" do
+    config.after_initialize do
       if Alchemy.user_class
         ActiveSupport.on_load(:active_record) do
           Alchemy.user_class.model_stamper
@@ -45,5 +45,16 @@ module Alchemy
         end
       end
     end
+
+    initializer "alchemy.webp-mime_type" do
+      # Rails does not know anything about webp even in 2022
+      unless Mime::Type.lookup_by_extension(:webp)
+        Mime::Type.register("image/webp", :webp)
+      end
+      # Dragonfly uses Rack to read the mime type and guess what
+      unless Rack::Mime::MIME_TYPES[".webp"]
+        Rack::Mime::MIME_TYPES[".webp"] = "image/webp"
+      end
+    end
   end
 end

data/lib/alchemy/essence.rb

@@ -3,18 +3,6 @@
 require "active_record"
 
 module Alchemy #:nodoc:
-  # A bogus association that skips eager loading for essences not having an ingredient association
-  class IngredientAssociation < ActiveRecord::Associations::BelongsToAssociation
-    # Skip eager loading if called by Rails' preloader
-    def klass
-      if caller.any? { |line| line =~ /preloader\.rb/ }
-        nil
-      else
-        super
-      end
-    end
-  end
-
   module Essence #:nodoc:
     def self.included(base)
       base.extend(ClassMethods)
@@ -43,8 +31,6 @@ module Alchemy #:nodoc:
           ingredient_column: "body",
         }.update(options)
 
-        @_classes_with_ingredient_association ||= []
-
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
           attr_writer :validation_errors
           include Alchemy::Essence::InstanceMethods
@@ -87,18 +73,6 @@ module Alchemy #:nodoc:
             alias_method :#{configuration[:ingredient_column]}, :ingredient_association
             alias_method :#{configuration[:ingredient_column]}=, :ingredient_association=
           RUBY
-
-          @_classes_with_ingredient_association << self
-        end
-      end
-
-      # Overwrite ActiveRecords method to return a bogus association class that skips eager loading
-      # for essence classes that do not have an ingredient association
-      def _reflect_on_association(name)
-        if name == :ingredient_association && !in?(@_classes_with_ingredient_association)
-          OpenStruct.new(association_class: Alchemy::IngredientAssociation)
-        else
-          super
         end
       end
 

data/lib/alchemy/resource.rb

@@ -169,10 +169,25 @@ module Alchemy
           name: col.name,
           type: resource_column_type(col),
           relation: resource_relation(col.name),
-        }.delete_if { |_k, v| v.nil? }
+          enum: enum_values_collection_for_select(col.name),
+        }.delete_if { |_k, v| v.blank? }
       end.compact
     end
 
+    def enum_values_collection_for_select(column_name)
+      enum = model.defined_enums[column_name]
+      return if enum.blank?
+
+      enum.keys.map do |key|
+        [
+          ::I18n.t(key, scope: [
+            :activerecord, :attributes, model.model_name.i18n_key, "#{column_name}_values"
+          ], default: key.humanize),
+          key,
+        ]
+      end
+    end
+
     def sorted_attributes
       @_sorted_attributes ||= attributes.
         sort_by  { |attr| attr[:name] == "name" ? 0 : 1 }.

data/lib/alchemy/test_support/essence_shared_examples.rb

@@ -7,18 +7,6 @@ RSpec.shared_examples_for "an essence" do
   let(:content) { Alchemy::Content.new(name: "foo") }
   let(:content_definition) { { "name" => "foo" } }
 
-  describe "eager loading" do
-    before do
-      2.times { described_class.create! }
-    end
-
-    it "does not throw error if eager loaded" do
-      expect {
-        described_class.all.includes(:ingredient_association).to_a
-      }.to_not raise_error
-    end
-  end
-
   it "touches the element after save" do
     element = FactoryBot.create(:alchemy_element)
     content = FactoryBot.create(:alchemy_content, element: element, essence: essence, essence_type: essence.class.name)

data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb

@@ -16,7 +16,7 @@ module Alchemy::Upgrader::Tasks
           # eager load all elements that have ingredients defined but no ingredient records yet.
           all_elements = Alchemy::Element
             .named(elements_with_ingredients.map { |d| d[:name] })
-            .includes(contents: { essence: :ingredient_association })
+            .includes(contents: :essence)
             .left_outer_joins(:ingredients).where(alchemy_ingredients: { id: nil })
             .to_a
           elements_with_ingredients.map do |element_definition|

data/lib/alchemy/version.rb

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

data/package/src/image_loader.js

@@ -40,9 +40,9 @@ export default class ImageLoader {
   }
 
   onError(evt) {
-    const message = `Could not load ${this.image.src}`
+    const message = `Could not load "${this.image.src}"`
     this.removeSpinner()
-    this.parent.innerHTML = `<span class="icon fas fa-exclamation-triangle" title="${message}" />`
+    this.parent.innerHTML = `<span class="icon error fas fa-exclamation-triangle" title="${message}" />`
     console.error(message, evt)
     this.unbind()
   }

data/package/src/picture_editors.js

@@ -5,7 +5,6 @@ import ImageLoader from "./image_loader"
 
 const UPDATE_DELAY = 125
 const IMAGE_PLACEHOLDER = '<i class="icon far fa-image fa-fw"></i>'
-const EMPTY_IMAGE = '<img src="" class="img_paddingtop" />'
 const THUMBNAIL_SIZE = "160x120"
 
 class PictureEditor {
@@ -62,7 +61,7 @@ class PictureEditor {
     this.image.removeAttribute("alt")
     this.image.removeAttribute("src")
     this.imageLoader.load(true)
-    get(`/admin/pictures/${this.pictureId}/url`, {
+    get(Alchemy.routes.url_admin_picture_path(this.pictureId), {
       crop: this.imageCropperEnabled,
       crop_from: this.cropFrom,
       crop_size: this.cropSize,
@@ -83,9 +82,10 @@ class PictureEditor {
   ensureImage() {
     if (this.image) return
 
-    this.thumbnailBackground.innerHTML = EMPTY_IMAGE
-    this.image = this.container.querySelector("img")
-    this.imageLoader = new ImageLoader(this.image)
+    const img = new Image()
+    this.thumbnailBackground.replaceChildren(img)
+    this.image = img
+    this.imageLoader = new ImageLoader(img)
   }
 
   removeImage() {

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.0-rc7",
+  "version": "6.0.0",
   "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.0.pre.rc7
+  version: 6.0.0
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-28 00:00:00.000000000 Z
+date: 2022-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -24,7 +24,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
@@ -44,7 +44,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -64,7 +64,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -134,7 +134,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -164,7 +164,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -174,7 +174,7 @@ dependencies:
         version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
@@ -408,9 +408,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -418,9 +418,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: request_store
   requirement: !ruby/object:Gem::Requirement
@@ -1515,9 +1515,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
 rubygems_version: 3.1.6