trix-rails 2.3.0 → 2.4.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/workflows/ci.yml +39 -0
- data/Appraisals +14 -23
- data/CHANGELOG.md +27 -19
- data/README.md +5 -5
- data/gemfiles/{rails_6.1.gemfile → rails_5_2.gemfile} +1 -1
- data/gemfiles/{rails_6.0.0.gemfile → rails_6_0.gemfile} +0 -0
- data/gemfiles/{rails_5.1.gemfile → rails_6_1.gemfile} +1 -1
- data/gemfiles/{rails_5.2.1.gemfile → rails_7.gemfile} +1 -1
- data/lib/trix/version.rb +1 -1
- data/trix.gemspec +2 -2
- metadata +13 -22
- data/gemfiles/rails_4.2.gemfile +0 -7
- data/gemfiles/rails_5.0.gemfile +0 -7
- data/gemfiles/rails_5.2.gemfile +0 -7
- data/gemfiles/rails_master.gemfile +0 -13
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: bb93d87948dae892f401b527310642483edd8a5a07a7493e9177337fccefa69f
|
|
4
|
+
data.tar.gz: 03b1a94b56734f4e57391e9b1f6086e77635022b22fa17917835f1ce015ae5a8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 5f8d4d482dba187b37b78612d9a8f70724b29d1bba4a9fb23e06dd22961492d8745f14ad92e3f97a2494e2fcef67539f0bdc5933203f3bdd398651f247d06d41
|
|
7
|
+
data.tar.gz: 451bbea5451a20725fba8e1d8b2fc83ac7413bda1fba48a1fadff9ac64db4b5da39d8eae4f2736ef99223349016c05147f2c21cec5eeb45f0cc6a7fd87191b39
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
name: Tests
|
|
2
|
+
|
|
3
|
+
on:
|
|
4
|
+
pull_request:
|
|
5
|
+
branches:
|
|
6
|
+
- "*"
|
|
7
|
+
push:
|
|
8
|
+
branches:
|
|
9
|
+
- master
|
|
10
|
+
jobs:
|
|
11
|
+
test:
|
|
12
|
+
runs-on: ubuntu-latest
|
|
13
|
+
strategy:
|
|
14
|
+
matrix:
|
|
15
|
+
ruby: ["2.7", "3.0"]
|
|
16
|
+
gemfile:
|
|
17
|
+
- rails_5_2
|
|
18
|
+
- rails_6_0
|
|
19
|
+
- rails_6_1
|
|
20
|
+
- rails_7
|
|
21
|
+
exclude:
|
|
22
|
+
- ruby: "3.0"
|
|
23
|
+
gemfile: "rails_5_2"
|
|
24
|
+
env:
|
|
25
|
+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
|
|
26
|
+
BUNDLE_PATH_RELATIVE_TO_CWD: true
|
|
27
|
+
|
|
28
|
+
steps:
|
|
29
|
+
- uses: actions/checkout@master
|
|
30
|
+
|
|
31
|
+
- name: Set up Ruby
|
|
32
|
+
uses: ruby/setup-ruby@v1
|
|
33
|
+
with:
|
|
34
|
+
ruby-version: ${{ matrix.ruby }}
|
|
35
|
+
bundler: default
|
|
36
|
+
bundler-cache: true
|
|
37
|
+
- name: Run tests
|
|
38
|
+
run: |
|
|
39
|
+
bundle exec rspec
|
data/Appraisals
CHANGED
|
@@ -1,31 +1,22 @@
|
|
|
1
|
-
appraise 'rails-5
|
|
2
|
-
gem 'rails', '~> 5.
|
|
1
|
+
appraise 'rails-5-2' do
|
|
2
|
+
gem 'rails', '~> 5.2'
|
|
3
3
|
end
|
|
4
4
|
|
|
5
|
-
appraise 'rails-
|
|
6
|
-
gem 'rails', '~> 5.1.0'
|
|
7
|
-
end
|
|
8
|
-
|
|
9
|
-
appraise 'rails-5.2' do
|
|
10
|
-
gem 'rails', '~> 5.2.0'
|
|
11
|
-
end
|
|
12
|
-
|
|
13
|
-
appraise 'rails-5.2.1' do
|
|
14
|
-
gem 'rails', '~> 5.2.1'
|
|
15
|
-
end
|
|
16
|
-
|
|
17
|
-
appraise 'rails-6.0.0' do
|
|
5
|
+
appraise 'rails-6-0' do
|
|
18
6
|
gem 'rails', '6.0.0'
|
|
19
7
|
end
|
|
20
8
|
|
|
21
|
-
appraise 'rails-6
|
|
22
|
-
gem 'rails', '6.1
|
|
9
|
+
appraise 'rails-6-1' do
|
|
10
|
+
gem 'rails', '~> 6.1'
|
|
23
11
|
end
|
|
24
12
|
|
|
25
|
-
appraise 'rails-
|
|
26
|
-
gem 'rails',
|
|
27
|
-
gem 'arel', git: 'https://github.com/rails/arel.git', branch: 'master'
|
|
28
|
-
%w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
|
|
29
|
-
gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'main'
|
|
30
|
-
end
|
|
13
|
+
appraise 'rails-7' do
|
|
14
|
+
gem 'rails', '~> 7.0'
|
|
31
15
|
end
|
|
16
|
+
|
|
17
|
+
# appraise 'rails-main' do
|
|
18
|
+
# gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'main'
|
|
19
|
+
# %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
|
|
20
|
+
# gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'main'
|
|
21
|
+
# end
|
|
22
|
+
# end
|
data/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,16 @@ This project adheres to [Semantic Versioning](http://semver.org/).
|
|
|
7
7
|
|
|
8
8
|
Not released
|
|
9
9
|
|
|
10
|
+
## 2.4.0
|
|
11
|
+
|
|
12
|
+
Released December 15th, 2021
|
|
13
|
+
|
|
14
|
+
- 🚫 Remove old appraisals for Rails 5.1.x and below (support will be removed in trix-rails 3.x)
|
|
15
|
+
- ✅ Add Appraisal configuration for Rails 7
|
|
16
|
+
- ✅ Relax gemspec to support Rails versions greater than 4.x
|
|
17
|
+
- ✅ Setup GitHub CI for running gem tests against Ruby 2.7 and 3.0
|
|
18
|
+
- 💪 Bump version to 2.4.0
|
|
19
|
+
|
|
10
20
|
## 2.3.0
|
|
11
21
|
|
|
12
22
|
Released December 6th, 2020
|
|
@@ -16,46 +26,44 @@ Released December 6th, 2020
|
|
|
16
26
|
- ✅ Upgrade to [Trix 1.3.1](https://github.com/basecamp/trix/releases/tag/1.3.1)
|
|
17
27
|
- 💪 Bump to version 2.3.0
|
|
18
28
|
|
|
19
|
-
|
|
20
29
|
## 2.2.0
|
|
21
30
|
|
|
22
31
|
Released September 13, 2019
|
|
23
32
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
33
|
+
- ✅ Upgrade to [Trix 1.2.0](https://github.com/basecamp/trix/releases/tag/1.2.0)
|
|
34
|
+
- 💪 Bump to version 2.2.0
|
|
35
|
+
- 🚫 Remove appraisals for Rails 4.2 (support will be removed in trix-rails 3.x)
|
|
27
36
|
|
|
28
37
|
## 2.1.0
|
|
29
38
|
|
|
30
39
|
Released September 9, 2019
|
|
31
40
|
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
41
|
+
- 🐛🔨 Add customizable input name for trix-editor in simple form ([#12](https://github.com/kylefox/trix/pull/12)). Thanks [@ptrr](https://github.com/ptrr)!
|
|
42
|
+
- 💪 Modify Gemspec to support Rails 6 ([#17](https://github.com/kylefox/trix/pull/17)). Thanks [@afomera](https://github.com/afomera)!
|
|
43
|
+
- 💪 Bump to version 2.1.0
|
|
35
44
|
|
|
36
45
|
## 2.0.0
|
|
37
46
|
|
|
38
47
|
Released September 29, 2018
|
|
39
48
|
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
49
|
+
- ✅ Upgrade to [Trix 1.0.0](https://github.com/basecamp/trix/releases/tag/1.0.0) 🎉
|
|
50
|
+
- ☝️ Note: following this project's [versioning policy](https://github.com/kylefox/trix/issues/4), the major version for `trix-rails` is likewise bumped when Trix receives a major version bump.
|
|
51
|
+
- 🐛🔨 simple_form helper outputs hidden input tag before trix editor tag ([#10](https://github.com/kylefox/trix/pull/10)). Thanks [@bensie](https://github.com/bensie)!
|
|
52
|
+
- 💪 Add appraisals for Rails 5.2.1
|
|
45
53
|
|
|
46
54
|
## 1.0.1
|
|
47
55
|
|
|
48
56
|
Released September 20, 2018
|
|
49
57
|
|
|
50
|
-
|
|
51
|
-
|
|
58
|
+
- ✅ Upgrade to Trix 0.12.1.
|
|
59
|
+
- 🐛🔨 Formtastic helper outputs hidden input tag before trix editor tag ([#9](https://github.com/kylefox/trix/pull/9)). Thanks [@ch000](https://github.com/ch000)!
|
|
52
60
|
|
|
53
61
|
## 1.0.0
|
|
54
62
|
|
|
55
63
|
Released September 2, 2018
|
|
56
64
|
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
65
|
+
- ✅ Bumped to version 1.0.0 — `trix-rails` version numbers are now independent of [Trix](https://github.com/basecamp/trix) itself. See [this issue](https://github.com/kylefox/trix/issues/4) for more detail.
|
|
66
|
+
- ✅ Upgrade to Trix 0.12.0.
|
|
67
|
+
- ✅ Added support for Ruby 2.5.1.
|
|
68
|
+
- 🚫 Dropped support for Ruby 2.2.
|
|
69
|
+
- 🐛🔨 Allow additional options when using simple_form ([#8](https://github.com/kylefox/trix/pull/8)). Thanks [@phylor](https://github.com/phylor)!
|
data/README.md
CHANGED
|
@@ -6,9 +6,9 @@ Want to include Basecamp's awesome [Trix WYSIWYG
|
|
|
6
6
|
editor](http://trix-editor.org) in your Ruby on Rails application?
|
|
7
7
|
You've come to the right place!
|
|
8
8
|
|
|
9
|
-
Compatible with Rails 5.
|
|
9
|
+
Compatible with Rails 5.2 and up.
|
|
10
10
|
|
|
11
|
-
_Note: trix-rails 2.x is technically compatible with Rails 4.2 and up, but is no longer tested or maintained. Support for < Rails 5.
|
|
11
|
+
_Note: trix-rails 2.x is technically compatible with Rails 4.2 and up, but is no longer tested or maintained. Support for < Rails 5.2 will be dropped in trix-rails 3.x_
|
|
12
12
|
|
|
13
13
|
# Installation
|
|
14
14
|
|
|
@@ -85,15 +85,15 @@ For example:
|
|
|
85
85
|
will render:
|
|
86
86
|
|
|
87
87
|
```html
|
|
88
|
-
<trix-editor autofocus="true" data-coffee="delicious">
|
|
88
|
+
<trix-editor autofocus="true" data-coffee="delicious"></trix-editor>
|
|
89
89
|
```
|
|
90
90
|
|
|
91
91
|
# Contributing
|
|
92
92
|
|
|
93
93
|
Bug reports and feature requests are welcome. They're _much_ more likely to be addressed if they are accompanied by a pull request 😘
|
|
94
94
|
|
|
95
|
-
|
|
96
|
-
|
|
95
|
+
- [Report a bug](https://github.com/kylefox/trix/issues/new?template=bug_report.md)
|
|
96
|
+
- [Request a feature](https://github.com/kylefox/trix/issues/new?template=feature_request.md)
|
|
97
97
|
|
|
98
98
|
## Testing
|
|
99
99
|
|
|
File without changes
|
data/lib/trix/version.rb
CHANGED
data/trix.gemspec
CHANGED
|
@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
|
|
|
18
18
|
spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
|
|
19
19
|
spec.require_paths = ['lib']
|
|
20
20
|
|
|
21
|
-
spec.add_runtime_dependency 'rails', '> 4.1'
|
|
21
|
+
spec.add_runtime_dependency 'rails', '> 4.1'
|
|
22
22
|
|
|
23
23
|
spec.add_development_dependency 'appraisal'
|
|
24
24
|
spec.add_development_dependency 'bundler', '~> 2.0'
|
|
25
25
|
spec.add_development_dependency 'formtastic', '~> 3.0'
|
|
26
|
-
spec.add_development_dependency 'rake', '
|
|
26
|
+
spec.add_development_dependency 'rake', '>= 10.0'
|
|
27
27
|
spec.add_development_dependency 'rspec-activemodel-mocks'
|
|
28
28
|
spec.add_development_dependency 'rspec-rails'
|
|
29
29
|
spec.add_development_dependency 'rubocop', '0.35.1'
|
metadata
CHANGED
|
@@ -1,15 +1,15 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: trix-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.4.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Kyle Fox
|
|
8
8
|
- Jon Moss
|
|
9
|
-
autorequire:
|
|
9
|
+
autorequire:
|
|
10
10
|
bindir: exe
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date:
|
|
12
|
+
date: 2021-12-16 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rails
|
|
@@ -18,9 +18,6 @@ dependencies:
|
|
|
18
18
|
- - ">"
|
|
19
19
|
- !ruby/object:Gem::Version
|
|
20
20
|
version: '4.1'
|
|
21
|
-
- - "<"
|
|
22
|
-
- !ruby/object:Gem::Version
|
|
23
|
-
version: '7.0'
|
|
24
21
|
type: :runtime
|
|
25
22
|
prerelease: false
|
|
26
23
|
version_requirements: !ruby/object:Gem::Requirement
|
|
@@ -28,9 +25,6 @@ dependencies:
|
|
|
28
25
|
- - ">"
|
|
29
26
|
- !ruby/object:Gem::Version
|
|
30
27
|
version: '4.1'
|
|
31
|
-
- - "<"
|
|
32
|
-
- !ruby/object:Gem::Version
|
|
33
|
-
version: '7.0'
|
|
34
28
|
- !ruby/object:Gem::Dependency
|
|
35
29
|
name: appraisal
|
|
36
30
|
requirement: !ruby/object:Gem::Requirement
|
|
@@ -77,14 +71,14 @@ dependencies:
|
|
|
77
71
|
name: rake
|
|
78
72
|
requirement: !ruby/object:Gem::Requirement
|
|
79
73
|
requirements:
|
|
80
|
-
- - "
|
|
74
|
+
- - ">="
|
|
81
75
|
- !ruby/object:Gem::Version
|
|
82
76
|
version: '10.0'
|
|
83
77
|
type: :development
|
|
84
78
|
prerelease: false
|
|
85
79
|
version_requirements: !ruby/object:Gem::Requirement
|
|
86
80
|
requirements:
|
|
87
|
-
- - "
|
|
81
|
+
- - ">="
|
|
88
82
|
- !ruby/object:Gem::Version
|
|
89
83
|
version: '10.0'
|
|
90
84
|
- !ruby/object:Gem::Dependency
|
|
@@ -153,6 +147,7 @@ extra_rdoc_files: []
|
|
|
153
147
|
files:
|
|
154
148
|
- ".github/ISSUE_TEMPLATE/bug_report.md"
|
|
155
149
|
- ".github/ISSUE_TEMPLATE/feature_request.md"
|
|
150
|
+
- ".github/workflows/ci.yml"
|
|
156
151
|
- ".gitignore"
|
|
157
152
|
- ".rspec"
|
|
158
153
|
- ".rubocop.yml"
|
|
@@ -167,14 +162,10 @@ files:
|
|
|
167
162
|
- bin/console
|
|
168
163
|
- bin/setup
|
|
169
164
|
- gemfiles/.bundle/config
|
|
170
|
-
- gemfiles/
|
|
171
|
-
- gemfiles/
|
|
172
|
-
- gemfiles/
|
|
173
|
-
- gemfiles/
|
|
174
|
-
- gemfiles/rails_5.2.gemfile
|
|
175
|
-
- gemfiles/rails_6.0.0.gemfile
|
|
176
|
-
- gemfiles/rails_6.1.gemfile
|
|
177
|
-
- gemfiles/rails_master.gemfile
|
|
165
|
+
- gemfiles/rails_5_2.gemfile
|
|
166
|
+
- gemfiles/rails_6_0.gemfile
|
|
167
|
+
- gemfiles/rails_6_1.gemfile
|
|
168
|
+
- gemfiles/rails_7.gemfile
|
|
178
169
|
- lib/formtastic/inputs/trix_editor_input.rb
|
|
179
170
|
- lib/trix.rb
|
|
180
171
|
- lib/trix/engine.rb
|
|
@@ -188,7 +179,7 @@ homepage: https://github.com/kylefox/trix
|
|
|
188
179
|
licenses:
|
|
189
180
|
- MIT
|
|
190
181
|
metadata: {}
|
|
191
|
-
post_install_message:
|
|
182
|
+
post_install_message:
|
|
192
183
|
rdoc_options: []
|
|
193
184
|
require_paths:
|
|
194
185
|
- lib
|
|
@@ -203,8 +194,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
203
194
|
- !ruby/object:Gem::Version
|
|
204
195
|
version: '0'
|
|
205
196
|
requirements: []
|
|
206
|
-
rubygems_version: 3.
|
|
207
|
-
signing_key:
|
|
197
|
+
rubygems_version: 3.2.22
|
|
198
|
+
signing_key:
|
|
208
199
|
specification_version: 4
|
|
209
200
|
summary: A rich text editor for everyday writing
|
|
210
201
|
test_files: []
|
data/gemfiles/rails_4.2.gemfile
DELETED
data/gemfiles/rails_5.0.gemfile
DELETED
data/gemfiles/rails_5.2.gemfile
DELETED
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
# This file was generated by Appraisal
|
|
2
|
-
|
|
3
|
-
source "https://rubygems.org"
|
|
4
|
-
|
|
5
|
-
gem "rails", git: "https://github.com/rails/rails.git", branch: "master"
|
|
6
|
-
gem "arel", git: "https://github.com/rails/arel.git", branch: "master"
|
|
7
|
-
gem "rspec-core", git: "https://github.com/rspec/rspec-core.git", branch: "main"
|
|
8
|
-
gem "rspec-expectations", git: "https://github.com/rspec/rspec-expectations.git", branch: "main"
|
|
9
|
-
gem "rspec-mocks", git: "https://github.com/rspec/rspec-mocks.git", branch: "main"
|
|
10
|
-
gem "rspec-rails", git: "https://github.com/rspec/rspec-rails.git", branch: "main"
|
|
11
|
-
gem "rspec-support", git: "https://github.com/rspec/rspec-support.git", branch: "main"
|
|
12
|
-
|
|
13
|
-
gemspec path: "../"
|