ckeditor5 1.5.4 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482179142a7c42597ead0126fe8eedb8c2ca1ae5e33427e7c2438feea952cc40
-  data.tar.gz: 7fa425d5018e6a804e05780958a040cc03b946853f84fe666e1d0fe6df8b0512
+  metadata.gz: 4ad96eb676ba96b39112d59c4f4404dbdb0c0fbce2b4f550b35c3e101912c18f
+  data.tar.gz: f58e26500ca145f1b4a4cb8421ee525f9dd3865e545a012cac132b9e667489ab
 SHA512:
-  metadata.gz: 5922019eda63b05842228e06acc45d016d4489a568b5f023a756b5fc6c7355ff58f02523101b44b9066f077fe820d336ca9314a8404ad6282763d71dde4b99af
-  data.tar.gz: a91192a64da0d0c20f8ee8e5125e2c1b3a6e1e44c58a6fad76bc1dc9e1ef60a5e91b023f6cac551d4a615ae692cf6ced42ebf966e9ddbaae6caf64002a505361
+  metadata.gz: deffecb44d57d886e23adacb80e2849517e43f5528154ee0e956dac016cd0ce541bd949e8d707049f1750687ecb4e9c872b89c719f7b76c1ad2550fceec51aed
+  data.tar.gz: 595a4e6f3ea8a192ec28973452074dad87d3f6da84b2ff926868c4921afea8238bc2642649ca0a0d45c734d8dfdfb88fb0b23f84686d9ba10727c5778845a59e

data/README.md

@@ -2,6 +2,7 @@
 
 [![License: GPL v2](https://img.shields.io/badge/License-GPL_v2-blue.svg?style=flat-square)](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
 ![Gem Version](https://img.shields.io/gem/v/ckeditor5?style=flat-square)
+![Gem Total Downloads](https://img.shields.io/gem/dt/ckeditor5?style=flat-square&color=orange)
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-green.svg?style=flat-square)](http://makeapullrequest.com)
 ![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/mati365/ckeditor5-rails?style=flat-square)
 [![GitHub issues](https://img.shields.io/github/issues/mati365/ckeditor5-rails?style=flat-square)](https://github.com/Mati365/ckeditor5-rails/issues)
@@ -566,6 +567,9 @@ To specify a custom preset, you need to pass the `preset` keyword argument with
 <% content_for :head do %>
   <%= ckeditor5_assets preset: :custom %>
 <% end %>
+
+<%-# This editor will use `custom` preset defined in `ckeditor5_assets` above %>
+<%= ckeditor5_editor %>
 ```
 
 In order to define such preset, you can use the following configuration:
@@ -584,6 +588,18 @@ CKEditor5::Rails.configure do
 end
 ```
 
+:warning: Keep in mind that all `ckeditor5_editor` helpers will use the configuration from the preset defined in the `ckeditor5_assets`. If you want to use a different preset for a specific editor, you can pass the `preset` keyword argument to the `ckeditor5_editor` helper.
+
+```erb
+<!-- app/views/demos/index.html.erb -->
+
+<% content_for :head do %>
+  <%= ckeditor5_assets preset: :custom %>
+<% end %>
+
+<%= ckeditor5_editor preset: :default %>
+```
+
 #### Inline preset definition
 
 It's possible to define the preset directly in the `ckeditor5_assets` helper method. It allows you to dynamically specify version, cdn provider or even translations in the view. The example below inherits the default preset and adds Polish translations and other options:

data/lib/ckeditor5/rails/cdn/helpers.rb

@@ -23,7 +23,8 @@ module CKEditor5::Rails
 
       @__ckeditor_context = {
         license_key: license_key,
-        bundle: bundle
+        bundle: bundle,
+        preset: preset
       }
 
       Assets::AssetsBundleHtmlSerializer.new(bundle).to_html

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

@@ -11,21 +11,17 @@ module CKEditor5::Rails
 
     def ckeditor5_editor( # rubocop:disable Metrics/ParameterLists
       config: nil, extra_config: {},
-      type: nil, preset: :default,
+      type: nil, preset: nil,
       initial_data: nil, watchdog: true,
       **html_attributes, &block
     )
+      validate_editor_input!(initial_data, block)
       controller_context = validate_and_get_editor_context!
-      preset = fetch_editor_preset(preset)
 
-      config ||= preset.config
+      preset = resolve_editor_preset(preset || controller_context[:preset])
+      config = build_editor_config(preset, config, extra_config, initial_data)
       type ||= preset.type
 
-      config = config.deep_merge(extra_config)
-      config[:initialData] = initial_data if initial_data
-
-      raise ArgumentError, 'Cannot pass initial data and block at the same time.' if initial_data && block
-
       editor_props = Editor::Props.new(
         controller_context, type, config,
         watchdog: watchdog
@@ -52,6 +48,23 @@ module CKEditor5::Rails
 
     private
 
+    def validate_editor_input!(initial_data, block)
+      return unless initial_data && block
+
+      raise ArgumentError, 'Cannot pass initial data and block at the same time.'
+    end
+
+    def resolve_editor_preset(preset_name)
+      fetch_editor_preset(preset_name || :default)
+    end
+
+    def build_editor_config(preset, config, extra_config, initial_data)
+      editor_config = config || preset.config
+      editor_config = editor_config.deep_merge(extra_config)
+      editor_config[:initialData] = initial_data if initial_data
+      editor_config
+    end
+
     def validate_and_get_editor_context!
       unless defined?(@__ckeditor_context)
         raise EditorContextError,

data/lib/ckeditor5/rails/version.rb

@@ -2,6 +2,6 @@
 
 module CKEditor5
   module Rails
-    VERSION = '1.5.4'
+    VERSION = '1.6.1'
   end
 end

metadata

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