ckeditor 4.2.4 → 5.1.1

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

@@ -1,5 +1,7 @@
-class CreateCkeditorAssets < ActiveRecord::Migration
-  def self.up
+# frozen_string_literal: true
+
+class CreateCkeditorAssets < ActiveRecord::Migration[5.2]
+  def up
     create_table :ckeditor_assets do |t|
       t.string  :data_file_name, null: false
       t.string  :data_content_type
@@ -7,8 +9,8 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :type, limit: 30
 
       # Uncomment it to save images dimensions, if your need it
-      t.integer :width
-      t.integer :height
+      # t.integer :width
+      # t.integer :height
 
       t.timestamps null: false
     end
@@ -16,7 +18,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
     add_index :ckeditor_assets, :type
   end
 
-  def self.down
+  def down
     drop_table :ckeditor_assets
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::Asset < ActiveRecord::Base
   include Ckeditor::Orm::ActiveRecord::AssetBase
   include Ckeditor::Backend::Dragonfly

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::AttachmentFile < Ckeditor::Asset
   validates_property :ext, of: :data, in: attachment_file_types unless attachment_file_types.empty?
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::Picture < Ckeditor::Asset
   validates_property :format, of: :data, in: image_file_types unless image_file_types.empty?
   validates_property :image?, of: :data, as: true, message: :invalid

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

@@ -1,5 +1,7 @@
-class CreateCkeditorAssets < ActiveRecord::Migration
-  def self.up
+# frozen_string_literal: true
+
+class CreateCkeditorAssets < ActiveRecord::Migration[5.2]
+  def up
     create_table :ckeditor_assets do |t|
       t.string  :data_uid, null: false
       t.string  :data_name, null: false
@@ -8,8 +10,8 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :type, limit: 30
 
       # Uncomment these to save image dimensions, if your need them.
-      t.integer :data_width
-      t.integer :data_height
+      # t.integer :data_width
+      # t.integer :data_height
 
       t.timestamps null: false
     end
@@ -17,7 +19,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
     add_index :ckeditor_assets, :type
   end
 
-  def self.down
+  def down
     drop_table :ckeditor_assets
   end
 end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::Asset < ActiveRecord::Base
   include Ckeditor::Orm::ActiveRecord::AssetBase
   include Ckeditor::Backend::Paperclip

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::AttachmentFile < Ckeditor::Asset
   has_attached_file :data,
                     url: '/ckeditor_assets/attachments/:id/:filename',

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::Picture < Ckeditor::Asset
   has_attached_file :data,
                     url: '/ckeditor_assets/pictures/:id/:style_:basename.:extension',

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

@@ -1,5 +1,7 @@
-class CreateCkeditorAssets < ActiveRecord::Migration
-  def self.up
+# frozen_string_literal: true
+
+class CreateCkeditorAssets < ActiveRecord::Migration[5.2]
+  def up
     create_table :ckeditor_assets do |t|
       t.string  :data_file_name, null: false
       t.string  :data_content_type
@@ -7,9 +9,9 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       t.string  :data_fingerprint
       t.string  :type, limit: 30
 
-      # Uncomment	it to save images dimensions, if your need it
-      t.integer :width
-      t.integer :height
+      # Uncomment it to save images dimensions, if your need it
+      # t.integer :width
+      # t.integer :height
 
       t.timestamps null: false
     end
@@ -17,7 +19,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration
     add_index :ckeditor_assets, :type
   end
 
-  def self.down
+  def down
     drop_table :ckeditor_assets
   end
 end

data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_attachment_file_uploader.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'carrierwave'
 
 class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base

data/lib/generators/ckeditor/templates/base/carrierwave/uploaders/ckeditor_picture_uploader.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 class CkeditorPictureUploader < CarrierWave::Uploader::Base
   include Ckeditor::Backend::CarrierWave
 
@@ -28,8 +29,6 @@ class CkeditorPictureUploader < CarrierWave::Uploader::Base
   #   # do something
   # end
 
-  process :extract_dimensions
-
   # Create different versions of your uploaded files:
   version :thumb do
     process resize_to_fill: [118, 100]

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load Dragonfly if it isn't loaded already.
 require 'dragonfly'
 

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'shrine'
+require 'shrine/storage/file_system'
+require 'ckeditor/backend/shrine'
+
+# Choose your favorite image processor
+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 :instrumentation
+
+Shrine.plugin :validation_helpers
+Shrine.plugin :processing
+Shrine.plugin :versions

data/lib/generators/ckeditor/templates/ckeditor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Use this hook to configure ckeditor
 Ckeditor.setup do |config|
   # ==> ORM configuration
@@ -23,7 +25,7 @@ Ckeditor.setup do |config|
 
   # Setup authorization to be run as a before filter
   # By default: there is no authorization.
-  # config.authorize_with :cancan
+  # config.authorize_with :cancancan
 
   # Override parent controller CKEditor inherits from
   # By default: 'ApplicationController'
@@ -41,11 +43,6 @@ Ckeditor.setup do |config|
   # By default: nil
   # config.asset_path = 'http://www.example.com/assets/ckeditor/'
 
-  # To reduce the asset precompilation time, you can limit plugins and/or languages to those you need:
-  # By default: nil (no limit)
-  # config.assets_languages = ['en', 'uk']
-  # config.assets_plugins = ['image', 'smiley']
-
   # CKEditor CDN
   # More info here http://cdn.ckeditor.com/
   # By default: nil (CDN disabled)

data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/asset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::Asset
   include Ckeditor::Orm::Mongoid::AssetBase
 

data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/attachment_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::AttachmentFile < Ckeditor::Asset
   mount_uploader :data, CkeditorAttachmentFileUploader, mount_on: :data_file_name
 

data/lib/generators/ckeditor/templates/mongoid/carrierwave/ckeditor/picture.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::Picture < Ckeditor::Asset
   mount_uploader :data, CkeditorPictureUploader, mount_on: :data_file_name
 

data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/asset.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::Asset
   include Ckeditor::Orm::Mongoid::AssetBase
   include Mongoid::Paperclip

data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/attachment_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::AttachmentFile < Ckeditor::Asset
   has_mongoid_attached_file :data,
                             url: '/ckeditor_assets/attachments/:id/:filename',

data/lib/generators/ckeditor/templates/mongoid/paperclip/ckeditor/picture.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::Picture < Ckeditor::Asset
   has_mongoid_attached_file :data,
                             url: '/ckeditor_assets/pictures/:id/:style_:basename.:extension',

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

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+class Ckeditor::Asset
+  include Ckeditor::Orm::Mongoid::AssetBase
+  include Ckeditor::Backend::Shrine
+
+  field :data_data, type: Hash
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Ckeditor
+  class AttachmentFileUploader < Shrine
+    plugin :validation_helpers
+
+    Attacher.validate do
+      validate_max_size 100.megabytes
+    end
+  end
+
+  class AttachmentFile < Ckeditor::Asset
+    include AttachmentFileUploader.attachment(:data)
+
+    validates :data, presence: true
+
+    def url_thumb
+      @url_thumb ||= Ckeditor::Utils.filethumb(filename)
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+module Ckeditor
+  class PictureUploader < Shrine
+    plugin :determine_mime_type
+    plugin :validation_helpers
+    plugin :processing
+    plugin :versions
+
+    Attacher.validate do
+      validate_mime_type_inclusion %w[image/jpeg image/gif image/png]
+      validate_max_size 2.megabytes
+    end
+
+    process(:store) do |io, _context|
+      # return the hash of processed files
+      {}.tap do |versions|
+        io.download do |original|
+          pipeline = SHRINE_PICTURE_PROCESSOR.source(original)
+
+          versions[:content] = pipeline.resize_to_limit!(800, 800)
+          versions[:thumb] = pipeline.resize_to_limit!(118, 100)
+        end
+      end
+    end
+  end
+
+  class Picture < Ckeditor::Asset
+    include PictureUploader.attachment(:data)
+
+    validates :data, presence: true
+
+    def url_content
+      data_url(:content)
+    end
+
+    def url_thumb
+      data_url(:thumb)
+    end
+
+    def path
+      data[:thumb].storage.path(data[:thumb].id)
+    end
+
+    def datasource
+      @datasource ||= HashWithIndifferentAccess
+                      .new(data)
+                      .fetch(:thumb, OpenStruct.new(metadata: {}))
+                      .metadata
+    end
+  end
+end

data/lib/generators/ckeditor/templates/pundit_policy/attachment_file_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::AttachmentFilePolicy
   attr_reader :user, :attachment
 

data/lib/generators/ckeditor/templates/pundit_policy/picture_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::PicturePolicy
   attr_reader :user, :picture
 

data/lib/tasks/ckeditor.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 
 namespace :ckeditor do

data/test/controllers/attachment_files_controller_test.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class AttachmentFilesControllerTest < ActionController::TestCase
   tests Ckeditor::AttachmentFilesController
 
-  include RawPost
-
   def setup
     @attachment = fixture_file_upload('files/rails.tar.gz', 'application/x-gzip')
     @routes = Ckeditor::Engine.routes
@@ -14,48 +14,50 @@ class AttachmentFilesControllerTest < ActionController::TestCase
     Ckeditor::AttachmentFile.destroy_all
   end
 
-  test "index action" do
+  test 'index action' do
     get :index
 
     assert_equal 200, @response.status
-    assert_template "ckeditor/attachment_files/index"
+    assert_template 'ckeditor/attachment_files/index'
   end
 
-  test "create action via filebrowser" do
+  test 'create action via filebrowser' do
     assert_difference 'Ckeditor::AttachmentFile.count' do
-      post :create, :qqfile => @attachment
+      post :create, params: { qqfile: @attachment }
     end
 
     assert_equal 200, @response.status
   end
 
-  test "create action via CKEditor upload form" do
+  test 'create action via CKEditor upload form' do
     assert_difference 'Ckeditor::AttachmentFile.count' do
-      post :create, :upload => @attachment, :CKEditor => 'ckeditor_field'
+      post :create, params: { upload: @attachment, CKEditor: 'ckeditor_field' }
     end
 
     assert_equal 200, @response.status
   end
 
-  test "create action via html5 upload" do
+  test 'create action via html5 upload' do
+    params = { qqfile: @attachment.original_filename }
+
     assert_difference 'Ckeditor::AttachmentFile.count' do
-      raw_post :create, { :qqfile => @attachment.original_filename }, @attachment.read
+      post :create, params: params, body: @attachment.read
     end
 
     assert_equal 200, @response.status
   end
 
-  test "invalid params for create action" do
+  test 'invalid params for create action' do
     assert_no_difference 'Ckeditor::AttachmentFile.count' do
-      post :create, :qqfile => nil, :format => :html
+      post :create, params: { qqfile: nil, format: :html }
     end
   end
 
-  test "destroy action via filebrowser" do
-    @attachment_file = Ckeditor::AttachmentFile.create :data => @attachment
+  test 'destroy action via filebrowser' do
+    @attachment_file = Ckeditor::AttachmentFile.create data: @attachment
 
     assert_difference 'Ckeditor::AttachmentFile.count', -1 do
-      delete :destroy, :id => @attachment_file.id
+      delete :destroy, params: { id: @attachment_file.id }
     end
 
     assert_equal 302, @response.status

data/test/controllers/pictures_controller_test.rb

@@ -1,10 +1,10 @@
+# frozen_string_literal: true
+
 require 'test_helper'
 
 class PicturesControllerTest < ActionController::TestCase
   tests Ckeditor::PicturesController
 
-  include RawPost
-  
   def setup
     @image = fixture_file_upload('files/rails.png', 'image/png')
     @routes = Ckeditor::Engine.routes
@@ -14,48 +14,50 @@ class PicturesControllerTest < ActionController::TestCase
     Ckeditor::Picture.destroy_all
   end
 
-  test "index action" do
+  test 'index action' do
     get :index
 
     assert_equal 200, @response.status
-    assert_template "ckeditor/pictures/index"
+    assert_template 'ckeditor/pictures/index'
   end
 
-  test "create action via filebrowser" do
+  test 'create action via filebrowser' do
     assert_difference 'Ckeditor::Picture.count' do
-      post :create, :qqfile => @image
+      post :create, params: { qqfile: @image }
     end
 
     assert_equal 200, @response.status
   end
 
-  test "create action via CKEditor upload form" do
+  test 'create action via CKEditor upload form' do
     assert_difference 'Ckeditor::Picture.count' do
-      post :create, :upload => @image, :CKEditor => 'ckeditor_field'
+      post :create, params: { upload: @image, CKEditor: 'ckeditor_field' }
     end
 
     assert_equal 200, @response.status
   end
 
-  test "create action via html5 upload" do
+  test 'create action via html5 upload' do
+    params = { qqfile: @image.original_filename }
+
     assert_difference 'Ckeditor::Picture.count' do
-      raw_post :create, { :qqfile => @image.original_filename }, @image.read, "image/png"
+      post :create, params: params, body: @image.read
     end
 
     assert_equal 200, @response.status
   end
 
-  test "invalid params for create action" do
+  test 'invalid params for create action' do
     assert_no_difference 'Ckeditor::Picture.count' do
-      post :create, :qqfile => nil, :format => :html
+      post :create, params: { qqfile: nil, format: :html }
     end
   end
 
-  test "destroy action via filebrowser" do
-    @picture = Ckeditor::Picture.create :data => @image
+  test 'destroy action via filebrowser' do
+    @picture = Ckeditor::Picture.create data: @image
 
     assert_difference 'Ckeditor::Picture.count', -1 do
-      delete :destroy, :id => @picture.id
+      delete :destroy, params: { id: @picture.id }
     end
 
     assert_equal 302, @response.status

data/test/dummy/Rakefile

@@ -1,4 +1,6 @@
 #!/usr/bin/env rake
+# frozen_string_literal: true
+
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 

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

@@ -6,5 +6,3 @@
 //
 //= require jquery
 //= require jquery_ujs
-
-//= require ckeditor/init

data/test/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ApplicationController < ActionController::Base
   protect_from_forgery
 end

data/test/dummy/app/controllers/posts_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PostsController < ApplicationController
   # GET /posts
   # GET /posts.xml

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module ApplicationHelper
 end

data/test/dummy/app/helpers/posts_helper.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 module PostsHelper
 end

data/test/dummy/app/models/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 case CKEDITOR_ORM
 
 when :active_record

data/test/dummy/app/views/posts/index.html.erb

@@ -22,6 +22,3 @@
 
 <h2>Text area test</h2>
 <%= cktext_area_tag("test_area", "Ckeditor") %>
-
-<h2>Text area test with options</h2>
-<%= cktext_area_tag("content", "Ckeditor", :cols => 10, :rows => 20, :ckeditor => {:toolbar => 'Easy'}) %>

data/test/dummy/app/views/posts/show.html.erb

@@ -3,3 +3,6 @@
 
 <%= link_to 'Edit', edit_post_path(@post) %> |
 <%= link_to 'Back', posts_path %>
+
+<h2>Text area test with options</h2>
+<%= cktext_area_tag("content", "Ckeditor", :cols => 10, :rows => 20, :ckeditor => {:toolbar => 'Easy'}) %>

data/test/dummy/config/application.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path('../boot', __FILE__)
 
 require "rails"
@@ -10,7 +12,8 @@ require "action_controller/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
 require "rails/test_unit/railtie"
-
+require "active_storage/engine"
+require "active_job/railtie"
 # Require the gems listed in Gemfile, including any gems
 # you've limited to :test, :development, or :production.
 Bundler.require(*Rails.groups)
@@ -59,5 +62,6 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+    config.active_storage.service = :local
   end
 end

data/test/dummy/config/boot.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 gemfile = File.expand_path('../../../../Gemfile', __FILE__)
 

data/test/dummy/config/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Load the rails application
 require File.expand_path('../application', __FILE__)
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dummy::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb