ckeditor 4.3.0 → 5.1.0

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

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 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,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

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

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'

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) || languages.empty?
-            items << file.relative_path_from(relative_folder).to_s
-          end
-
-          items
-        end
-      end
     end
   end
 end

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/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Ckeditor
   module Version
-    GEM = '4.3.0'.freeze
-    EDITOR = '4.11.1'.freeze
+    GEM = '5.1.0'
+    EDITOR = '4.11.3'
   end
 end