trix-rails 2.0.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b04e0fd70f69ccaaea02b5801e0a13de7a200b961ad2654df29602f838f79957
-  data.tar.gz: dbb3e3a5d09cc0a42e5a1de84d90c9cf278be3eea7a1158dbfab7db3c8a6e56d
+  metadata.gz: bb93d87948dae892f401b527310642483edd8a5a07a7493e9177337fccefa69f
+  data.tar.gz: 03b1a94b56734f4e57391e9b1f6086e77635022b22fa17917835f1ce015ae5a8
 SHA512:
-  metadata.gz: 5a403e2a68b74a9ea7f8dd30c0dac448a39c6e40a95e5c265d97a5f693de1d16dc3695818214ad9b76196b233e2a824341912b950b407df985cd2b83401c2c20
-  data.tar.gz: 648e90125470a5eb0adcf336d0d87b5d8e251ca23cbfa4d5666c616f265e98aa221f2158172d3cfea727eab29557ab4654b30fd61ea82907d28b79e98b600fab
+  metadata.gz: 5f8d4d482dba187b37b78612d9a8f70724b29d1bba4a9fb23e06dd22961492d8745f14ad92e3f97a2494e2fcef67539f0bdc5933203f3bdd398651f247d06d41
+  data.tar.gz: 451bbea5451a20725fba8e1d8b2fc83ac7413bda1fba48a1fadff9ac64db4b5da39d8eae4f2736ef99223349016c05147f2c21cec5eeb45f0cc6a7fd87191b39

data/.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: Tests
+
+on:
+  pull_request:
+    branches:
+      - "*"
+  push:
+    branches:
+      - master
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: ["2.7", "3.0"]
+        gemfile:
+          - rails_5_2
+          - rails_6_0
+          - rails_6_1
+          - rails_7
+        exclude:
+          - ruby: "3.0"
+            gemfile: "rails_5_2"
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
+      BUNDLE_PATH_RELATIVE_TO_CWD: true
+
+    steps:
+      - uses: actions/checkout@master
+
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler: default
+          bundler-cache: true
+      - name: Run tests
+        run: |
+          bundle exec rspec

data/.travis.yml

@@ -1,16 +1,21 @@
 language: ruby
 rvm:
-  - 2.3.4
-  - 2.4.1
-  - 2.5.1
+  - 2.3.8
+  - 2.4.7
+  - 2.5.6
+  - 2.6.4
 gemfile:
-  - gemfiles/rails_4.2.gemfile
   - gemfiles/rails_5.0.gemfile
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_5.2.1.gemfile
+  - gemfiles/rails_6.0.0.gemfile
   - gemfiles/rails_master.gemfile
 matrix:
   allow_failures:
     - gemfile: 'gemfiles/rails_master.gemfile'
-before_install: gem install bundler -v 1.11.2
+    - gemfile: gemfiles/rails_6.0.0.gemfile
+      rvm: 2.3.8
+    - gemfile: gemfiles/rails_6.0.0.gemfile
+      rvm: 2.4.7
+before_install: gem install bundler -v '~> 2.0'

data/Appraisals

@@ -1,27 +1,22 @@
-appraise 'rails-4.2' do
-  gem 'rails', '~> 4.2.0'
+appraise 'rails-5-2' do
+  gem 'rails', '~> 5.2'
 end
 
-appraise 'rails-5.0' do
-  gem 'rails', '~> 5.0.0'
+appraise 'rails-6-0' do
+  gem 'rails', '6.0.0'
 end
 
-appraise 'rails-5.1' do
-  gem 'rails', '~> 5.1.0'
+appraise 'rails-6-1' do
+  gem 'rails', '~> 6.1'
 end
 
-appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.0'
+appraise 'rails-7' do
+  gem 'rails', '~> 7.0'
 end
 
-appraise 'rails-5.2.1' do
-  gem 'rails', '~> 5.2.1'
-end
-
-appraise 'rails-master' do
-  gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'master'
-  gem 'arel', git: 'https://github.com/rails/arel.git', branch: 'master'
-  %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
-    gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'master'
-  end
-end
+# appraise 'rails-main' do
+#   gem 'rails', git: 'https://github.com/rails/rails.git', branch: 'main'
+#   %w[rspec-core rspec-expectations rspec-mocks rspec-rails rspec-support].each do |lib|
+#     gem lib, git: "https://github.com/rspec/#{lib}.git", branch: 'main'
+#   end
+# end

data/CHANGELOG.md

@@ -3,29 +3,67 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## Master
+
+Not released
+
+## 2.4.0
+
+Released December 15th, 2021
+
+- 🚫 Remove old appraisals for Rails 5.1.x and below (support will be removed in trix-rails 3.x)
+- ✅ Add Appraisal configuration for Rails 7
+- ✅ Relax gemspec to support Rails versions greater than 4.x
+- ✅ Setup GitHub CI for running gem tests against Ruby 2.7 and 3.0
+- 💪 Bump version to 2.4.0
+
+## 2.3.0
+
+Released December 6th, 2020
+
+- ✅ Relax gemspec for Rails 6.1 and higher offical release.
+- ✅ Add Appraisal configration for Rails 6.1.
+- ✅ Upgrade to [Trix 1.3.1](https://github.com/basecamp/trix/releases/tag/1.3.1)
+- 💪 Bump to version 2.3.0
+
+## 2.2.0
+
+Released September 13, 2019
+
+- ✅ Upgrade to [Trix 1.2.0](https://github.com/basecamp/trix/releases/tag/1.2.0)
+- 💪 Bump to version 2.2.0
+- 🚫 Remove appraisals for Rails 4.2 (support will be removed in trix-rails 3.x)
+
+## 2.1.0
+
+Released September 9, 2019
+
+- 🐛🔨 Add customizable input name for trix-editor in simple form ([#12](https://github.com/kylefox/trix/pull/12)). Thanks [@ptrr](https://github.com/ptrr)!
+- 💪 Modify Gemspec to support Rails 6 ([#17](https://github.com/kylefox/trix/pull/17)). Thanks [@afomera](https://github.com/afomera)!
+- 💪 Bump to version 2.1.0
+
 ## 2.0.0
 
 Released September 29, 2018
 
-* ✅ Upgrade to [Trix 1.0.0](https://github.com/basecamp/trix/releases/tag/1.0.0) 🎉
-* ☝️ 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.
-* 🐛🔨 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)!
-* 💪 Add appraisals for Rails 5.2.1
-
+- ✅ Upgrade to [Trix 1.0.0](https://github.com/basecamp/trix/releases/tag/1.0.0) 🎉
+- ☝️ 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.
+- 🐛🔨 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)!
+- 💪 Add appraisals for Rails 5.2.1
 
 ## 1.0.1
 
 Released September 20, 2018
 
-* ✅ Upgrade to Trix 0.12.1.
-* 🐛🔨 Formtastic helper outputs hidden input tag before trix editor tag ([#9](https://github.com/kylefox/trix/pull/9)). Thanks [@ch000](https://github.com/ch000)!
+- ✅ Upgrade to Trix 0.12.1.
+- 🐛🔨 Formtastic helper outputs hidden input tag before trix editor tag ([#9](https://github.com/kylefox/trix/pull/9)). Thanks [@ch000](https://github.com/ch000)!
 
 ## 1.0.0
 
 Released September 2, 2018
 
-* ✅ 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.
-* ✅ Upgrade to Trix 0.12.0.
-* ✅ Added support for Ruby 2.5.1.
-* 🚫 Dropped support for Ruby 2.2.
-* 🐛🔨 Allow additional options when using simple_form ([#8](https://github.com/kylefox/trix/pull/8)). Thanks [@phylor](https://github.com/phylor)!
+- ✅ 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.
+- ✅ Upgrade to Trix 0.12.0.
+- ✅ Added support for Ruby 2.5.1.
+- 🚫 Dropped support for Ruby 2.2.
+- 🐛🔨 Allow additional options when using simple_form ([#8](https://github.com/kylefox/trix/pull/8)). Thanks [@phylor](https://github.com/phylor)!

data/README.md

@@ -6,7 +6,9 @@ Want to include Basecamp's awesome [Trix WYSIWYG
 editor](http://trix-editor.org) in your Ruby on Rails application?
 You've come to the right place!
 
-Compatible with Rails 4.2 and up.
+Compatible with Rails 5.2 and up.
+
+_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_
 
 # Installation
 
@@ -83,15 +85,15 @@ For example:
 will render:
 
 ```html
-<trix-editor autofocus="true" data-coffee="delicious">
+<trix-editor autofocus="true" data-coffee="delicious"></trix-editor>
 ```
 
 # Contributing
 
 Bug reports and feature requests are welcome. They're _much_ more likely to be addressed if they are accompanied by a pull request 😘
 
-* [Report a bug](https://github.com/kylefox/trix/issues/new?template=bug_report.md)
-* [Request a feature](https://github.com/kylefox/trix/issues/new?template=feature_request.md)
+- [Report a bug](https://github.com/kylefox/trix/issues/new?template=bug_report.md)
+- [Request a feature](https://github.com/kylefox/trix/issues/new?template=feature_request.md)
 
 ## Testing
 

data/gemfiles/{rails_4.2.gemfile → rails_5_2.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 4.2.0"
+gem "rails", "~> 5.2"
 
 gemspec path: "../"

data/gemfiles/{rails_5.0.gemfile → rails_6_0.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0.0"
+gem "rails", "6.0.0"
 
 gemspec path: "../"

data/gemfiles/{rails_5.1.gemfile → rails_6_1.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1.0"
+gem "rails", "~> 6.1"
 
 gemspec path: "../"

data/gemfiles/{rails_5.2.1.gemfile → rails_7.gemfile}

@@ -2,6 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2.1"
+gem "rails", "~> 7.0"
 
 gemspec path: "../"

data/lib/trix/simple_form/trix_editor_input.rb

@@ -2,7 +2,7 @@ module Trix
   module SimpleForm
     class TrixEditorInput < ::SimpleForm::Inputs::Base
       def input(_wrapper_options)
-        trix_options = options.slice(:spellcheck, :toolbar, :tabindex)
+        trix_options = options.slice(:spellcheck, :toolbar, :tabindex, :input)
         editor_options = { input: input_class, class: 'trix-content' }.merge(trix_options)
 
         editor_tag = template.content_tag('trix-editor', '', editor_options)

data/lib/trix/version.rb

@@ -1,3 +1,3 @@
 module Trix
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.4.0'.freeze
 end

data/trix.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rails', '> 4.1', '< 6.0'
+  spec.add_runtime_dependency 'rails', '> 4.1'
 
   spec.add_development_dependency 'appraisal'
-  spec.add_development_dependency 'bundler', '~> 1.10'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'formtastic', '~> 3.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '>= 10.0'
   spec.add_development_dependency 'rspec-activemodel-mocks'
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'rubocop', '0.35.1'