alchemy_cms 6.1.1 → 6.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 143bb006641791929e37a72fd82d200d10084c85e9685934776e54dc61e08f58
-  data.tar.gz: 2a8a82d5f452822f394ee9af1d55eca46efa4772a269e09583de154addc8be5f
+  metadata.gz: 3f4631fa484db8a523e27e3200b1e1911b145d10dbd3dd2ff065f97b72dbf6d4
+  data.tar.gz: 5ccb79a30a2f55110e954b9a19632f2dd73862b202e237d46afc120f0cad45f1
 SHA512:
-  metadata.gz: fd987d8e08a1813c1f6b3ae50904910e1cb8c60c2a1a0ad5906ef9b0cdd3a233c71871e7c3b6b00f10b5caa8f56169c060cd61f03a1f0231b8ae85d7b1ff44b6
-  data.tar.gz: 9dae2d9dabe3c81da44d17ddfc4ddb8713a328927e07caef81d6c42aba2445a9854262fa12f55f74e3cd11960197ed183bbb898a363c7ff9b3dd5ef175b91743
+  metadata.gz: 92bd96d81e63b05fbf655009f84d14c3007fd06fdee71331871ae53e28bfc28a457ac0942fd735671790ed10317421bac695418a45a52b004bb5d869ef2259c2
+  data.tar.gz: 1624a01a069cae4153859a9140df190e0de942ddcc739572b7c3efcd08c74242e326fba6a43fe89d97467a92cfeff838a7f505514f2f79d8d32b827d8125067a

data/.github/workflows/ci.yml

@@ -82,6 +82,9 @@ jobs:
           sudo apt update -qq
           sudo apt install -qq --fix-missing libmysqlclient-dev -o dir::cache::archives="/home/runner/apt/cache"
           sudo chown -R runner /home/runner/apt/cache
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16
       - name: Restore node modules cache
         id: yarn-cache
         uses: actions/cache@v2.1.3

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 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))
+
 ## 6.1.1 (2023-01-23)
 
 - Re-introduce deleted methods [#2422](https://github.com/AlchemyCMS/alchemy_cms/pull/2422) ([tvdeyen](https://github.com/tvdeyen))

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/models/alchemy/picture/url.rb

@@ -3,7 +3,7 @@
 module Alchemy
   class Picture < BaseRecord
     class Url
-      attr_reader :variant
+      attr_reader :variant, :thumb
 
       # @param [Alchemy::PictureVariant]
       #
@@ -31,14 +31,23 @@ module Alchemy
 
       def uid
         signature = PictureThumb::Signature.call(variant)
-        thumb = variant.picture.thumbs.detect { |t| t.signature == signature }
-        if thumb
-          uid = thumb.uid
+        if find_thumb_by(signature)
+          thumb.uid
         else
           uid = PictureThumb::Uid.call(signature, variant)
-          PictureThumb.generator_class.call(variant, signature, uid)
+          ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do
+            PictureThumb.generator_class.call(variant, signature, uid)
+          end
+          uid
         end
-        uid
+      end
+
+      def find_thumb_by(signature)
+        @thumb = if variant.picture.thumbs.loaded?
+            variant.picture.thumbs.find { |t| t.signature == signature }
+          else
+            variant.picture.thumbs.find_by(signature: signature)
+          end
       end
     end
   end

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

@@ -19,11 +19,10 @@ module Alchemy
 
           # create the thumb before storing
           # to prevent db race conditions
-          thumb = Alchemy::PictureThumb.create!(
-            picture: variant.picture,
-            signature: signature,
-            uid: uid,
-          )
+          @thumb = Alchemy::PictureThumb.create_or_find_by!(signature: signature) do |thumb|
+            thumb.picture = variant.picture
+            thumb.uid = uid
+          end
           begin
             # process the image
             image = variant.image
@@ -32,7 +31,7 @@ module Alchemy
           rescue RuntimeError => e
             ErrorTracking.notification_handler.call(e)
             # destroy the thumb if processing or storing fails
-            thumb&.destroy
+            @thumb&.destroy
           end
         end
 

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.1"
+  VERSION = "6.1.3"
 
   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.1",
+  "version": "6.1.3",
   "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.1
+  version: 6.1.3
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-03-29 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.3.26
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails