Skip to content

Commit

Permalink
Downgrade cocaine, Bump Version 5.1.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Peter Kim authored and Peter Kim committed Feb 23, 2022
1 parent 784c368 commit 48b1caa
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
ckeditor (5.1.5)
ckeditor (5.1.6)
orm_adapter (~> 0.5.0)

GEM
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -251,7 +251,7 @@ DEPENDENCIES
carrierwave
carrierwave-mongoid
ckeditor!
cocaine
cocaine (= 0.5.8)
dragonfly
image_processing
jquery-rails (~> 4.3.3)
Expand Down
18 changes: 8 additions & 10 deletions lib/ckeditor/asset_response.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion lib/ckeditor/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

module Ckeditor
module Version
GEM = '5.1.6'
GEM = '5.1.7'
EDITOR = '4.17.0'
end
end

0 comments on commit 48b1caa

Please sign in to comment.