ckeditor5 1.35.1 → 1.82.3

data/lib/ckeditor5/rails/presets/manager.rb

@@ -27,7 +27,7 @@ module CKEditor5::Rails::Presets
     #   end
     # @example Define preset from scratch
     #   presets.define :blank, inherit: false do
-    #     version '43.3.1'
+    #     version '44.3.0'
     #     gpl
     #     type :classic
     #   end
@@ -40,8 +40,6 @@ module CKEditor5::Rails::Presets
                end
 
       preset.instance_eval(&block)
-      preset.try_compress_inline_plugins! if preset.compression?
-
       @presets[name] = preset
     end
 
@@ -56,10 +54,7 @@ module CKEditor5::Rails::Presets
     #     end
     #   end
     def override(name, &block)
-      preset = @presets[name]
-
-      preset.instance_eval(&block)
-      preset.try_compress_inline_plugins! if preset.compression?
+      @presets[name].instance_eval(&block)
     end
 
     alias extend override
@@ -83,7 +78,7 @@ module CKEditor5::Rails::Presets
     # @example Basic configuration
     #   CKEditor5::Rails.configure do
     #     presets.define :default do
-    #       version '43.3.1'
+    #       version '44.3.0'
     #       gpl
     #       type :classic
     #       menubar

data/lib/ckeditor5/rails/presets/preset_builder.rb

@@ -6,14 +6,14 @@ require_relative 'special_characters_builder'
 
 module CKEditor5::Rails
   module Presets
-    class PresetBuilder # rubocop:disable Metrics/ClassLength
+    class PresetBuilder
       include Editor::Helpers::Config
       include Concerns::ConfigurationMethods
       include Concerns::PluginMethods
 
       # @example Basic initialization
       #   PresetBuilder.new do
-      #     version '43.3.1'
+      #     version '44.3.0'
       #     gpl
       #     type :classic
       #   end
@@ -27,7 +27,6 @@ module CKEditor5::Rails
         @ckbox = nil
         @editable_height = nil
         @automatic_upgrades = false
-        @disallow_inline_plugin_compression = false
         @custom_translations = {}
         @config = {
           plugins: [],
@@ -37,6 +36,12 @@ module CKEditor5::Rails
         instance_eval(&block) if block_given?
       end
 
+      def deconstruct_keys(keys)
+        keys.index_with do |key|
+          public_send(key)
+        end
+      end
+
       # @example Copy preset and modify it
       #   original = PresetBuilder.new
       #   copied = original.initialize_copy(original)
@@ -169,15 +174,12 @@ module CKEditor5::Rails
 
       # Set or get editor version
       # @param version [String, nil] Editor version to set
-      # @param apply_patches [Boolean] Whether to apply integration patches after setting version
       # @example Set specific version
-      #   version '43.3.1'
-      # @example Set version without applying patches
-      #   version '43.3.1', apply_patches: false
+      #   version '44.3.0'
       # @example Get current version
       #   version # => "43.3.1"
       # @return [String, nil] Current version string or nil if not set
-      def version(version = nil, apply_patches: true)
+      def version(version = nil)
         return @version&.to_s if version.nil?
 
         if @automatic_upgrades && version
@@ -190,13 +192,6 @@ module CKEditor5::Rails
         # If there is no license key set, and the version if newer than 44.0.0, switch to GPL
         # as the license key is now required in all versions
         gpl if license_key.nil? && @version.major >= 44
-        apply_integration_patches if apply_patches
-      end
-
-      # Apply integration patches for the current version
-      # @return [void]
-      def apply_integration_patches(compress: !@disallow_inline_plugin_compression)
-        patch_plugin(Plugins::Patches::FixColorPickerRaceCondition.new(compress: compress))
       end
 
       # Enable or disable automatic version upgrades
@@ -333,7 +328,6 @@ module CKEditor5::Rails
       # Configure custom translations for the editor
       # @param lang_code [Symbol] Language code for translations (e.g. :en, :pl)
       # @param translations [Hash] A hash containing translations in format { key => translation }
-      # @param compress [Boolean] Whether to compress the translations
       # @example Add multiple translations
       #   custom_translations :en, {
       #     'my.button': 'My Button'
@@ -352,15 +346,14 @@ module CKEditor5::Rails
       #     ]
       #   }
       # @return [void]
-      def custom_translations(lang_code = nil, translations = {},
-                              compress: !@disallow_inline_plugin_compression)
+      def custom_translations(lang_code = nil, translations = {})
         return @custom_translations if lang_code.blank?
 
         @custom_translations[lang_code.to_sym] ||= {}
         @custom_translations[lang_code.to_sym].merge!(translations)
 
         plugins.remove(:CustomTranslationsLoader)
-        plugins.prepend(Plugins::CustomTranslationsLoader.new(@custom_translations, compress: compress))
+        plugins.prepend(Plugins::CustomTranslationsLoader.new(@custom_translations))
       end
 
       # Configure editor language
@@ -388,37 +381,34 @@ module CKEditor5::Rails
 
       # Configure simple upload adapter
       # @param upload_url [String] Upload endpoint URL
-      # @param compress [Boolean] Enable compression
       # @example Enable upload adapter
       #   simple_upload_adapter '/uploads'
-      def simple_upload_adapter(upload_url = '/uploads', compress: !@disallow_inline_plugin_compression)
+      def simple_upload_adapter(upload_url = '/uploads')
         plugins do
           remove(:Base64UploadAdapter)
         end
 
-        plugin(Plugins::SimpleUploadAdapter.new(compress: compress))
+        plugin(Plugins::SimpleUploadAdapter.new)
         configure(:simpleUpload, { uploadUrl: upload_url })
       end
 
       # Configure WProofreader plugin
       # @param version [String, nil] Plugin version
       # @param cdn [String, nil] CDN URL
-      # @param compress [Boolean] Enable compression
       # @param config [Hash] Plugin configuration
       # @example Basic configuration
       #   wproofreader serviceId: 'your-service-ID',
       #              srcUrl: 'https://svc.webspellchecker.net/spellcheck31/wscbundle/wscbundle.js'
-      def wproofreader(version: nil, cdn: nil, compress: !@disallow_inline_plugin_compression, **config)
+      def wproofreader(version: nil, cdn: nil, **config)
         configure :wproofreader, config
         plugins do
-          prepend(Plugins::WProofreaderSync.new(compress: compress))
+          prepend(Plugins::WProofreaderSync.new)
           append(Plugins::WProofreader.new(version: version, cdn: cdn))
         end
       end
 
       # Configure special characters plugin
       #
-      # @param compress [Boolean] Enable compression
       # @yield Block for configuring special characters
       # @example Basic configuration with block
       #   special_characters do
@@ -444,14 +434,14 @@ module CKEditor5::Rails
       #       item 'heart', '❤️'
       #     end
       #   end
-      def special_characters(compress: !@disallow_inline_plugin_compression, &block)
+      def special_characters(&block)
         builder = SpecialCharactersBuilder.new
         builder.instance_eval(&block) if block_given?
 
         plugins do
           append(:SpecialCharacters)
           builder.packs_plugins.each { |pack| append(pack) }
-          prepend(Plugins::SpecialCharactersBootstrap.new(compress: compress))
+          prepend(Plugins::SpecialCharactersBootstrap.new)
         end
 
         configure(:specialCharactersBootstrap, builder.to_h)

data/lib/ckeditor5/rails/presets/special_characters_builder.rb

@@ -20,7 +20,8 @@ module CKEditor5::Rails::Presets
     #   group = Group.new('Emoji', label: 'Emoticons')
     #   group.item('smiley', '😊')
     class Group
-      attr_reader :name, :label, :items
+      attr_reader :name, :label
+      private attr_reader :items
 
       # Initialize a new special characters group
       #

data/lib/ckeditor5/rails/semver.rb

@@ -3,7 +3,7 @@
 module CKEditor5
   module Rails
     class Semver
-      SEMVER_PATTERN = /\A\d+\.\d+\.\d+\z/.freeze
+      SEMVER_PATTERN = /\A\d+\.\d+\.\d+\z/
 
       attr_reader :major, :minor, :patch
 

data/lib/ckeditor5/rails/version.rb

@@ -2,8 +2,8 @@
 
 module CKEditor5
   module Rails
-    VERSION = '1.35.1'
+    VERSION = '1.82.3'
 
-    DEFAULT_CKEDITOR_VERSION = '47.6.0'
+    DEFAULT_CKEDITOR_VERSION = '44.3.0'
   end
 end

data/spec/e2e/features/context_spec.rb

@@ -17,7 +17,7 @@ RSpec.describe 'CKEditor5 Context Integration', type: :feature, js: true do
   end
 
   it 'allows editing content in context editors' do
-    editors = all('.ck-editor__editable', count: 2, wait: 10)
+    editors = all('.ck-editor__editable')
 
     # Test first editor
     editors[0].click

data/spec/e2e/spec_helper.rb

@@ -47,4 +47,4 @@ RSpec.configure do |config|
   end
 end
 
-Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }

data/spec/lib/ckeditor5/rails/cdn/helpers_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe CKEditor5::Rails::Cdn::Helpers do
   let(:helper) { test_class.new }
   let(:preset) do
     CKEditor5::Rails::Presets::PresetBuilder.new do
-      version '34.1.0', apply_patches: false
+      version '34.1.0'
       type :classic
       translations :pl
       cdn :cloud
@@ -151,7 +151,7 @@ RSpec.describe CKEditor5::Rails::Cdn::Helpers do
     context 'when overriding preset values' do
       let(:preset) do
         CKEditor5::Rails::Presets::PresetBuilder.new do
-          version '34.1.0', apply_patches: false
+          version '34.1.0'
           type :classic
           language :pl
           cdn :cloud
@@ -200,13 +200,16 @@ RSpec.describe CKEditor5::Rails::Cdn::Helpers do
 
         expect(context[:preset].language).to eq({ ui: :pl, content: :pl })
       end
+    end
 
-      it 'should set language with normalized separated code' do
-        preset.language(:'zh-CN')
-
-        helper.ckeditor5_assets(preset: :default)
+    context 'with missing required parameters' do
+      before do
+        allow(helper).to receive(:merge_with_editor_preset).and_return({})
+      end
 
-        expect(context[:preset].language).to eq({ ui: :'zh-cn', content: :'zh-cn' })
+      it 'raises error about missing required parameters' do
+        expect { helper.ckeditor5_assets(preset: :default) }
+          .to raise_error(NoMatchingPatternKeyError)
       end
     end
 
@@ -358,7 +361,7 @@ RSpec.describe CKEditor5::Rails::Cdn::Helpers do
 
   describe '#ckeditor5_inline_plugins_tags' do
     let(:preset) do
-      preset = CKEditor5::Rails::Presets::PresetBuilder.new do
+      CKEditor5::Rails::Presets::PresetBuilder.new do
         inline_plugin 'Plugin1', <<~JAVASCRIPT
           const { Plugin } = await import( 'ckeditor5' );
 
@@ -379,13 +382,10 @@ RSpec.describe CKEditor5::Rails::Cdn::Helpers do
           }
         JAVASCRIPT
       end
-
-      preset.try_compress_inline_plugins!
-      preset
     end
 
     let(:another_preset) do
-      preset = CKEditor5::Rails::Presets::PresetBuilder.new do
+      CKEditor5::Rails::Presets::PresetBuilder.new do
         inline_plugin 'Plugin3', <<~JAVASCRIPT
           const { Plugin } = await import( 'ckeditor5' );
 
@@ -396,9 +396,6 @@ RSpec.describe CKEditor5::Rails::Cdn::Helpers do
           }
         JAVASCRIPT
       end
-
-      preset.try_compress_inline_plugins!
-      preset
     end
 
     before do

data/spec/lib/ckeditor5/rails/context/preset_builder_spec.rb

@@ -83,24 +83,6 @@ RSpec.describe CKEditor5::Rails::Context::PresetBuilder do
     end
   end
 
-  describe 'try_compress_inline_plugins!' do
-    let(:plugin_code) do
-      <<~JAVASCRIPT
-        const { Plugin } = await import( 'ckeditor5' );
-
-        return class Abc extends Plugin {}
-      JAVASCRIPT
-    end
-
-    it 'raises CompressionDisabledError when compression is disabled' do
-      builder.instance_variable_set(:@disallow_inline_plugin_compression, true)
-
-      expect do
-        builder.try_compress_inline_plugins!
-      end.to raise_error(CKEditor5::Rails::Presets::Concerns::PluginMethods::CompressionDisabledError)
-    end
-  end
-
   describe '#inline_plugin' do
     let(:plugin_code) do
       <<~JAVASCRIPT

data/spec/lib/ckeditor5/rails/editor/helpers/editor_helpers_spec.rb

@@ -238,13 +238,6 @@ RSpec.describe CKEditor5::Rails::Editor::Helpers::Editor do
         expect(result).to include('preset-license-key')
       end
     end
-
-    context 'turbo temporary attribute' do
-      it 'includes data-turbo-temporary attribute in the editor component' do
-        result = helper.ckeditor5_editor
-        expect(result).to include('data-turbo-temporary="true"')
-      end
-    end
   end
 
   describe '#ckeditor5_editable' do
@@ -254,11 +247,6 @@ RSpec.describe CKEditor5::Rails::Editor::Helpers::Editor do
         with: { name: 'content' }
       )
     end
-
-    it 'includes data-turbo-temporary attribute in the editable component' do
-      result = helper.ckeditor5_editable('content')
-      expect(result).to include('data-turbo-temporary="true"')
-    end
   end
 
   describe '#ckeditor5_ui_part' do
@@ -268,11 +256,6 @@ RSpec.describe CKEditor5::Rails::Editor::Helpers::Editor do
         with: { name: 'toolbar' }
       )
     end
-
-    it 'includes data-turbo-temporary attribute in the ui part component' do
-      result = helper.ckeditor5_ui_part('toolbar')
-      expect(result).to include('data-turbo-temporary="true"')
-    end
   end
 
   describe '#ckeditor5_toolbar' do
@@ -282,11 +265,6 @@ RSpec.describe CKEditor5::Rails::Editor::Helpers::Editor do
         with: { name: 'toolbar' }
       )
     end
-
-    it 'includes data-turbo-temporary attribute in the toolbar component' do
-      result = helper.ckeditor5_toolbar
-      expect(result).to include('data-turbo-temporary="true"')
-    end
   end
 
   describe '#ckeditor5_menubar' do
@@ -296,10 +274,5 @@ RSpec.describe CKEditor5::Rails::Editor::Helpers::Editor do
         with: { name: 'menuBarView' }
       )
     end
-
-    it 'includes data-turbo-temporary attribute in the menubar component' do
-      result = helper.ckeditor5_menubar
-      expect(result).to include('data-turbo-temporary="true"')
-    end
   end
 end

data/spec/lib/ckeditor5/rails/editor/props_inline_plugin_spec.rb

@@ -26,34 +26,6 @@ RSpec.describe CKEditor5::Rails::Editor::PropsInlinePlugin do
     end
   end
 
-  describe '#try_compress!' do
-    let(:plugin) { described_class.new(:CustomPlugin, valid_code) }
-    let(:compiled_code) { '(async()=>{const compressed_code})()' }
-    let(:terser_instance) { instance_double('Terser') }
-
-    context 'when compression is enabled' do
-      it 'compresses the code using Terser' do
-        expect(Terser).to receive(:new).with(compress: false, mangle: true).and_return(terser_instance)
-        expect(terser_instance).to receive(:compile).with(plugin.code).and_return(compiled_code)
-
-        plugin.try_compress!
-        expect(plugin.code).to eq(compiled_code)
-      end
-    end
-
-    context 'when compression is disabled' do
-      let(:plugin) { described_class.new(:CustomPlugin, valid_code, compress: false) }
-      let(:original_code) { plugin.code.dup }
-
-      it 'does not modify the code' do
-        expect(Terser).not_to receive(:new)
-
-        plugin.try_compress!
-        expect(plugin.code).to eq(original_code)
-      end
-    end
-  end
-
   describe '#to_h' do
     it 'returns correct hash representation' do
       plugin = described_class.new(:CustomPlugin, valid_code)

data/spec/lib/ckeditor5/rails/editor/props_spec.rb

@@ -32,21 +32,11 @@ RSpec.describe CKEditor5::Rails::Editor::Props do
       )
     end
 
-    context 'when bundle is nil' do
-      let(:bundle) { nil }
-
-      it 'includes bundle attribute with nil value' do
-        attributes = props.to_attributes
-        expect(attributes).to have_key(:bundle)
-        expect(attributes[:bundle]).to be_nil
-      end
-    end
-
     context 'with editable height' do
       subject(:props) { described_class.new(type, config, bundle: bundle, editable_height: '500px') }
 
       it 'includes editable-height attribute' do
-        expect(props.to_attributes[:'editable-height']).to eq('500px')
+        expect(props.to_attributes['editable-height']).to eq('500px')
       end
     end
 
@@ -87,12 +77,12 @@ RSpec.describe CKEditor5::Rails::Editor::Props do
 
       it 'accepts integer values' do
         props = described_class.new(type, config, bundle: bundle, editable_height: 500)
-        expect(props.to_attributes[:'editable-height']).to eq('500px')
+        expect(props.to_attributes['editable-height']).to eq('500px')
       end
 
       it 'accepts pixel string values' do
         props = described_class.new(type, config, bundle: bundle, editable_height: '500px')
-        expect(props.to_attributes[:'editable-height']).to eq('500px')
+        expect(props.to_attributes['editable-height']).to eq('500px')
       end
 
       it 'raises error for invalid values' do

data/spec/lib/ckeditor5/rails/presets/manager_spec.rb

@@ -20,7 +20,7 @@ RSpec.describe CKEditor5::Rails::Presets::Manager do
       it 'creates new preset based on default' do
         manager.define(:custom) do
           automatic_upgrades enabled: false
-          version '36.0.0', apply_patches: false
+          version '36.0.0'
         end
 
         expect(manager[:custom].version).to eq('36.0.0')
@@ -32,42 +32,13 @@ RSpec.describe CKEditor5::Rails::Presets::Manager do
       it 'creates completely new preset' do
         manager.define(:custom, inherit: false) do
           automatic_upgrades enabled: false
-          version '36.0.0', apply_patches: false
+          version '36.0.0'
         end
 
         expect(manager[:custom].version).to eq('36.0.0')
         expect(manager[:custom].config).to eq({ plugins: [], toolbar: [] })
       end
     end
-
-    context 'with compression settings' do
-      it 'attempts compression when compression? returns true' do
-        preset = manager.define(:with_compression, inherit: false) do
-          version '36.0.0', apply_patches: true
-          inline_plugin 'Test', <<~JAVASCRIPT
-            const { Plugin } = await import( 'ckeditor5' );
-
-            return class Abc extends Plugin {}
-          JAVASCRIPT
-        end
-
-        expect(preset.config[:plugins].first.code).to include('const{Plugin:t,ColorPickerView:i,debounce:o}=')
-      end
-
-      it 'does not attempt compression when compression? returns false' do
-        preset = manager.define(:without_compression, inherit: false) do
-          compression enabled: false
-          version '36.0.0', apply_patches: true
-          inline_plugin 'Test', <<~JAVASCRIPT
-            const { Plugin } = await import( 'ckeditor5' );
-
-            return class Abc extends Plugin {}
-          JAVASCRIPT
-        end
-
-        expect(preset.config[:plugins].first.code).to include('const { Plugin, ColorPickerView, debounce }')
-      end
-    end
   end
 
   describe '#override/#extend' do
@@ -98,33 +69,6 @@ RSpec.describe CKEditor5::Rails::Presets::Manager do
 
       expect(manager[:custom].version).to eq('36.0.0')
     end
-
-    context 'with compression settings' do
-      let(:preset_builder) { instance_double(CKEditor5::Rails::Presets::PresetBuilder) }
-
-      before do
-        allow(preset_builder).to receive(:instance_eval)
-        manager.instance_variable_set(:@presets, { custom: preset_builder })
-      end
-
-      it 'attempts compression when compression? returns true' do
-        allow(preset_builder).to receive(:compression?).and_return(true)
-        allow(preset_builder).to receive(:try_compress_inline_plugins!)
-
-        manager.override(:custom) {}
-
-        expect(preset_builder).to have_received(:try_compress_inline_plugins!).once
-      end
-
-      it 'does not attempt compression when compression? returns false' do
-        allow(preset_builder).to receive(:compression?).and_return(false)
-        allow(preset_builder).to receive(:try_compress_inline_plugins!)
-
-        manager.override(:custom) {}
-
-        expect(preset_builder).not_to have_received(:try_compress_inline_plugins!)
-      end
-    end
   end
 
   describe '#[]' do

data/spec/lib/ckeditor5/rails/presets/preset_builder_spec.rb

@@ -280,8 +280,7 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
     end
 
     it 'adds inline plugin to configuration' do
-      builder.inline_plugin(:CustomPlugin, plugin_code, compress: true)
-      builder.try_compress_inline_plugins!
+      builder.inline_plugin(:CustomPlugin, plugin_code)
 
       plugin = builder.config[:plugins].first
       expect(plugin).to be_a(CKEditor5::Rails::Editor::PropsInlinePlugin)
@@ -332,14 +331,6 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
     end
   end
 
-  describe '#disable_compression' do
-    it 'disables compression for inline plugins' do
-      builder.compression(enabled: false)
-      expect(builder.compression?).to be false
-      expect(builder.disallow_inline_plugin_compression).to be true
-    end
-  end
-
   describe '#external_plugin' do
     it 'adds external plugin to config' do
       plugin = builder.external_plugin('Test', script: 'https://example.org/script.js')
@@ -718,7 +709,7 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
     it 'applies patch when applicable' do
       allow(patch_plugin).to receive(:applicable_for_version?).and_return(true)
 
-      builder.version('35.0.0', apply_patches: false)
+      builder.version('35.0.0')
       builder.patch_plugin(patch_plugin)
 
       plugin_names = builder.config[:plugins].map(&:name)
@@ -742,19 +733,4 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
       expect(plugin_names).to include(:TestPatch)
     end
   end
-
-  describe '#apply_integration_patches' do
-    it 'applies known integration patches' do
-      builder.version('35.0.0', apply_patches: false)
-      expect { builder.apply_integration_patches }
-        .to change { builder.config[:plugins].count }
-        .by(1)
-    end
-
-    it 'apply patches when version is not set' do
-      expect { builder.apply_integration_patches }
-        .to change { builder.config[:plugins].count }
-        .by(1)
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -34,7 +34,7 @@ require 'rspec/rails'
 require 'rspec/expectations'
 require 'rspec-html-matchers'
 
-Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }
 
 Rails.application.initialize! unless Rails.application.initialized?