ckeditor_wave 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 690d7e85ca4196310754a0719d770f6a40899e9432a8edc82a7034c73ad3ebc1
-  data.tar.gz: 49c1016f4c625bf13a9b5926b21a328ca02c63956c5f0c403ad2e0df152cbb16
+  metadata.gz: ff96ab447af708dd508293df7242e11e754661a30f0e4fff9d8376d9974c2f2e
+  data.tar.gz: b521b5454254fe3ac9ef66d147396ca9838723a5f07ce68113ad16a93dca7c49
 SHA512:
-  metadata.gz: 0f51f3356c18707d0f11a231fa7829468604baa4ae51df6d8b3a2df19257c4f017d9f82119a705ce71e889edf80197c13a694739e4812dede05e3a1112e54d85
-  data.tar.gz: 3f3f252b44e1046ce29c50b7a7ae91cd3b213b6f316052bb18fbb79b2bdf706519cbee4d2bb4fdb1d55fac1debe7fa49f03419226c01d6307681b53d15603469
+  metadata.gz: 6269a1e18c2192c993a88d16c1b1a24a3b13292876efabf44ddfc49a3c13d886a258701dba5a1454eed26b4c8b547caddad40ac7c989208a7eb7803cf9207eab
+  data.tar.gz: 225bd23f48ff0809ef141c97dac765945cfcd97f3801f40d4c21edade51aed23ff9e8be374a35fbfb0732c32b2dece901069916d28dbb34e39c3a3badcab7996

data/README.md

@@ -7,17 +7,13 @@ This gem integrates [CKEditor 5](https://docs.ckeditor.com/ckeditor5/) with [Car
 Add this line to your application's Gemfile:
 
 ```
-gem 'ckeditor_wave', '~> 2.0'
+gem 'ckeditor_wave', '~> 2.1'
 ```
 
 And then execute:
 
     $ bundle
 
-Or install it yourself as:
-
-    $ gem install ckeditor_wave
-
 To generate and execute the migration, run:
 
     $ rails g ckeditor_wave
@@ -29,12 +25,6 @@ Add the following at the bottom of your application.js:
 //= require ckeditor_wave
 ```
 
-Add the following to your routes.rb file:
-
-```
-mount CkeditorWave::Engine => 'ckeditor_wave'
-```
-
 
 To attach [CKEditor 5](https://docs.ckeditor.com/ckeditor5/) to HTML forms, call the initiateCkeditor() function inside your application.js by wrapping in in a DOMContentLoaded EventListener and giving it one or more CSS selectors as arguments. For example:
 
@@ -45,7 +35,7 @@ document.addEventListener('DOMContentLoaded', () => {
 ```
 
 ## Dependencies
-* [CKEditor 5](https://docs.ckeditor.com/ckeditor5/) - classic editor build 10.0.1
+* [CKEditor 5](https://docs.ckeditor.com/ckeditor5/) - classic editor build 12.1.0
 * [CarrierWave](https://github.com/carrierwaveuploader/carrierwave) - version ~> 1.2
 
 To install [CKEditor 5](https://docs.ckeditor.com/ckeditor5/), download the 'classic editor build 10.0.1' ZIP package from [this link](https://ckeditor.com/ckeditor-5/download/) and insert the ckeditor.js file inside you app/assets/javascripts folder. Alternatively, you can use the CDN also available from the [same link](https://ckeditor.com/ckeditor-5/download/).

data/app/assets/javascripts/ckeditor_wave.js

@@ -1 +1 @@
-'use strict';var _createClass=function(){function a(b,c){for(var e,d=0;d<c.length;d++)e=c[d],e.enumerable=e.enumerable||!1,e.configurable=!0,'value'in e&&(e.writable=!0),Object.defineProperty(b,e.key,e)}return function(b,c,d){return c&&a(b.prototype,c),d&&a(b,d),b}}();function _classCallCheck(a,b){if(!(a instanceof b))throw new TypeError('Cannot call a class as a function')}function initiateCkeditor(){var a=Array.from(arguments);a.forEach(function(b){newEditor(b)})}function newEditor(a){var a=document.querySelector(a);if(null===a)return!1;try{ClassicEditor.create(a).then(function(b){b.plugins.get('FileRepository').createUploadAdapter=function(c){return new UploadAdapter(c)},a.nextSibling.querySelector('.ck-content').addEventListener('DOMNodeRemoved',function(c){var d=c.target,e=d.className.split(' ');e.includes('image')&&server.destroy(id(d.children[0]))})}).catch(function(b){console.error(b)})}catch(b){console.log(b),console.log('Is ckeditor.js included?','https://ckeditor.com/ckeditor-5/download/')}}var UploadAdapter=function(){function a(b){_classCallCheck(this,a),this.loader=b}return _createClass(a,[{key:'upload',value:function(){return server.upload(this.loader.file)}}]),a}(),server={upload:upload,destroy:destroy};function upload(a){return new Promise(function(b,c){var d=new XMLHttpRequest,e=new FormData;d.onreadystatechange=function(){4===d.readyState&&200!==d.status&&c('Image upload failed'),4===d.readyState&&200===d.status&&(b({default:d.responseText}),console.log('Image upload successful'))},e.set('ck_image',a),d.open('POST','/ckeditor_wave/ck_images'),d.send(e)})}function destroy(a){var b=new XMLHttpRequest,c=new FormData;b.onreadystatechange=function(){4===b.readyState&&200!==b.status&&console.log('Image deletion failed'),4===b.readyState&&200===b.status&&console.log(b.responseText)},c.set('method','delete'),b.open('DELETE','/ckeditor_wave/ck_images/'+a),b.send(c)}function id(a){var b=a.src.match(/[^\/]*.$/g).toString();return b.match(/[^.]*/)}
+"use strict";function _instanceof(e,n){return null!=n&&"undefined"!=typeof Symbol&&n[Symbol.hasInstance]?n[Symbol.hasInstance](e):e instanceof n}function _classCallCheck(e,n){if(!_instanceof(e,n))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,n){for(var t=0;t<n.length;t++){var r=n[t];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function _createClass(e,n,t){return n&&_defineProperties(e.prototype,n),t&&_defineProperties(e,t),e}var initiateCkeditor=function(){for(var e=arguments.length,n=new Array(e),t=0;t<e;t++)n[t]=arguments[t];Array.from(n).forEach(function(e){newEditor(e)})},newEditor=function(e){var n=document.querySelector(e);if(null===n)return!1;try{ClassicEditor.create(n).then(function(e){e.plugins.get("FileRepository").createUploadAdapter=function(e){return new UploadAdapter(e)}}).catch(function(e){console.error(e)})}catch(e){console.log(e),console.log("Is ckeditor.js included?","https://ckeditor.com/ckeditor-5/download/")}},UploadAdapter=function(){function e(n){_classCallCheck(this,e),this.loader=n}return _createClass(e,[{key:"upload",value:function(){var e=this;return this.loader.file.then(function(n){return new Promise(function(t,r){e._initRequest(),e._initListeners(t,r,n),e._sendRequest(n)})})}},{key:"abort",value:function(){this.xhr&&this.xhr.abort()}},{key:"_initRequest",value:function(){var e=this.xhr=new XMLHttpRequest;e.open("POST","/ckeditor_wave/ck_images",!0),e.responseType="json"}},{key:"_initListeners",value:function(e,n,t){var r=this.xhr,o=this.loader,a="Couldn't upload file: ".concat(t.name,".");r.addEventListener("error",function(){return n(a)}),r.addEventListener("abort",function(){return n()}),r.addEventListener("load",function(){var t=r.response;if(!t||t.error)return n(t&&t.error?t.error.message:a);e({default:t.url})}),r.upload&&r.upload.addEventListener("progress",function(e){e.lengthComputable&&(o.uploadTotal=e.total,o.uploaded=e.loaded)})}},{key:"_sendRequest",value:function(e){var n=new FormData;n.append("ck_image",e),this.xhr.send(n)}}]),e}();

data/app/assets/javascripts/ckeditor_wave_src.js

@@ -1,14 +1,17 @@
-function initiateCkeditor() {
-  var editors = Array.from(arguments);
-    editors.forEach(function(editor){
-      newEditor(editor);
-    });
+const initiateCkeditor = (...args) => {
+  const editor_ids = Array.from(args);
+
+  editor_ids.forEach(function(editor_id){
+    newEditor(editor_id);
+  });
 }
 
-function newEditor(ck_editor) {
-  var ck_editor = document.querySelector(ck_editor);
+const newEditor = (editor_id) => {
+  const ck_editor = document.querySelector(editor_id);
+
+  if (ck_editor === null)
+    return false;
 
-  if (ck_editor === null) return false;
   try{
     ClassicEditor
       .create(ck_editor)
@@ -16,14 +19,6 @@ function newEditor(ck_editor) {
         editor.plugins.get('FileRepository').createUploadAdapter = (loader) => {
           return new UploadAdapter(loader);
         };
-
-        ck_editor.nextSibling.querySelector('.ck-content').addEventListener(
-          'DOMNodeRemoved', (event) => {
-          var element = event.target;
-          var classes = element.className.split(' ');
-          if (classes.includes('image'))
-            server.destroy(id(element.children[0]));
-        });
       })
       .catch(error => {
         console.error(error);
@@ -35,54 +30,61 @@ function newEditor(ck_editor) {
 }
 
 class UploadAdapter {
-  constructor(loader) {
+  constructor( loader ) {
     this.loader = loader;
   }
+
   upload() {
-    return server.upload(this.loader.file);
+    return this.loader.file
+      .then(file => new Promise((resolve, reject) => {
+        this._initRequest();
+        this._initListeners(resolve, reject, file);
+        this._sendRequest(file);
+      }));
   }
-}
 
-var server = {
-  upload: upload,
-  destroy: destroy
-}
+  abort() {
+    if (this.xhr)
+      this.xhr.abort();
+  }
 
-function upload(file) {
-  return new Promise((resolve, reject) => {
-    var xhr = new XMLHttpRequest();
-    var formData = new FormData();
-    xhr.onreadystatechange = () => {
-      if (xhr.readyState === 4 && xhr.status !== 200)
-        reject('Image upload failed');
-      if (xhr.readyState === 4 && xhr.status === 200) {
-        resolve({
-          default: xhr.responseText
-        });
-        console.log('Image upload successful');
-      }
-    };
-    formData.set('ck_image', file);
-    xhr.open('POST', '/ckeditor_wave/ck_images');
-    xhr.send(formData);
-  });
-}
+  _initRequest() {
+    const xhr = this.xhr = new XMLHttpRequest();
+    xhr.open('POST', '/ckeditor_wave/ck_images', true);
+    xhr.responseType = 'json';
+  }
 
-function destroy(id) {
-  var xhr = new XMLHttpRequest();
-  var formData = new FormData();
-  xhr.onreadystatechange = () => {
-    if (xhr.readyState === 4 && xhr.status !== 200)
-      console.log('Image deletion failed');
-    if (xhr.readyState === 4 && xhr.status === 200)
-      console.log(xhr.responseText);
-  };
-  formData.set('method', 'delete');
-  xhr.open('DELETE', '/ckeditor_wave/ck_images/' + id);
-  xhr.send(formData);
-}
+  _initListeners(resolve, reject, file) {
+    const xhr = this.xhr;
+    const loader = this.loader;
+    const genericErrorText = `Couldn't upload file: ${file.name}.`;
+
+    xhr.addEventListener('error', () => reject(genericErrorText));
+    xhr.addEventListener('abort', () => reject());
+    xhr.addEventListener('load', () => {
+      const response = xhr.response;
+
+      if (!response || response.error)
+        return reject(response && response.error ? response.error.message : genericErrorText);
+
+      resolve({default: response.url});
+    });
 
-function id(element) {
-  var filename = element.src.match(/[^\/]*.$/g).toString();
-  return filename.match(/[^.]*/);
+    // progress not being displayed currently
+    if (xhr.upload) {
+      xhr.upload.addEventListener('progress', evt => {
+        if (evt.lengthComputable) {
+          loader.uploadTotal = evt.total;
+          loader.uploaded = evt.loaded;
+        }
+      });
+    }
+  }
+
+  _sendRequest(file) {
+    const data = new FormData();
+
+    data.append('ck_image', file);
+    this.xhr.send(data);
+  }
 }

data/app/controllers/ckeditor_wave/ck_images_controller.rb

@@ -4,20 +4,12 @@ module CkeditorWave
 
     def create
       ck_image = CkImage.new(ck_image: params[:ck_image], uuid: SecureRandom.uuid)
-      if ck_image.save
-        render plain: ck_image.url
-      else
-        render plain: 'Image upload failed'
-      end
-    end
 
-    def destroy
-      ck_image = CkImage.find_by_uuid(params[:id])
-      if ck_image.destroy
-        render plain: 'Image deletion successful'
+      if ck_image.save
+        render json: { url: ck_image.url }
       else
-        render plain: 'Image deletion failed'
+        render head(500)
       end
     end
   end
-end
+end

data/app/models/ckeditor_wave/ck_image.rb

@@ -1,6 +1,7 @@
 module CkeditorWave
   class CkImage < ApplicationRecord
     mount_uploader :ck_image, CkImageUploader
+
     def url
       ck_image.url
     end

data/app/uploaders/ckeditor_wave/ck_image_uploader.rb

@@ -1,5 +1,5 @@
 module CkeditorWave
-  class CkImageUploader < CarrierWave::Uploader::Base
+  class CkImageUploader < ::CarrierWave::Uploader::Base
     def store_dir
       "uploads/#{model.class.to_s.pluralize.underscore}"
     end
@@ -7,4 +7,4 @@ module CkeditorWave
       "#{model.uuid}.jpg"
     end
   end
-end
+end

data/config/routes.rb

@@ -1,5 +1,3 @@
-CkeditorWave::Engine.routes do
-  scope module: 'ckeditor_wave' do
-    resources :ck_images
-  end
+Rails.application.routes.draw do
+  post 'ckeditor_wave/ck_images', to: 'ckeditor_wave/ck_images#create'
 end

data/lib/ckeditor_wave/version.rb

@@ -1,3 +1,3 @@
 module CkeditorWave
-  VERSION = '2.0.7'
+  VERSION = '2.0.8'
 end

data/lib/ckeditor_wave.rb

@@ -1,5 +1,3 @@
-require 'ckeditor_wave/version'
-
 module CkeditorWave
   class Engine < ::Rails::Engine
     config.generators do |g|

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: ckeditor_wave
 version: !ruby/object:Gem::Version
-  version: 2.0.7
+  version: 2.0.8
 platform: ruby
 authors:
 - Evgeni Radev
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-03-31 00:00:00.000000000 Z
+date: 2019-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
+        version: '1.2'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: carrierwave
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '10.0'
 description: 
 email:
 - evgeniradev@gmail.com
@@ -59,8 +59,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- Gemfile
 - LICENSE
 - README.md
 - Rakefile
@@ -69,11 +67,7 @@ files:
 - app/controllers/ckeditor_wave/ck_images_controller.rb
 - app/models/ckeditor_wave/ck_image.rb
 - app/uploaders/ckeditor_wave/ck_image_uploader.rb
-- bin/console
-- bin/setup
-- ckeditor_wave.gemspec
 - config/routes.rb
-- db/migrate/migration.rb
 - lib/ckeditor_wave.rb
 - lib/ckeditor_wave/version.rb
 - lib/generators/ckeditor_wave_generator.rb
@@ -98,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: This gem integrates CKEditor 5 with CarrierWave to allow image upload.

data/.gitignore

@@ -1,9 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-/*.gem

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in ckeditor_wave.gemspec
-gemspec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "ckeditor_wave"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/ckeditor_wave.gemspec

@@ -1,31 +0,0 @@
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ckeditor_wave/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'ckeditor_wave'
-  spec.version       = CkeditorWave::VERSION
-  spec.authors       = ['Evgeni Radev']
-  spec.email         = ['evgeniradev@gmail.com']
-  spec.summary       = %q{This gem integrates CKEditor 5 with CarrierWave to allow image upload.}
-  spec.homepage      = 'https://github.com/evgeniradev/ckeditor_wave'
-  spec.license       = 'GPL-3.0+'
-
-  if spec.respond_to?(:metadata)
-    spec.metadata['allowed_push_host'] = 'https://rubygems.org'
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-      'public gem pushes.'
-  end
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'carrierwave', '~> 1.2'
-end

data/db/migrate/migration.rb

@@ -1,9 +0,0 @@
-class CreateCkImagesTable < ActiveRecord::Migration[5.2]
-  def change
-    create_table :ck_images do |t|
-      t.string :ck_image
-      t.string :uuid, index: true
-      t.timestamps
-    end
-  end
-end