Skip to content

Commit dd92b3c

Browse files
luciuschoiluciuschoi
authored
Merge pull request #87 from lespoupeesrusses/master
Update to 0.8.15.0
2 parents ec78368 + 818e780 commit dd92b3c

File tree

164 files changed

+37068
-24079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+37068
-24079
lines changed

‎.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.1
1+
2.6.6

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 0.8.16.0 (2020-03-30)
2+
3+
- Update assets from Summernote 0.8.15 to 0.8.16
4+
- https://github.com/summernote/summernote/releases/tag/v0.8.16
5+
- Added source map files for JS assets.
6+
- Added langs' licence files.
7+
8+
## 0.8.15.0 (2020-01-23)
9+
10+
- Update assets from Summernote 0.8.12 to 0.8.15
11+
- https://github.com/summernote/summernote/releases/tag/v0.8.15
12+
- https://github.com/summernote/summernote/releases/tag/v0.8.14
13+
- Added placeholder to example app.
14+
115
## 0.8.12.0 (2019-05-17)
216

317
- Update assets from Summernote 0.8.10 to 0.8.12

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The version of summernote-rails is matched with that of original summernote edit
1111
## Installation
1212

1313
Environments:
14-
- Ruby 2.5.1
14+
- Ruby 2.6.5
1515
- Gems :
1616
- Rails
1717
- Bootstrap
@@ -24,7 +24,7 @@ gem 'rails'
2424
gem 'jquery-rails'
2525
gem 'bootstrap'
2626
gem 'simple_form'
27-
gem 'summernote-rails', '~> 0.8.12.0'
27+
gem 'summernote-rails', '~> 0.8.16.0'
2828
```
2929

3030
And then execute:

‎Rakefile‎

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,94 @@
1-
require "bundler/gem_tasks"
1+
require 'bundler/gem_tasks'
22
require 'open-uri'
3-
require "json"
3+
require 'json'
44

55
def download_release_file
66
url = 'https://api.github.com/repos/summernote/summernote/releases/latest'
7-
zip_url = JSON.parse(open(url).read)['assets'].first['browser_download_url']
7+
asset = JSON.parse(open(url).read)['assets'].first
88

9-
FileUtils.rm_rf("tmp")
10-
FileUtils.mkdir_p("tmp")
11-
File.open("tmp/summernote.zip", "wb") do |saved_file|
12-
open(zip_url, "rb") do |read_file|
13-
saved_file.write(read_file.read)
9+
if asset.nil?
10+
puts 'No asset found on GitHub.'
11+
else
12+
zip_url = asset['browser_download_url']
13+
FileUtils.rm_rf('tmp')
14+
FileUtils.mkdir_p('tmp')
15+
File.open("tmp/summernote.zip", "wb") do |saved_file|
16+
open(zip_url, "rb") do |read_file|
17+
saved_file.write(read_file.read)
18+
end
1419
end
1520
end
1621

17-
`unzip -d tmp tmp/summernote.zip`
22+
puts 'No zip to process. Exiting...' and exit unless File.exists? 'tmp/summernote.zip'
23+
24+
puts 'Unzipping "tmp/summernote.zip"...'
25+
FileUtils.rm_rf('tmp/dist')
26+
`unzip -d tmp/dist tmp/summernote.zip`
1827
end
1928

2029
def clean_assets
30+
puts 'Cleaning old JS and CSS files...'
31+
2132
`rm -rf vendor/assets/stylesheets`
2233
`rm -rf vendor/assets/fonts`
2334
`rm -rf vendor/assets/javascripts/lang`
2435
`rm -rf vendor/assets/javascripts/plugin`
2536

26-
FileUtils.mkdir_p("vendor/assets/stylesheets")
27-
FileUtils.mkdir_p("vendor/assets/fonts")
28-
FileUtils.mkdir_p("vendor/assets/javascripts/summernote/lang")
29-
FileUtils.mkdir_p("vendor/assets/javascripts/summernote/plugin")
37+
FileUtils.mkdir_p('vendor/assets/stylesheets')
38+
FileUtils.mkdir_p('vendor/assets/fonts')
39+
FileUtils.mkdir_p('vendor/assets/javascripts/summernote/lang')
40+
FileUtils.mkdir_p('vendor/assets/javascripts/summernote/plugin')
3041
end
3142

32-
def clean_fonts
43+
def fix_fonts
44+
puts 'Fixing font URLs in CSS files...'
45+
3346
css_paths = [
34-
"vendor/assets/stylesheets/summernote.css",
35-
"vendor/assets/stylesheets/summernote-bs4.css",
36-
"vendor/assets/stylesheets/summernote-lite.css"
47+
'vendor/assets/stylesheets/summernote.css',
48+
'vendor/assets/stylesheets/summernote.min.css',
49+
'vendor/assets/stylesheets/summernote-bs4.css',
50+
'vendor/assets/stylesheets/summernote-bs4.min.css',
51+
'vendor/assets/stylesheets/summernote-lite.css',
52+
'vendor/assets/stylesheets/summernote-lite.min.css'
3753
]
3854

3955
css_paths.each do |css_path|
4056
css_file = File.read(css_path)
41-
css_file = css_file.gsub(/url\(\"\.\/font\/summernote.([a-z]+)\?[0-9a-f]+(#iefix)*\"\)/, 'url(asset-path("summernote.\1\2"))')
42-
css_file = css_file.gsub(/#iefix/, '?\0')
57+
css_file = css_file.gsub(/url\(font\/(summernote.[a-z0-9#?]+)\)/, 'url(asset-path("\1"))')
4358
File.open(css_path, "w") {|old_css_file| old_css_file.print css_file}
4459
end
4560
end
4661

4762
def copy_assets
4863
clean_assets
4964

65+
puts 'Copying new JS and CSS files...'
5066
`cp tmp/dist/summernote.js vendor/assets/javascripts/summernote/summernote.js`
5167
`cp tmp/dist/summernote.min.js vendor/assets/javascripts/summernote/summernote.min.js`
68+
`cp tmp/dist/summernote.min.js.map vendor/assets/javascripts/summernote/summernote.min.js.map`
5269
`cp tmp/dist/summernote-bs4.js vendor/assets/javascripts/summernote/summernote-bs4.js`
5370
`cp tmp/dist/summernote-bs4.min.js vendor/assets/javascripts/summernote/summernote-bs4.min.js`
71+
`cp tmp/dist/summernote-bs4.min.js.map vendor/assets/javascripts/summernote/summernote-bs4.min.js.map`
5472
`cp tmp/dist/summernote-lite.js vendor/assets/javascripts/summernote/summernote-lite.js`
5573
`cp tmp/dist/summernote-lite.min.js vendor/assets/javascripts/summernote/summernote-lite.min.js`
74+
`cp tmp/dist/summernote-lite.min.js.map vendor/assets/javascripts/summernote/summernote-lite.min.js.map`
5675
`cp tmp/dist/summernote.css vendor/assets/stylesheets/summernote.css`
76+
`cp tmp/dist/summernote.min.css vendor/assets/stylesheets/summernote.min.css`
5777
`cp tmp/dist/summernote-bs4.css vendor/assets/stylesheets/summernote-bs4.css`
78+
`cp tmp/dist/summernote-bs4.min.css vendor/assets/stylesheets/summernote-bs4.min.css`
5879
`cp tmp/dist/summernote-lite.css vendor/assets/stylesheets/summernote-lite.css`
80+
`cp tmp/dist/summernote-lite.min.css vendor/assets/stylesheets/summernote-lite.min.css`
5981
`cp -R tmp/dist/plugin/* vendor/assets/javascripts/summernote/plugin`
6082
`cp -R tmp/dist/lang/* vendor/assets/javascripts/summernote/lang`
6183
`cp -R tmp/dist/font/* vendor/assets/fonts`
62-
63-
clean_fonts
84+
85+
fix_fonts
6486
end
6587

6688
desc "Update assets"
6789
task 'update' do
6890
download_release_file
6991
copy_assets
92+
93+
puts 'Finished!'
7094
end

‎example/.ruby-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.5.1
1+
2.6.5

‎example/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
source 'https://rubygems.org'
22
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
33

4-
ruby '2.5.1'
4+
ruby '2.6.5'
55

66
gem 'puma', '~> 3.11'
77
gem 'bootsnap', '>= 1.1.0', require: false

‎example/app/assets/javascripts/summernote-init.coffee‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ $(document).on 'turbolinks:load', ->
3434
$(this).summernote
3535
lang: 'fr-FR'
3636
height: 400
37+
inheritPlaceholder: true
3738
callbacks:
3839
onInit: ->
3940
console.log('Summernote is launched');

‎example/app/views/posts/_form.html.erb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<div class="form-inputs">
66
<%= f.input :title %>
7-
<%= f.input :content, as: :summernote %>
7+
<%= f.input :content, as: :summernote, placeholder: 'Placeholder text...' %>
88
</div>
99

1010
<div class="form-actions">

‎example/app/views/posts/show.html.erb‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,16 @@
1010
<%=raw @post.content %>
1111
</p>
1212

13-
<hr>
13+
<% images = @post.content.scan(/(<img(?:.+?)>)/).flatten %>
14+
<% if images.any? %>
15+
<hr>
1416

15-
<ul class='pl-4'>
16-
<% @post.content.scan(/(<img(?:.+?)>)/).flatten.each do | image | %>
17-
<li><%= image %></li>
18-
<% end %>
19-
</ul>
17+
<ul class='pl-4'>
18+
<% images.each do |image| %>
19+
<li><%= image %></li>
20+
<% end %>
21+
</ul>
22+
<% end %>
2023

2124
<hr>
2225

‎lib/summernote-rails/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module SummernoteRails
22
module Rails
3-
VERSION = "0.8.12.0"
3+
VERSION = "0.8.17.0"
44
end
55
end

0 commit comments

Comments
 (0)