sorbet-rails 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33c9dda20b44067f6f788873f626fd9d2fdf5bbe8a62d8c374e2748b637f5993
-  data.tar.gz: e2d65d1ec7c2e03d7135d7de8540b859c6348d27382732893fff611a5b627d88
+  metadata.gz: 19c59c20c90b7bc42d394b78ba48351d8e39c0721707e8463e337ca8141efe0b
+  data.tar.gz: 30e0524281e51eb3614c346dbb67d966df524c7b2873b29967442924e525a64d
 SHA512:
-  metadata.gz: 86a4cc741bef3972a5a8cb3a77d1eaa1f1fe4924d816c5ba681bf6fe5b5d91d0b6e94410a2a08fe15b8d696b80e50b7ff7f4c5a049e58a841fa9d2ecd83fd9c0
-  data.tar.gz: 6120f8d8fdf6e631f92cf6428774cd6df1a410d64282d96ed4921202c1715e2211e15823a510234849615cb7e3dc08368121fd663ad1ab9148ad337123799dca
+  metadata.gz: a53b6bb92d2f307dc64682b42cdefb5badff876c65328d56bed5511c996e7c7d89ad9b07a25287d5bb8e212224283f80a98b30b8da92d5bd513ddfca7a6fd4a4
+  data.tar.gz: 2745eb20e8f3058105f23b5b159e837da6f64e382860aa68f85dc49b5acfdae83d697e73daa54baf06aacb059fb5e3904921fbaaba93255c7379a35a4c1add8f

data/.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    # Files stored in repository root
+    directory: "/"
+    schedule:
+      interval: "daily"

data/.github/workflows/ci-master.yml

@@ -0,0 +1,28 @@
+name: ci-master
+
+on:
+  push:
+    branches: # Trigger only on the main branch to avoid duplicate runs on PR branches
+      - master
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7]
+        rails: [5.2, 6.0, 6.1]
+
+    env:
+      RAILS_VERSION: ${{ matrix.rails }}
+      CI: true
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        # bundler-cache: true -- this messes up some dynamic constants
+    - run: "./spec/bin/run_spec.sh"

data/.github/workflows/ci.yml

@@ -0,0 +1,26 @@
+name: ci
+
+on:
+  pull_request: # Trigger All PRs
+
+jobs:
+  rspec:
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.5, 2.6, 2.7]
+        rails: [5.2, 6.0, 6.1]
+
+    env:
+      RAILS_VERSION: ${{ matrix.rails }}
+      CI: true
+
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        # bundler-cache: true -- this messes up some dynamic constants
+    - run: "./spec/bin/run_spec.sh"

data/.github/workflows/publish-gem.yml

@@ -0,0 +1,21 @@
+name: publish-gem
+
+on:
+  pull_request: # test with pull request
+  # push:
+  #   branches: # Trigger only on the main branch to avoid duplicate runs on PR branches
+  #     - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    env:
+      CI: true
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Release Gem
+      uses: dawidd6/action-publish-gem@v1
+      with:
+        api_key: ${{secrets.RUBYGEMS_API_KEY}}

data/CONTRIBUTING.md

@@ -87,10 +87,9 @@ To run the tests against all supported Rails branches, use:
 You can also switch to a version of Rails with `RAILS_VERSION`:
 
 ```sh
-❯ RAILS_VERSION=5.0 ./spec/bin/run_spec.sh
-❯ RAILS_VERSION=5.1 ./spec/bin/run_spec.sh
 ❯ RAILS_VERSION=5.2 ./spec/bin/run_spec.sh
 ❯ RAILS_VERSION=6.0 ./spec/bin/run_spec.sh
+❯ RAILS_VERSION=6.1 ./spec/bin/run_spec.sh
 ```
 
 #### Debugging

data/Gemfile

@@ -2,6 +2,8 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rspec-core', '~> 3.8.0'
+
 group :test do
   gem 'simplecov', require: false
   gem 'codecov', require: false
@@ -13,14 +15,6 @@ case rails_version
 when "master"
   gem "rails", {github: "rails/rails"}
   gem "bundler", ">= 1.3.0"
-when "5.0"
-  gem "rails", "~> 5.0.7"
-  gem "bundler", ">= 2.0"
-  gem "sqlite3", "~> 1.3.6"
-when "5.1"
-  gem "rails", "~> 5.1.7"
-  gem "bundler", ">= 2.0"
-  gem "sqlite3", "~> 1.4.1"
 when "5.2"
   gem "rails", "~> 5.2.3"
   gem "bundler", ">= 2.0"
@@ -29,8 +23,12 @@ when "6.0"
   gem "rails", "~> 6.0.0"
   gem "bundler", ">= 2.0"
   gem "sqlite3", "~> 1.4.1"
+when "6.1"
+  gem "rails", "~> 6.1.0"
+  gem "bundler", ">= 2.0"
+  gem "sqlite3", "~> 1.4.1"
 else
-  gem "rails", "~> 5.2.3"
+  gem "rails", "~> 6.0.0"
   gem "bundler", ">= 2.0"
   gem "sqlite3", "~> 1.4.1"
 end

data/README.md

@@ -1,6 +1,6 @@
 # sorbet-rails
 [![Gem Version](https://badge.fury.io/rb/sorbet-rails.svg)](https://badge.fury.io/rb/sorbet-rails)
-[![Build Status](https://travis-ci.com/chanzuckerberg/sorbet-rails.svg?branch=master)](https://travis-ci.com/chanzuckerberg/sorbet-rails)
+[![Build Status](https://github.com/chanzuckerberg/sorbet-rails/actions/workflows/ci-master.yml/badge.svg)](https://github.com/chanzuckerberg/sorbet-rails)
 [![codecov](https://codecov.io/gh/chanzuckerberg/sorbet-rails/branch/master/graph/badge.svg)](https://codecov.io/gh/chanzuckerberg/sorbet-rails)
 
 A set of tools to make the [Sorbet](https://sorbet.org) typechecker work with Ruby on Rails seamlessly.
@@ -206,7 +206,7 @@ end
 ❯ bundle exec  rake rails_rbi:custom
 ```
 
-`sorbet-rails` adds `TypedParams` to extact typed controller parameters.
+`sorbet-rails` adds `TypedParams` to extract typed controller parameters.
 
 TypedParams takes a parameter definition, which is a subclass of `T::Struct` and coerces the `params` object into an instance of that subclass using [sorbet-coerce](https://github.com/chanzuckerberg/sorbet-coerce):
 ```ruby
@@ -311,7 +311,7 @@ It is worth going through the list of files that is ignored and resolve them (an
 
 ### Overriding generated signatures if needed
 
-`sorbet-rails` relies on Rails reflection to generate signatures. There are features this gem doesn't support yet such as [serialize](https://github.com/chanzuckerberg/sorbet-rails/issues/49) and [attribute custom types](https://github.com/chanzuckerberg/sorbet-rails/issues/16). The gem also doesn't know the signature of any methods you have overridden. However, it is possible to override the signatures that `sorbet-rails` generates.
+`sorbet-rails` relies on Rails reflection to generate signatures. There are features this gem doesn't support yet such as [attribute custom types](https://github.com/chanzuckerberg/sorbet-rails/issues/16). The gem also doesn't know the signature of any methods you have overridden. However, it is possible to override the signatures that `sorbet-rails` generates.
 
 For example, here is how to override the signature for a method in a model:
 
@@ -524,6 +524,8 @@ These are the currently-supported gems and their symbolized names:
 | [Paperclip]  | `:paperclip` |
 | [AttrJson]  | `:attr_json` |
 | [FlagShihTzu]  | `:flag_shih_tzu` |
+| [AASM]  | `:aasm` |
+| [Money-Rails]  | `:money_rails` |
 
 You can also configure the core model plugins if needed. The default plugins are defined in the [config](https://github.com/chanzuckerberg/sorbet-rails/blob/master/lib/sorbet-rails/config.rb). For the full list of plugin symbols, check out [here](https://github.com/chanzuckerberg/sorbet-rails/blob/master/lib/sorbet-rails/model_plugins/plugins.rb).
 
@@ -537,6 +539,8 @@ You can also configure the core model plugins if needed. The default plugins are
 [Paperclip]: https://github.com/thoughtbot/paperclip
 [AttrJson]: https://github.com/jrochkind/attr_json
 [FlagShihTzu]: https://github.com/pboling/flag_shih_tzu
+[AASM]: https://github.com/aasm/aasm
+[Money-Rails]: https://github.com/RubyMoney/money-rails
 
 ### Customize Generation Class
 

data/Rakefile

@@ -10,13 +10,22 @@ namespace :update_spec do
 
   desc "Generate Rails apps for all versions."
   task :all do |t, args|
+    Rake::Task['update_spec:v6_1'].invoke
     Rake::Task['update_spec:v6_0'].invoke
     Rake::Task['update_spec:v5_2'].invoke
-    Rake::Task['update_spec:v5_1'].invoke
-    Rake::Task['update_spec:v5_0'].invoke
   end
 
-  desc "Delete the Rails 6 spec directory and regenerate it."
+  desc "Delete the Rails 6.1 spec directory and regenerate it."
+  task :v6_1 do |t, args|
+    Bundler.with_clean_env do
+      FileUtils.rm_rf 'spec/support/v6.1' if File.directory?('spec/support/v6.1')
+      system("gem install rails -v 6.1.4")
+      system("rails _6.1.4_ -v")
+      system("RAILS_VERSION='6.1' rails _6.1.4_ new --template spec/generators/rails-template.rb spec/support/v6.0 --skip-javascript --skip-action-cable --skip-test --skip-sprockets --skip-spring --skip-bootsnap --skip-listen")
+    end
+  end
+
+  desc "Delete the Rails 6.0 spec directory and regenerate it."
   task :v6_0 do |t, args|
     Bundler.with_clean_env do
       FileUtils.rm_rf 'spec/support/v6.0' if File.directory?('spec/support/v6.0')
@@ -36,29 +45,9 @@ namespace :update_spec do
     end
   end
 
-  desc "Delete the Rails 5.1 spec directory and regenerate it."
-  task :v5_1 do |t, args|
-    Bundler.with_clean_env do
-      FileUtils.rm_rf 'spec/support/v5.1' if File.directory?('spec/support/v5.1')
-      system("gem install rails -v 5.1.7")
-      system("rails _5.1.7_ -v")
-      system("RAILS_VERSION='5.1' rails _5.1.7_ new --template spec/generators/rails-template.rb spec/support/v5.1 --skip-javascript --skip-action-cable --skip-test --skip-sprockets --skip-spring --skip-listen")
-    end
-  end
-
-  desc "Delete the Rails 5.0 spec directory and regenerate it."
-  task :v5_0 do |t, args|
-    Bundler.with_clean_env do
-      FileUtils.rm_rf 'spec/support/v5.0' if File.directory?('spec/support/v5.0')
-      system("gem install rails -v 5.0.7")
-      system("rails _5.0.7_ -v")
-      system("RAILS_VERSION='5.0' rails _5.0.7_ new --template spec/generators/rails-template.rb spec/support/v5.0 --skip-javascript --skip-action-cable --skip-test --skip-sprockets --skip-spring --skip-listen")
-    end
-  end
-
   desc "Update sorbet_test_cases.rb in all the Rails apps in spec/support."
   task :sorbet_test_cases do |t, args|
-    ['v6.0', 'v5.2', 'v5.1', 'v5.0'].each do |version|
+    ['v6.1', 'v6.0', 'v5.2'].each do |version|
       FileUtils.cp("spec/generators/sorbet_test_cases.rb", "spec/support/#{version}/sorbet_test_cases.rb")
     end
   end

data/lib/sorbet-rails/active_record_rbi_formatter.rb

@@ -273,6 +273,18 @@ class SorbetRails::ActiveRecordRbiFormatter
         class_method: class_method,
       )
     end
+
+    boolean_methods = %w(any? many? none? one?)
+    boolean_methods.each do |boolean_method|
+      class_rbi.create_method(
+        boolean_method,
+        parameters: [
+          Parameter.new("&block", type: "T.nilable(T.proc.params(e: #{type}).returns(T::Boolean))"),
+        ],
+        return_type: "T::Boolean",
+        class_method: class_method,
+      )
+    end
   end
 
   sig {
@@ -288,14 +300,5 @@ class SorbetRails::ActiveRecordRbiFormatter
       return_type: "T::Boolean",
       class_method: class_method,
     )
-
-    boolean_methods = %w(any? many? none? one?)
-    boolean_methods.each do |boolean_method|
-      class_rbi.create_method(
-        boolean_method,
-        return_type: "T::Boolean",
-        class_method: class_method,
-      )
-    end
   end
 end

data/lib/sorbet-rails/dependent_gem_rbis/activerecord.rbi

@@ -42,3 +42,7 @@ module ActiveModel::Validations
     def validators_on(*attributes); end
   end
 end
+
+class ActiveRecord::Type::Serialized
+  def coder; end
+end

data/lib/sorbet-rails/dependent_gem_rbis/parlour.rbi

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: ignore
 module Kernel
 end
 

data/lib/sorbet-rails/gem_plugins/aasm_plugin.rb

@@ -0,0 +1,50 @@
+# typed: false
+class AasmPlugin < SorbetRails::ModelPlugins::Base
+  sig { override.params(root: Parlour::RbiGenerator::Namespace).void }
+  def generate(root)
+    return unless @model_class.include?(::AASM)
+
+    model_rbi = root.create_class(
+      model_class_name
+    )
+
+    aasm_events = @model_class.aasm.events.map(&:name)
+    aasm_states = @model_class.aasm.states.map(&:name)
+
+    # If you have an event like :bazify, you get these methods:
+    # - `may_bazify?`
+    # - `bazify`
+    # - `bazify!`
+    # - `bazify_without_validation!`
+    aasm_events.each do |event|
+      model_rbi.create_method(
+        "may_#{event}?",
+        return_type: 'T::Boolean'
+      )
+
+      model_rbi.create_method(
+        event.to_s,
+        return_type: 'T::Boolean'
+      )
+
+      model_rbi.create_method(
+        "#{event}!",
+        return_type: 'T::Boolean'
+      )
+
+      model_rbi.create_method(
+        "#{event}_without_validation!",
+        return_type: 'T::Boolean'
+      )
+    end
+
+    # - If you have a state like :baz, you get these methods:
+    # - `baz?`
+    aasm_states.each do |state|
+      model_rbi.create_method(
+        "#{state}?",
+        return_type: 'T::Boolean'
+      )
+    end
+  end
+end

data/lib/sorbet-rails/gem_plugins/money_rails_plugin.rb

@@ -0,0 +1,76 @@
+# typed: strict
+class MoneyRailsPlugin < SorbetRails::ModelPlugins::Base
+  sig { params(attribute: T.any(Symbol, String)).returns(T::Boolean) }
+  def allows_nil(attribute)
+    validators = model_class.validators_on(attribute)
+    return false if validators.empty?
+
+    validators.any? do |validator|
+      validator.respond_to?(:options) &&
+        validator.options[:allow_nil]
+    end
+  end
+
+  sig { override.params(root: Parlour::RbiGenerator::Namespace).void }
+  def generate(root)
+    return unless exists_class_method?(:monetize)
+
+    # money-rails gives us a hash mapping the monetized attribute to its subunit
+    # equivalent, eg: `{"price": "price_cents"}`
+    monetized_attributes = T.let(
+      T.unsafe(model_class).monetized_attributes,
+      T::Hash[String,String]
+    )
+
+    return if monetized_attributes.empty?
+
+    module_name = model_module_name("GeneratedMoneyRailsMethods")
+    module_rbi = root.create_module(module_name)
+
+    model_class_rbi = root.create_class(model_class_name)
+    model_class_rbi.create_include(module_name)
+
+    monetized_attributes.each do |name, subunit_name|
+      validators = model_class.validators_on(name)
+
+      money_attribute_type = allows_nil(name) ? "T.nilable(::Money)" : "::Money"
+      subunit_attribute_type = allows_nil(name) ? "T.nilable(Integer)" : "Integer"
+
+      module_rbi.create_method(
+        name,
+        return_type: money_attribute_type
+      )
+
+      module_rbi.create_method(
+        subunit_name,
+        return_type: subunit_attribute_type
+      )
+
+      module_rbi.create_method(
+        "#{name}_money_before_type_cast",
+        return_type: 'T.untyped'
+      )
+
+      module_rbi.create_method(
+        "#{name}=",
+        parameters:  [
+           Parlour::RbiGenerator::Parameter.new("value", type: money_attribute_type)
+        ],
+        return_type: nil
+      )
+
+      module_rbi.create_method(
+        "#{subunit_name}=",
+        parameters:  [
+           Parlour::RbiGenerator::Parameter.new("value", type: subunit_attribute_type)
+        ],
+        return_type: nil
+      )
+
+      module_rbi.create_method(
+        "currency_for_#{name}",
+        return_type: "T.nilable(::Money::Currency)"
+      )
+    end
+  end
+end

data/lib/sorbet-rails/job_rbi_formatter.rb

@@ -80,7 +80,7 @@ module SorbetRails
 
     sig { returns(String) }
     def generate_rbi
-      puts "-- Generate sigs for mailer #{@job_class.name} --"
+      puts "-- Generate sigs for ActiveJob #{@job_class.name} --"
       populate_rbi
       @rbi_generator.rbi
     end

data/lib/sorbet-rails/model_plugins/active_record_serialized_attribute.rb

@@ -60,9 +60,10 @@ class SorbetRails::ModelPlugins::ActiveRecordSerializedAttribute < SorbetRails::
       # ActiveSupport::JSON.encode/ActiveSupport::JSON.decode
       # note that Hash keys are Strings since this is JSON
       'T.any(T::Array[T.untyped], T::Boolean, Float, T::Hash[String, T.untyped], Integer, String)'
-    else
-      # unknown uses YAML.load/YAML.dump
+    when 'Object', ''
       'T.any(T::Array[T.untyped], T::Boolean, Float, T::Hash[T.untyped, T.untyped], Integer, String)'
+    else
+      serialization_coder.to_s
     end
   end
 end

data/lib/sorbet-rails/model_plugins/base.rb

@@ -35,7 +35,14 @@ module SorbetRails::ModelPlugins
       column_type = @model_class.type_for_attribute(column_name)
       return unless column_type.is_a?(ActiveRecord::Type::Serialized)
 
-      column_type.coder.try(:object_class) || Object
+      object_class = column_type.coder.try(:object_class)
+      if object_class
+        object_class
+      elsif column_type.coder.is_a? Class
+        column_type.coder
+      else
+        Object
+      end
     end
   end
 end

data/lib/sorbet-rails/model_plugins/custom_finder_methods.rb

@@ -39,7 +39,7 @@ class SorbetRails::ModelPlugins::CustomFinderMethods < SorbetRails::ModelPlugins
     # allow common cases find_by_id
     custom_module_rbi.create_method(
       "find_by_id",
-      parameters: [ Parameter.new("id", type: "Integer") ],
+      parameters: [ Parameter.new("id", type: "T.nilable(Integer)") ],
       return_type: "T.nilable(#{self.model_class_name})",
     )
     custom_module_rbi.create_method(

data/lib/sorbet-rails/model_plugins/plugins.rb

@@ -87,6 +87,12 @@ module SorbetRails::ModelPlugins
     when :flag_shih_tzu
       require('sorbet-rails/gem_plugins/flag_shih_tzu_plugin')
       FlagShihTzuPlugin
+    when :aasm
+      require('sorbet-rails/gem_plugins/aasm_plugin')
+      AasmPlugin
+    when :money_rails
+      require('sorbet-rails/gem_plugins/money_rails_plugin')
+      MoneyRailsPlugin
     else
       raise UnrecognizedPluginName.new(
         "Unrecognized plugin with name: #{plugin_name}. Please check available plugins in the

data/lib/sorbet-rails/railtie.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: false
 require "rails"
 require "sorbet-runtime"
 require "sorbet-rails/config"

data/lib/sorbet-rails/routes_rbi_formatter.rb

@@ -39,6 +39,14 @@ class SorbetRails::RoutesRbiFormatter
     @parlour.root.create_class('ActionMailer::Base') do |mod|
       mod.create_include('GeneratedUrlHelpers')
     end
+
+    @parlour.root.create_class('ActionDispatch::IntegrationTest') do |mod|
+      mod.create_include('GeneratedUrlHelpers')
+    end
+
+    @parlour.root.create_class('ActionDispatch::SystemTestCase') do |mod|
+      mod.create_include('GeneratedUrlHelpers')
+    end
   end
 
   sig { params(routes: T.untyped, filter: T.untyped).void }

data/lib/sorbet-rails/tasks/rails_rbi.rake

@@ -16,12 +16,12 @@ namespace :rails_rbi do
     FileUtils.rm_rf(rails_rbi_root_path)
 
     # run all rake tasks
-    Rake::Task['rails_rbi:routes'].invoke
-    Rake::Task['rails_rbi:models'].invoke
-    Rake::Task['rails_rbi:helpers'].invoke
-    Rake::Task['rails_rbi:mailers'].invoke
-    Rake::Task['rails_rbi:jobs'].invoke
-    Rake::Task['rails_rbi:custom'].invoke
+    Rake::Task[rails_rbi_task_name(t, 'routes')].invoke
+    Rake::Task[rails_rbi_task_name(t, 'models')].invoke
+    Rake::Task[rails_rbi_task_name(t, 'helpers')].invoke
+    Rake::Task[rails_rbi_task_name(t, 'mailers')].invoke
+    Rake::Task[rails_rbi_task_name(t, 'jobs')].invoke
+    Rake::Task[rails_rbi_task_name(t, 'custom')].invoke
   end
 
   desc "Generate rbis for rails routes"
@@ -36,7 +36,7 @@ namespace :rails_rbi do
   end
 
   desc "Copy custom rbis for typed_params, pluck_to_struct, etc."
-  task custom: :environment do
+  task custom: :environment do |t, args|
     copy_bundled_rbi('type_assert.rbi')
     copy_bundled_rbi('pluck_to_tstruct.rbi')
     copy_bundled_rbi('typed_params.rbi')
@@ -44,7 +44,7 @@ namespace :rails_rbi do
 
     # These files were previously bundled_rbi but are now generated so this
     # is needed for backwards compatibility with anyone using `rails_rbi:custom`
-    Rake::Task['rails_rbi:active_record'].invoke
+    Rake::Task[rails_rbi_task_name(t, 'active_record')].invoke
   end
 
   desc "Generate rbis for rails active_record base"
@@ -182,4 +182,8 @@ namespace :rails_rbi do
     FileUtils.mkdir_p(File.dirname(copy_to_path))
     FileUtils.cp(bundled_rbi_file_path, copy_to_path)
   end
+
+  def rails_rbi_task_name(current_task, target_task_suffix)
+    current_task.to_s.sub(/\w+$/, target_task_suffix)
+  end
 end

data/sorbet-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = %q{sorbet-rails}
-  s.version       = "0.7.4"
+  s.version       = "0.7.5"
   s.date          = %q{2019-04-18}
   s.summary       = %q{Set of tools to make Sorbet work with Rails seamlessly.}
   s.authors       = ["Chan Zuckerberg Initiative"]
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '~> 3.8', '>= 3.8'
   # Debugging
   s.add_development_dependency 'awesome_print', '~>1.8.0', '>=1.8.0'
-  s.add_development_dependency 'byebug', '~>11.0.1', '>=11.0.1'
+  s.add_development_dependency 'byebug', '~>11.1.3', '>=11.1.3'
 
   # for testing a gem with a rails app (controller specs)
   s.add_development_dependency 'rspec-rails', '>=3.8.2'

data/spec/bin/run_all_specs.sh

@@ -3,9 +3,8 @@
 
 wd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-RAILS_VERSION=5.0 bash $wd/run_spec.sh
-RAILS_VERSION=5.1 bash $wd/run_spec.sh
-RAILS_VERSION=6.0 bash $wd/run_spec.sh
+RAILS_VERSION=5.2 bash $wd/run_spec.sh
+RAILS_VERSION=6.1 bash $wd/run_spec.sh
 
-# Always end with the default version, which is Rails 5.2
+# Always end with the default version, which is Rails 6.0
 bash $wd/run_spec.sh

data/spec/bin/run_spec.sh

@@ -6,7 +6,7 @@ wd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 current_dir=$(pwd)
 
 if [[ -z $RAILS_VERSION ]]; then
-  rails_dir="$wd/../support/v5.2"
+  rails_dir="$wd/../support/v6.0"
 else
   rails_dir="$wd/../support/v$RAILS_VERSION"
 fi
@@ -15,7 +15,10 @@ fi
 rm $wd/../../Gemfile.lock 2>/dev/null # clean up Gemfile.lock first
 bundle install
 
+echo "===================================================================="
+echo "Run test for folder:"
 echo $rails_dir
+echo "===================================================================="
 
 # update gems in rails_dir
 cd $rails_dir

data/spec/generators/rails-template.rb

@@ -127,7 +127,7 @@ def create_models
 
   # A nasty hack to add has_one_attached and has_many_attached to the models/wizard.rb file.
   attachments = nil
-  if ['5.2', '6.0'].include?(ENV["RAILS_VERSION"])
+  if ['5.2', '6.0', '6.1'].include?(ENV["RAILS_VERSION"])
     attachments = "has_one_attached :school_photo\n  has_many_attached :hats"
   end
 
@@ -313,11 +313,8 @@ def create_migrations
         add_column :wands, :broken_at,      :datetime, null: true
         add_column :wands, :chosen_at_date, :date
         add_column :wands, :chosen_at_time, :time
-        # JSON column type is only supported on 5.2 or higher
-        unless ['5.0', '5.1'].include?(ENV['RAILS_VERSION'])
-          add_column :wands, :spell_history,  :json
-          add_column :wands, :maker_info,     :json,    null: false, default: '{}'
-        end
+        add_column :wands, :spell_history,  :json
+        add_column :wands, :maker_info,     :json,    null: false, default: '{}'
       end
     end
   RUBY
@@ -507,20 +504,6 @@ end
 # Main setup
 source_paths
 
-if ['5.0'].include?(ENV["RAILS_VERSION"])
-  File.open('Gemfile', 'r+') do |f|
-    out = ""
-    f.each do |line|
-      # We remove sdoc and web-console because they misbehave.
-      # sqlite needs to be limited to 1.3.x or it won't work.
-      out << line.gsub("gem 'sqlite3'", "gem 'sqlite3', '~> 1.3.6'") unless line =~ /gem \'(sdoc|web-console)\'.*/
-    end
-    f.pos = 0
-    f.print out
-    f.truncate(f.pos)
-  end
-end
-
 add_gems
 
 after_bundle do