alchemy_cms 7.0.8 → 7.1.0.pre.b2

data/lib/alchemy/auth_accessors.rb

@@ -11,6 +11,7 @@
 # +Alchemy.login_path defaults to +'/login'+
 # +Alchemy.logout_path defaults to +'/logout'+
 # +Alchemy.logout_method defaults to +'delete'+
+# +Alchemy.unauthorized_path defaults to +'/'+
 #
 # Anyway, you can tell Alchemy about your authentication model configuration:
 #
@@ -22,6 +23,7 @@
 #   5. The path to the login form - @see: Alchemy.login_path
 #   6. The path to the logout method - @see: Alchemy.logout_path
 #   7. The http verb for the logout method - @see: Alchemy.logout_method
+#   8. The path to the page showing the user she's unauthorized - @see: Alchemy.unauthorized_path
 #
 # == Example
 #
@@ -33,6 +35,7 @@
 #     Alchemy.login_path = '/auth/login'
 #     Alchemy.logout_path = '/auth/logout'
 #     Alchemy.logout_method = 'get'
+#     Alchemy.unauthorized_path = '/home'
 #
 # If you don't have your own user model or don't want to provide one,
 # add the `alchemy-devise` gem into your App's Gemfile.
@@ -49,7 +52,8 @@ module Alchemy
     :signup_path,
     :login_path,
     :logout_path,
-    :logout_method
+    :logout_method,
+    :unauthorized_path
 
   # Defaults
   #
@@ -60,6 +64,7 @@ module Alchemy
   @@login_path = "/login"
   @@logout_path = "/logout"
   @@logout_method = "delete"
+  @@unauthorized_path = "/"
 
   # Returns the user class
   #

data/lib/alchemy/config.rb

@@ -9,7 +9,8 @@ module Alchemy
       #
       def get(name)
         check_deprecation(name)
-        show[name.to_s]
+        key = check_replacement(name)
+        show[key.to_s]
       end
 
       alias_method :parameter, :get
@@ -27,13 +28,20 @@ module Alchemy
         @config ||= merge_configs!(alchemy_config, main_app_config, env_specific_config)
       end
 
-      # A list of deprecated configurations
+      # A list of deprecated configuration values
       # a value of nil means there is no new default
       # any not nil value is the new default
       def deprecated_configs
         {}
       end
 
+      # A list of replaced configuration keys
+      def replaced_config_keys
+        {
+          output_image_quality: :output_image_jpg_quality
+        }
+      end
+
       private
 
       # Alchemy default configuration
@@ -87,6 +95,20 @@ module Alchemy
           end
         end
       end
+
+      def check_replacement(name)
+        if replaced_config_keys.key?(name.to_sym)
+          old_key = replaced_config_keys[name.to_sym]
+          if show[old_key.to_s]
+            Alchemy::Deprecation.warn("Using #{old_key} configuration is deprecated and will be removed in Alchemy #{Alchemy::Deprecation.deprecation_horizon}. Please use #{name} instead.")
+            old_key
+          else
+            name
+          end
+        else
+          name
+        end
+      end
     end
   end
 end

data/lib/alchemy/dev_support/live_reload_watcher.rb

@@ -0,0 +1,5 @@
+module Alchemy
+  class LiveReloadWatcher < RailsLiveReload::Watcher
+    def root = Alchemy::Engine.root
+  end
+end

data/lib/alchemy/engine.rb

@@ -24,7 +24,8 @@ module Alchemy
       Alchemy.importmap.draw(Engine.root.join("config", "importmap.rb"))
 
       package_path = Engine.root.join("app/javascript")
-      app.config.assets.paths << package_path
+      vendor_packages_path = Engine.root.join("vendor/javascript")
+      app.config.assets.paths += [package_path, vendor_packages_path]
 
       if app.config.importmap.sweep_cache
         Alchemy.importmap.cache_sweeper(watches: package_path)
@@ -46,8 +47,8 @@ module Alchemy
     initializer "alchemy.ransack" do
       Ransack.configure do |config|
         config.custom_arrows = {
-          up_arrow: '<i class="fa fas fa-xs fa-arrow-up"></i>',
-          down_arrow: '<i class="fa fas fa-xs fa-arrow-down"></i>'
+          up_arrow: '<i class="ri-1x ri-arrow-up-line"></i>',
+          down_arrow: '<i class="ri-1x ri-arrow-down-line"></i>'
         }
       end
     end
@@ -59,6 +60,12 @@ module Alchemy
           Alchemy.user_class.stampable(stamper_class_name: Alchemy.user_class.name)
         end
       end
+
+      if defined?(RailsLiveReload) && Rails.env.development?
+        require "alchemy/dev_support/live_reload_watcher"
+
+        Alchemy::LiveReloadWatcher.init
+      end
     end
 
     initializer "alchemy.webp-mime_type" do

data/lib/alchemy/forms/builder.rb

@@ -9,20 +9,25 @@ module Alchemy
         options[:wrapper] = :alchemy
 
         if object.respond_to?(:attribute_fixed?) && object.attribute_fixed?(attribute_name)
-          options[:disabled] = true
-          options[:input_html] = options.fetch(:input_html, {}).merge(
-            "data-alchemy-tooltip" => Alchemy.t(:attribute_fixed, attribute: attribute_name)
-          )
+          tooltip_options = {
+            content: Alchemy.t(:attribute_fixed, attribute: attribute_name),
+            class: "like-hint-tooltip",
+            placement: "bottom-start"
+          }
+          template.content_tag(:div, class: "input") do
+            label(attribute_name) +
+              template.content_tag("sl-tooltip", tooltip_options) do
+                input_field(attribute_name, disabled: true)
+              end
+          end
+        else
+          super
         end
-
-        super
       end
 
       # Renders a simple_form input that displays a datepicker
       #
       def datepicker(attribute_name, options = {})
-        options[:wrapper] = :alchemy
-
         type = options[:as] || :date
         value = options.fetch(:input_html, {}).delete(:value)
         date = value || object.send(attribute_name.to_sym).presence
@@ -31,21 +36,22 @@ module Alchemy
         input_options = {
           type: :text,
           class: type,
-          data: {datepicker_type: type},
           value: date&.iso8601
         }.merge(options[:input_html] || {})
 
-        input attribute_name, as: :string, input_html: input_options
+        date_field = input attribute_name, as: :string, input_html: input_options
+        template.content_tag("alchemy-datepicker", date_field, type: type)
       end
 
       # Renders a button tag wrapped in a div with 'submit' class.
       #
       def submit(label, options = {})
         options = {
-          wrapper_html: {class: "submit"}
+          wrapper_html: {class: "submit"},
+          input_html: {is: "alchemy-button"}
         }.update(options)
         template.content_tag("div", options.delete(:wrapper_html)) do
-          template.content_tag("button", label, options.delete(:input_html))
+          template.button_tag(label, options.delete(:input_html))
         end
       end
     end

data/lib/alchemy/resources_helper.rb

@@ -160,10 +160,10 @@ module Alchemy
     #
     # NOTE: Alchemy gives you a local variable named like your resource
     #
-    def render_resources
-      render partial: resource_name, collection: resources_instance_variable
+    def render_resources(icon: nil)
+      render partial: resource_name, collection: resources_instance_variable, locals: {icon: icon}
     rescue ActionView::MissingTemplate
-      render partial: "resource", collection: resources_instance_variable
+      render partial: "resource", collection: resources_instance_variable, locals: {icon: icon}
     end
 
     def resource_has_tags

data/lib/alchemy/test_support/capybara_helpers.rb

@@ -46,11 +46,12 @@ module Alchemy
         end
       end
 
-      def click_button_with_label(label)
-        label = find("label", text: label)
-        within label.first(:xpath, ".//..") do
-          first("button").click
-        end
+      def click_button_with_tooltip(content)
+        find(%([content="#{content}"] > button)).click
+      end
+
+      def click_link_with_tooltip(content)
+        find(%([content="#{content}"] > a)).click
       end
 
       private
@@ -63,6 +64,8 @@ module Alchemy
         find "label:not(.select2-offscreen)",
           text: /#{Regexp.escape(text)}/i,
           match: :one
+      rescue Capybara::ElementNotFound
+        find %([content="#{text}"]), match: :one
       end
     end
   end

data/lib/alchemy/test_support/having_picture_thumbnails_examples.rb

@@ -203,8 +203,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
       allow(record).to receive(:settings) { settings }
     end
 
-    it "includes the image's original file format." do
-      expect(thumbnail_url).to match(/\.png/)
+    it "includes webp file format." do
+      expect(thumbnail_url).to match(/\.webp/)
     end
 
     it "flattens the image." do
@@ -305,8 +305,8 @@ RSpec.shared_examples_for "having picture thumbnails" do
         create(:alchemy_picture)
       end
 
-      it "includes the image's original file format." do
-        expect(thumbnail_url_options[:format]).to eq("png")
+      it "uses webp image format." do
+        expect(thumbnail_url_options[:format]).to eq("webp")
       end
 
       it "flattens the image." do
@@ -381,7 +381,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
           crop_from: nil,
           crop_size: nil,
           flatten: true,
-          format: "jpg",
+          format: "webp",
           size: "160x120"
         )
       end
@@ -400,7 +400,7 @@ RSpec.shared_examples_for "having picture thumbnails" do
             crop_from: nil,
             crop_size: nil,
             flatten: true,
-            format: "jpg",
+            format: "webp",
             size: "160x120"
           )
         end

data/lib/alchemy/test_support/rspec_matchers.rb

@@ -0,0 +1,14 @@
+RSpec::Matchers.define :have_link_with_tooltip do |content|
+  match do |session|
+    session.has_css?(%([content="#{content}"] a))
+  end
+end
+
+# Here's a tiny custom matcher making it a bit easier to check the
+# current session for a language configuration.
+#
+RSpec::Matchers.define :include_language_information_for do |expected|
+  match do |actual|
+    actual[:alchemy_language_id] == expected.id
+  end
+end

data/lib/alchemy/test_support/shared_uploader_examples.rb

@@ -6,7 +6,7 @@ RSpec.shared_examples_for "having a json uploader error message" do
     expect(response.media_type).to eq("application/json")
     expect(response.status).to eq(422)
     json = JSON.parse(response.body)
-    expect(json).to have_key("growl_message")
+    expect(json).to have_key("message")
     expect(json).to have_key("files")
   end
 end

data/lib/alchemy/tinymce.rb

@@ -4,13 +4,25 @@ module Alchemy
   module Tinymce
     mattr_accessor :languages, :plugins
 
-    @@plugins = %w[alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table]
+    DEFAULT_PLUGINS = %w[
+      anchor
+      charmap
+      code
+      directionality
+      fullscreen
+      link
+      lists
+    ]
+
+    @@plugins = DEFAULT_PLUGINS + %w[alchemy_link]
     @@init = {
       skin: "alchemy",
+      content_css: "/assets/tinymce/skins/content/alchemy/content.min.css",
+      icons: "remixicons",
       width: "auto",
       resize: true,
-      autoresize_min_height: "105",
-      autoresize_max_height: "480",
+      min_height: 250,
+      height: 250,
       menubar: false,
       statusbar: true,
       toolbar: [
@@ -33,6 +45,10 @@ module Alchemy
       def init
         @@init
       end
+
+      def preloadable_plugins
+        @@plugins - DEFAULT_PLUGINS
+      end
     end
   end
 end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.0.8"
+  VERSION = "7.1.0-b2"
 
   def self.version
     VERSION

data/package.json

@@ -2,26 +2,47 @@
   "name": "alchemy_admin",
   "scripts": {
     "test": "jest",
-    "lint": "prettier --check 'app/javascript/**/*.js'"
+    "lint": "prettier --check 'app/javascript/**/*.js'",
+    "build": "rollup -c"
   },
   "keywords": [],
   "author": "Thomas von Deyen",
   "license": "BSD-3-Clause",
+  "dependencies": {
+    "@rails/ujs": "^7.1.2",
+    "@shoelace-style/shoelace": "^2.12.0",
+    "@ungap/custom-elements": "^1.3.0",
+    "clipboard": "^2.0.11",
+    "flatpickr": "^4.6.13",
+    "keymaster": "^1.6.2",
+    "sortablejs": "^1.15.1",
+    "tinymce": "^6.8.2"
+  },
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "babel-jest": "^29.0.1",
-    "flatpickr": "^4.6.9",
-    "jest": "^25.2.7",
-    "lodash-es": "^4.17.21",
-    "prettier": "^2.0.2",
-    "sortablejs": "^1.10.2",
+    "@babel/core": "^7.22.11",
+    "@babel/preset-env": "^7.22.11",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
+    "babel-jest": "^29.6.4",
+    "jest": "^29.6.4",
+    "jest-environment-jsdom": "^29.6.4",
+    "jquery": "^3.7.1",
+    "jsdom-testing-mocks": "^1.11.0",
+    "prettier": "^3.0.0",
+    "rollup": "^4.9.3",
     "xhr-mock": "^2.5.1"
   },
   "jest": {
     "globals": {
       "Alchemy": {}
     },
+    "moduleNameMapper": {
+      "alchemy_admin/(.*)": "<rootDir>/app/javascript/alchemy_admin/$1",
+      "assets/(.*)": "<rootDir>/vendor/assets/javascripts/$1",
+      "vendor/(.*)": "<rootDir>/vendor/javascript/$1"
+    },
+    "testEnvironment": "jsdom",
     "roots": [
       "spec/javascript/alchemy_admin"
     ]

data/rollup.config.mjs

@@ -0,0 +1,65 @@
+import resolve from "@rollup/plugin-node-resolve"
+import commonjs from "@rollup/plugin-commonjs"
+import terser from "@rollup/plugin-terser"
+
+export default [
+  {
+    input: "node_modules/clipboard/dist/clipboard.min.js",
+    output: {
+      file: "vendor/javascript/clipboard.min.js"
+    },
+    context: "window"
+  },
+  {
+    input: "node_modules/flatpickr/dist/esm/index.js",
+    output: {
+      file: "vendor/javascript/flatpickr.min.js"
+    },
+    plugins: [resolve(), terser()],
+    context: "window"
+  },
+  {
+    input: "node_modules/keymaster/keymaster.js",
+    output: {
+      file: "vendor/javascript/keymaster.min.js"
+    },
+    plugins: [terser()],
+    context: "window"
+  },
+  {
+    input: "node_modules/sortablejs/modular/sortable.esm.js",
+    output: {
+      file: "vendor/javascript/sortable.min.js"
+    },
+    plugins: [terser()]
+  },
+  {
+    input: "node_modules/@ungap/custom-elements/min.js",
+    output: {
+      file: "vendor/javascript/ungap-custom-elements.min.js"
+    }
+  },
+  {
+    input: "node_modules/@rails/ujs/app/assets/javascripts/rails-ujs.esm.js",
+    output: {
+      file: "vendor/javascript/rails-ujs.min.js"
+    },
+    plugins: [terser()]
+  },
+  {
+    input: "bundles/shoelace.js",
+    output: {
+      file: "vendor/javascript/shoelace.min.js"
+    },
+    plugins: [resolve(), terser()]
+  },
+  {
+    input: "bundles/tinymce.js",
+    output: {
+      file: "vendor/javascript/tinymce.min.js",
+      name: "tinymce",
+      format: "esm"
+    },
+    plugins: [resolve(), commonjs(), terser()]
+  }
+]