diff --git a/CHANGELOG.md b/CHANGELOG.md index bbd0eac3c..30c8a781e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,10 @@ ## NEXT +## Ckeditor 5.1.7 (2-23-2022) + + * Downgrade `cocaine` to `0.5.8` + ## Ckeditor 5.1.6 (2-23-2022) * Add `cocaine` for ContentTypeDetector diff --git a/Gemfile b/Gemfile index a6587b00d..c5917c317 100644 --- a/Gemfile +++ b/Gemfile @@ -7,7 +7,7 @@ gemspec gem 'rails', '~> 5.2.4.6' platforms :ruby do - gem 'cocaine' + gem 'cocaine', '= 0.5.8' gem 'sass' gem 'sqlite3', '~> 1.3.6' gem 'sprockets', '~> 3.7.2' diff --git a/Gemfile.lock b/Gemfile.lock index b90aebdbe..2cb09a4d8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - ckeditor (5.1.5) + ckeditor (5.1.6) orm_adapter (~> 0.5.0) GEM @@ -76,8 +76,8 @@ GEM mongoid (>= 3.0, < 8.0) mongoid-grid_fs (>= 1.3, < 3.0) climate_control (0.2.0) - cocaine (0.6.0) - terrapin (= 0.6.0) + cocaine (0.5.8) + climate_control (>= 0.0.3, < 1.0) concurrent-ruby (1.1.9) content_disposition (1.0.0) crass (1.0.6) @@ -251,7 +251,7 @@ DEPENDENCIES carrierwave carrierwave-mongoid ckeditor! - cocaine + cocaine (= 0.5.8) dragonfly image_processing jquery-rails (~> 4.3.3) diff --git a/lib/ckeditor/asset_response.rb b/lib/ckeditor/asset_response.rb index 33a7900bc..49c4e2c8e 100644 --- a/lib/ckeditor/asset_response.rb +++ b/lib/ckeditor/asset_response.rb @@ -17,13 +17,11 @@ def initialize(asset, request) @asset = asset @request = request @params = request.params - - @asset.data = Ckeditor::Http.normalize_param(file, @request) end - # def data - # @data ||= read_data - # end + def data + @data ||= read_data + end def json? params[:responseType] == JSON_TYPE @@ -111,11 +109,11 @@ def extract_mode end end - # def read_data - # data = Ckeditor::Http.normalize_param(file, request) - # return if data.size.zero? || data.original_filename.blank? + def read_data + data = Ckeditor::Http.normalize_param(file, request) + return if data.size.zero? || data.original_filename.blank? - # data - # end + data + end end end diff --git a/lib/ckeditor/version.rb b/lib/ckeditor/version.rb index 4b26459d3..6b3774c4c 100644 --- a/lib/ckeditor/version.rb +++ b/lib/ckeditor/version.rb @@ -2,7 +2,7 @@ module Ckeditor module Version - GEM = '5.1.6' + GEM = '5.1.7' EDITOR = '4.17.0' end end