alchemy_cms 6.1.2 → 6.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2f303fbee5eb7ba00c41042f4a2c435e345621eae81768d8c66f86dad04d23d
-  data.tar.gz: e2ad0dfb05e0412676eb203c0ac7829d4945c8e8db879c8393748bb40089ce19
+  metadata.gz: 1ffc03e16f129a444f6adfcdf851012f04cdbca01d1bf10e8e4edae163383be2
+  data.tar.gz: c40cc3dd8deb37fa7cae8c78de08438c184d2200cce480fce1785cc5ca62f210
 SHA512:
-  metadata.gz: 1ec82e1628873bcfb3f1e16826087289ab1dcefe4bb98598ad320bce329c3f1481dc0df28fdbd0570a3fb79f6325de4a9eee510dd4dc6a981f3cc82565bd908b
-  data.tar.gz: 10c17180fbff27a83a2c6f052c200a9723858dea973f547206c9ca094e46b18bdc7130f5914e006acd058296b6783b4adafa47bc2bad87fca29ca6774673a973
+  metadata.gz: 141196b0c09257888ebe8408513ab5fb2bbebdcb5eaa4b8871fbec81afde8d6323021ca7d97dc2f880a44151860b618501b92f42e0649164ac6affdac01ca384
+  data.tar.gz: fc764011dd71971b3ec970bc0c86f8a5fc4f3b288f5e9596facb69dab8a5ad35805743dfe4c128682419b356504e6ab8b27b0db3e9d1da43d676b6a309615ba2

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 6.1.4 (2023-05-18)
+
+- [6.1] Revert "Preload related objects in Alchemy::PagesController" [#2473](https://github.com/AlchemyCMS/alchemy_cms/pull/2473) ([tvdeyen](https://github.com/tvdeyen))
+
+## 6.1.3 (2023-03-29)
+
+- Fix installer: Add seeds file if not exists [#2446](https://github.com/AlchemyCMS/alchemy_cms/pull/2446) ([tvdeyen](https://github.com/tvdeyen))
+- Integrate non_stupid_digest_assets gem [#2430](https://github.com/AlchemyCMS/alchemy_cms/pull/2430) ([afdev82](https://github.com/afdev82))
+
 ## 6.1.2 (2023-02-27)
 
 - [6.1] Fix thumbnail writing for multi-concurrent and multi-db setups [#2434](https://github.com/AlchemyCMS/alchemy_cms/pull/2434) ([tvdeyen](https://github.com/tvdeyen))

data/Gemfile

@@ -19,6 +19,7 @@ group :development, :test do
   # in our case the culprit is `handlebars-assets`. The changes between 2.7.0 and 2.8.0 are
   # minimal, but breaking.
   gem "execjs", "= 2.8.1"
+  gem "selenium-webdriver", "< 4.9.1" # until https://github.com/teamcapybara/capybara/pull/2665 got merged
 
   if ENV["GITHUB_ACTIONS"]
     # Necessary because GH Actions gem cache does not have this "Bundled with Ruby" gem installed

data/alchemy_cms.gemspec

@@ -45,7 +45,6 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency "jquery-ui-rails", ["~> 6.0"]
   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", "< 4.0"]
   gem.add_runtime_dependency "request_store", ["~> 1.2"]
   gem.add_runtime_dependency "responders", [">= 2.0", "< 4.0"]

data/app/controllers/alchemy/pages_controller.rb

@@ -104,14 +104,7 @@ 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 ||= Language.current_root_page
       render template: "alchemy/welcome", layout: false if signup_required?
     end
 
@@ -127,13 +120,10 @@ 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 ||= Language.current.pages.contentpages.find_by(
+        urlname: params[:urlname],
+        language_code: params[:locale] || Language.current.code,
+      )
     end
 
     def enforce_locale
@@ -244,9 +234,5 @@ module Alchemy
     def page_not_found!
       not_found_error!("Alchemy::Page not found \"#{request.fullpath}\"")
     end
-
-    def page_includes
-      Alchemy::EagerLoading.page_includes(version: :public_version)
-    end
   end
 end

data/app/models/alchemy/element.rb

@@ -21,6 +21,7 @@
 #
 
 require_dependency "alchemy/element/definitions"
+require_dependency "alchemy/element/dom_id"
 require_dependency "alchemy/element/element_contents"
 require_dependency "alchemy/element/element_ingredients"
 require_dependency "alchemy/element/element_essences"

data/app/models/alchemy/picture.rb

@@ -136,14 +136,15 @@ module Alchemy
       end
 
       def alchemy_resource_filters
+        @_file_formats ||= distinct.pluck(:image_file_format).compact.presence || []
         [
           {
             name: :by_file_format,
-            values: distinct.pluck(:image_file_format),
+            values: @_file_formats,
           },
           {
             name: :misc,
-            values: %w(recent last_upload without_tag),
+            values: %w(recent last_upload without_tag deletable),
           },
         ]
       end

data/config/locales/alchemy.en.yml

@@ -128,6 +128,7 @@ en:
             last_upload: Last upload only
             recent: Recently uploaded only
             without_tag: Without tag
+            deletable: Not linked by file content
       attachment:
         by_file_type:
           name: File Type
@@ -139,7 +140,6 @@ en:
             last_upload: Last upload only
             recent: Recently uploaded only
             without_tag: Without tag
-            deletable: Not linked by file content
 
     # === Translations for content validations
     # Used when a user did not enter (correct) values to the content field.

data/lib/alchemy/install/tasks.rb

@@ -31,7 +31,13 @@ module Alchemy
         end
 
         def inject_seeder
-          append_file "./db/seeds.rb", "Alchemy::Seeder.seed!\n"
+          seed_file = Rails.root.join("db", "seeds.rb")
+          args = [seed_file, "Alchemy::Seeder.seed!\n"]
+          if File.exist?(seed_file)
+            append_file(*args)
+          else
+            add_file(*args)
+          end
         end
       end
     end

data/lib/alchemy/version.rb

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

data/lib/alchemy_cms.rb

@@ -15,7 +15,7 @@ require "handlebars_assets"
 require "jquery-rails"
 require "jquery-ui-rails"
 require "kaminari"
-require "non-stupid-digest-assets"
+require "non_stupid_digest_assets"
 require "ransack"
 require "request_store"
 require "responders"

data/lib/non_stupid_digest_assets.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require "sprockets/manifest"
+require "active_support/core_ext/module/attribute_accessors"
+
+module NonStupidDigestAssets
+  mattr_accessor :whitelist
+  @@whitelist = []
+
+  class << self
+    def assets(assets)
+      return assets if whitelist.empty?
+
+      whitelisted_assets(assets)
+    end
+
+    private
+
+    def whitelisted_assets(assets)
+      assets.select do |logical_path, _digest_path|
+        whitelist.any? do |item|
+          item =~ logical_path
+        end
+      end
+    end
+  end
+
+  module CompileWithNonDigest
+    def compile(*args)
+      paths = super
+      NonStupidDigestAssets.assets(assets).each do |(logical_path, digest_path)|
+        full_digest_path = File.join dir, digest_path
+        full_digest_gz_path = "#{full_digest_path}.gz"
+        full_non_digest_path = File.join dir, logical_path
+        full_non_digest_gz_path = "#{full_non_digest_path}.gz"
+
+        if File.exist? full_digest_path
+          logger.debug "Writing #{full_non_digest_path}"
+          FileUtils.copy_file full_digest_path, full_non_digest_path, :preserve_attributes
+        else
+          logger.debug "Could not find: #{full_digest_path}"
+        end
+        if File.exist? full_digest_gz_path
+          logger.debug "Writing #{full_non_digest_gz_path}"
+          FileUtils.copy_file full_digest_gz_path, full_non_digest_gz_path, :preserve_attributes
+        else
+          logger.debug "Could not find: #{full_digest_gz_path}"
+        end
+      end
+      paths
+    end
+  end
+end
+
+Sprockets::Manifest.prepend NonStupidDigestAssets::CompileWithNonDigest

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.1.2",
+  "version": "6.1.4",
   "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.1.2
+  version: 6.1.4
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-27 00:00:00.000000000 Z
+date: 2023-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -387,20 +387,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
-- !ruby/object:Gem::Dependency
-  name: non-stupid-digest-assets
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -1432,6 +1418,7 @@ files:
 - lib/generators/alchemy/site_layouts/templates/layout.html.haml
 - lib/generators/alchemy/site_layouts/templates/layout.html.slim
 - lib/generators/alchemy/views/views_generator.rb
+- lib/non_stupid_digest_assets.rb
 - lib/tasks/alchemy/db.rake
 - lib/tasks/alchemy/install.rake
 - lib/tasks/alchemy/thumbnails.rake
@@ -1538,7 +1525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.4.6
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails