ckeditor5 1.14.1 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2d481ae5f7ed4d671e8d6ade94e9efa0ab5d0b4bba36f24b8052d84eadd21e9
-  data.tar.gz: 3d8ff1d8a23aadc4398e2439996d9a86aa792eec16e33a70837e731e68f6ba9f
+  metadata.gz: a7d0dce96ea4b299699c42c1567c3f101a257c465a0e93b8856847fff94c6062
+  data.tar.gz: 9ca6f4faa82bc9f62efa91b65634b8b9a037ce7fda0bf99507cefc87fca8348b
 SHA512:
-  metadata.gz: a407f380c8f2295959533cd08966aace68f1d9d20208608a16269921ae167ba450e719663d918ff725ee10f0be6d020c2130d50873b51cc726b00bf4fa55b573
-  data.tar.gz: 37f51f50d80ce4e51aeed85188b7bf48963723b0b1cf004bc6faceb5ec561c85c79d00887ca50ce4fe2ed702468677718b35c7cdaceb7af9db10fed5ce088381
+  metadata.gz: c484342136c54b500b98e3615647f8c9c92c403d4af5569cadc910a520250f7767ccf020f9d697853fce9a9ae67a4bfa7dedb883b0691a6008f65b3b04c93190
+  data.tar.gz: f98cb8faacebed0f36ffda4a8523443f4307b138b20136e670ee9dc7894bd91d9889c9acc14f0abe736c34c7339d1ff664b9332f8cf22555348c8094cfa7b592

data/README.md

@@ -28,7 +28,12 @@ In your config (the default config is defined [here](https://github.com/Mati365/
 # config/initializers/ckeditor5.rb
 
 CKEditor5::Rails.configure do
-  version '43.3.0'
+  version '43.3.0'  # 🔖 Specify the version of editor you want.
+                    # ⚙️ Configuration includes:
+                    #    📝 Classic editor build
+                    #    🧩 Essential plugins (paragraphs, basic styles)
+                    #    🎛️ Default toolbar layout
+                    #    📜 GPL license
 end
 ```
 
@@ -54,38 +59,43 @@ In your view:
 <!-- app/views/demos/index.html.erb -->
 
 <% content_for :head do %>
+  <!-- 📦 Loads CKEditor assets via importmap based on initializer config -->
   <%= ckeditor5_assets %>
 <% end %>
 
+<!-- 🖋️ Renders rich text editor interface using WebComponent -->
 <%= ckeditor5_editor %>
 ```
 
 Voilà! You have CKEditor 5 integrated with your Rails application. 🎉
 
-## Demos 🚀
+## Try Our Demos! 🎮 ✨
 
-Interested in more advanced configuration? Visit the demos in the [demo application](https://github.com/Mati365/ckeditor5-rails/tree/main/sandbox/app/views/demos) or take a look at official CKEditor 5 [examples](https://ckeditor.com/docs/ckeditor5/latest/examples/builds/classic-editor.html).
+Want to see some cool examples? We've got you covered! Check out our interactive [demo application](https://github.com/Mati365/ckeditor5-rails/tree/main/sandbox/app/views/demos) packed with various editor configurations. You can also explore official CKEditor 5 [examples](https://ckeditor.com/docs/ckeditor5/latest/examples/builds/classic-editor.html) for more inspiration! 💡
 
-In order to run all demos locally, you can clone the repository and run the following commands:
+Ready to play with the demos locally? It's super easy! Just follow these steps: 🚀
 
 ```bash
-bundle install
-cd sandbox
-bundle exec rails server -p 3000
+bundle install # Install all the goodies 📦
+bundle exec guard -g rails # Fire up the server 🔥
 ```
 
-Then visit [http://localhost:3000/demos](http://localhost:3000/) to see the demos in action. 🚀
+Now the fun part - open [http://localhost:3000/](http://localhost:3000/) in your browser and start experimenting! 🎯 Feel free to tweak the code and make it your own! 🎨
+
+Want to extend CKEditor's functionality? Check out our [plugins directory](https://github.com/Mati365/ckeditor5-rails/tree/main/lib/ckeditor5/rails/plugins) and create your own awesome plugins! 🔌 We love community contributions - your plugin could be the next great addition to our ecosystem! ⭐
 
 ## Table of Contents 📚
 
 - [CKEditor 5 Rails Integration ✨](#ckeditor-5-rails-integration-)
   - [Installation 🛠️](#installation-️)
-  - [Demos 🚀](#demos-)
+  - [Try Our Demos! 🎮 ✨](#try-our-demos--)
   - [Table of Contents 📚](#table-of-contents-)
   - [Presets 🎨](#presets-)
+    - [Automatic upgrades 🔄](#automatic-upgrades-)
     - [Available Configuration Methods ⚙️](#available-configuration-methods-️)
       - [`cdn(cdn = nil, &block)` method](#cdncdn--nil-block-method)
       - [`version(version)` method](#versionversion-method)
+      - [`automatic_upgrades(enabled: true)` method](#automatic_upgradesenabled-true-method)
       - [`gpl` method](#gpl-method)
       - [`license_key(key)` method](#license_keykey-method)
       - [`premium` method](#premium-method)
@@ -164,6 +174,11 @@ CKEditor5::Rails.configure do
   presets.define :blank_preset, inherit: false do
     version '44.0.0'
 
+    # It tells the integration to fetch the newest security patches and bug fixes.
+    # It may be disabled, but it's highly recommended to keep it enabled to avoid
+    # potential security issues.
+    automatic_upgrades
+
     gpl
     type :classic
 
@@ -208,6 +223,22 @@ end
 
 Configuration of the editor can be complex, and it's recommended to use the [CKEditor 5 online builder](https://ckeditor.com/ckeditor-5/online-builder/) to generate the configuration. It allows you to select the features you want to include and generate the configuration code in JavaScript format. Keep in mind that you need to convert the JavaScript configuration to Ruby format before using it in this gem.
 
+### Automatic upgrades 🔄
+
+The gem includes a feature that automatically upgrades the CKEditor&nbsp;5 version when it's released. It's enabled by default for the `:default` preset. It means that the editor will automatically check the version of the editor during the initialization and upgrade it to the latest version if the new patch or minor version is released.
+
+If you want to disable automatic upgrades, you can pass the `enabled: false` keyword argument to the `automatic_upgrades` method.
+
+```rb
+# config/initializers/ckeditor5.rb
+
+CKEditor5::Rails.configure do
+  # ... other configuration
+
+  automatic_upgrades enabled: false
+end
+```
+
 ### Available Configuration Methods ⚙️
 
 #### `cdn(cdn = nil, &block)` method
@@ -254,6 +285,24 @@ CKEditor5::Rails.configure do
 end
 ```
 
+#### `automatic_upgrades(enabled: true)` method
+
+Defines if automatic upgrades should be enabled. It's enabled for the `:default` preset by default. The example below shows how to disable automatic upgrades:
+
+```rb
+# config/initializers/ckeditor5.rb
+
+CKEditor5::Rails.configure do
+  # ... other configuration
+
+  automatic_upgrades enabled: false
+end
+```
+
+It means that the editor will automatically upgrade to the latest version when the gem is updated. It'll upgrade the editor only if the new patch or minor version is released. If you want to disable automatic upgrades, you can pass the `enabled: false` keyword argument to the `automatic_upgrades` method.
+
+Version is checked every nth day, where n is the number of days since the last check. Currently it's 4 days.
+
 #### `gpl` method
 
 Defines the license of CKEditor 5. The example below shows how to set the license to GPL:

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

@@ -76,6 +76,12 @@ module CKEditor5::Rails
       editor_config = config || preset.config
       editor_config = editor_config.deep_merge(extra_config)
       editor_config[:initialData] = initial_data if initial_data
+
+      if preset.automatic_upgrades? && editor_config[:version].present?
+        detected_version = VersionDetector.latest_safe_version(editor_config[:version])
+        editor_config[:version] = detected_version if detected_version
+      end
+
       editor_config
     end
 

data/lib/ckeditor5/rails/plugins/simple_upload_adapter.rb

@@ -36,6 +36,13 @@ module CKEditor5::Rails::Plugins
                   xhr.open('POST', config.uploadUrl, true);
                   xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 
+                  // Add CSRF token from meta tag
+                  const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content;
+
+                  if (csrfToken) {
+                    xhr.setRequestHeader('X-CSRF-Token', csrfToken);
+                  }
+
                   xhr.upload.onprogress = (evt) => {
                     if (evt.lengthComputable) {
                       loader.uploadTotal = evt.total;

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

@@ -42,6 +42,7 @@ module CKEditor5::Rails::Presets
 
     def define_default_preset # rubocop:disable Metrics/MethodLength
       define :default do
+        automatic_upgrades
         gpl
         type :classic
         menubar

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

@@ -16,6 +16,7 @@ module CKEditor5::Rails
         @type = :classic
         @ckbox = nil
         @editable_height = nil
+        @automatic_upgrades = false
         @config = {
           plugins: [],
           toolbar: []
@@ -105,7 +106,20 @@ module CKEditor5::Rails
       def version(version = nil)
         return @version.to_s if version.nil?
 
-        @version = Semver.new(version)
+        if @automatic_upgrades && version
+          detected = VersionDetector.latest_safe_version(version)
+          @version = Semver.new(detected || version)
+        else
+          @version = Semver.new(version)
+        end
+      end
+
+      def automatic_upgrades(enabled: true)
+        @automatic_upgrades = enabled
+      end
+
+      def automatic_upgrades?
+        @automatic_upgrades
       end
 
       def cdn(cdn = nil, &block)

data/lib/ckeditor5/rails/semver.rb

@@ -1,18 +1,48 @@
 # frozen_string_literal: true
 
-class CKEditor5::Rails::Semver
-  attr_reader :version
+module CKEditor5
+  module Rails
+    class Semver
+      SEMVER_PATTERN = /\A\d+\.\d+\.\d+\z/
 
-  alias to_s :version
+      attr_reader :major, :minor, :patch
 
-  def initialize(version)
-    @version = version.to_s
-    validate!
-  end
+      include Comparable
+
+      def initialize(version_string)
+        validate!(version_string)
+        @major, @minor, @patch = version_string.split('.').map(&:to_i)
+      end
+
+      def <=>(other)
+        return nil unless other.is_a?(Semver)
+
+        [major, minor, patch] <=> [other.major, other.minor, other.patch]
+      end
+
+      def safe_update?(other_version)
+        other = self.class.new(other_version)
+
+        return false if other.major != major
+        return true if other.minor > minor
+        return true if other.minor == minor && other.patch > patch
+
+        false
+      end
+
+      def version
+        "#{major}.#{minor}.#{patch}"
+      end
+
+      alias to_s :version
+
+      private
 
-  private
+      def validate!(version_string)
+        return if version_string.is_a?(String) && version_string.match?(SEMVER_PATTERN)
 
-  def validate!
-    raise ArgumentError, 'invalid version format' unless version.match?(/\A\d+\.\d+\.\d+\z/)
+        raise ArgumentError, 'invalid version format'
+      end
+    end
   end
 end

data/lib/ckeditor5/rails/version.rb

@@ -2,6 +2,6 @@
 
 module CKEditor5
   module Rails
-    VERSION = '1.14.1'
+    VERSION = '1.15.1'
   end
 end

data/lib/ckeditor5/rails/version_detector.rb

@@ -0,0 +1,80 @@
+# frozen_string_literal: true
+
+require 'net/http'
+require 'json'
+require 'singleton'
+require 'monitor'
+require_relative 'semver'
+
+module CKEditor5::Rails
+  class VersionDetector
+    include Singleton
+
+    NPM_PACKAGE = 'ckeditor5'
+    CACHE_DURATION = 345_600 # 4 days in seconds
+
+    class << self
+      delegate :latest_safe_version, to: :instance
+    end
+
+    def initialize
+      @cache = {}
+      @monitor = Monitor.new
+    end
+
+    def latest_safe_version(current_version)
+      @monitor.synchronize do
+        cache_key = "#{current_version}_latest"
+        return @cache[cache_key][:version] if valid_cache_entry?(cache_key)
+
+        version = find_latest_safe_version(current_version)
+        @cache[cache_key] = { version: version, timestamp: Time.now.to_i }
+        version
+      end
+    end
+
+    private
+
+    def valid_cache_entry?(key)
+      entry = @cache[key]
+      entry && (Time.now.to_i - entry[:timestamp] < CACHE_DURATION)
+    end
+
+    def find_latest_safe_version(current_version)
+      versions = fetch_all_versions
+      return nil if versions.empty?
+
+      current_semver = Semver.new(current_version)
+      versions
+        .reject { |v| v.include?('nightly') || v.include?('dev') }
+        .select { |v| v.match?(Semver::SEMVER_PATTERN) }
+        .sort_by { |v| Semver.new(v) }
+        .reverse
+        .find { |v| current_semver.safe_update?(v) }
+    end
+
+    def fetch_all_versions
+      uri = URI("https://registry.npmjs.org/#{NPM_PACKAGE}")
+      response = fetch_with_timeout(uri)
+
+      if response.is_a?(Net::HTTPSuccess)
+        data = JSON.parse(response.body)
+        data['versions'].keys
+      else
+        warn 'Failed to fetch CKEditor versions'
+        []
+      end
+    rescue StandardError => e
+      warn "Error fetching versions: #{e.message}"
+      []
+    end
+
+    def fetch_with_timeout(uri)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = (uri.scheme == 'https')
+      http.open_timeout = 1
+      http.read_timeout = 1
+      http.get(uri.request_uri)
+    end
+  end
+end

data/lib/ckeditor5/rails.rb

@@ -3,6 +3,7 @@
 module CKEditor5
   module Rails
     require_relative 'rails/version'
+    require_relative 'rails/version_detector'
     require_relative 'rails/semver'
     require_relative 'rails/assets/assets_bundle'
     require_relative 'rails/assets/assets_bundle_html_serializer'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ckeditor5
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.1
 platform: ruby
 authors:
 - Mateusz Bagiński
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-20 00:00:00.000000000 Z
+date: 2024-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -74,6 +74,7 @@ files:
 - lib/ckeditor5/rails/presets/toolbar_builder.rb
 - lib/ckeditor5/rails/semver.rb
 - lib/ckeditor5/rails/version.rb
+- lib/ckeditor5/rails/version_detector.rb
 - spec/lib/ckeditor5/rails/cdn/url_generator_spec.rb
 - spec/lib/ckeditor5/rails/semver_spec.rb
 - spec/spec_helper.rb