ckeditor 4.2.4 → 5.1.1

data/lib/ckeditor/backend/paperclip.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Backend
     module Paperclip
@@ -9,9 +11,6 @@ module Ckeditor
       module ClassMethods
         def self.extended(base)
           base.class_eval do
-            before_validation :extract_content_type
-            before_create :extract_dimensions
-
             delegate :url, :path, :styles, :content_type, to: :data
           end
         end
@@ -27,18 +26,6 @@ module Ckeditor
         def file
           @file ||= data.respond_to?(:queued_for_write) ? data.queued_for_write[:original] : data.to_file
         end
-
-        def extract_dimensions
-          if image? && has_dimensions?
-            self.width = geometry.width
-            self.height = geometry.height
-          end
-        end
-
-        def extract_content_type
-          path = file.nil? ? nil : file.path
-          self.data_content_type = Utils::ContentTypeDetector.new(path).detect
-        end
       end
     end
   end

data/lib/ckeditor/backend/shrine.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Ckeditor
+  module Backend
+    module Shrine
+      def self.included(base)
+        base.send(:include, InstanceMethods)
+      end
+
+      module InstanceMethods
+        def url
+          data_url
+        end
+
+        def data_file_name
+          datasource['filename']
+        end
+
+        def data_file_size
+          datasource['size']
+        end
+
+        def datasource
+          @datasource ||= data&.metadata || {}
+        end
+      end
+    end
+  end
+end

data/lib/ckeditor/helpers/controllers.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Helpers
     module Controllers
-      extend ActiveSupport::Concern
-
       protected
 
       def ckeditor_current_user

data/lib/ckeditor/helpers/form_builder.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Helpers
     module FormBuilder
-      extend ActiveSupport::Concern
-
       def cktext_area(method, options = {})
         @template.cktext_area(@object_name, method, objectify_options(options))
       end

data/lib/ckeditor/helpers/form_helper.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Helpers
     module FormHelper
-      extend ActiveSupport::Concern
-
       def cktext_area(object_name, method, options = {})
         TextArea.new(self, options).render_instance_tag(object_name, method)
       end

data/lib/ckeditor/helpers/view_helper.rb

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Helpers
     module ViewHelper
-      extend ActiveSupport::Concern
-
       def cktext_area_tag(name, content = nil, options = {})
         TextArea.new(self, options).render_tag(name, content)
       end

data/lib/ckeditor/hooks/action_policy.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+require 'action_policy'
+
+module Ckeditor
+  module Hooks
+    # This adapter is for the Action Policy[https://github.com/palkan/action_policy] authorization library.
+    # You can create another adapter for different authorization behavior, just be certain it
+    # responds to each of the public methods here.
+    class ActionPolicyAuthorization
+      include Ckeditor::Helpers::Controllers
+
+      # See the +authorize_with+ config method for where the initialization happens.
+      def initialize(controller)
+        @controller = controller
+      end
+
+      # This method is called in every controller action and should raise an exception
+      # when the authorization fails. The first argument is the name of the controller
+      # action as a symbol (:create, :destroy, etc.). The second argument is the actual model
+      # instance if it is available.
+      def authorize(_action, model_object = nil)
+        @controller.authorize!(model_object, context: {user: @controller.ckeditor_current_user})
+      end
+
+      # This method is called primarily from the view to determine whether the given user
+      # has access to perform the action on a given model. It should return true when authorized.
+      # This takes the same arguments as +authorize+. The difference is that this will
+      # return a boolean whereas +authorize+ will raise an exception when not authorized.
+      def authorized?(action, model_object = nil)
+        if action
+          @controller.allowed_to?(:"#{action}?",
+                                  model_object,
+                                  context: {user: @controller.ckeditor_current_user})
+        end
+      end
+    end
+  end
+end
+
+Ckeditor::AUTHORIZATION_ADAPTERS[:action_policy] = Ckeditor::Hooks::ActionPolicyAuthorization

data/lib/ckeditor/hooks/cancan.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 require 'cancan'
 
 module Ckeditor
   module Hooks
-    # This adapter is for the CanCan[https://github.com/ryanb/cancan] authorization library.
+    # This adapter is for the CanCanCan[https://github.com/CanCanCommunity/cancancan] authorization library.
     # You can create another adapter for different authorization behavior, just be certain it
     # responds to each of the public methods here.
     class CanCanAuthorization
@@ -45,3 +47,4 @@ module Ckeditor
 end
 
 Ckeditor::AUTHORIZATION_ADAPTERS[:cancan] = Ckeditor::Hooks::CanCanAuthorization
+Ckeditor::AUTHORIZATION_ADAPTERS[:cancancan] = Ckeditor::Hooks::CanCanAuthorization

data/lib/ckeditor/hooks/formtastic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'formtastic'
 
 class CkeditorInput

data/lib/ckeditor/hooks/pundit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pundit'
 
 module Ckeditor

data/lib/ckeditor/hooks/simple_form.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'simple_form'
 
 module Ckeditor

data/lib/ckeditor/http.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'digest/sha1'
 
 module Ckeditor
@@ -41,16 +42,16 @@ module Ckeditor
     class QqFile < ::Tempfile
       attr_reader :original_filename
 
-      def initialize(filename, request, tmpdir = Dir.tmpdir)
+      def initialize(filename, request)
         @original_filename = filename
         @request = request
 
-        super(Digest::SHA1.hexdigest(filename), tmpdir)
-        binmode
+        super(Digest::SHA1.hexdigest(filename))
         fetch
       end
 
       def fetch
+        binmode
         write(body)
         rewind
         self
@@ -72,12 +73,14 @@ module Ckeditor
     # Convert nested Hash to HashWithIndifferentAccess and replace
     # file upload hash with UploadedFile objects
     def self.normalize_param(*args)
-      value = args.first
+      value = args.compact.first
 
       if value.is_a?(Hash) && value.key?(:tempfile)
         UploadedFile.new(value)
       elsif value.is_a?(String)
         QqFile.new(*args)
+      elsif value.is_a?(ActionDispatch::Request)
+        value.params['upload']
       else
         value
       end

data/lib/ckeditor/orm/active_record.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ckeditor/orm/base'
 
 module Ckeditor

data/lib/ckeditor/orm/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Orm
     module Base

data/lib/ckeditor/orm/mongoid.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'orm_adapter/adapters/mongoid'
 require 'ckeditor/orm/base'
 

data/lib/ckeditor/paginatable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   # Simple paginate relation
   class Paginatable

data/lib/ckeditor/rails.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   class Engine < ::Rails::Engine
     isolate_namespace Ckeditor
@@ -24,6 +26,7 @@ module Ckeditor
 
       require 'ckeditor/hooks/cancan' if Object.const_defined?('CanCan')
       require 'ckeditor/hooks/pundit' if Object.const_defined?('Pundit')
+      require 'ckeditor/hooks/action_policy' if Object.const_defined?('ActionPolicy')
     end
 
     rake_tasks do

data/lib/ckeditor/text_area.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support'
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/form_tag_helper'
@@ -40,7 +42,7 @@ module Ckeditor
     end
 
     def output_buffer
-      @output_buffer ||= ActiveSupport::SafeBuffer.new
+      @output_buffer ||= ActionView::OutputBuffer.new
     end
 
     def build_tag(object_name, method)

data/lib/ckeditor/utils/javascript_code.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module Ckeditor
   module Utils

data/lib/ckeditor/utils.rb

@@ -1,11 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'active_support/json/encoding'
 
 module Ckeditor
   module Utils
     autoload :JavascriptCode, 'ckeditor/utils/javascript_code'
-    autoload :ContentTypeDetector, 'ckeditor/utils/content_type_detector'
 
     class << self
       def escape_single_quotes(str)
@@ -72,43 +71,6 @@ module Ckeditor
           false
         end
       end
-
-      def select_assets(path, relative_path)
-        relative_folder = Ckeditor.root_path.join(relative_path)
-        folder = relative_folder.join(path)
-        extensions = '*.{js,css,png,gif,jpg,html}'
-        languages = (Ckeditor.assets_languages || [])
-
-        # Files at root
-        files = Dir[folder.join(extensions)]
-
-        # Filter plugins
-        if Ckeditor.assets_plugins.nil?
-          files += Dir[folder.join('plugins', '**', extensions)]
-        else
-          Ckeditor.assets_plugins.each do |plugin|
-            files += Dir[folder.join('plugins', plugin, '**', extensions)]
-          end
-        end
-
-        # Other folders
-        Dir[folder.join('*/')].each do |subfolder|
-          path = Pathname.new(subfolder)
-          next if ['plugins'].include?(path.basename.to_s)
-          files += Dir[path.join('**', extensions)]
-        end
-
-        files.inject([]) do |items, name|
-          file = Pathname.new(name)
-          base = file.basename('.*').to_s
-
-          if !name.include?('/lang/') || languages.include?(base)
-            items << file.relative_path_from(relative_folder).to_s
-          end
-
-          items
-        end
-      end
     end
   end
 end

data/lib/ckeditor/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Version
-    GEM = '4.2.4'.freeze
-    EDITOR = '4.7.1'.freeze
+    GEM = '5.1.1'
+    EDITOR = '4.11.3'
   end
 end

data/lib/ckeditor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'orm_adapter'
 require 'pathname'
 
@@ -19,13 +21,15 @@ module Ckeditor
     autoload :SimpleFormBuilder, 'ckeditor/hooks/simple_form'
     autoload :CanCanAuthorization, 'ckeditor/hooks/cancan'
     autoload :PunditAuthorization, 'ckeditor/hooks/pundit'
+    autoload :ActionPolicyAuthorization, 'ckeditor/hooks/action_policy'
   end
 
   module Backend
+    autoload :ActiveStorage, 'ckeditor/backend/active_storage'
     autoload :Paperclip, 'ckeditor/backend/paperclip'
     autoload :CarrierWave, 'ckeditor/backend/carrierwave'
     autoload :Dragonfly, 'ckeditor/backend/dragonfly'
-    autoload :Refile, 'ckeditor/backend/refile'
+    autoload :Shrine, 'ckeditor/backend/shrine'
   end
 
   IMAGE_TYPES = %w[image/jpeg image/png image/gif image/jpg image/pjpeg image/tiff image/x-png].freeze
@@ -69,15 +73,9 @@ module Ckeditor
   mattr_accessor :default_per_page
   @@default_per_page = 24
 
-  # Asset restrictions
-  mattr_accessor :assets_languages
-  mattr_accessor :assets_plugins
-  @@assets_languages = nil
-  @@assets_plugins = nil
-
   # CKEditor CDN
   mattr_accessor :cdn_url
-  @@cdn_url = nil
+  @@cdn_url = '//cdn.ckeditor.com/4.11.3/standard/ckeditor.js'
 
   # Url to ckeditor config, used when CDN enabled
   mattr_accessor :js_config_url
@@ -123,11 +121,7 @@ module Ckeditor
 
   # All css and js files from ckeditor folder
   def self.assets
-    @assets ||= if Ckeditor.cdn_enabled?
-                  ['ckeditor/config.js']
-                else
-                  Utils.select_assets('ckeditor', 'vendor/assets/javascripts') << 'ckeditor/init.js'
-                end
+    @assets ||= Ckeditor.cdn_enabled? ? ['ckeditor/config.js'] : []
   end
 
   def self.assets=(value)
@@ -201,11 +195,11 @@ module Ckeditor
   #   end
   #
   # To use an authorization adapter, pass the name of the adapter. For example,
-  # to use with CanCan[https://github.com/ryanb/cancan], pass it like this.
+  # to use with CanCanCan[https://github.com/CanCanCommunity/cancancan], pass it like this.
   #
-  # @example CanCan
+  # @example CanCanCan
   #   Ckeditor.setup do |config|
-  #     config.authorize_with :cancan
+  #     config.authorize_with :cancancan
   #   end
   #
   def self.authorize_with(*args, &block)

data/lib/generators/ckeditor/action_policy_generator.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module Ckeditor
+  module Generators
+    class ActionPolicyGenerator < Rails::Generators::Base
+      desc 'Generates policy files for Action Policy'
+
+      def self.source_root
+        @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
+      end
+
+      # copy configuration
+      def copy_policy_files
+        [:picture, :attachment_file].each do |model_name|
+          template "action_policy/#{model_name}_policy.rb", "app/policies/ckeditor/#{model_name}_policy.rb"
+        end
+      end
+    end
+  end
+end

data/lib/generators/ckeditor/install_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 require 'rails/generators/migration'
 
@@ -13,14 +15,14 @@ module Ckeditor
                          desc: 'Backend processor for upload support'
 
       class_option :backend, type: :string, default: 'paperclip',
-                             desc: 'paperclip (default), carrierwave, refile or dragonfly'
+                             desc: 'paperclip (default), active_storage, carrierwave or dragonfly'
 
       def self.source_root
         @source_root ||= File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
       end
 
       def self.next_migration_number(_dirname)
-        Time.now.strftime('%Y%m%d%H%M%S')
+        Time.now.utc.strftime('%Y%m%d%H%M%S')
       end
 
       # copy configuration
@@ -30,6 +32,10 @@ module Ckeditor
         if backend_dragonfly?
           template 'base/dragonfly/initializer.rb', 'config/initializers/ckeditor_dragonfly.rb'
         end
+
+        if backend_shrine?
+          template 'base/shrine/initializer.rb', 'config/initializers/ckeditor_shrine.rb'
+        end
       end
 
       def mount_engine
@@ -52,10 +58,10 @@ module Ckeditor
       end
 
       def create_ckeditor_migration
-        if ['active_record'].include?(orm)
-          migration_template "#{generator_dir}/migration.rb",
-                             File.join('db/migrate', 'create_ckeditor_assets.rb')
-        end
+        return unless ['active_record'].include?(orm)
+
+        migration_template "#{generator_dir}/migration.rb",
+                           File.join('db/migrate', 'create_ckeditor_assets.rb')
       end
 
       protected
@@ -68,6 +74,10 @@ module Ckeditor
         backend == 'dragonfly'
       end
 
+      def backend_shrine?
+        backend == 'shrine'
+      end
+
       def ckeditor_dir
         'ckeditor'
       end

data/lib/generators/ckeditor/pundit_policy_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 
 module Ckeditor

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Ckeditor::AttachmentFilePolicy < ApplicationPolicy
+  # See https://actionpolicy.evilmartians.io/#/writing_policies
+  #
+
+  def index?
+    user.present?
+  end
+
+  def create?
+    user.present?
+  end
+
+  def destroy?
+    user.present?
+  end
+end

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

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+class Ckeditor::PicturePolicy < ApplicationPolicy
+  # See https://actionpolicy.evilmartians.io/#/writing_policies
+  #
+
+  def index?
+    user.present?
+  end
+
+  def create?
+    user.present?
+  end
+
+  def destroy?
+    user.present?
+  end
+end

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

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+class Ckeditor::Asset < ActiveRecord::Base
+  include Ckeditor::Orm::ActiveRecord::AssetBase
+  include Ckeditor::Backend::ActiveStorage
+
+  attr_accessor :data
+
+  has_one_attached :storage_data
+end

data/lib/generators/ckeditor/templates/active_record/{refile → active_storage}/ckeditor/attachment_file.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 class Ckeditor::AttachmentFile < Ckeditor::Asset
-  attachment :data, extension: attachment_file_types
+  # for validation, see https://github.com/igorkasyanchuk/active_storage_validations
 
   def url_thumb
     @url_thumb ||= Ckeditor::Utils.filethumb(filename)

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class Ckeditor::Picture < Ckeditor::Asset
+  # for validation, see https://github.com/igorkasyanchuk/active_storage_validations
+
+  def url_content
+    rails_representation_url(storage_data.variant(resize: '800>').processed, only_path: true)
+  end
+
+  def url_thumb
+    rails_representation_url(storage_data.variant(resize: '118x100').processed, only_path: true)
+  end
+end

data/lib/generators/ckeditor/templates/active_record/{refile → active_storage}/migration.rb

@@ -1,15 +1,17 @@
-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_id, null: false
-      t.string  :data_filename, null: false
-      t.integer :data_size
+      t.string  :data_file_name, null: false
       t.string  :data_content_type
+      t.integer :data_file_size
+      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
+      # 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/active_record/carrierwave/ckeditor/asset.rb

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

data/lib/generators/ckeditor/templates/active_record/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/active_record/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