alchemy_cms 6.0.11 → 6.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9b537e2e01fab999228f1a8813bbd0c905d521639eeeb1413021c70e5add7e
-  data.tar.gz: 6d93f0bb79d91d05a6cda0d9a1f6697fada5cd2de30bc11b7e5c879f98ebd1a4
+  metadata.gz: d401fd3a44495f1a096fc4115eec8d32be8862305cc95c35715548147ec7688a
+  data.tar.gz: 8f9a98f79c64acafaad1eaef6358a1ca468ed00cb18e5dff15627f47db028bde
 SHA512:
-  metadata.gz: 9640f98ba68fb3b85dcdf7edb966911eb148448838259981576f0f5da1e8a6511b2adf6c72753c5396b13ae7d3d42776ac160db9e5793b6b34f4cb5296e28910
-  data.tar.gz: 59ab7f7c6097b79df1971212cae17cc587aadb93338b8e7a8131dfdea73756bb3e0ec0b5fd68726769b829e326b346bd0ce9832764bd613af131a4b21dfb8a76
+  metadata.gz: 7982344f2c8376017f665f70985da9f1263551a9424481646081a7cfa65a6cd65f7e87ee615cbd64ace815b9e6f4450c45625fea87330db7690233cb2b042d63
+  data.tar.gz: 4b148956360c26b3acb5495a341de5a14f809272fb709c856ff878882367af59b7b7a1133731c02e68fad2cf5404e00e5db8730b1b1b91d6a7a2e8511b5872b0

data/.github/workflows/brakeman-analysis.yml

@@ -5,42 +5,42 @@ name: Brakeman Scan
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
     # The branches below must be a subset of the branches above
-    branches: [ main ]
+    branches: [main]
   schedule:
-    - cron: '40 4 * * 2'
+    - cron: "40 4 * * 2"
 
 jobs:
   brakeman-scan:
     name: Brakeman Scan
     runs-on: ubuntu-latest
     steps:
-    # Checkout the repository to the GitHub Actions runner
-    - name: Checkout
-      uses: actions/checkout@v2
+      # Checkout the repository to the GitHub Actions runner
+      - name: Checkout
+        uses: actions/checkout@v2
 
-    # Customize the ruby version depending on your needs
-    - name: Setup Ruby
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: '2.7'
+      # Customize the ruby version depending on your needs
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: "3.0"
 
-    - name: Setup Brakeman
-      env:
-        BRAKEMAN_VERSION: '4.10' # SARIF support is provided in Brakeman version 4.10+
-      run: |
-        gem install brakeman --version $BRAKEMAN_VERSION
+      - name: Setup Brakeman
+        env:
+          BRAKEMAN_VERSION: "5.4" # SARIF support is provided in Brakeman version 4.10+
+        run: |
+          gem install brakeman --version $BRAKEMAN_VERSION
 
-    # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
-    - name: Scan
-      continue-on-error: true
-      run: |
-        brakeman -f sarif -o output.sarif.json .
+      # Execute Brakeman CLI and generate a SARIF output with the security issues identified during the analysis
+      - name: Scan
+        continue-on-error: true
+        run: |
+          brakeman -f sarif -o output.sarif.json .
 
-    # Upload the SARIF file generated in the previous step
-    - name: Upload SARIF
-      uses: github/codeql-action/upload-sarif@v1
-      with:
-        sarif_file: output.sarif.json
+      # Upload the SARIF file generated in the previous step
+      - name: Upload SARIF
+        uses: github/codeql-action/upload-sarif@v1
+        with:
+          sarif_file: output.sarif.json

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# Changelog
+
+## 6.0.13 (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.0.12 (2022-11-19)
+
+- More installer options [#2385](https://github.com/AlchemyCMS/alchemy_cms/pull/2385) ([tvdeyen](https://github.com/tvdeyen))
+- Fix custom module installer [#2384](https://github.com/AlchemyCMS/alchemy_cms/pull/2384) ([tvdeyen](https://github.com/tvdeyen))
+- Always provide format with attachment URLs [#2383](https://github.com/AlchemyCMS/alchemy_cms/pull/2383) ([mamhoff](https://github.com/mamhoff))
+
 ## 6.0.11 (2022-09-22)
 
 - Do not touch pages when toggling element [#2377](https://github.com/AlchemyCMS/alchemy_cms/pull/2377) ([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/attachment/url.rb

@@ -23,6 +23,7 @@ module Alchemy
       # @return [String]
       #
       def call(options = {})
+        options[:format] ||= @attachment.suffix
         if options.delete(:download)
           routes.download_attachment_path(@attachment, options)
         else

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

@@ -15,13 +15,25 @@ module Alchemy
         # @return [Alchemy::PictureThumb] The persisted thumbnail record
         #
         def call(variant, signature, uid)
-          image = variant.image
-          image.to_file(server_path(uid)).close
-          variant.picture.thumbs.create!(
+          return if !variant.picture.valid?
+
+          # create the thumb before storing
+          # to prevent db race conditions
+          thumb = Alchemy::PictureThumb.create!(
             picture: variant.picture,
             signature: signature,
             uid: uid,
           )
+          begin
+            # process the image
+            image = variant.image
+            # store the processed image
+            image.to_file(server_path(uid)).close
+          rescue RuntimeError => e
+            Rails.logger.warn(e)
+            # destroy the thumb if processing or storing fails
+            thumb&.destroy
+          end
         end
 
         private

data/lib/alchemy/install/tasks.rb

@@ -18,12 +18,10 @@ module Alchemy
           inject_into_file "./config/routes.rb", "\n  mount Alchemy::Engine => '#{mountpoint}'\n", { after: sentinel, verbose: true }
         end
 
-        def set_primary_language(auto_accept = false)
-          code = "en"
+        def set_primary_language(code: "en", name: "English", auto_accept: false)
           unless auto_accept
             code = ask("- What is the language code of your site's primary language?", default: code)
           end
-          name = "English"
           unless auto_accept
             name = ask("- What is the name of your site's primary language?", default: name)
           end
@@ -33,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/modules.rb

@@ -32,13 +32,13 @@ module Alchemy
           defined_controllers = [definition_hash["navigation"]["controller"]]
 
           if definition_hash["navigation"]["sub_navigation"].is_a?(Array)
-            defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map{ |x| x["controller"] })
+            defined_controllers.concat(definition_hash["navigation"]["sub_navigation"].map { |x| x["controller"] })
           end
 
           validate_controllers_existence(defined_controllers)
         end
 
-        @@alchemy_modules << definition_hash
+        @@alchemy_modules |= [definition_hash]
       end
 
       private

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.0.11"
+  VERSION = "6.0.13"
 
   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/generators/alchemy/install/install_generator.rb

@@ -26,7 +26,22 @@ module Alchemy
       class_option :skip_db_create,
         type: :boolean,
         default: false,
-        desc: "Skip creting the database during install."
+        desc: "Skip creating the database during install."
+
+      class_option :skip_mount,
+        type: :boolean,
+        default: false,
+        desc: "Skip mounting into routes.rb during install."
+
+      class_option :default_language_code,
+        type: :string,
+        default: "en",
+        desc: "The default language code of your site."
+
+      class_option :default_language_name,
+        type: :string,
+        default: "English",
+        desc: "The default language name of your site."
 
       source_root File.expand_path("files", __dir__)
 
@@ -34,6 +49,11 @@ module Alchemy
         header
         say "Welcome to AlchemyCMS!"
         say "Let's begin with some questions.\n\n"
+      end
+
+      def mount
+        return if options[:skip_mount]
+
         install_tasks.inject_routes(options[:auto_accept])
       end
 
@@ -108,13 +128,17 @@ module Alchemy
 
       def set_primary_language
         header
-        install_tasks.set_primary_language(options[:auto_accept])
+        install_tasks.set_primary_language(
+          code: options[:default_language_code],
+          name: options[:default_language_name],
+          auto_accept: options[:auto_accept]
+        )
       end
 
       def setup_database
         rake("db:create", abort_on_failure: true) unless options[:skip_db_create]
         # We can't invoke this rake task, because Rails will use wrong engine names otherwise
-        rake("railties:install:migrations", abort_on_failure: true)
+        rake("alchemy:install:migrations", abort_on_failure: true)
         rake("db:migrate", abort_on_failure: true)
         install_tasks.inject_seeder
         rake("db:seed", abort_on_failure: true)

data/lib/generators/alchemy/module/templates/ability.rb.tt

@@ -1,4 +1,4 @@
-class <%= @class_name %>Ability
+class <%= @controller_class %>Ability
   include CanCan::Ability
 
   def initialize(user)
@@ -7,5 +7,4 @@ class <%= @class_name %>Ability
       can :manage, :admin_<%= @controller_name %>
     end
   end
-
-end
+end

data/lib/generators/alchemy/module/templates/module_config.rb.tt

@@ -1,17 +1,19 @@
-Alchemy::Modules.register_module({
-  name: '<%= @module_name %>',
-  order: 1,
-  navigation: {
-    name: 'modules.<%= @module_name %>',
-    controller: '/admin/<%= @module_name %>',
-    action: 'index',
-    image: 'alchemy/<%= @module_name %>_module.png',
-    sub_navigation: [{
+Rails.application.config.to_prepare do
+  Alchemy::Modules.register_module({
+    name: '<%= @module_name %>',
+    order: 1,
+    navigation: {
       name: 'modules.<%= @module_name %>',
       controller: '/admin/<%= @module_name %>',
-      action: 'index'
-    }]
-  }
-})
+      action: 'index',
+      image: 'alchemy/<%= @module_name %>_module.png',
+      sub_navigation: [{
+        name: 'modules.<%= @module_name %>',
+        controller: '/admin/<%= @module_name %>',
+        action: 'index'
+      }]
+    }
+  })
 
-Alchemy.register_ability(<%= @class_name %>Ability)
+  Alchemy.register_ability(<%= @controller_class %>Ability)
+end

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.0.11",
+  "version": "6.0.13",
   "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.11
+  version: 6.0.13
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-22 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
@@ -1419,6 +1405,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
@@ -1524,7 +1511,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails