ckeditor5 1.26.0 → 1.26.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae47ab2c50827fd1a0716bc093475ce4e55a237ad3a9f4c35ba0b66d8ea46f7c
-  data.tar.gz: 13e648a1a348203b84f7220b7160c9d98e25753a97a207e4c5260d8d4d598571
+  metadata.gz: b30c6cdd98e034209f4dd07ffa70d5a209c207fc1f7a7b37dfd58192a12ac4bc
+  data.tar.gz: e36f7f055fc52af917e2b146653879172a840af29e16665a650c6331092a18a7
 SHA512:
-  metadata.gz: c311294593a9de01ba525eab43d6dbf0418f454e6c7754a8c2a607464539ca82ed39f61a66d58f5c3a977f89a39c591adfb60b63711c47f3c2657e6c3442c49e
-  data.tar.gz: 64f021c1316971588676e9819d422b09d83bea982d74e94544ccbcc703ffb381778dc08aa308620559701a030d88423c20b5b3a678abfc1854daebb33f9fccc1
+  metadata.gz: de3f06d82c4dedc97d34e3082a2f1aaf13323b9fb15ed0bc68d126fa4f63890234206e5fc52528e27332937d9330fc70440b687cc91a7facfe6f8a7b04271836
+  data.tar.gz: 26c4eeb0617420bd283841c0bd4bd77a3516eef5287e59a7388591bc6f8538838c7abba67ccc20fc4a32db5662daa8c168954767eb158a96a4cfcc626ed36310

data/lib/ckeditor5/rails/editor/helpers/editor_helpers.rb

@@ -73,7 +73,7 @@ module CKEditor5::Rails
       type ||= preset.type
 
       # Add some fallbacks
-      config[:licenseKey] ||= context[:license_key]
+      config[:licenseKey] ||= context[:license_key] || preset.license_key
       config[:language] = { ui: language } if language
 
       editor_props = Editor::Props.new(

data/lib/ckeditor5/rails/plugins/patches/fix_color_picker_race_condition.rb

@@ -44,7 +44,7 @@ module CKEditor5::Rails::Plugins::Patches
     JS
 
     def initialize
-      super(:FixColorPickerRaceCondition, PLUGIN_CODE)
+      super(:FixColorPickerRaceCondition, PLUGIN_CODE, max_version: '44.4.0')
       compress!
     end
   end

data/lib/ckeditor5/rails/presets/concerns/plugin_methods.rb

@@ -80,7 +80,7 @@ module CKEditor5::Rails
             raise InvalidPatchPluginError, 'Provided plugin must be a PropsPatchPlugin instance'
           end
 
-          return unless plugin.applicable_for_version?(config[:version])
+          return unless !@version || plugin.applicable_for_version?(@version)
 
           register_plugin(plugin)
         end
@@ -127,8 +127,10 @@ module CKEditor5::Rails
         # Check if the plugin looks like an inline plugin
         # @param plugin [Editor::PropsBasePlugin] Plugin instance
         # @return [Boolean] True if the plugin is an inline plugin
-        def looks_like_inline_plugin?(plugin)
-          plugin.respond_to?(:code) && plugin.code.present?
+        def looks_like_unsafe_inline_plugin?(plugin)
+          plugin.respond_to?(:code) &&
+            plugin.code.present? &&
+            !plugin.is_a?(CKEditor5::Rails::Editor::PropsPatchPlugin)
         end
 
         # Register a plugin in the editor configuration.
@@ -140,7 +142,7 @@ module CKEditor5::Rails
         # @param plugin_obj [Editor::PropsBasePlugin] Plugin instance to register
         # @return [Editor::PropsBasePlugin] The registered plugin
         def register_plugin(plugin_obj)
-          if disallow_inline_plugins && looks_like_inline_plugin?(plugin_obj)
+          if disallow_inline_plugins && looks_like_unsafe_inline_plugin?(plugin_obj)
             raise DisallowedInlinePluginError, 'Inline plugins are not allowed here.'
           end
 

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

@@ -191,6 +191,9 @@ module CKEditor5::Rails
           @version = Semver.new(version)
         end
 
+        # 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
 

data/lib/ckeditor5/rails/semver.rb

@@ -10,6 +10,13 @@ module CKEditor5
       include Comparable
 
       def initialize(version_string)
+        if version_string.is_a?(Semver)
+          @major = version_string.major
+          @minor = version_string.minor
+          @patch = version_string.patch
+          return
+        end
+
         validate!(version_string)
         @major, @minor, @patch = version_string.split('.').map(&:to_i)
       end

data/lib/ckeditor5/rails/version.rb

@@ -2,7 +2,7 @@
 
 module CKEditor5
   module Rails
-    VERSION = '1.26.0'
+    VERSION = '1.26.1'
 
     DEFAULT_CKEDITOR_VERSION = '44.1.0'
   end

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

@@ -24,6 +24,7 @@ RSpec.describe CKEditor5::Rails::Editor::Helpers::Editor do
     allow(preset).to receive(:config).and_return({})
     allow(preset).to receive(:automatic_upgrades?).and_return(false)
     allow(preset).to receive(:editable_height).and_return(nil)
+    allow(preset).to receive(:license_key).and_return(nil)
   end
 
   before do
@@ -225,6 +226,18 @@ RSpec.describe CKEditor5::Rails::Editor::Helpers::Editor do
         expect(helper.ckeditor5_editor(editable_height: 600)).to include('editable-height="600px"')
       end
     end
+
+    context 'when using license key' do
+      it 'uses license key from preset when no other license key is provided' do
+        custom_context = { preset: :default, bundle: 'custom-bundle' }
+        allow(helper).to receive(:ckeditor5_context_or_fallback).and_return(custom_context)
+
+        allow(preset).to receive(:license_key).and_return('preset-license-key')
+
+        result = helper.ckeditor5_editor
+        expect(result).to include('preset-license-key')
+      end
+    end
   end
 
   describe '#ckeditor5_editable' do

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

@@ -36,6 +36,62 @@ RSpec.describe CKEditor5::Rails::Editor::PropsPatchPlugin do
       expect(result).to be true
     end
 
+    it 'returns true when version is equal to min constraint' do
+      result = described_class.applicable_for_version?(
+        '29.0.0',
+        min_version: '29.0.0'
+      )
+      expect(result).to be true
+    end
+
+    it 'returns true when version is equal to max constraint' do
+      result = described_class.applicable_for_version?(
+        '30.0.0',
+        max_version: '30.0.0'
+      )
+      expect(result).to be true
+    end
+
+    it 'returns true when version is higher than min constraint (patch)' do
+      result = described_class.applicable_for_version?(
+        '29.0.1',
+        min_version: '29.0.0'
+      )
+      expect(result).to be true
+    end
+
+    it 'returns true when version is higher than min constraint (minor)' do
+      result = described_class.applicable_for_version?(
+        '29.1.0',
+        min_version: '29.0.0'
+      )
+      expect(result).to be true
+    end
+
+    it 'returns true when version is higher than min constraint (major)' do
+      result = described_class.applicable_for_version?(
+        '30.0.0',
+        min_version: '29.0.0'
+      )
+      expect(result).to be true
+    end
+
+    it 'returns false when version is not equal to max constraint (patch)' do
+      result = described_class.applicable_for_version?(
+        '30.0.1',
+        max_version: '30.0.0'
+      )
+      expect(result).to be false
+    end
+
+    it 'returns false when version is not equal to min constraint (minor)' do
+      result = described_class.applicable_for_version?(
+        '29.1.0',
+        max_version: '29.0.0'
+      )
+      expect(result).to be false
+    end
+
     it 'returns false when version is too low' do
       result = described_class.applicable_for_version?(
         '28.9.9',
@@ -56,16 +112,46 @@ RSpec.describe CKEditor5::Rails::Editor::PropsPatchPlugin do
   end
 
   describe '#applicable_for_version?' do
-    let(:plugin) do
-      described_class.new(plugin_name, plugin_code, min_version: '29.0.0', max_version: '30.0.0')
+    context 'with both version constraints' do
+      let(:plugin) do
+        described_class.new(plugin_name, plugin_code, min_version: '29.0.0', max_version: '30.0.0')
+      end
+
+      it 'returns true for version within constraints' do
+        expect(plugin.applicable_for_version?('29.1.0')).to be true
+      end
+
+      it 'returns false for version outside constraints' do
+        expect(plugin.applicable_for_version?('28.9.9')).to be false
+      end
     end
 
-    it 'returns true for version within constraints' do
-      expect(plugin.applicable_for_version?('29.1.0')).to be true
+    context 'with only min_version constraint' do
+      let(:plugin) do
+        described_class.new(plugin_name, plugin_code, min_version: '29.0.0')
+      end
+
+      it 'returns true for version above min_version' do
+        expect(plugin.applicable_for_version?('30.0.0')).to be true
+      end
+
+      it 'returns false for version below min_version' do
+        expect(plugin.applicable_for_version?('28.9.9')).to be false
+      end
     end
 
-    it 'returns false for version outside constraints' do
-      expect(plugin.applicable_for_version?('28.9.9')).to be false
+    context 'with only max_version constraint' do
+      let(:plugin) do
+        described_class.new(plugin_name, plugin_code, max_version: '30.0.0')
+      end
+
+      it 'returns true for version below max_version' do
+        expect(plugin.applicable_for_version?('29.0.0')).to be true
+      end
+
+      it 'returns false for version above max_version' do
+        expect(plugin.applicable_for_version?('30.0.1')).to be false
+      end
     end
   end
 end

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

@@ -31,6 +31,34 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
     end
   end
 
+  describe '#version' do
+    it 'sets version' do
+      builder.version '35.0.0'
+      expect(builder.version).to eq('35.0.0')
+    end
+
+    context 'with version >= 44.0.0' do
+      it 'sets GPL license when no license key is set' do
+        builder.version('44.0.0')
+        expect(builder.license_key).to eq('GPL')
+        expect(builder.premium?).to be false
+      end
+
+      it 'does not change license when license key is already set' do
+        builder.license_key('commercial-key')
+        builder.version('44.0.0')
+        expect(builder.license_key).to eq('commercial-key')
+      end
+    end
+
+    context 'with version < 44.0.0' do
+      it 'does not set GPL license automatically' do
+        builder.version('43.0.0')
+        expect(builder.license_key).to be_nil
+      end
+    end
+  end
+
   describe '#initialize_copy' do
     let(:original) do
       described_class.new do
@@ -520,6 +548,10 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
   end
 
   describe '#special_characters' do
+    it 'should not crash if block is not provided' do
+      expect { builder.special_characters }.not_to raise_error
+    end
+
     it 'configures special characters with groups and items' do # rubocop:disable Metrics/BlockLength
       builder.special_characters do
         group 'Emoji', label: 'Emoticons' do
@@ -542,36 +574,38 @@ RSpec.describe CKEditor5::Rails::Presets::PresetBuilder do
         order :Text, :Arrows, :Emoji, :Mixed
       end
 
-      expect(builder.config[:specialCharactersBootstrap]).to eq({
-                                                                  groups: [
-                                                                    {
-                                                                      name: 'Emoji',
-                                                                      items: [
-                                                                        { title: 'smiley', character: '😊' },
-                                                                        { title: 'heart', character: '❤️' }
-                                                                      ],
-                                                                      options: { label: 'Emoticons' }
-                                                                    },
-                                                                    {
-                                                                      name: 'Arrows',
-                                                                      items: [
-                                                                        { title: 'right', character: '→' },
-                                                                        { title: 'left', character: '←' }
-                                                                      ],
-                                                                      options: {}
-                                                                    },
-                                                                    {
-                                                                      name: 'Mixed',
-                                                                      items: [
-                                                                        { title: 'star', character: '⭐' },
-                                                                        { title: 'heart', character: '❤️' }
-                                                                      ],
-                                                                      options: { label: 'Mixed Characters' }
-                                                                    }
-                                                                  ],
-                                                                  order: %w[Text Arrows Emoji Mixed],
-                                                                  packs: []
-                                                                })
+      data = {
+        groups: [
+          {
+            name: 'Emoji',
+            items: [
+              { title: 'smiley', character: '😊' },
+              { title: 'heart', character: '❤️' }
+            ],
+            options: { label: 'Emoticons' }
+          },
+          {
+            name: 'Arrows',
+            items: [
+              { title: 'right', character: '→' },
+              { title: 'left', character: '←' }
+            ],
+            options: {}
+          },
+          {
+            name: 'Mixed',
+            items: [
+              { title: 'star', character: '⭐' },
+              { title: 'heart', character: '❤️' }
+            ],
+            options: { label: 'Mixed Characters' }
+          }
+        ],
+        order: %w[Text Arrows Emoji Mixed],
+        packs: []
+      }
+
+      expect(builder.config[:specialCharactersBootstrap]).to eq(data)
 
       plugin_names = builder.config[:plugins].map(&:name)
       expect(plugin_names).to include(:SpecialCharacters)

data/spec/lib/ckeditor5/rails/semver_spec.rb

@@ -8,6 +8,15 @@ RSpec.describe CKEditor5::Rails::Semver do
       it 'accepts version in x.y.z format' do
         expect { described_class.new('1.2.3') }.not_to raise_error
       end
+
+      it 'accepts Semver object' do
+        original = described_class.new('1.2.3')
+        copied = described_class.new(original)
+
+        expect(copied.major).to eq(1)
+        expect(copied.minor).to eq(2)
+        expect(copied.patch).to eq(3)
+      end
     end
 
     context 'with invalid version' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ckeditor5
 version: !ruby/object:Gem::Version
-  version: 1.26.0
+  version: 1.26.1
 platform: ruby
 authors:
 - Mateusz Bagiński