axlsx_rails 0.5.2 → 0.6.1

data/{Gemfile.lock.5.0 → Gemfile.lock.5.2}

@@ -17,46 +17,33 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actioncable (5.0.7)
-      actionpack (= 5.0.7)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.7)
-      actionpack (= 5.0.7)
-      actionview (= 5.0.7)
-      activejob (= 5.0.7)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.7)
-      actionview (= 5.0.7)
-      activesupport (= 5.0.7)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.7)
-      activesupport (= 5.0.7)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.7)
-      activesupport (= 5.0.7)
-      globalid (>= 0.3.6)
-    activemodel (5.0.7)
-      activesupport (= 5.0.7)
-    activerecord (5.0.7)
-      activemodel (= 5.0.7)
-      activesupport (= 5.0.7)
-      arel (~> 7.0)
-    activesupport (5.0.7)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
-    arel (7.1.4)
+    arel (9.0.0)
     axlsx (2.0.1)
       htmlentities (~> 4.3.1)
       nokogiri (>= 1.4.1)
@@ -81,12 +68,10 @@ GEM
     daemons (1.2.6)
     diff-lcs (1.3)
     docile (1.1.5)
-    erubis (2.7.0)
-    eventmachine (1.2.6)
+    erubi (1.7.1)
+    eventmachine (1.2.7)
     ffi (1.9.23)
     formatador (0.2.5)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
     growl (1.0.3)
     guard (2.14.2)
       formatador (>= 0.2.4)
@@ -118,14 +103,11 @@ GEM
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.0.13)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
     method_source (0.8.2)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
     nenv (0.3.0)
-    nio4r (2.3.1)
     nokogiri (1.8.2)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
@@ -139,28 +121,16 @@ GEM
       pry (>= 0.9.10, < 0.11.0)
     public_suffix (3.0.2)
     rack (2.0.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.7)
-      actioncable (= 5.0.7)
-      actionmailer (= 5.0.7)
-      actionpack (= 5.0.7)
-      actionview (= 5.0.7)
-      activejob (= 5.0.7)
-      activemodel (= 5.0.7)
-      activerecord (= 5.0.7)
-      activesupport (= 5.0.7)
-      bundler (>= 1.3.0)
-      railties (= 5.0.7)
-      sprockets-rails (>= 2.0.0)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.4)
       loofah (~> 2.2, >= 2.2.2)
-    railties (5.0.7)
-      actionpack (= 5.0.7)
-      activesupport (= 5.0.7)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -168,9 +138,6 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    responders (2.4.0)
-      actionpack (>= 4.2.0, < 5.3)
-      railties (>= 4.2.0, < 5.3)
     roo (1.13.2)
       nokogiri
       rubyzip
@@ -208,13 +175,6 @@ GEM
     slop (3.6.0)
     spreadsheet (1.1.7)
       ruby-ole (>= 1.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     term-ansicolor (1.6.0)
       tins (~> 1.0)
@@ -227,10 +187,7 @@ GEM
     tins (1.16.3)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    xpath (3.0.0)
+    xpath (3.1.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -247,10 +204,8 @@ DEPENDENCIES
   jquery-rails
   pry
   pry-nav
-  rails (~> 5.0.0)
   rake
   rb-fsevent
-  responders (~> 2.0)
   roo
   rspec-rails
   rubyzip

data/README.md

@@ -1,61 +1,54 @@
+Notice: Community Axlsx organization
+===================================================
+All Axlsx related gems have been forked or moved to a community organization: http://github.com/caxlsx
+* [Axlsx](http://github.com/caxlsx/caxlsx)
+* [acts_as_caxlsx](http://github.com/caxlsx/acts_as_caxlsx)
+* [axlsx_rails](http://github.com/caxlsx/axlsx_rails)
+* [activeadmin-caxlsx](http://github.com/caxlsx/activeadmin-caxlsx)
+
+The gems will be released as is as a starting point to allow releases of other gems that depend on these gems. Submit issues as usual. 
+
+Please consider helping develop and test these gems.
+
 Axlsx-Rails — Spreadsheet templates for Rails
 ===================================================
 
-[![Build Status](https://secure.travis-ci.org/straydogstudio/axlsx_rails.svg?branch=master)](http://travis-ci.org/straydogstudio/axlsx_rails)
+[![Build Status](https://secure.travis-ci.org/caxlsx/axlsx_rails.svg?branch=master)](http://travis-ci.org/caxlsx/axlsx_rails)
 [![Gem
 Version](https://badge.fury.io/rb/axlsx_rails.svg)](http://badge.fury.io/rb/axlsx_rails)
-[![Dependency Status](https://gemnasium.com/straydogstudio/axlsx_rails.svg?branch=master)](https://gemnasium.com/straydogstudio/axlsx_rails)
 [![Coverage
-Status](https://coveralls.io/repos/straydogstudio/axlsx_rails/badge.svg)](https://coveralls.io/r/straydogstudio/axlsx_rails)
+Status](https://coveralls.io/repos/caxlsx/axlsx_rails/badge.svg)](https://coveralls.io/r/caxlsx/axlsx_rails)
 
 ![Total downloads](http://ruby-gem-downloads-badge.herokuapp.com/axlsx_rails?type=total)
-![Downloads for 0.4.0](http://ruby-gem-downloads-badge.herokuapp.com/axlsx_rails/0.4.0?label=0.4.0)
-![Downloads for 0.5.0](http://ruby-gem-downloads-badge.herokuapp.com/axlsx_rails/0.5.0?label=0.5.0)
-![Downloads for latest release](http://ruby-gem-downloads-badge.herokuapp.com/axlsx_rails/0.5.1?label=0.5.1)
+![Downloads for 0.5.1](http://ruby-gem-downloads-badge.herokuapp.com/axlsx_rails/0.5.1?label=0.5.1)
+![Downloads for 0.5.2](http://ruby-gem-downloads-badge.herokuapp.com/axlsx_rails/0.5.2?label=0.5.2)
+![Downloads for 0.6.0 (latest)](http://ruby-gem-downloads-badge.herokuapp.com/axlsx_rails/0.6.0?label=0.6.0)
 
 ## Installation
 
 In your Gemfile:
 
 ```ruby
-gem 'rubyzip', '>= 1.2.1'
-gem 'axlsx', git: 'https://github.com/randym/axlsx.git', ref: 'c8ac844'
 gem 'axlsx_rails'
 ```
 
-**NOTE:** Axlsx has been pending release for a long time. You must specify the master on github to support Rubyzip 1.2.1.
-
-If `rubyzip 1.0.0` is needed:
-
-```ruby
-gem 'rubyzip', '= 1.0.0'
-gem 'axlsx', '= 2.0.1'
-gem 'axlsx_rails'
-```
-
-If `rubyzip >= 1.1.0` is needed:
-
-```ruby
-gem 'rubyzip', '~> 1.1.0'
-gem 'axlsx', '2.1.0.pre'
-gem 'axlsx_rails'
-```
+See [previous installations](#previous-installations) if needed.
 
 ## Requirements
 
-* Rails 4.2, 5.0 or 5.1 (tested)
+* Tested on Rails 4.2, 5.x and 6.0
 * For Rails 3.1 or 3.2 use version 3.0
 * **As of 0.5.0 requires Axlsx 2.0.1, but strongly suggests 2.1.0.pre, which requires rubyzip 1.1.0**
 * As of Rails 4.1 you must use `render_to_string` to render a mail attachment.
 
 ## FYI
 
-* This gem depends on [Axlsx](https://github.com/randym/axlsx). See [the blog](http://axlsx.blog.randym.net/) or the [examples page](https://github.com/randym/axlsx/blob/master/examples/example.rb) for usage.
+* This gem depends on [Axlsx](https://github.com/caxlsx/axlsx). See [the blog](http://axlsx.blog.randym.net/) or the [examples page](https://github.com/randym/axlsx/blob/master/examples/example.rb) for usage.
 * Check out [axlsx_styler](https://github.com/sakovias/axlsx_styler) by [sakovias](https://github.com/sakovias) for easier styles and borders!
 
 ## Usage
 
-Axlsx-Rails provides a renderer and a template handler. It adds the `:xlsx` format and parses `.xlsx.axlsx` templates. This lets you take all the [Axlsx](https://github.com/randym/axlsx) code out of your controller or model and place it inside the template, where view code belongs! **See [this blog post](http://axlsx.blog.randym.net/2012/08/excel-on-rails-like-pro-with-axlsxrails.html) for a more complete walkthrough.**
+Axlsx-Rails provides a renderer and a template handler. It adds the `:xlsx` format and parses `.xlsx.axlsx` templates. This lets you take all the [Axlsx](https://github.com/caxlsx/axlsx) code out of your controller or model and place it inside the template, where view code belongs! **See [this blog post](http://axlsx.blog.randym.net/2012/08/excel-on-rails-like-pro-with-axlsxrails.html) for a more complete walkthrough.**
 
 ### Controller
 
@@ -85,7 +78,7 @@ wb.add_worksheet(name: "Buttons") do |sheet|
 end
 ```
 
-This is where you place all your [Axlsx](https://github.com/randym/axlsx) specific markup. Add worksheets, fill content, merge cells, add styles. See the [Axlsx examples](https://github.com/randym/axlsx/tree/master/examples/example.rb) page to see what you can do.
+This is where you place all your [Axlsx](https://github.com/caxlsx/axlsx) specific markup. Add worksheets, fill content, merge cells, add styles. See the [Axlsx examples](https://github.com/caxlsx/axlsx/tree/master/examples/example.rb) page to see what you can do.
 
 Remember, like in `erb` templates, view helpers are available to use the `.xlsx.axlsx` template.
 
@@ -126,7 +119,7 @@ format.xlsx {
 }
 ```
 
-If you use `render xlsx:` the gem will try to guess the file name: 
+If you use `render xlsx:` the gem will try to guess the file name:
 
 ```ruby
 # filename of 'buttons'
@@ -143,13 +136,13 @@ render xlsx: "action_or_template", filename: "my_new_filename.xlsx"
 
 ### Acts As Xlsx
 
-If you use [acts_as_xlsx](https://github.com/randym/acts_as_xlsx), configure the active record normally, but specify the package in the template:
+If you use [acts_as_xlsx](https://github.com/caxlsx/acts_as_xlsx), configure the active record normally, but specify the package in the template:
 
 ```ruby
 User.to_xlsx package: xlsx_package, (other options)
 ```
 
-**Note:** As of 4/1/2014 Acts As Xlsx is not compatible with Rails 4.1, and generates a warning on 4.0. You may use [my patched fork](https://github.com/straydogstudio/acts_as_xlsx) until it is remedied.
+**Note:** As of 4/1/2014 Acts As Xlsx is not compatible with Rails 4.1, and generates a warning on 4.0. You may use [my patched fork](https://github.com/caxlsx/acts_as_caxlsx) until it is remedied.
 
 ### Axlsx Package Options
 
@@ -213,7 +206,7 @@ class UserMailer < ActionMailer::Base
 end
 ```
 
-* If the route specifies or suggests the `:xlsx` format you do not need to specify `formats` or `handlers`. 
+* If the route specifies or suggests the `:xlsx` format you do not need to specify `formats` or `handlers`.
 * If the template (`users/export`) can refer to only one file (the xlsx.axlsx template), you do not need to specify `handlers`, provided the `formats` includes `:xlsx`.
 * Specifying the encoding as 'base64' can avoid UTF-8 errors.
 
@@ -241,7 +234,7 @@ RSpec.shared_context 'axlsx' do
   let(:template_path) do
     ['app', 'views', template_name]
   end
-  
+
   # This helper will be used in tests
   def render_template(locals = {})
     axlsx_binding = Kernel.binding
@@ -255,7 +248,9 @@ RSpec.shared_context 'axlsx' do
 
     # mimics an ActionView::Template class, presenting a 'source' method
     # to retrieve the content of the template
-    axlsx_binding.eval(ActionView::Template::Handlers::AxlsxBuilder.call(Struct.new(:source).new(File.read(Rails.root.join(*template_path)))))
+    filename = Rails.root.join(*template_path).to_s
+    source = Struct.new(:source).new(File.read(filename))
+    axlsx_binding.eval(ActionView::Template::Handlers::AxlsxBuilder.new.call(source), filename)
     axlsx_binding.local_variable_get(:wb)
   end
 end
@@ -360,7 +355,7 @@ class UserMailer < ActionMailer::Base
 end
 ```
 
-If you get these errors, please open an issue and share code so the bug can be isolated. Or comment on issue [#29](https://github.com/straydogstudio/axlsx_rails/issues/29) or [#25](https://github.com/straydogstudio/axlsx_rails/issues/25).
+If you get these errors, please open an issue and share code so the bug can be isolated. Or comment on issue [#29](https://github.com/caxlsx/axlsx_rails/issues/29) or [#25](https://github.com/caxlsx/axlsx_rails/issues/25).
 
 ### Generated Files Can't Be Opened or Invalid Byte Sequence in UTF-8
 
@@ -403,10 +398,36 @@ link_to 'Download spreadsheet', path_to_sheet, data: {turbolinks: false}
 
 If you are having problems, try to isolate the issue. Use the console or a script to make sure your data is good. Then create the spreadsheet line by line without Axlsx-Rails to see if you are having Axlsx problems. If you can manually create the spreadsheet, create an issue and we will work it out.
 
+## Previous Installations
+
+In your Gemfile:
+
+```ruby
+gem 'rubyzip', '>= 1.2.1'
+gem 'axlsx', git: 'https://github.com/randym/axlsx.git', ref: 'c8ac844'
+gem 'axlsx_rails'
+```
+
+If `rubyzip 1.0.0` is needed:
+
+```ruby
+gem 'rubyzip', '= 1.0.0'
+gem 'axlsx', '= 2.0.1'
+gem 'axlsx_rails'
+```
+
+If `rubyzip >= 1.1.0` is needed:
+
+```ruby
+gem 'rubyzip', '~> 1.1.0'
+gem 'axlsx', '2.1.0.pre'
+gem 'axlsx_rails'
+```
+
 ## Dependencies
 
 - [Rails](https://github.com/rails/rails)
-- [Axlsx](https://github.com/randym/axlsx)
+- [Axlsx](https://github.com/caxlsx/axlsx)
 
 ## Authors
 
@@ -414,7 +435,7 @@ If you are having problems, try to isolate the issue. Use the console or a scrip
 
 ## Contributors
 
-Many thanks to [contributors](https://github.com/straydogstudio/axlsx_rails/graphs/contributors):
+Many thanks to [contributors](https://github.com/caxlsx/axlsx_rails/graphs/contributors):
 
 * [randym](https://github.com/randym)
 * [sugi](https://github.com/sugi)
@@ -437,6 +458,10 @@ source:
 
 ## Change log
 
+**September 5, 2019**: 0.5.3 release
+
+- Improved Rails 6.0 compatibility re MIME type
+
 **May 1st, 2018**: 0.5.2 release
 
 - Improved Rails 5 compatibility re MIME type

data/lib/axlsx_rails/template_handler.rb

@@ -8,10 +8,17 @@ module ActionView
     class AxlsxBuilder
 
       def default_format
-        Rails.version.to_f >= 5 ? Mime[:xlsx] : Mime::XLSX
+        case
+        when Rails.version.to_f >= 6
+          Mime[:xlsx].symbol
+        when Rails.version.to_f >= 5
+          Mime[:xlsx]
+        else
+          Mime::XLSX
+        end
       end
 
-      def call(template)
+      def call(template, source = nil)
         builder = StringIO.new
         builder << "require 'axlsx';"
         builder << "xlsx_author = defined?(xlsx_author).nil? ? nil : xlsx_author;"
@@ -21,7 +28,7 @@ module ActionView
         builder << ":author => xlsx_author,"
         builder << ":created_at => xlsx_created_at,"
         builder << ":use_shared_strings => xlsx_use_shared_strings);"
-        builder << template.source
+        builder << (source || template.source)
         builder << ";xlsx_package.to_stream.string;"
         builder.string
       end

data/lib/axlsx_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AxlsxRails
-  VERSION = '0.5.2'
+  VERSION = '0.6.1'
 end

data/lib/axlsx_rails.rb

@@ -1,3 +1,5 @@
 # frozen_string_literal: true
 
+warn "DEPRECATION WARNING: axlsx_rails has been renamed to caxlsx_rails. See http://github.com/caxlsx"
+
 require 'axlsx_rails/railtie' if defined?(Rails)

data/spec/axlsx_builder_spec.rb

@@ -18,10 +18,23 @@ describe 'Axlsx template handler' do
     # end
 
     it "has xlsx format" do
-      expect(handler.default_format).to eq(mime_type)
+      if Rails::VERSION::MAJOR >= 6
+        expect(handler.default_format).to eq(mime_type.symbol)
+      else
+        expect(handler.default_format).to eq(mime_type)
+      end
     end
 
-    it "compiles to an excel spreadsheet" do
+    it "compiles to an excel spreadsheet when passing in a source" do
+      xlsx_package, wb = nil
+      source = "wb = xlsx_package.workbook;\nwb.add_worksheet(name: 'Test') do |sheet|\n\tsheet.add_row ['four', 'five', 'six']\n\tsheet.add_row ['d', 'e', 'f']\nend\n"
+      eval( AB.new.call template, source )
+      xlsx_package.serialize('/tmp/axlsx_temp.xlsx')
+      expect{ wb = Roo::Excelx.new('/tmp/axlsx_temp.xlsx') }.to_not raise_error
+      expect(wb.cell(2,3)).to eq('f')
+    end
+
+    it "compiles to an excel spreadsheet when inferring source from template " do
       xlsx_package, wb = nil
       eval( AB.new.call template )
       xlsx_package.serialize('/tmp/axlsx_temp.xlsx')

data/spec/axlsx_request_spec.rb

@@ -8,7 +8,7 @@ describe 'Axlsx request', :type => :request do
   end
 
   it "has a working dummy app" do
-    @user1 = User.create name: 'Elmer', last_name: 'Fudd', address: '1234 Somewhere, Over NY 11111', email: 'elmer@fudd.com'
+    User.create name: 'Elmer', last_name: 'Fudd', address: '1234 Somewhere, Over NY 11111', email: 'elmer@fudd.com'
     visit '/'
     expect(page).to have_content("Hey, you")
   end
@@ -60,8 +60,8 @@ describe 'Axlsx request', :type => :request do
 
   it "downloads an excel file from acts_as_xlsx model" do
     User.destroy_all
-    @user1 = User.create name: 'Elmer', last_name: 'Fudd', address: '1234 Somewhere, Over NY 11111', email: 'elmer@fudd.com'
-    @user2 = User.create name: 'Bugs', last_name: 'Bunny', address: '1234 Left Turn, Albuquerque NM 22222', email: 'bugs@bunny.com'
+    User.create name: 'Elmer', last_name: 'Fudd', address: '1234 Somewhere, Over NY 11111', email: 'elmer@fudd.com'
+    User.create name: 'Bugs', last_name: 'Bunny', address: '1234 Left Turn, Albuquerque NM 22222', email: 'bugs@bunny.com'
     visit '/users.xlsx'
     expect(page.response_headers['Content-Type']).to eq(mime_type.to_s + "; charset=utf-8")
     File.open('/tmp/axlsx_temp.xlsx', 'w') {|f| f.write(page.source) }
@@ -117,6 +117,7 @@ describe 'Axlsx request', :type => :request do
   it "uses respond_with" do
     User.destroy_all
     @user = User.create name: 'Responder', last_name: 'Bunny', address: '1234 Right Turn, Albuquerque NM 22222', email: 'bugs@bunny.com'
+    visit "/users/#{@user.id}.xlsx"
     expect {
       visit "/users/#{@user.id}.xlsx"
     }.to_not raise_error
@@ -185,15 +186,17 @@ describe 'Axlsx request', :type => :request do
     end
   end
 
-  it "downloads an excel file when there is no action" do
-    User.destroy_all
-    @user1 = User.create name: 'Elmer', last_name: 'Fudd', address: '1234 Somewhere, Over NY 11111', email: 'elmer@fudd.com'
-    @user2 = User.create name: 'Bugs', last_name: 'Bunny', address: '1234 Left Turn, Albuquerque NM 22222', email: 'bugs@bunny.com'
-    visit '/users/noaction.xlsx'
-    expect(page.response_headers['Content-Type']).to eq(mime_type.to_s + "; charset=utf-8")
-    File.open('/tmp/axlsx_temp.xlsx', 'w') {|f| f.write(page.source) }
-    wb = nil
-    expect{ wb = Roo::Excelx.new('/tmp/axlsx_temp.xlsx') }.to_not raise_error
-    expect(wb.cell(3,2)).to eq('Bugs')
+  if Rails::VERSION::MAJOR < 6
+    it "downloads an excel file when there is no action" do
+      User.destroy_all
+      User.create name: 'Elmer', last_name: 'Fudd', address: '1234 Somewhere, Over NY 11111', email: 'elmer@fudd.com'
+      User.create name: 'Bugs', last_name: 'Bunny', address: '1234 Left Turn, Albuquerque NM 22222', email: 'bugs@bunny.com'
+      visit '/users/noaction.xlsx'
+      expect(page.response_headers['Content-Type']).to eq(mime_type.to_s + "; charset=utf-8")
+      File.open('/tmp/axlsx_temp.xlsx', 'w') {|f| f.write(page.source) }
+      wb = nil
+      expect{ wb = Roo::Excelx.new('/tmp/axlsx_temp.xlsx') }.to_not raise_error
+      expect(wb.cell(3,2)).to eq('Bugs')
+    end
   end
 end

data/spec/ci.rb

@@ -1,11 +1,14 @@
 #!/usr/bin/env ruby
 
-if ENV['RAILS_VERSION'] =~ /^5/
-  puts "Testing Rails 5"
-  exit system('cd spec/dummy_5 && bundle install --without debug && bundle exec rake db:create && bundle exec rake db:migrate && cd ../../ && bundle exec rspec spec')
+if ENV['RAILS_VERSION'] =~ /^6.0/
+  puts "Testing Rails 6.0"
+  exit system('cd spec/dummy_6.0 && bundle install --without debug && rails db:reset && cd ../../ && bundle exec rspec spec')
+elsif ENV['RAILS_VERSION'] =~ /^5/
+  puts "Testing Rails #{ENV['RAILS_VERSION']}"
+  exit system("cd spec/dummy_#{ENV['RAILS_VERSION']} && bundle install --without debug && rails db:reset && cd ../../ && bundle exec rspec spec")
 elsif ENV['RAILS_VERSION'] =~ /^4/
-  puts "Testing Rails 4"
-  exit system('cd spec/dummy_4 && bundle install --without debug && bundle exec rake db:create && bundle exec rake db:migrate && cd ../../ && bundle exec rspec spec')
+  puts "Testing Rails #{ENV['RAILS_VERSION'].to_i}"
+  exit system("cd spec/dummy_#{ENV['RAILS_VERSION'].to_i} && bundle install --without debug && rake db:reset && cd ../../ && bundle exec rspec spec")
 else
   puts "Testing Rails 3"
   exit system('cd spec/dummy && bundle install --without debug && bundle exec rake db:create && bundle exec rake db:migrate && cd ../../ && bundle exec rspec spec')

data/spec/dummy/config/application.rb

@@ -58,7 +58,7 @@ module Dummy
     # This will create an empty whitelist of attributes available for mass-assignment for all models
     # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
     # parameters by using an attr_accessible or attr_protected declaration.
-    config.active_record.whitelist_attributes = false
+    config.active_record.whitelist_attributes = false if Rails::VERSION::MAJOR < 6
 
     # Enable the asset pipeline
     config.assets.enabled = true

data/spec/dummy/config/environments/development.rb

@@ -23,11 +23,11 @@ Dummy::Application.configure do
   config.action_dispatch.best_standards_support = :builtin
 
   # Raise exception on mass assignment protection for Active Record models
-  config.active_record.mass_assignment_sanitizer = :strict
+  config.active_record.mass_assignment_sanitizer = :strict if Rails::VERSION::MAJOR < 6
 
   # Log the query plan for queries taking more than this (works
   # with SQLite, MySQL, and PostgreSQL)
-  config.active_record.auto_explain_threshold_in_seconds = 0.5
+  config.active_record.auto_explain_threshold_in_seconds = 0.5 if Rails::VERSION::MAJOR < 6
 
   # Do not compress assets
   config.assets.compress = false