alchemy_cms 7.0.0.pre.a → 7.0.0.pre.b

data/lib/alchemy/tinymce.rb

@@ -4,7 +4,7 @@ module Alchemy
   module Tinymce
     mattr_accessor :languages, :plugins
 
-    @@plugins = %w(alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table)
+    @@plugins = %w[alchemy_link anchor autoresize charmap code directionality fullscreen hr link lists paste tabfocus table]
     @@init = {
       skin: "alchemy",
       width: "auto",
@@ -15,14 +15,14 @@ module Alchemy
       statusbar: true,
       toolbar: [
         "bold italic underline | strikethrough subscript superscript | numlist bullist indent outdent | removeformat | fullscreen",
-        "pastetext charmap hr | undo redo | alchemy_link unlink anchor | code",
+        "pastetext charmap hr | undo redo | alchemy_link unlink anchor | code"
       ],
       fix_list_elements: true,
       convert_urls: false,
       entity_encoding: "raw",
       paste_as_text: true,
       element_format: "html",
-      branding: false,
+      branding: false
     }
 
     class << self
@@ -33,29 +33,6 @@ module Alchemy
       def init
         @@init
       end
-
-      def custom_configs_present?(page)
-        custom_config_ingredients(page).any?
-      end
-
-      def custom_config_ingredients(page)
-        ingredient_definitions_from_elements(page.descendent_element_definitions)
-      end
-
-      private
-
-      def ingredient_definitions_from_elements(definitions)
-        definitions.collect do |el|
-          next if el["ingredients"].blank?
-
-          ingredients = el["ingredients"].select do |c|
-            c["settings"] && c["settings"]["tinymce"].is_a?(Hash)
-          end
-          next if ingredients.blank?
-
-          ingredients.map { |c| c.merge("element" => el["name"]) }
-        end.flatten.compact
-      end
     end
   end
 end

data/lib/alchemy/upgrader.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/shell"
 
 module Alchemy

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "7.0.0-a"
+  VERSION = "7.0.0-b"
 
   def self.version
     VERSION

data/lib/alchemy_cms.rb

@@ -23,6 +23,7 @@ require "sassc-rails"
 require "simple_form"
 require "turbolinks"
 require "userstamp"
+require "view_component"
 
 # Require globally used Alchemy mixins
 require_relative "alchemy/ability_helper"

data/lib/generators/alchemy/base.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy
@@ -11,7 +12,7 @@ module Alchemy
       def conditional_template(source, destination)
         files = Dir.glob(destination.gsub(/\.([a-z]+)$/, "*"))
         if files.any?
-          ext = File.extname(files.first)[1..-1]
+          ext = File.extname(files.first)[1..]
 
           # If view already exists using a different template engine, change
           # source and destination file names to use that engine.
@@ -36,7 +37,7 @@ module Alchemy
         YAML.safe_load(
           ERB.new(File.read(Rails.root.join("config", "alchemy", name))).result,
           permitted_classes: YAML_PERMITTED_CLASSES,
-          aliases: true,
+          aliases: true
         )
       rescue Errno::ENOENT
         puts "\nERROR: Could not read config/alchemy/#{name} file. Please run: `rails generate alchemy:install`"

data/lib/generators/alchemy/elements/elements_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../base"
 
 module Alchemy
@@ -26,7 +27,7 @@ module Alchemy
       end
 
       def element_name(element)
-        if element["name"] =~ Alchemy::Element::NAME_REGEXP
+        if Alchemy::Element::NAME_REGEXP.match?(element["name"])
           element["name"].underscore
         else
           raise "Element name '#{element["name"]}' has wrong format. Only lowercase and non whitespace characters allowed."

data/lib/generators/alchemy/ingredient/ingredient_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy

data/lib/generators/alchemy/install/files/application.html.erb

@@ -6,7 +6,7 @@
     <%= csp_meta_tag %>
 
     <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_link_tag 'application', 'data-turbolinks-track': 'reload' %>
+    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
   </head>
 
   <body>

data/lib/generators/alchemy/install/install_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails/generators"
 require "alchemy/install/tasks"
 require "alchemy/version"
@@ -57,7 +58,7 @@ module Alchemy
       end
 
       def copy_yml_files
-        %w(elements page_layouts menus).each do |file|
+        %w[elements page_layouts menus].each do |file|
           template "#{__dir__}/templates/#{file}.yml.tt", app_config_path.join("alchemy", "#{file}.yml")
         end
       end

data/lib/generators/alchemy/module/module_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy

data/lib/generators/alchemy/page_layouts/page_layouts_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../base"
 
 module Alchemy

data/lib/generators/alchemy/site_layouts/site_layouts_generator.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "../base"
 
 module Alchemy

data/lib/generators/alchemy/views/views_generator.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
+
 require "rails"
 
 module Alchemy
   module Generators
     class ViewsGenerator < ::Rails::Generators::Base
-      ALCHEMY_VIEWS = %w(breadcrumb language_links messages_mailer)
+      ALCHEMY_VIEWS = %w[breadcrumb language_links messages_mailer]
 
       desc "Generates Alchemy views for #{ALCHEMY_VIEWS.to_sentence}."
 

data/lib/tasks/alchemy/thumbnails.rake

@@ -5,7 +5,7 @@ namespace :alchemy do
     desc "Generates all thumbnails for Alchemy Pictures and Picture Ingredients."
     task thumbnails: [
       "alchemy:generate:picture_thumbnails",
-      "alchemy:generate:ingredient_picture_thumbnails",
+      "alchemy:generate:ingredient_picture_thumbnails"
     ]
 
     desc "Generates thumbnails for Alchemy Pictures."
@@ -24,10 +24,10 @@ namespace :alchemy do
 
     desc "Generates thumbnails for Alchemy Picture Ingredients (set ELEMENTS=element1,element2 to only generate thumbnails for a subset of elements)."
     task ingredient_picture_thumbnails: :environment do
-      ingredient_pictures = Alchemy::Ingredients::Picture.
-        joins(:element).
-        preload({ related_object: :thumbs }).
-        merge(Alchemy::Element.published)
+      ingredient_pictures = Alchemy::Ingredients::Picture
+        .joins(:element)
+        .preload({related_object: :thumbs})
+        .merge(Alchemy::Element.published)
 
       if ENV["ELEMENTS"].present?
         ingredient_pictures = ingredient_pictures.merge(

data/lib/tasks/alchemy/tidy.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/tasks/tidy"
 
 namespace :alchemy do

data/lib/tasks/alchemy/upgrade.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "alchemy/upgrader"
 require "alchemy/version"
 
@@ -6,7 +7,7 @@ namespace :alchemy do
   desc "Upgrades your app to AlchemyCMS v#{Alchemy::VERSION}."
   task upgrade: [
     "alchemy:upgrade:prepare",
-    "alchemy:upgrade:7.0:run",
+    "alchemy:upgrade:7.0:run"
   ] do
     Alchemy::Upgrader.display_todos
   end
@@ -16,13 +17,13 @@ namespace :alchemy do
     task prepare: [
       "alchemy:upgrade:database",
       "alchemy:upgrade:config",
-      "alchemy:upgrade:package",
+      "alchemy:upgrade:package"
     ]
 
     desc "Alchemy Upgrader: Prepares the database."
     task database: [
       "alchemy:install:migrations",
-      "db:migrate",
+      "db:migrate"
     ]
 
     desc "Alchemy Upgrader: Copy configuration file."
@@ -38,14 +39,14 @@ namespace :alchemy do
     desc "Upgrade Alchemy to v7.0"
     task "7.0" => [
       "alchemy:upgrade:prepare",
-      "alchemy:upgrade:7.0:run",
+      "alchemy:upgrade:7.0:run"
     ] do
       Alchemy::Upgrader.display_todos
     end
 
     namespace "7.0" do
       task "run" => [
-        "alchemy:upgrade:7.0:update_admin_entrypoint",
+        "alchemy:upgrade:7.0:update_admin_entrypoint"
       ]
 
       desc "Update alchemy admin entrypoint"

data/package/admin.js

@@ -8,6 +8,7 @@ import ImageLoader from "./src/image_loader"
 import ImageCropper from "./src/image_cropper"
 import Datepicker from "./src/datepicker"
 import Sitemap from "./src/sitemap"
+import Tinymce from "./src/tinymce"
 import PagePublicationFields from "./src/page_publication_fields.js"
 
 // Global Alchemy object
@@ -28,5 +29,6 @@ Object.assign(Alchemy, {
   IngredientAnchorLink,
   Datepicker,
   Sitemap,
+  Tinymce,
   PagePublicationFields
 })