ckeditor5 1.1.5 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8a3607d5a38c9654f181481a3c84f0b62119bf82aa5821c4e679eb3624323a5
-  data.tar.gz: 9c1f3765da1ad876a02c326141645eb4f941db6ecb2f12cb8bc16b04d9ebf965
+  metadata.gz: a512b289e611ca5d7480b5088b14f83ed459481b6f99f0c15b4467e627c464e7
+  data.tar.gz: dc3969b71fd184b7e9bc39a95fc7d0702280203c940197925d8e8f8d17d22a50
 SHA512:
-  metadata.gz: 6372388ead48cef2105d1f5f25fb34e650687bf3a5197f2d3d30a65b27b4197418e53504ecf153c4b373db32a574511da1afda0c59ec4a3d60a84656bbcc4828
-  data.tar.gz: fca6e5780732f512f0b0d380777cb6b95a881e714b1a9b91ddfc624391d6ca4d77a555e29eb04eb9d1ecd6e94e9d0796751c481543cfbf24df032ceabe055caf
+  metadata.gz: d3491c052e7e736f1ed484a67eaf7fae034fd73874977c4bcfd671295e5fe5d9673d7c27845df6877fb527a4a29763ad3529c58e30fcee893f8a174fe066ac84
+  data.tar.gz: e579d1032b12e79d265da252ad74af5b090922aeb0eb4d68ab12c252d9ed173ec9b1f5e4cc904f4fcc62c4dbc0cb20b4b79ae87ee9cfff40afc33b1497caf464

data/README.md

@@ -490,7 +490,7 @@ If you want to use CKEditor 5 under the GPL license, you can include the assets
 <!-- app/views/demos/index.html.erb -->
 
 <% content_for :head do %>
-  <%= ckeditor5_assets version: '43.3.0' %>
+  <%= ckeditor5_assets %>
 <% end %>
 ```
 
@@ -524,7 +524,7 @@ In order to use `unpkg` CDN, you can pass the `cdn` keyword argument with the va
 <!-- app/views/demos/index.html.erb -->
 
 <% content_for :head do %>
-  <%= ckeditor5_assets version: '43.3.0', cdn: :unpkg %>
+  <%= ckeditor5_assets cdn: :unpkg %>
 <% end %>
 ```
 
@@ -534,7 +534,7 @@ or using helper function:
 <!-- app/views/demos/index.html.erb -->
 
 <% content_for :head do %>
-  <%= ckeditor5_jsdelivr_assets version: '43.3.0' %>
+  <%= ckeditor5_jsdelivr_assets %>
 <% end %>
 ```
 
@@ -544,7 +544,7 @@ Translating CKEditor 5 is possible by passing the `translations` keyword argumen
 <!-- app/views/demos/index.html.erb -->
 
 <% content_for :head do %>
-  <%= ckeditor5_assets version: '43.3.0', translations: [:pl] %>
+  <%= ckeditor5_assets translations: [:pl] %>
 <% end %>
 ```
 

data/lib/ckeditor5/rails/engine.rb

@@ -1,52 +1,45 @@
 # frozen_string_literal: true
 
 require 'rails/engine'
-require_relative 'presets'
+
+require_relative 'presets/manager'
 require_relative 'hooks/form'
 
 module CKEditor5::Rails
   class Engine < ::Rails::Engine
     config.ckeditor5 = ActiveSupport::OrderedOptions.new
-
-    # Specifies configuration of editors generated by gem.
-    config.ckeditor5.presets = PresetsManager.new
+    config.ckeditor5.presets = Presets::Manager.new
 
     initializer 'helper' do
-      ActiveSupport.on_load(:action_view) do
-        include Helpers
-      end
+      ActiveSupport.on_load(:action_view) { include Helpers }
     end
 
-    initializer 'ckeditor5.simple_form' do
-      next unless defined?(::SimpleForm)
-
+    initializer 'ckeditor5.simple_form', if: -> { defined?(::SimpleForm) } do
       require_relative 'hooks/simple_form'
-
       ::SimpleForm::FormBuilder.map_type :ckeditor5, to: Hooks::SimpleForm::CKEditor5Input
     end
 
     initializer 'ckeditor5.form_builder' do
       require_relative 'hooks/form'
-
-      ActionView::Helpers::FormBuilder.include(
-        Hooks::Form::FormBuilderExtension
-      )
+      ActionView::Helpers::FormBuilder.include(Hooks::Form::FormBuilderExtension)
     end
 
-    def self.base
-      config.ckeditor5
-    end
+    class << self
+      def base
+        config.ckeditor5
+      end
 
-    def self.default_preset
-      config.ckeditor5.presets.default
-    end
+      def default_preset
+        config.ckeditor5.presets.default
+      end
 
-    def self.configure
-      yield config.ckeditor5
+      def configure
+        yield config.ckeditor5
+      end
     end
   end
 
-  def configure(&block)
+  def self.configure(&block)
     Engine.configure(&block)
   end
 end

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

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+require_relative 'preset_builder'
+require_relative 'toolbar_builder'
+
+module CKEditor5::Rails::Presets
+  class Manager
+    attr_reader :presets
+
+    def initialize
+      @presets = {}
+      define_default_preset
+    end
+
+    def define(name, &block)
+      preset = PresetBuilder.new
+      preset.instance_eval(&block)
+      @presets[name] = preset
+    end
+
+    def override(name, &block)
+      @presets[name].instance_eval(&block)
+    end
+
+    def default
+      @presets[:default] || {}
+    end
+
+    def [](name)
+      @presets[name] || {}
+    end
+
+    private
+
+    def define_default_preset # rubocop:disable Metrics/MethodLength
+      define :default do
+        gpl
+        type :classic
+        menubar
+
+        toolbar :undo, :redo, :|, :heading, :|, :bold, :italic, :underline, :|,
+                :link, :insertImage, :mediaEmbed, :insertTable, :blockQuote, :|,
+                :bulletedList, :numberedList, :todoList, :outdent, :indent
+
+        plugins :AccessibilityHelp, :Autoformat, :AutoImage, :Autosave,
+                :BlockQuote, :Bold, :CloudServices,
+                :Essentials, :Heading, :ImageBlock, :ImageCaption, :ImageInline,
+                :ImageInsert, :ImageInsertViaUrl, :ImageResize, :ImageStyle,
+                :ImageTextAlternative, :ImageToolbar, :ImageUpload, :Indent,
+                :IndentBlock, :Italic, :Link, :LinkImage, :List, :ListProperties,
+                :MediaEmbed, :Paragraph, :PasteFromOffice, :PictureEditing,
+                :SelectAll, :Table, :TableCaption, :TableCellProperties,
+                :TableColumnResize, :TableProperties, :TableToolbar,
+                :TextTransformation, :TodoList, :Underline, :Undo, :Base64UploadAdapter
+
+        configure :image, {
+          toolbar: ['imageTextAlternative', 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side']
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+
+module CKEditor5::Rails
+  module Presets
+    class PresetBuilder
+      attr_reader :config
+
+      def initialize
+        @version = nil
+        @premium = false
+        @cdn = :jsdelivr
+        @translations = []
+        @license_key = nil
+        @type = :classic
+        @ckbox = nil
+        @config = {
+          plugins: [],
+          toolbar: []
+        }
+      end
+
+      def to_h_with_overrides(**overrides)
+        {
+          version: overrides.fetch(:version, version),
+          premium: overrides.fetch(:premium, premium),
+          cdn: overrides.fetch(:cdn, cdn),
+          translations: overrides.fetch(:translations, translations),
+          license_key: overrides.fetch(:license_key, license_key),
+          type: overrides.fetch(:type, type),
+          ckbox: overrides.fetch(:ckbox, ckbox),
+          config: config.merge(overrides.fetch(:config, {}))
+        }
+      end
+
+      def ckbox(version = nil, theme: :lark)
+        return @ckbox if version.nil?
+
+        @ckbox = { version: version, theme: theme }
+      end
+
+      def license_key(license_key = nil)
+        return @license_key if license_key.nil?
+
+        @license_key = license_key
+      end
+
+      def gpl
+        license_key('GPL')
+        premium(false)
+      end
+
+      def premium(premium = nil)
+        return @premium if premium.nil?
+
+        @premium = premium
+      end
+
+      def translations(*translations)
+        return @translations if translations.empty?
+
+        @translations = translations
+      end
+
+      def version(version = nil)
+        return @version.to_s if version.nil?
+
+        @version = Semver.new(version)
+      end
+
+      def cdn(cdn = nil)
+        return @cdn if cdn.nil?
+
+        @cdn = cdn
+      end
+
+      def type(type = nil)
+        return @type if type.nil?
+        raise ArgumentError, "Invalid editor type: #{type}" unless Editor::Props.valid_editor_type?(type)
+
+        @type = type
+      end
+
+      def configure(key, value)
+        @config[key] = value
+      end
+
+      def menubar(visible: true)
+        @config[:menuBar] = {
+          isVisible: visible
+        }
+      end
+
+      def toolbar(*items, should_group_when_full: true, &block)
+        if @config[:toolbar].blank? || !items.empty?
+          @config[:toolbar] = {
+            items: items,
+            shouldNotGroupWhenFull: !should_group_when_full
+          }
+        end
+
+        return unless block
+
+        builder = ToolbarBuilder.new(@config[:toolbar])
+        builder.instance_eval(&block)
+      end
+
+      def inline_plugin(name, code)
+        @config[:plugins] << Editor::PropsInlinePlugin.new(name, code)
+      end
+
+      def plugin(name, **kwargs)
+        @config[:plugins] << Editor::PropsPlugin.new(name, **kwargs)
+      end
+
+      def plugins(*names, **kwargs)
+        names.each { |name| plugin(name, **kwargs) }
+      end
+
+      def language(ui, content: ui) # rubocop:disable Naming/MethodParameterName
+        @config[:language] = {
+          ui: ui,
+          content: content
+        }
+      end
+    end
+  end
+end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module CKEditor5::Rails::Presets
+  class ToolbarBuilder
+    def initialize(toolbar_config)
+      @toolbar_config = toolbar_config
+    end
+
+    def items
+      @toolbar_config[:items]
+    end
+
+    def remove(*removed_items)
+      removed_items.each { |item| items.delete(item) }
+    end
+
+    def prepend(*prepended_items, before: nil)
+      if before
+        index = items.index(before)
+        raise ArgumentError, "Item '#{before}' not found in toolbar" unless index
+
+        items.insert(index, *prepended_items)
+      else
+        items.insert(0, *prepended_items)
+      end
+    end
+
+    def append(*appended_items, after: nil)
+      if after
+        index = items.index(after)
+        raise ArgumentError, "Item '#{after}' not found in toolbar" unless index
+
+        items.insert(index + 1, *appended_items)
+      else
+        items.push(*appended_items)
+      end
+    end
+  end
+end

data/lib/ckeditor5/rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CKEditor5::Rails
-  VERSION = '1.1.5'
+  VERSION = '1.1.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ckeditor5
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.7
 platform: ruby
 authors:
 - Mateusz Bagiński
@@ -59,7 +59,9 @@ files:
 - lib/ckeditor5/rails/helpers.rb
 - lib/ckeditor5/rails/hooks/form.rb
 - lib/ckeditor5/rails/hooks/simple_form.rb
-- lib/ckeditor5/rails/presets.rb
+- lib/ckeditor5/rails/presets/manager.rb
+- lib/ckeditor5/rails/presets/preset_builder.rb
+- lib/ckeditor5/rails/presets/toolbar_builder.rb
 - lib/ckeditor5/rails/semver.rb
 - lib/ckeditor5/rails/version.rb
 homepage: https://github.com/Mati365/ckeditor5-rails

data/lib/ckeditor5/rails/presets.rb

@@ -1,220 +0,0 @@
-# frozen_string_literal: true
-
-module CKEditor5::Rails
-  class PresetsManager
-    attr_reader :presets
-
-    def initialize
-      @presets = {}
-      define_default_preset
-    end
-
-    def define(name, &block)
-      preset = PresetBuilder.new
-      preset.instance_eval(&block)
-      @presets[name] = preset
-    end
-
-    def override(name, &block)
-      @presets[name].instance_eval(&block)
-    end
-
-    def default
-      @presets[:default] || {}
-    end
-
-    def [](name)
-      @presets[name] || {}
-    end
-
-    private
-
-    def define_default_preset # rubocop:disable Metrics/MethodLength
-      define :default do
-        gpl
-
-        type :classic
-
-        menubar
-
-        toolbar :undo, :redo, :|, :heading, :|, :bold, :italic, :underline, :|,
-                :link, :insertImage, :mediaEmbed, :insertTable, :blockQuote, :|,
-                :bulletedList, :numberedList, :todoList, :outdent, :indent
-
-        plugins :AccessibilityHelp, :Autoformat, :AutoImage, :Autosave,
-                :BlockQuote, :Bold, :CloudServices,
-                :Essentials, :Heading, :ImageBlock, :ImageCaption, :ImageInline,
-                :ImageInsert, :ImageInsertViaUrl, :ImageResize, :ImageStyle,
-                :ImageTextAlternative, :ImageToolbar, :ImageUpload, :Indent,
-                :IndentBlock, :Italic, :Link, :LinkImage, :List, :ListProperties,
-                :MediaEmbed, :Paragraph, :PasteFromOffice, :PictureEditing,
-                :SelectAll, :Table, :TableCaption, :TableCellProperties,
-                :TableColumnResize, :TableProperties, :TableToolbar,
-                :TextTransformation, :TodoList, :Underline, :Undo, :Base64UploadAdapter
-
-        configure :image, {
-          toolbar: ['imageTextAlternative', 'imageStyle:inline', 'imageStyle:block', 'imageStyle:side']
-        }
-      end
-    end
-  end
-
-  class PresetBuilder
-    attr_reader :config
-
-    def initialize
-      @version = nil
-      @premium = false
-      @cdn = :jsdelivr
-      @translations = []
-      @license_key = nil
-      @type = :classic
-      @ckbox = nil
-      @config = {
-        plugins: [],
-        toolbar: []
-      }
-    end
-
-    def to_h_with_overrides(**overrides)
-      {
-        version: overrides.fetch(:version, version),
-        premium: overrides.fetch(:premium, premium),
-        cdn: overrides.fetch(:cdn, cdn),
-        translations: overrides.fetch(:translations, translations),
-        license_key: overrides.fetch(:license_key, license_key),
-        type: overrides.fetch(:type, type),
-        ckbox: overrides.fetch(:ckbox, ckbox),
-        config: config.merge(overrides.fetch(:config, {}))
-      }
-    end
-
-    def ckbox(version = nil, theme: :lark)
-      return @ckbox if version.nil?
-
-      @ckbox = { version: version, theme: theme }
-    end
-
-    def license_key(license_key = nil)
-      return @license_key if license_key.nil?
-
-      @license_key = license_key
-    end
-
-    def gpl
-      license_key('GPL')
-      premium(false)
-    end
-
-    def premium(premium = nil)
-      return @premium if premium.nil?
-
-      @premium = premium
-    end
-
-    def translations(*translations)
-      return @translations if translations.empty?
-
-      @translations = translations
-    end
-
-    def version(version = nil)
-      return @version.to_s if version.nil?
-
-      @version = Semver.new(version)
-    end
-
-    def cdn(cdn = nil)
-      return @cdn if cdn.nil?
-
-      @cdn = cdn
-    end
-
-    def type(type = nil)
-      return @type if type.nil?
-
-      raise ArgumentError, "Invalid editor type: #{type}" unless Editor::Props.valid_editor_type?(type)
-
-      @type = type
-    end
-
-    def configure(key, value)
-      @config[key] = value
-    end
-
-    def menubar(visible: true)
-      @config[:menuBar] = {
-        isVisible: visible
-      }
-    end
-
-    def toolbar(*items, should_group_when_full: true, &block)
-      if @config[:toolbar].blank? || !items.empty?
-        @config[:toolbar] = {
-          items: items,
-          shouldNotGroupWhenFull: !should_group_when_full
-        }
-      end
-
-      return unless block
-
-      builder = ToolbarBuilder.new(@config[:toolbar])
-      builder.instance_eval(&block)
-    end
-
-    def inline_plugin(name, code)
-      @config[:plugins] << Editor::PropsInlinePlugin.new(name, code)
-    end
-
-    def plugin(name, **kwargs)
-      @config[:plugins] << Editor::PropsPlugin.new(name, **kwargs)
-    end
-
-    def plugins(*names, **kwargs)
-      names.each { |name| plugin(name, **kwargs) }
-    end
-
-    def language(ui, content: ui) # rubocop:disable Naming/MethodParameterName
-      @config[:language] = {
-        ui: ui,
-        content: content
-      }
-    end
-  end
-
-  class ToolbarBuilder
-    def initialize(toolbar_config)
-      @toolbar_config = toolbar_config
-    end
-
-    def items
-      @toolbar_config[:items]
-    end
-
-    def remove(*removed_items)
-      removed_items.each { |item| items.delete(item) }
-    end
-
-    def prepend(*prepended_items, before: nil)
-      if before
-        index = items.index(before)
-        raise ArgumentError, "Item '#{before}' not found in toolbar" unless index
-
-        items.insert(index, *prepended_items)
-      else
-        items.insert(0, *prepended_items)
-      end
-    end
-
-    def append(*appended_items, after: nil)
-      if after
-        index = items.index(after)
-        raise ArgumentError, "Item '#{after}' not found in toolbar" unless index
-
-        items.insert(index + 1, *appended_items)
-      else
-        items.push(*appended_items)
-      end
-    end
-  end
-end