alchemy_cms 7.0.7 → 7.1.0.pre.b1

data/lib/alchemy/resource.rb

@@ -108,7 +108,7 @@ module Alchemy
     def initialize(controller_path, module_definition = nil, custom_model = nil)
       @controller_path = controller_path
       @module_definition = module_definition
-      @model = (custom_model || guess_model_from_controller_path)
+      @model = custom_model || guess_model_from_controller_path
       if model.respond_to?(:alchemy_resource_relations)
         if !model.respond_to?(:reflect_on_all_associations)
           raise MissingActiveRecordAssociation
@@ -320,7 +320,7 @@ module Alchemy
       model.alchemy_resource_relations.each do |name, options|
         relation_name = name.to_s.gsub(/_id$/, "") # ensure that we don't have an id
         association = association_from_relation_name(relation_name)
-        foreign_key = association.options[:foreign_key] || "#{association.name}_id".to_sym
+        foreign_key = association.options[:foreign_key] || :"#{association.name}_id"
         collection = options[:collection] || resource_relation_class(association).all
         resource_relations[foreign_key] = options.merge(
           model_association: association,

data/lib/alchemy/resources_helper.rb

@@ -14,11 +14,11 @@ module Alchemy
     end
 
     def resource_instance_variable
-      instance_variable_get("@#{resource_handler.resource_name}")
+      instance_variable_get(:"@#{resource_handler.resource_name}")
     end
 
     def resources_instance_variable
-      instance_variable_get("@#{resource_handler.resources_name}")
+      instance_variable_get(:"@#{resource_handler.resources_name}")
     end
 
     def resource_url_proxy
@@ -46,7 +46,7 @@ module Alchemy
     end
 
     def edit_resource_path(resource = nil, options = {})
-      path_segments = (resource_scope + [resource] || resource_handler.resource_array)
+      path_segments = resource_scope + [resource] || resource_handler.resource_array
       edit_polymorphic_path path_segments, options
     end
 
@@ -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/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,14 @@ 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 hr link lists paste tabfocus table]
+
+    @@plugins = DEFAULT_PLUGINS + %w[alchemy_link]
     @@init = {
       skin: "alchemy",
       width: "auto",
       resize: true,
-      autoresize_min_height: "105",
-      autoresize_max_height: "480",
+      min_height: 220,
       menubar: false,
       statusbar: true,
       toolbar: [
@@ -33,6 +34,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.7"
+  VERSION = "7.1.0-b1"
 
   def self.version
     VERSION

data/package.json

@@ -7,14 +7,18 @@
   "keywords": [],
   "author": "Thomas von Deyen",
   "license": "BSD-3-Clause",
+  "dependencies": {},
   "devDependencies": {
-    "@babel/core": "^7.9.6",
-    "@babel/preset-env": "^7.9.6",
-    "babel-jest": "^29.0.1",
+    "@babel/core": "^7.22.11",
+    "@babel/preset-env": "^7.22.11",
+    "babel-jest": "^29.6.4",
     "flatpickr": "^4.6.9",
-    "jest": "^25.2.7",
+    "jest": "^29.6.4",
+    "jest-environment-jsdom": "^29.6.4",
+    "jquery": "^3.7.1",
+    "jsdom-testing-mocks": "^1.11.0",
     "lodash-es": "^4.17.21",
-    "prettier": "^2.0.2",
+    "prettier": "^3.0.0",
     "sortablejs": "^1.10.2",
     "xhr-mock": "^2.5.1"
   },
@@ -22,6 +26,11 @@
     "globals": {
       "Alchemy": {}
     },
+    "moduleNameMapper": {
+      "alchemy_admin/(.*)": "<rootDir>/app/javascript/alchemy_admin/$1",
+      "vendor/(.*)": "<rootDir>/vendor/assets/javascripts/$1"
+    },
+    "testEnvironment": "jsdom",
     "roots": [
       "spec/javascript/alchemy_admin"
     ]