Rails 6 support (again) (#50)

* Rails 6 support * Added Separate appraisal for Rails 6 RC1 * Remove debugging * Add rails-6 builds to Travis * Polish Rails 6 support * Changelog for v3.1.0 * whitespace * Update Gemfiles
zombocom · Oct 2, 2019 · ee6e68b · ee6e68b
1 parent 1d25d7f
commit ee6e68b
Show file tree

Hide file tree

Showing 17 changed files with 233 additions and 121 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,3 +9,4 @@ test/dummy/.sass-cache
 *.gem
 .ruby-version
 .DS_Store
+Gemfile.lock
diff --git a/.travis.yml b/.travis.yml
@@ -7,7 +7,6 @@ before_install:
   - gem install bundler --no-document
 
 rvm:
-  - 2.3.8
   - 2.4.6
   - 2.5.5
   - 2.6.3
@@ -17,10 +16,15 @@ gemfile:
   - gemfiles/rails_5.gemfile
   - gemfiles/rails_51.gemfile
   - gemfiles/rails_52.gemfile
+  - gemfiles/rails_6.gemfile
   - gemfiles/rails_head.gemfile
 
 matrix:
   exclude:
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6.gemfile
+    - rvm: 2.4.6
+      gemfile: gemfiles/rails_6.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails_head.gemfile
     - rvm: 2.4.6

diff --git a/Appraisals b/Appraisals
@@ -13,6 +13,11 @@ appraise "rails-52" do
   gem "sqlite3", "~> 1.3.6"
 end
 
+appraise "rails-6" do
+  gem "rails", "6.0.0"
+  gem "sqlite3", "~> 1.4"
+end
+
 appraise "rails-head" do
   gem "rails", git: "https://github.com/rails/rails.git"
   gem "sqlite3", "~> 1.4"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.1.0
+
+- Support for Rails 6 (https://github.com/schneems/maildown/pull/50)
+
 ## 3.0.3
 
 - Remove an Action View deprecation in Rails 6 (https://github.com/schneems/maildown/pull/45)

diff --git a/Gemfile b/Gemfile
@@ -12,5 +12,4 @@ gemspec
 
 # To use debugger
 # gem 'debugger'
-
 gem "appraisal"
diff --git a/Gemfile.lock b/Gemfile.lock
diff --git a/README.md b/README.md
@@ -203,6 +203,21 @@ Features we have that they don't:
 - Their gem is unmaintained, but honestly it's pretty simple and will keep working for some time.
 - We have way more monkeypatches than they do 🙀.
 
+
+## Test
+
+We use the appraisal gem to generate Gemfiles. Install all dependencies with this:
+
+```
+$ appraisal install
+```
+
+Run a specific suite like this:
+
+```
+$ BUNDLE_GEMFILE=gemfiles/rails_6.gemfile bundle exec rake test
+```
+
 ## License
 
 MIT
diff --git a/gemfiles/rails_5.gemfile.lock b/gemfiles/rails_5.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    maildown (3.0.2)
+    maildown (3.1.0)
       actionmailer (>= 4.0.0)
       kramdown
 
@@ -126,4 +126,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.1
+   2.0.2
diff --git a/gemfiles/rails_51.gemfile.lock b/gemfiles/rails_51.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    maildown (3.0.2)
+    maildown (3.1.0)
       actionmailer (>= 4.0.0)
       kramdown
 
@@ -126,4 +126,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.1
+   2.0.2
diff --git a/gemfiles/rails_52.gemfile.lock b/gemfiles/rails_52.gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    maildown (3.0.2)
+    maildown (3.1.0)
       actionmailer (>= 4.0.0)
       kramdown
 
@@ -134,4 +134,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.6)
 
 BUNDLED WITH
-   1.16.1
+   2.0.2
diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile
@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "rails", "6.0.0"
+gem "sqlite3", "~> 1.4"
+
+gemspec path: "../"
diff --git a/gemfiles/rails_6.gemfile.lock b/gemfiles/rails_6.gemfile.lock
@@ -0,0 +1,153 @@
+PATH
+  remote: ..
+  specs:
+    maildown (3.1.0)
+      actionmailer (>= 4.0.0)
+      kramdown
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      mail (>= 2.7.1)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
+      globalid (>= 0.3.6)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      marcel (~> 0.3.1)
+    activesupport (6.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.1, >= 2.1.8)
+    appraisal (2.2.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    erubi (1.9.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    kramdown (2.1.0)
+    loofah (2.3.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.12.2)
+    nio4r (2.5.2)
+    nokogiri (1.10.4)
+      mini_portile2 (~> 2.4.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
+      bundler (>= 1.3.0)
+      railties (= 6.0.0)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.2.0)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rake (13.0.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.4.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    websocket-driver (0.7.1)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.4)
+    zeitwerk (2.1.10)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal
+  maildown!
+  rails (= 6.0.0)
+  railties
+  rake
+  sqlite3 (~> 1.4)
+
+BUNDLED WITH
+   2.0.2
diff --git a/gemfiles/rails_head.gemfile.lock b/gemfiles/rails_head.gemfile.lock
@@ -82,7 +82,7 @@ GIT
 PATH
   remote: ..
   specs:
-    maildown (3.0.2)
+    maildown (3.1.0)
       actionmailer (>= 4.0.0)
       kramdown
 
@@ -155,4 +155,4 @@ DEPENDENCIES
   sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   1.16.1
+   2.0.2