ckeditor 5.1.1 → 5.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b71ac2d1ebfd0eb53c8e24472f22e603c41c3ae8fc5958e44664211ee8e2b6ed
-  data.tar.gz: 8dd8a0c4681b5c76baf6a09d7c4a71426e7fedd9dd5c10e9623af7bd9d4a567d
+  metadata.gz: c89e25ff455ec7ecad8cc5e69b3a27b54d497ab09613447428800a31b2092a9d
+  data.tar.gz: d32384ed3c0beb3020018f8c67a0596955f4dc7a95e4f35fc58eea4e6de5c69f
 SHA512:
-  metadata.gz: a609bce33d5a52dfab3d630681ffe9f84cf58f39a1fc219606030f9a618a416ba620f9958345afab23cb76e79958ca4c7c3e8aa5cf3a8c1f701d856491b2cf30
-  data.tar.gz: d2ebba5c7fe3716a65e4af6595da206f52bdee4913fb6ca961d3ae3dcfb5d838664b86067f1dbb265dbe889c4817a15a78624e93e9b2b9bdf5b63f5858830d87
+  metadata.gz: 1eda1217bdfead0b319fc7d0d74a9022c2e51760d9ebbf7eb832ae982a7b59cf1e6b2c96a72688dc59354df2177d455bbb11010d33558a07f6a3fa7e8ca61a4b
+  data.tar.gz: 9a5bdbdedd22a14486474171513db087e425934ed1575d87d7ca2464140a89a2b9642dad373d2ddee675fd34b93a5f9c1237412fc21067be74c286934b8d07c4

data/Gemfile

@@ -4,19 +4,16 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 5.2.4.6'
+gem 'rails', '~> 6.1'
 
 platforms :ruby do
   gem 'sass'
-  gem 'sqlite3', '~> 1.3.6'
-  gem 'sprockets', '~> 3.7.2'
+  gem 'sqlite3'
+  gem 'sprockets-rails'
+  gem 'sassc'
 
   group :development, :test do
-    gem 'capybara', '>= 0.4.0'
-    gem 'jquery-rails', '~> 4.3.3'
-    gem 'mynyml-redgreen', '~> 0.7.1', require: 'redgreen'
-    gem 'rails-controller-testing'
-
+    gem 'capybara'
     gem 'rubocop-rails'
   end
 
@@ -24,14 +21,13 @@ platforms :ruby do
     gem 'carrierwave'
     gem 'dragonfly'
     gem 'mini_magick'
-    gem 'paperclip', '~> 6.1.0'
+    # gem 'paperclip', '~> 6.1.0'
   end
 
   group :mongoid do
-    gem 'bson_ext'
     gem 'carrierwave-mongoid', require: 'carrierwave/mongoid'
-    gem 'mongoid', '~> 7.0.2'
-    gem 'mongoid-paperclip', require: 'mongoid_paperclip'
+    gem 'mongoid'
+    # gem 'mongoid-paperclip', require: 'mongoid_paperclip'
     gem 'shrine'
     gem 'shrine-mongoid'
     gem 'image_processing'

data/README.md

@@ -1,13 +1,18 @@
 # Ckeditor
 
-[![Build Status](https://semaphoreci.com/api/v1/igor-galeta/ckeditor/branches/master/shields_badge.svg)](https://semaphoreci.com/igor-galeta/ckeditor)
+[![Build Status](https://galetahub.semaphoreci.com/badges/ckeditor/branches/master.svg?style=shields&key=eabcab57-9b51-4460-9b27-9c61c28efcdb)](https://galetahub.semaphoreci.com/projects/ckeditor)
 [![Code Climate](https://codeclimate.com/github/galetahub/ckeditor/badges/gpa.svg)](https://codeclimate.com/github/galetahub/ckeditor)
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/badges/StandWithUkraine.svg)](https://stand-with-ukraine.pp.ua)
 
-CKEditor is a WYSIWYG text editor designed to simplify web content creation. It brings common word processing features directly to your web pages. Enhance your website experience with our community maintained editor. Currently this gem supports [ckeditor 4](https://ckeditor.com/ckeditor-4/) only.
+
+CKEditor is a WYSIWYG text editor designed to simplify web content creation. It brings common word processing features directly to your web pages. Enhance your website experience with our
+community maintained editor. Currently this gem supports [ckeditor 4](https://ckeditor.com/ckeditor-4/) only.
+
+[![Stand With Ukraine](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner-direct.svg)](https://stand-with-ukraine.pp.ua)
 
 ## Features
 
-* CKEditor version 4.x (https://ckeditor.com/ckeditor-4/)
+* CKEditor version 4.x (<https://ckeditor.com/cke4/release-notes>)
 * Rails 5.x, 4.2.x integration
 * Files browser
 * HTML5 file uploader
@@ -57,7 +62,7 @@ rails generate ckeditor:install --orm=active_record --backend=paperclip
 ```
 gem "mini_magick"
 
-rails active_storage:install # if you not install active_storage yet
+rails active_storage:install # if you haven't installed active_storage yet
 rails generate ckeditor:install --orm=active_record --backend=active_storage
 ```
 
@@ -72,7 +77,7 @@ rails generate ckeditor:install --orm=active_record --backend=carrierwave
 
 #### ActiveRecord + dragonfly
 
-Requires Dragonfly 1.0 or greater.
+Requires Dragonfly 1.0 or higher.
 
 ```
 gem 'dragonfly'
@@ -110,7 +115,7 @@ Models are autoloaded in Rails 4. For earlier Rails versions, you need to add th
 config.autoload_paths += %w(#{config.root}/app/models/ckeditor)
 ```
 
-Mount the Ckeditor::Engine in your routes (config/routes.rb):
+Mount the Ckeditor::Engine to your routes (config/routes.rb):
 
 ```ruby
 mount Ckeditor::Engine => '/ckeditor'
@@ -120,7 +125,7 @@ mount Ckeditor::Engine => '/ckeditor'
 
 ### Load editor via CKEditor CDN
 
-Setup editor version to load (more info here http://cdn.ckeditor.com/)
+Setup editor version to load (more info here <http://cdn.ckeditor.com/>)
 
 ```ruby
 # in config/initializers/ckeditor.rb
@@ -229,6 +234,7 @@ jQuery sample:
 ```
 
 ### SimpleForm integration
+
 Note that the toolbar option should match the case specified in the config. If the config is not found it defaults to all available toolbar items.
 
 i.e. config.toolbar_mini becomes {toolbar: 'mini'} in the form.
@@ -238,6 +244,7 @@ i.e. config.toolbar_mini becomes {toolbar: 'mini'} in the form.
 ```
 
 ### Turbolink integration
+
 Create a file app/assets/javascripts/init_ckeditor.coffee
 
 ```coffee
@@ -248,6 +255,7 @@ ready = ->
 $(document).ready(ready)
 $(document).on('page:load', ready)
 ```
+
 Make sure the file is loaded from your app/assets/javascripts/application.js
 
 ### CanCanCan integration
@@ -288,8 +296,9 @@ end
 Then, generate the policy files for model **Picture** and **AttachmentFile**
 
 ```
-$ rails g ckeditor:pundit_policy # or ckeditor:action_policy
+rails g ckeditor:pundit_policy # or ckeditor:action_policy
 ```
+
 By this command, you will got two files:
 > app/policies/ckeditor/picture_policy.rb
 app/policies/ckeditor/attachment_file_policy.rb
@@ -303,6 +312,7 @@ You can customize these two policy files as you like.
 * To override the default CKEditor routes create a [config.js](https://github.com/galetahub/ckeditor/blob/master/app/assets/javascripts/ckeditor/config.js) file within the host application at `app/assets/javascripts/ckeditor/config.js`
 
 * By default, the engine inherits from `ApplicationController`. To override the default parent controller:
+
 ```
 # in config/initializers/ckeditor.rb
 

data/app/assets/config/ckeditor_manifest.js

@@ -0,0 +1,7 @@
+//= link_tree ../images
+
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+
+//= link ckeditor/application.css
+//= link application.css

data/app/assets/javascripts/ckeditor/config.js

@@ -32,7 +32,8 @@ CKEDITOR.editorConfig = function( config )
   config.filebrowserUploadUrl = "/ckeditor/attachment_files";
 
   config.allowedContent = true;
-  config.filebrowserUploadMethod = 'form';
+  config.filebrowserUploadMethod = 'form';
+  config.versionCheck = false;
 
   // Toolbar groups configuration.
   config.toolbar = [

data/lib/ckeditor/backend/shrine.rb

@@ -8,8 +8,12 @@ module Ckeditor
       end
 
       module InstanceMethods
+        def data=(value)
+          self.attachment = value
+        end
+
         def url
-          data_url
+          attachment&.url
         end
 
         def data_file_name
@@ -21,7 +25,7 @@ module Ckeditor
         end
 
         def datasource
-          @datasource ||= data&.metadata || {}
+          @datasource ||= attachment&.metadata || {}
         end
       end
     end

data/lib/ckeditor/version.rb

@@ -2,7 +2,7 @@
 
 module Ckeditor
   module Version
-    GEM = '5.1.1'
-    EDITOR = '4.11.3'
+    GEM = '5.1.3'
+    EDITOR = '4.22.1'
   end
 end

data/lib/ckeditor.rb

@@ -75,7 +75,7 @@ module Ckeditor
 
   # CKEditor CDN
   mattr_accessor :cdn_url
-  @@cdn_url = '//cdn.ckeditor.com/4.11.3/standard/ckeditor.js'
+  @@cdn_url = '//cdn.ckeditor.com/4.22.1/standard/ckeditor.js'
 
   # Url to ckeditor config, used when CDN enabled
   mattr_accessor :js_config_url

data/lib/generators/ckeditor/install_generator.rb

@@ -47,14 +47,21 @@ module Ckeditor
           template "#{generator_dir}/ckeditor/#{filename}.rb",
                    File.join('app/models', ckeditor_dir, "#{filename}.rb")
         end
+      end
 
+      def create_uploaders
         if backend_carrierwave?
-          template "#{uploaders_dir}/uploaders/ckeditor_attachment_file_uploader.rb",
+          template "#{uploaders_dir}/ckeditor_attachment_file_uploader.rb",
                    File.join('app/uploaders', 'ckeditor_attachment_file_uploader.rb')
 
-          template "#{uploaders_dir}/uploaders/ckeditor_picture_uploader.rb",
+          template "#{uploaders_dir}/ckeditor_picture_uploader.rb",
                    File.join('app/uploaders', 'ckeditor_picture_uploader.rb')
         end
+
+        if backend_shrine?
+          template "#{uploaders_dir}/ckeditor_attachment_uploader.rb",
+                   File.join('app/uploaders', 'ckeditor_attachment_uploader.rb')
+        end
       end
 
       def create_ckeditor_migration
@@ -87,7 +94,7 @@ module Ckeditor
       end
 
       def uploaders_dir
-        @uploaders_dir ||= 'base/carrierwave'
+        @uploaders_dir ||= "base/#{backend}/uploaders"
       end
 
       def orm

data/lib/generators/ckeditor/templates/active_record/active_storage/migration.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateCkeditorAssets < ActiveRecord::Migration[5.2]
+class CreateCkeditorAssets < ActiveRecord::Migration[6.1]
   def up
     create_table :ckeditor_assets do |t|
       t.string  :data_file_name, null: false

data/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateCkeditorAssets < ActiveRecord::Migration[5.2]
+class CreateCkeditorAssets < ActiveRecord::Migration[6.1]
   def up
     create_table :ckeditor_assets do |t|
       t.string  :data_file_name, null: false

data/lib/generators/ckeditor/templates/active_record/dragonfly/migration.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateCkeditorAssets < ActiveRecord::Migration[5.2]
+class CreateCkeditorAssets < ActiveRecord::Migration[6.1]
   def up
     create_table :ckeditor_assets do |t|
       t.string  :data_uid, null: false

data/lib/generators/ckeditor/templates/active_record/paperclip/migration.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreateCkeditorAssets < ActiveRecord::Migration[5.2]
+class CreateCkeditorAssets < ActiveRecord::Migration[6.1]
   def up
     create_table :ckeditor_assets do |t|
       t.string  :data_file_name, null: false

data/lib/generators/ckeditor/templates/active_record/shrine/ckeditor/asset.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Ckeditor::Asset < ActiveRecord::Base
+  include Ckeditor::Orm::ActiveRecord::AssetBase
+  include Ckeditor::Backend::Shrine
+
+  include CkeditorAttachmentUploader::Attachment(:attachment)
+
+  validates :attachment_data, presence: true
+end

data/lib/generators/ckeditor/templates/active_record/shrine/ckeditor/attachment_file.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Ckeditor::AttachmentFile < Ckeditor::Asset
+  def url_thumb
+    Ckeditor::Utils.filethumb(filename)
+  end
+end

data/lib/generators/ckeditor/templates/active_record/shrine/ckeditor/picture.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+class Ckeditor::Picture < Ckeditor::Asset
+  def url_content
+    attachment&.url
+  end
+
+  def url_thumb
+    attachment&.url
+  end
+end

data/lib/generators/ckeditor/templates/active_record/shrine/migration.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class CreateCkeditorAssets < ActiveRecord::Migration[6.1]
+  def up
+    create_table :ckeditor_assets do |t|
+      t.integer :data_size
+      t.string  :type, limit: 30
+
+      # Shrine column
+      t.text    :attachment_data
+
+      # Uncomment these to save image dimensions, if your need them.
+      # t.integer :data_width
+      # t.integer :data_height
+
+      t.timestamps null: false
+    end
+
+    add_index :ckeditor_assets, :type
+  end
+
+  def down
+    drop_table :ckeditor_assets
+  end
+end

data/lib/generators/ckeditor/templates/base/shrine/initializer.rb

@@ -8,16 +8,15 @@ require 'ckeditor/backend/shrine'
 require 'image_processing/mini_magick'
 SHRINE_PICTURE_PROCESSOR = ImageProcessing::MiniMagick
 
-# require 'image_processing/vips'
-# SHRINE_PICTURE_PROCESSOR = ImageProcessing::Vips
-
 Shrine.storages = {
   cache: Shrine::Storage::FileSystem.new('public', prefix: 'uploads/cache'),
   store: Shrine::Storage::FileSystem.new('public', prefix: 'system')
 }
 
-Shrine.plugin :determine_mime_type
 Shrine.plugin :mongoid
+Shrine.plugin :activerecord
+
+Shrine.plugin :determine_mime_type
 Shrine.plugin :instrumentation
 
 Shrine.plugin :validation_helpers

data/lib/generators/ckeditor/templates/base/shrine/uploaders/ckeditor_attachment_uploader.rb

@@ -0,0 +1,8 @@
+class CkeditorAttachmentUploader < Shrine
+  plugin :validation_helpers
+
+  Attacher.validate do
+    validate_max_size 5*1024*1024 # file size must not be greater than 5 MB
+    validate_min_size 1024        # file size must not be less than 1 KB
+  end
+end

data/test/controllers/attachment_files_controller_test.rb

@@ -6,7 +6,8 @@ class AttachmentFilesControllerTest < ActionController::TestCase
   tests Ckeditor::AttachmentFilesController
 
   def setup
-    @attachment = fixture_file_upload('files/rails.tar.gz', 'application/x-gzip')
+    @attachment = Rack::Test::UploadedFile.new('test/dummy/test/fixtures/files/rails.tar.gz', 'application/x-gzip')
+
     @routes = Ckeditor::Engine.routes
   end
 
@@ -18,7 +19,6 @@ class AttachmentFilesControllerTest < ActionController::TestCase
     get :index
 
     assert_equal 200, @response.status
-    assert_template 'ckeditor/attachment_files/index'
   end
 
   test 'create action via filebrowser' do

data/test/controllers/pictures_controller_test.rb

@@ -6,7 +6,7 @@ class PicturesControllerTest < ActionController::TestCase
   tests Ckeditor::PicturesController
 
   def setup
-    @image = fixture_file_upload('files/rails.png', 'image/png')
+    @image = Rack::Test::UploadedFile.new('test/dummy/test/fixtures/files/rails.png', 'image/png')
     @routes = Ckeditor::Engine.routes
   end
 
@@ -18,7 +18,6 @@ class PicturesControllerTest < ActionController::TestCase
     get :index
 
     assert_equal 200, @response.status
-    assert_template 'ckeditor/pictures/index'
   end
 
   test 'create action via filebrowser' do
@@ -54,7 +53,7 @@ class PicturesControllerTest < ActionController::TestCase
   end
 
   test 'destroy action via filebrowser' do
-    @picture = Ckeditor::Picture.create data: @image
+    @picture = Ckeditor::Picture.create! data: @image
 
     assert_difference 'Ckeditor::Picture.count', -1 do
       delete :destroy, params: { id: @picture.id }

data/test/dummy/app/assets/config/manifest.js

@@ -0,0 +1,5 @@
+//= link_directory ../javascripts .js
+//= link_directory ../stylesheets .css
+
+//= link ckeditor/application.css
+//= link application.css

data/test/dummy/app/assets/javascripts/application.js

@@ -4,5 +4,3 @@
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
-//= require jquery
-//= require jquery_ujs

data/test/dummy/config/environments/test.rb

@@ -37,5 +37,5 @@ Dummy::Application.configure do
 
   config.active_support.test_order = :sorted
 
-  config.active_record.sqlite3.represent_boolean_as_integer = true
+  config.assets.precompile += %w( ckeditor/application.css ckeditor/application.js application.css )
 end

data/test/dummy/db/migrate/20110623120047_create_posts.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class CreatePosts < ActiveRecord::Migration[5.2]
+class CreatePosts < ActiveRecord::Migration[6.1]
   def up
     create_table :posts do |t|
       t.string :title

data/test/dummy/db/migrate/20170806125915_create_active_storage_tables.rb

@@ -1,4 +1,4 @@
-class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
+class CreateActiveStorageTables < ActiveRecord::Migration[6.1]
   def change
     create_table :active_storage_blobs do |t|
       t.string   :key,        null: false
@@ -8,6 +8,7 @@ class CreateActiveStorageTables < ActiveRecord::Migration[5.2]
       t.bigint   :byte_size,  null: false
       t.string   :checksum,   null: false
       t.datetime :created_at, null: false
+      t.string   :service_name, null: false
 
       t.index [ :key ], unique: true
     end

data/test/dummy/db/migrate/20240702124877_create_active_storage_variant_records.rb

@@ -0,0 +1,13 @@
+# This migration comes from active_storage (originally 20191206030411)
+class CreateActiveStorageVariantRecords < ActiveRecord::Migration[6.1]
+  def up
+    create_table :active_storage_variant_records do |t|
+      t.belongs_to :blob, null: false, index: false
+      t.string :variation_digest, null: false
+
+      t.index %i[ blob_id variation_digest ], name: "index_active_storage_variant_records_uniqueness",
+                                              unique: true
+      t.foreign_key :active_storage_blobs, column: :blob_id
+    end
+  end
+end