glebtv-ckeditor 4.11.1 → 4.13.0

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
@@ -71,13 +72,17 @@ module Ckeditor
 
     # Convert nested Hash to HashWithIndifferentAccess and replace
     # file upload hash with UploadedFile objects
-    def self.normalize_param(file, request)
-      if file.is_a?(Hash) && file.key?(:tempfile)
+    def self.normalize_param(*args)
+      value = args.compact.first
+
+      if value.is_a?(Hash) && value.key?(:tempfile)
         UploadedFile.new(value)
-      elsif request.params.key?(:qqfile)
-        QqFile.new(file, request)
+      elsif value.is_a?(String)
+        QqFile.new(*args)
+      elsif value.is_a?(ActionDispatch::Request)
+        value.params['upload']
       else
-        file
+        value
       end
     end
   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
@@ -6,6 +8,9 @@ module Ckeditor
           def filename
             data_file_name
           end
+          def fileName
+            filename
+          end
 
           def size
             data_file_size
@@ -31,14 +36,18 @@ module Ckeditor
             url(:thumb)
           end
 
+          def uploaded
+            1
+          end
+
           def as_json_methods
-            [:url_content, :url_thumb, :size, :filename, :format_created_at]
+            [:url, :url_content, :url_thumb, :size, :filename, :fileName, :format_created_at, :uploaded]
           end
 
           def as_json(options = nil)
             options = {
               methods: as_json_methods,
-              root: 'asset'
+              #root: 'asset'
             }.merge!(options || {})
 
             super(options)

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/rails_admin/field.rb

@@ -1,7 +1,20 @@
-require 'rails_admin/config/fields/types/ck_editor'
-
 module RailsAdmin::Config::Fields::Types
-  class Ckeditor < RailsAdmin::Config::Fields::Types::CKEditor
+  class Ckeditor < RailsAdmin::Config::Fields::Types::Text
     RailsAdmin::Config::Fields::Types::register(:ckeditor, self)
+    register_instance_option :config_js do
+      nil
+    end
+
+    register_instance_option :location do
+      nil
+    end
+
+    register_instance_option :base_location do
+      "#{Rails.application.config.assets.prefix}/ckeditor/"
+    end
+
+    register_instance_option :partial do
+      :form_ck_editor
+    end
   end
 end

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)
@@ -77,19 +76,11 @@ module Ckeditor
         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
+        files += Dir[folder.join('plugins', '**', extensions)]
 
         # Other folders
         Dir[folder.join('*/')].each do |subfolder|
@@ -101,11 +92,7 @@ module Ckeditor
         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 << file.relative_path_from(relative_folder).to_s
           items
         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.11.1'.freeze
-    EDITOR = '4.11.1'.freeze
+    GEM = '4.13.0'
+    EDITOR = '4.13.0'
   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,11 +58,10 @@ module Ckeditor
       end
 
       def create_ckeditor_migration
-        if ['active_record'].include?(orm)
-          migration_template "#{generator_dir}/#{migration_file}.rb",
-                             File.join('db/migrate', 'create_ckeditor_assets.rb'),
-                             migration_version: migration_version
-        end
+        return unless ['active_record'].include?(orm)
+
+        migration_template "#{generator_dir}/migration.rb",
+                           File.join('db/migrate', 'create_ckeditor_assets.rb')
       end
 
       protected
@@ -69,6 +74,10 @@ module Ckeditor
         backend == 'dragonfly'
       end
 
+      def backend_shrine?
+        backend == 'shrine'
+      end
+
       def ckeditor_dir
         'ckeditor'
       end
@@ -88,18 +97,6 @@ module Ckeditor
       def backend
         (options[:backend] || 'paperclip').to_s
       end
-
-      def rails5?
-        Rails.version.start_with? '5'
-      end
-
-      def migration_version
-        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-      end
-
-      def migration_file
-        rails5? ? 'migration_versioned' : 'migration'
-      end
     end
   end
 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/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/{carrierwave/migration_versioned.rb → active_storage/migration.rb}

@@ -1,14 +1,17 @@
-class CreateCkeditorAssets < ActiveRecord::Migration<%= migration_version %>
-  def self.up
+# frozen_string_literal: true
+
+class CreateCkeditorAssets < ActiveRecord::Migration[5.2]
+  def up
     create_table :ckeditor_assets do |t|
       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
@@ -16,7 +19,7 @@ class CreateCkeditorAssets < ActiveRecord::Migration<%= migration_version %>
     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
 

data/lib/generators/ckeditor/templates/active_record/carrierwave/migration.rb

@@ -1,5 +1,7 @@
-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_file_name, null: false
       t.string  :data_content_type
@@ -7,8 +9,8 @@ class CreateCkeditorAssets < ActiveRecord::Migration
       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
@@ -16,7 +18,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/dragonfly/ckeditor/asset.rb

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

data/lib/generators/ckeditor/templates/active_record/dragonfly/ckeditor/attachment_file.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ckeditor::AttachmentFile < Ckeditor::Asset
   validates_property :ext, of: :data, in: attachment_file_types unless attachment_file_types.empty?