ckeditor 4.3.0 → 5.1.0

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.ru

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file is used by Rack-based servers to start the application.
 
 require ::File.expand_path('../config/environment',  __FILE__)

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
 

data/test/dummy/config/environments/test.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
   config.eager_load = false
@@ -10,7 +12,7 @@ Dummy::Application.configure do
 
   # Configure static asset server for tests with Cache-Control for performance
   config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  config.static_cache_control = 'public, max-age=3600'
 
   # Log error messages when you accidentally call methods on nil
   config.whiny_nils = true
@@ -23,7 +25,7 @@ Dummy::Application.configure do
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment
-  config.action_controller.allow_forgery_protection    = false
+  config.action_controller.allow_forgery_protection = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
@@ -35,5 +37,5 @@ Dummy::Application.configure do
 
   config.active_support.test_order = :sorted
 
-  config.active_record.raise_in_transactional_callbacks = true
+  config.active_record.sqlite3.represent_boolean_as_integer = true
 end

data/test/dummy/config/initializers/assets.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 Rails.application.config.assets.precompile += %w( ckeditor/* )

data/test/dummy/config/initializers/backtrace_silencers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.

data/test/dummy/config/initializers/ckeditor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 dir = File.join(Rails.root, "..", "..", "lib", "generators", "ckeditor", "templates")
 
 # Load the CKEditor initializer from the codebase.

data/test/dummy/config/initializers/cookies_serializer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Rails.application.config.action_dispatch.cookies_serializer = :json

data/test/dummy/config/initializers/inflections.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new inflection rules using the following format

data/test/dummy/config/initializers/mime_types.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 # Add new mime types for use in respond_to blocks:

data/test/dummy/config/initializers/paperclip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if Object.const_defined?('Paperclip')
   Paperclip.options[:command_path] = '/usr/local/bin/'
 end

data/test/dummy/config/initializers/session_store.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 
 Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'

data/test/dummy/config/initializers/wrap_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file contains settings for ActionController::ParamsWrapper which