Update template rendering and update_attributes for Rails 6.1; adds A…

…ppraisals for Rails 6.0 and 6.1 (#366)

* Update template rendering and update_attributes for Rails 6.1

* Undo rename of _report.erb -> _report.html.erb

* Fix how ERB templates are rendered in static report

* Add Appraisals and compatibility for Rails 6.0 and 6.1

.github/workflows/test.yml

@@ -34,6 +34,8 @@ jobs:
           - gemfiles/rails42_protected_attributes.gemfile
           - gemfiles/rails51.gemfile
           - gemfiles/rails52.gemfile
+          - gemfiles/rails60.gemfile
+          - gemfiles/rails61.gemfile
         exclude:
           - ruby: jruby-9.1.13.0
             gemfile: gemfiles/rails5.gemfile

Appraisals

@@ -26,3 +26,17 @@ appraise "rails52" do
   gem "fastthread", :github => "zoltankiss/fastthread", :platforms => :mri_20
   gem "passenger", "~>3.0"
 end
+
+appraise "rails60" do
+  gem "mocha",  "~> 1.0", :require=>false
+  gem "rails", "~>5.2.0"
+  gem "fastthread", :github => "zoltankiss/fastthread", :platforms => :mri_20
+  gem "passenger", "~>3.0"
+end
+
+appraise "rails61" do
+  gem "mocha",  "~> 1.0", :require=>false
+  gem "rails", "~>5.2.0"
+  gem "fastthread", :github => "zoltankiss/fastthread", :platforms => :mri_20
+  gem "passenger", "~>3.0"
+end

gemfiles/rails60.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack"
+gem "redis", ">= 3.2.1"
+gem "redis-namespace", ">= 1.1.0"
+gem "mongo", "~> 2.1"
+gem "integration", "<= 0.1.0"
+gem "rubystats", ">= 0.2.5"
+gem "garb", "< 0.9.2", require: false
+gem "mocha", "~> 1.0", require: false
+gem "rails", "~>5.2.0"
+gem "fastthread", platforms: :mri_20, git: "https://github.com/zoltankiss/fastthread.git"
+gem "passenger", "~>3.0"
+
+group :development do
+  gem "rake"
+  gem "RedCloth"
+  gem "yard"
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.3.10"
+  gem "jekyll", "~> 2.5.3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "jdbc-sqlite3"
+end
+
+gemspec development_group: :test, path: "../"

gemfiles/rails60.gemfile.lock

@@ -0,0 +1,293 @@
+GIT
+  remote: https://github.com/zoltankiss/fastthread.git
+  revision: cefbca3009b9c68df5e473d840462ebcc7fa1504
+  specs:
+    fastthread (1.0.7)
+
+PATH
+  remote: ..
+  specs:
+    vanity (3.0.0)
+      i18n
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.2.9)
+    RedCloth (4.2.9-java)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
+      globalid (>= 0.3.6)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activerecord-jdbc-adapter (52.8-java)
+      activerecord (~> 5.2.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    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)
+    appraisal (2.0.2)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (9.0.0)
+    blankslate (2.1.2.4)
+    bson (4.3.0)
+    bson (4.3.0-java)
+    builder (3.2.3)
+    classifier-reborn (2.2.0)
+      fast-stemmer (~> 1.0)
+    coderay (1.1.2)
+    coffee-script (2.4.1)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.11.1)
+    colorator (0.1)
+    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.0.5-java)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    crass (1.0.4)
+    daemon_controller (1.2.0)
+    erubi (1.7.1)
+    execjs (2.7.0)
+    fakefs (0.18.0)
+    faraday (0.15.2)
+      multipart-post (>= 1.2, < 3)
+    fast-stemmer (1.0.2)
+    ffi (1.15.5)
+    ffi (1.15.5-java)
+    garb (0.9.1)
+      activesupport (>= 2.2.0)
+      crack (>= 0.1.6)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    hashdiff (0.3.7)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
+    integration (0.1.0)
+    jdbc-sqlite3 (3.28.0)
+    jekyll (2.5.3)
+      classifier-reborn (~> 2.0)
+      colorator (~> 0.1)
+      jekyll-coffeescript (~> 1.0)
+      jekyll-gist (~> 1.0)
+      jekyll-paginate (~> 1.0)
+      jekyll-sass-converter (~> 1.0)
+      jekyll-watch (~> 1.1)
+      kramdown (~> 1.3)
+      liquid (~> 2.6.1)
+      mercenary (~> 0.3.3)
+      pygments.rb (~> 0.6.0)
+      redcarpet (~> 3.1)
+      safe_yaml (~> 1.0)
+      toml (~> 0.1.0)
+    jekyll-coffeescript (1.1.1)
+      coffee-script (~> 2.2)
+      coffee-script-source (~> 1.11.1)
+    jekyll-gist (1.5.0)
+      octokit (~> 4.2)
+    jekyll-paginate (1.1.0)
+    jekyll-sass-converter (1.5.2)
+      sass (~> 3.4)
+    jekyll-watch (1.5.1)
+      listen (~> 3.0)
+    kramdown (1.17.0)
+    liquid (2.6.3)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    mercenary (0.3.6)
+    method_source (0.9.0)
+    mimemagic (0.3.10)
+      nokogiri (~> 1)
+      rake
+    mini_mime (1.0.0)
+    mini_portile2 (2.6.1)
+    minitest (5.11.3)
+    mocha (1.13.0)
+    mongo (2.6.1)
+      bson (>= 4.3.0, < 5.0.0)
+    multipart-post (2.0.0)
+    nio4r (2.3.1)
+    nio4r (2.3.1-java)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    nokogiri (1.12.5-java)
+      racc (~> 1.4)
+    octokit (4.9.0)
+      sawyer (~> 0.8.0, >= 0.5.3)
+    parslet (1.5.0)
+      blankslate (~> 2.0)
+    passenger (3.0.21)
+      daemon_controller (>= 1.0.0)
+      fastthread (>= 1.0.1)
+      rack
+      rake (>= 0.8.1)
+    posix-spawn (0.3.13)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry (0.11.3-java)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+      spoon (~> 0.0)
+    public_suffix (3.0.2)
+    pygments.rb (0.6.3)
+      posix-spawn (~> 0.3.6)
+      yajl-ruby (~> 1.2.0)
+    racc (1.6.0)
+    racc (1.6.0-java)
+    rack (2.0.5)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
+      sprockets-rails (>= 2.0.0)
+    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.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    redcarpet (3.4.0)
+    redis (4.0.1)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
+    ruby_dep (1.5.0)
+    rubystats (0.3.0)
+    safe_yaml (1.0.4)
+    sass (3.5.7)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    sawyer (0.8.1)
+      addressable (>= 2.3.5, < 2.6)
+      faraday (~> 0.8, < 1.0)
+    spoon (0.0.6)
+      ffi
+    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.3.10)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    thread_safe (0.3.6-java)
+    timecop (0.9.1)
+    toml (0.1.2)
+      parslet (~> 1.5.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    webmock (3.4.2)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-driver (0.7.0-java)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    yajl-ruby (1.2.3)
+    yard (0.9.15)
+
+PLATFORMS
+  java
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  activerecord-jdbc-adapter
+  appraisal (~> 2.0)
+  bundler (>= 1.8.0)
+  fakefs
+  fastthread!
+  garb (< 0.9.2)
+  integration (<= 0.1.0)
+  jdbc-sqlite3
+  jekyll (~> 2.5.3)
+  minitest (>= 4.2)
+  mocha (~> 1.0)
+  mongo (~> 2.1)
+  passenger (~> 3.0)
+  pry
+  rack
+  rails (~> 5.2.0)
+  rake
+  redis (>= 3.2.1)
+  redis-namespace (>= 1.1.0)
+  rubystats (>= 0.2.5)
+  sqlite3 (~> 1.3.10)
+  timecop
+  vanity!
+  webmock
+  yard
+
+BUNDLED WITH
+   1.17.2

gemfiles/rails61.gemfile

@@ -0,0 +1,33 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rack"
+gem "redis", ">= 3.2.1"
+gem "redis-namespace", ">= 1.1.0"
+gem "mongo", "~> 2.1"
+gem "integration", "<= 0.1.0"
+gem "rubystats", ">= 0.2.5"
+gem "garb", "< 0.9.2", require: false
+gem "mocha", "~> 1.0", require: false
+gem "rails", "~>5.2.0"
+gem "fastthread", platforms: :mri_20, git: "https://github.com/zoltankiss/fastthread.git"
+gem "passenger", "~>3.0"
+
+group :development do
+  gem "rake"
+  gem "RedCloth"
+  gem "yard"
+end
+
+platforms :ruby do
+  gem "sqlite3", "~> 1.3.10"
+  gem "jekyll", "~> 2.5.3"
+end
+
+platforms :jruby do
+  gem "activerecord-jdbc-adapter"
+  gem "jdbc-sqlite3"
+end
+
+gemspec development_group: :test, path: "../"