Merge pull request #54 from github/upgrade-ruby-and-rails

Bump to rails 6 and ruby 2.7

Author: leequarella

.github/workflows/ruby.yml

@@ -8,13 +8,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up Ruby 2.5.7
-      uses: actions/setup-ruby@v1
+    - uses: actions/checkout@v2
+    - name: Set up Ruby 2.7.2
+      uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.5.7
+        ruby-version: 2.7.2
     - name: Build and test
       run: |
-        gem install bundler:1.16.1
         bundle install --binstubs
         bin/rspec

.ruby-version

@@ -1 +1 @@
-2.5.7
+2.7.1

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 4.0'
+gem 'rails'
 
 group :development, :test do
   gem "rspec-rails", "~> 3"

chatops-controller.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |s|
   s.files = Dir["{app,config,db,lib}/**/*", "README.md"]
   s.test_files = Dir["spec/**/*"]
 
-  s.add_dependency "rails", ">= 4.0"
+  s.add_dependency "actionpack", ">= 6.0"
+  s.add_dependency "activesupport", ">= 6.0"
 
   s.add_development_dependency "rspec-rails", "~> 3"
   s.add_development_dependency "pry", "~> 0"

lib/chatops/controller.rb

@@ -66,7 +66,7 @@ def jsonrpc_params
 
     def json_body
       hash = {}
-      if request.content_type =~ %r/\Aapplication\/json\Z/i
+      if request.content_mime_type == Mime[:json]
         hash = ActiveSupport::JSON.decode(request.raw_post) || {}
       end
       hash.with_indifferent_access

spec/dummy/config/environments/test.rb

@@ -13,12 +13,12 @@
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  if Rails.version.starts_with?("5")
-    config.public_file_server.enabled = true
-    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
-  else
+  if Rails.version.start_with?("4")
     config.serve_static_files   = true
     config.static_cache_control = 'public, max-age=3600'
+  else
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
   end
 
   # Show full error reports and disable caching.

spec/dummy/config/initializers/assets.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file.
 
 # Version of your assets, change this if you want to expire all your assets.
-if Rails.version.starts_with?("4")
+if Rails.version.start_with?("4")
   Rails.application.config.assets.version = '1.0'
 end
 

spec/lib/chatops/controller_spec.rb

@@ -60,7 +60,7 @@ def ensure_app_given
   end
 
   def rails_flexible_post(path, outer_params, jsonrpc_params = nil)
-    if Rails.version.starts_with?("4")
+    if Rails.version.start_with?("4")
       post path, outer_params.merge("params" => jsonrpc_params)
     else
       jsonrpc_params ||= {}