glebtv-ckeditor 4.11.1 → 4.13.0

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
 
@@ -16,8 +18,6 @@ class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
   end
 
   def destroy
-    return false unless Ckeditor.can_delete
-
     @attachment.destroy
 
     respond_to do |format|

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
 
@@ -16,8 +18,6 @@ class Ckeditor::PicturesController < Ckeditor::ApplicationController
   end
 
   def destroy
-    return false unless Ckeditor.can_delete
-
     @picture.destroy
 
     respond_to do |format|

data/app/helpers/ckeditor/application_helper.rb

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

data/app/views/ckeditor/shared/_asset.html.erb

@@ -1,13 +1,11 @@
 <%= content_tag(:div, id: dom_id(asset), class: "gal-item", data: { url: image_path(asset.url_content) }) do %>
-
-  <% if Ckeditor.can_delete then %>
   <%= link_to '', polymorphic_path(asset, format: :json),
           remote: true,
           method: :delete,
           title: I18n.t('ckeditor.buttons.delete'),
           data: { confirm: t('ckeditor.confirm_delete') },
           class: "fileupload-cancel gal-del" %>
-  <% end %>
+
   <div class="fileupload-file gal-inner-holder">
     <div class="img"><%= image_tag(asset.url_thumb, title: asset.filename) %></div>
     <div class="img-data">

data/app/views/ckeditor/shared/_asset_tmpl.html.erb

@@ -1,13 +1,11 @@
 <script id="fileupload_tmpl" type="text/x-jquery-tmpl">
 <div id="asset_${id}" class="gal-item" data-url="${url_content}">
-  <% if Ckeditor.can_delete then %>
   <%= link_to '', "/ckeditor/${controller}/${id}.json",
           remote: true,
           method: :delete,
           title: I18n.t('ckeditor.buttons.delete'),
           data: { confirm: t('ckeditor.confirm_delete') },
           class: "fileupload-cancel gal-del" %>
-  <% end %>
 
   <div class="fileupload-file gal-inner-holder">
     <div class="img"><img src="${url_thumb}" title="${filename}"></div>

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/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
@@ -38,9 +41,6 @@ module Ckeditor
     request.env['warden'].try(:user) || respond_to?(:current_user) && current_user
   end
 
-  mattr_accessor :can_delete
-  @@can_delete = true
-
   # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
   mattr_accessor :image_file_types
@@ -72,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
@@ -101,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.
@@ -126,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)
@@ -204,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,21 +8,23 @@ 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?
-      params.key?(:upload) || ( params[:responseType] == JSON_TYPE && !params.key?(:qqfile) )
+      params[:responseType] == JSON_TYPE
     end
 
     def ckeditor?
@@ -28,11 +32,7 @@ module Ckeditor
     end
 
     def file
-      if params.key?(:qqfile)
-        params[:qqfile]
-      else
-        params[:upload]
-      end
+      !(ckeditor? || json?) ? params[:qqfile] : params[:upload]
     end
 
     def current_mode
@@ -108,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

data/lib/ckeditor/backend/carrierwave.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mini_magick'
 
 module Ckeditor
@@ -11,7 +13,6 @@ module Ckeditor
       module ClassMethods
         def self.extended(base)
           base.class_eval do
-            process :extract_content_type
             process :extract_size
           end
         end
@@ -36,21 +37,10 @@ module Ckeditor
           end
         end
 
-        def extract_content_type
-          model.data_content_type = Utils::ContentTypeDetector.new(file.path).detect
-        end
-
         def extract_size
           model.data_file_size = file.size
         end
 
-        def extract_dimensions
-          if model.image? && model.has_dimensions?
-            model.width = magick[:width]
-            model.height = magick[:height]
-          end
-        end
-
         def magick
           @magick ||= ::MiniMagick::Image.new(current_path)
         end

data/lib/ckeditor/backend/dragonfly.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Backend
     module Dragonfly

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 filename
+          datasource['filename']
+        end
+
+        def size
+          datasource['size']
+        end
+
+        def datasource
+          data.metadata
+        end
+      end
+    end
+  end
+end

data/lib/ckeditor/helpers/controllers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Helpers
     module Controllers

data/lib/ckeditor/helpers/form_builder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Helpers
     module FormBuilder

data/lib/ckeditor/helpers/form_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Helpers
     module FormHelper

data/lib/ckeditor/helpers/view_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Helpers
     module ViewHelper

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