glebtv-ckeditor 4.7.3 → 4.14.1

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

@@ -21,13 +21,13 @@ CKEDITOR.editorConfig = function( config ) {
   config.filebrowserImageBrowseUrl = "/ckeditor/pictures";
 
   // The location of a script that handles file uploads in the Image dialog.
-  config.filebrowserImageUploadUrl = "/ckeditor/pictures";
+  config.filebrowserImageUploadUrl = "/ckeditor/pictures?";
 
   // The location of a script that handles file uploads.
   config.filebrowserUploadUrl = "/ckeditor/attachment_files";
 
   config.stylesSet = [];
-  config.extraPlugins = "colorbutton,colordialog,font,magicline,codemirror,stylesheetparser,loremipsum,CKCss,wordcount,youtube,lineheight";
+  config.extraPlugins = "colorbutton,colordialog,font,magicline,codemirror,loremipsum,CKCss,wordcount,youtube,lineheight,image2,uploadimage,filebrowser";
   config.contentsCss = "<%= stylesheet_path('ckcontent.css') %>";
 
   config.tabSpaces = 2;
@@ -38,7 +38,7 @@ CKEDITOR.editorConfig = function( config ) {
         ['Styles','Format','Font','FontSize', 'TextColor', 'BGColor'],  ['JustifyLeft','JustifyCenter', 'JustifyRight', 'JustifyBlock'],
         '/',
         ['Bold','Italic','Underline'], ['NumberedList','BulletedList','Blockquote'],
-        ['Link','Unlink'], ['lineheight'], ['Image', 'Flash'],
+        ['Link','Unlink'], ['lineheight'], ['Image'],
         ['Table','HorizontalRule','SpecialChar'], ['Maximize', 'Subscript', 'Superscript'], ['Outdent','Indent', 'ShowBlocks'],
         ['loremipsum', 'CKCss', 'Youtube']
     ];

data/app/controllers/ckeditor/application_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::ApplicationController < Ckeditor.parent_controller.constantize
   layout Ckeditor.controller_layout
 
@@ -9,6 +11,7 @@ class Ckeditor::ApplicationController < Ckeditor.parent_controller.constantize
 
   def respond_with_asset(asset)
     asset_response = Ckeditor::AssetResponse.new(asset, request)
+    asset.data = asset_response.data
 
     if asset.save
       render asset_response.success(config.relative_url_root)

data/app/controllers/ckeditor/attachment_files_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
   skip_before_action :verify_authenticity_token, only: :create, raise: false
 

data/app/controllers/ckeditor/pictures_controller.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::PicturesController < Ckeditor::ApplicationController
   skip_before_action :verify_authenticity_token, only: :create, raise: false
 

data/app/helpers/ckeditor/application_helper.rb

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

data/config/locales/bg.ckeditor.yml

@@ -0,0 +1,9 @@
+bg:
+  ckeditor:
+    page_title: "Списък с файлове"
+    confirm_delete: "Сигурни ли сте, че искате да изтриете този файл?"
+    buttons:
+      cancel: "Откажи"
+      upload: "Качи"
+      delete: "Изтрий"
+      next: "Следващ"

data/config/locales/cs.ckeditor.yml

@@ -0,0 +1,9 @@
+cs:
+  ckeditor:
+    page_title: "CKEditor Správce souborů"
+    confirm_delete: "Smazat soubor ?"
+    buttons:
+      cancel: "Zrušit"
+      upload: "Nahrát"
+      delete: "Smazat"
+      next: "Next"

data/config/locales/da.ckeditor.yml

@@ -0,0 +1,9 @@
+da:
+  ckeditor:
+    page_title: "CKEditor Fil Manager"
+    confirm_delete: "Slet fil?"
+    buttons:
+      cancel: "Annuller"
+      upload: "Upload"
+      delete: "Slet"
+      next: "Næste"

data/config/locales/de.ckeditor.yml

@@ -0,0 +1,9 @@
+de:
+  ckeditor:
+    page_title: "CKEditor Dateimanager"
+    confirm_delete: "Datei löschen?"
+    buttons:
+      cancel: "Abbrechen"
+      upload: "Hochladen"
+      delete: "Löschen"
+      next: "Next"

data/config/locales/el-GR.cdkeditor.yml

@@ -0,0 +1,9 @@
+"el-GR":
+  ckeditor:
+    page_title: "CKEditor Διαχείρηση Αρχείων"
+    confirm_delete: "Διαγραφή αρχείου;"
+    buttons:
+      cancel: "Ακύρωση"
+      upload: "Μεταφόρτωση"
+      delete: "Διαγραφή"
+      next: "Next"

data/config/locales/es.ckeditor.yml

@@ -0,0 +1,9 @@
+es:
+  ckeditor:
+    page_title: "Administrador de Archivos CKEditor"
+    confirm_delete: "¿Borrar archivo?"
+    buttons:
+      cancel: "Cancelar"
+      upload: "Subir"
+      delete: "Borrar"
+      next: "Next"

data/config/locales/fr.ckeditor.yml

@@ -0,0 +1,9 @@
+fr:
+  ckeditor:
+    page_title: "CKEditor - Gestionnaire de fichiers"
+    confirm_delete: "Supprimer le fichier ?"
+    buttons:
+      cancel: "Annuler"
+      upload: "Ajouter"
+      delete: "Supprimer"
+      next: "Next"

data/config/locales/hu.ckeditor.yml

@@ -0,0 +1,9 @@
+hu:
+  ckeditor:
+    page_title: "CKEditor fájlkezelő"
+    confirm_delete: "Biztosan töröljük a fájlt?"
+    buttons:
+      cancel: "Mégsem"
+      upload: "Feltöltés"
+      delete: "Törlés"
+      next: "Next"

data/config/locales/it.ckeditor.yml

@@ -0,0 +1,9 @@
+it:
+  ckeditor:
+    page_title: "CKEditor Files Manager"
+    confirm_delete: "Cancellare il file?"
+    buttons:
+      cancel: "Annulla"
+      upload: "Carica"
+      delete: "Elimina"
+      next: "Next"

data/config/locales/ja.ckeditor.yml

@@ -0,0 +1,9 @@
+ja:
+  ckeditor:
+    page_title: "CKEditor ファイル・マネージャー"
+    confirm_delete: "ファイルを削除しますか？"
+    buttons:
+      cancel: "キャンセル"
+      upload: "アップロード"
+      delete: "削除"
+      next: "次へ"

data/config/locales/nb.ckeditor.yml

@@ -0,0 +1,9 @@
+nb:
+  ckeditor:
+    page_title: "CKEditor filbehandlingr"
+    confirm_delete: "Slette filen?"
+    buttons:
+      cancel: "Avbryt"
+      upload: "Last opp"
+      delete: "Slett"
+      next: "Neste"

data/config/locales/nl.ckeditor.yml

@@ -0,0 +1,9 @@
+nl:
+  ckeditor:
+    page_title: "CKEditor Files Manager"
+    confirm_delete: "Delete file?"
+    buttons:
+      cancel: "Cancel"
+      upload: "Upload"
+      delete: "Delete"
+      next: "Next"

data/config/locales/pl.ckeditor.yml

@@ -0,0 +1,9 @@
+pl:
+  ckeditor:
+    page_title: "CKEditor Menadżer Plików"
+    confirm_delete: "Usunąć plik?"
+    buttons:
+      cancel: "Anuluj"
+      upload: "Wyślij"
+      delete: "Skasuj"
+      next: "Next"

data/config/locales/pt-BR.ckeditor.yml

@@ -0,0 +1,9 @@
+"pt-BR":
+  ckeditor:
+    page_title: "Gerenciador de arquivos do CKEditor"
+    confirm_delete: "Apagar arquivo?"
+    buttons:
+      cancel: "Cancelar"
+      upload: "Enviar"
+      delete: "Apagar"
+      next: "Next"

data/config/locales/pt-PT.ckeditor.yml

@@ -0,0 +1,9 @@
+"pt-PT":
+  ckeditor:
+    page_title: "Gestor de arquivos do CKEditor"
+    confirm_delete: "Apagar arquivo?"
+    buttons:
+      cancel: "Cancelar"
+      upload: "Enviar"
+      delete: "Apagar"
+      next: "Próximo"

data/config/locales/pt.ckeditor.yml

@@ -0,0 +1,9 @@
+pt:
+  ckeditor:
+    page_title: "Gestor de arquivos do CKEditor"
+    confirm_delete: "Apagar arquivo?"
+    buttons:
+      cancel: "Cancelar"
+      upload: "Enviar"
+      delete: "Apagar"
+      next: "Próximo"

data/config/locales/sq.ckeditor.yml

@@ -0,0 +1,9 @@
+sq:
+  ckeditor:
+    page_title: "Menaxher i dokumenteve CKEditor"
+    confirm_delete: "Fshi dokumentin?"
+    buttons:
+      cancel: "Anullo"
+      upload: "Upload"
+      delete: "Fshi"
+      next: "Tjetër"

data/config/locales/sv-SE.ckeditor.yml

@@ -0,0 +1,9 @@
+"sv-SE":
+  ckeditor:
+    page_title: "CKEditor filhanterare"
+    confirm_delete: "Ta bort fil?"
+    buttons:
+      cancel: "Avbryt"
+      upload: "Ladda upp"
+      delete: "Ta bort"
+      next: "Next"

data/config/locales/tr.ckeditor.yml

@@ -0,0 +1,9 @@
+tr:
+  ckeditor:
+    page_title: "CKEditor Dosya Yöneticisi"
+    confirm_delete: "Dosyayı sil?"
+    buttons:
+      cancel: "İptal"
+      upload: "Yükle"
+      delete: "Sil"
+      next: "Sonraki"

data/config/locales/uk.ckeditor.yml

@@ -0,0 +1,9 @@
+uk:
+  ckeditor:
+    page_title: "CKEditor Завантаження файлів"
+    confirm_delete: "Видалити файл?"
+    buttons:
+      cancel: "Відміна"
+      upload: "Завантажити"
+      delete: "Видалити"
+      next: "Показати більше"

data/config/locales/zh-CN.ckeditor.yml

@@ -0,0 +1,9 @@
+zh-CN:
+  ckeditor:
+    page_title: "CKEditor - 文件管理"
+    confirm_delete: "删除文件?"
+    buttons:
+      cancel: "取消"
+      upload: "上传"
+      delete: "删除"
+      next: "下一个"

data/config/locales/zh-TW.ckeditor.yml

@@ -0,0 +1,9 @@
+zh-TW:
+  ckeditor:
+    page_title: "CKEditor - 文件管理"
+    confirm_delete: "删除文件?"
+    buttons:
+      cancel: "取消"
+      upload: "上傳"
+      delete: "删除"
+      next: "下一個"

data/config/routes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Ckeditor::Engine.routes.draw do
   resources :pictures, only: [:index, :create, :destroy]
   resources :attachment_files, only: [:index, :create, :destroy]

data/lib/ckeditor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'orm_adapter'
 require 'pathname'
 
@@ -22,10 +24,11 @@ module Ckeditor
   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,14 +72,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 = '//cdn.ckeditor.com/4.11.3/standard/ckeditor.js'
   @@cdn_url = nil
 
   # Url to ckeditor config, used when CDN enabled
@@ -98,7 +96,7 @@ module Ckeditor
   # Turn on/off assets pipeline
   # By default ckeditor will check assets pipeline
   mattr_accessor :assets_pipeline_enabled
-  @@assets_pipeline_enabled = nil
+  @@assets_pipeline_enabled = true
 
   # Default way to setup Ckeditor. Run rails generate ckeditor to create
   # a fresh initializer with all configuration values.
@@ -123,11 +121,10 @@ 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']
+    :
+      Utils.select_assets('ckeditor', 'vendor/assets/javascripts') << 'ckeditor/init.js'
   end
 
   def self.assets=(value)
@@ -201,11 +198,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/ckeditor/asset_response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'action_view/helpers/tag_helper'
 require 'action_view/helpers/javascript_helper'
 
@@ -6,17 +8,19 @@ module Ckeditor
     include ActionView::Helpers::TagHelper
     include ActionView::Helpers::JavaScriptHelper
 
-    FUNCTION = 'window.parent.CKEDITOR.tools.callFunction'.freeze
-    JSON_TYPE = 'json'.freeze
+    FUNCTION = 'window.parent.CKEDITOR.tools.callFunction'
+    JSON_TYPE = 'json'
 
-    attr_reader :asset, :params
+    attr_reader :asset, :request, :params
 
     def initialize(asset, request)
       @asset = asset
       @request = request
       @params = request.params
+    end
 
-      @asset.data = Ckeditor::Http.normalize_param(file, @request)
+    def data
+      @data ||= read_data
     end
 
     def json?
@@ -104,5 +108,12 @@ module Ckeditor
         :default
       end
     end
+
+    def read_data
+      data = Ckeditor::Http.normalize_param(file, request)
+      return if data.size.zero? || data.original_filename.blank?
+
+      data
+    end
   end
 end

data/lib/ckeditor/backend/active_storage.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module Ckeditor
+  module Backend
+    module ActiveStorage
+      def self.included(base)
+        base.send(:include, Rails.application.routes.url_helpers)
+        base.send(:include, InstanceMethods)
+        base.send(:extend, ClassMethods)
+      end
+
+      module ClassMethods
+        def self.extended(base)
+          base.class_eval do
+            before_save :apply_data
+            validate do
+              if data.nil? || file.nil?
+                errors.add(:data, :not_data_present, message: "data must be present")
+              end
+            end
+          end
+        end
+      end
+
+      module InstanceMethods
+        def url
+          rails_blob_path(self.storage_data, only_path: true)
+        end
+
+        def path
+          rails_blob_path(self.storage_data, only_path: true)
+        end
+
+        def styles
+        end
+
+        def content_type
+          self.storage_data.content_type
+        end
+        def content_type=(_content_type)
+          self.storage_data.content_type = _content_type
+        end
+        protected
+
+        def file
+          @file ||= storage_data
+        end
+
+        def blob
+          @blob ||= ::ActiveStorage::Blob.find(file.attachment.blob_id)
+        end
+
+        def apply_data
+          if data.is_a?(Ckeditor::Http::QqFile)
+            storage_data.attach(io: data, filename: data.original_filename)
+          else
+            storage_data.attach(data)
+          end
+
+          self.data_file_name = storage_data.blob.filename
+          self.data_content_type = storage_data.blob.content_type
+          self.data_file_size = storage_data.blob.byte_size
+        end
+
+      end
+    end
+  end
+end