alchemy_cms 6.0.11 → 6.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9b537e2e01fab999228f1a8813bbd0c905d521639eeeb1413021c70e5add7e
-  data.tar.gz: 6d93f0bb79d91d05a6cda0d9a1f6697fada5cd2de30bc11b7e5c879f98ebd1a4
+  metadata.gz: 706ea8d8bb121be924f467a6d367104dae78cf131a1a86bca33c08c75f377239
+  data.tar.gz: 8e8d3603be2b6b507c39a010b6231b2b3b753babb6556453741258699635a400
 SHA512:
-  metadata.gz: 9640f98ba68fb3b85dcdf7edb966911eb148448838259981576f0f5da1e8a6511b2adf6c72753c5396b13ae7d3d42776ac160db9e5793b6b34f4cb5296e28910
-  data.tar.gz: 59ab7f7c6097b79df1971212cae17cc587aadb93338b8e7a8131dfdea73756bb3e0ec0b5fd68726769b829e326b346bd0ce9832764bd613af131a4b21dfb8a76
+  metadata.gz: 00b2766205aba938284f4fef79e6d7e00c1271c243ab4b50faa63dff68e11cb47c2029bc4afd20f57c917966429083328a0ab9a3629ab9ede810793b60aa036a
+  data.tar.gz: ecfbc1794df353099fd1ec2454275c55d09c9521cb85591258f67707ed2cf6dc72f287ca99135373783710def1df11a3302066f51935772bcf84c56d94a8ba98

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 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/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/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

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.12"
 
   def self.version
     VERSION

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.0.11",
+  "version": "6.0.12",
   "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.12
 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: 2022-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer