sorbet-rails 0.6.5.1 → 0.7.4

data/spec/support/v6.0/app/models/wizard.rb

@@ -47,6 +47,11 @@ class Wizard < ApplicationRecord
     blue: 2,
   }, _prefix: :color, _suffix: :eyes
 
+  serialize :owl_results, Hash
+  serialize :newt_subjects # no specific data type, uses the default YAML Object coder
+  serialize :pets, Array
+  serialize :patronus_characteristics, JSON
+
   has_one :wand
   has_many :spell_books
   # habtm which is optional at the db level

data/spec/support/v6.0/bin/bundle

@@ -31,7 +31,7 @@ m = Module.new do
         bundler_version = a
       end
       next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
-      bundler_version = $1 || ">= 0.a"
+      bundler_version = $1
       update_index = i
     end
     bundler_version
@@ -61,32 +61,41 @@ m = Module.new do
   end
 
   def bundler_version
-    @bundler_version ||= begin
+    @bundler_version ||=
       env_var_version || cli_arg_version ||
-        lockfile_version || "#{Gem::Requirement.default}.a"
-    end
+        lockfile_version
+  end
+
+  def bundler_requirement
+    return "#{Gem::Requirement.default}.a" unless bundler_version
+
+    bundler_gem_version = Gem::Version.new(bundler_version)
+
+    requirement = bundler_gem_version.approximate_recommendation
+
+    return requirement unless Gem::Version.new(Gem::VERSION) < Gem::Version.new("2.7.0")
+
+    requirement += ".a" if bundler_gem_version.prerelease?
+
+    requirement
   end
 
   def load_bundler!
     ENV["BUNDLE_GEMFILE"] ||= gemfile
 
-    # must dup string for RG < 1.8 compatibility
-    activate_bundler(bundler_version.dup)
+    activate_bundler
   end
 
-  def activate_bundler(bundler_version)
-    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
-      bundler_version = "< 2"
-    end
+  def activate_bundler
     gem_error = activation_error_handling do
-      gem "bundler", bundler_version
+      gem "bundler", bundler_requirement
     end
     return if gem_error.nil?
     require_error = activation_error_handling do
       require "bundler/version"
     end
-    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
-    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
+    return if require_error.nil? && Gem::Requirement.new(bundler_requirement).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_requirement}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_requirement}'`"
     exit 42
   end
 

data/spec/support/v6.0/config/environments/development.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/support/v6.0/config/environments/production.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/support/v6.0/config/environments/test.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 # The test environment is used exclusively to run your application's
 # test suite. You never need to work with it otherwise. Remember that
 # your test database is "scratch space" for the test suite and is wiped
@@ -6,7 +6,7 @@
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
-  
+
   config.cache_classes = true
 
   # Do not eager load code on boot. This avoids loading your whole application

data/spec/support/v6.0/config/routes.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 Rails.application.routes.draw do
   get 'test/index' => 'test#index'
   # For details on the DSL available within this file, see https://guides.rubyonrails.org/routing.html

data/spec/support/v6.0/db/migrate/20190620000015_add_serialized_to_wizards.rb

@@ -0,0 +1,9 @@
+# typed: true
+class AddSerializedToWizards < ActiveRecord::Migration[6.0]
+  def change
+    add_column :wizards, :owl_results, :text # Hash
+    add_column :wizards, :newt_subjects, :text # generic
+    add_column :wizards, :pets, :text # Array
+    add_column :wizards, :patronus_characteristics, :text # serialized as JSON, but not a JSON column type
+  end
+end

data/spec/support/v6.0/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_06_20_000014) do
+ActiveRecord::Schema.define(version: 2019_06_20_000015) do
 
   create_table "headmasters", force: :cascade do |t|
     t.integer "school_id"
@@ -89,6 +89,10 @@ ActiveRecord::Schema.define(version: 2019_06_20_000014) do
     t.integer "hair_length"
     t.string "type", default: "Wizard", null: false
     t.integer "school_id"
+    t.text "owl_results"
+    t.text "newt_subjects"
+    t.text "pets"
+    t.text "patronus_characteristics"
   end
 
   add_foreign_key "wizards", "schools"

data/spec/support/v6.0/sorbet_test_cases.rb

@@ -305,6 +305,21 @@ T.assert_type!(Wizard::House::Hufflepuff, Wizard::House)
 T.assert_type!(Wizard::House::Ravenclaw, Wizard::House)
 T.assert_type!(Wizard::House::Slytherin, Wizard::House)
 
+# Serialization
+T.assert_type!(
+  wizard.owl_results,
+  T.nilable(T::Hash[T.untyped, T.untyped])
+)
+T.assert_type!(
+  wizard.newt_subjects,
+  T.nilable(T.any(T::Array[T.untyped], T::Boolean, Float, T::Hash[T.untyped, T.untyped], Integer, String))
+)
+T.assert_type!(
+  wizard.patronus_characteristics,
+  T.nilable(T.any(T::Array[T.untyped], T::Boolean, Float, T::Hash[String, T.untyped], Integer, String))
+)
+T.assert_type!(wizard.pets, T.nilable(T::Array[T.untyped]))
+
 # Mythical plugin
 T.assert_type!(Wand.mythicals, T::Array[Wand])
 
@@ -312,7 +327,10 @@ T.assert_type!(Wand.mythicals, T::Array[Wand])
 T.assert_type!(HogwartsAcceptanceMailer.notify(wizard), ActionMailer::MessageDelivery)
 
 # Jobs
-AwardHousePointHourglasses.perform_later(student: wizard, point: 10)
+T.assert_type!(
+  AwardHousePointHourglasses.perform_later(student: wizard, point: 10),
+  AwardHousePointHourglasses
+)
 AwardHousePointHourglasses.perform_now(student: wizard, point: 10)
 AwardHousePointHourglasses.
   set(queue: :daily, wait: 5.minutes).
@@ -321,7 +339,6 @@ AwardHousePointHourglasses.
   set(priority: 10, wait_until: Time.now.tomorrow).
   perform_later(student: wizard, point: 10)
 
-
 T.assert_type!(wizard.broom_nimbus?, T::Boolean)
 T.assert_type!(wizard.color_brown_eyes?, T::Boolean)
 T.assert_type!(wizard.quidditch_keeper?, T::Boolean)
@@ -361,44 +378,6 @@ params = ActionController::Parameters.new({
 typed_params = TypedParams[MyActionParams].new.extract!(params)
 T.assert_type!(typed_params, MyActionParams)
 
-# -- require_typed
-T.assert_type!(
-  params.require_typed(:age, TA[Integer].new),
-  Integer,
-)
-T.assert_type!(
-  params.require_typed(:name, TA[String].new),
-  String,
-)
-info = params.require_typed(:info, TA[ActionController::Parameters].new)
-T.assert_type!(info, ActionController::Parameters)
-T.assert_type!(
-  info.require_typed(:friends, TA[T::Array[String]].new),
-  T::Array[String],
-)
-# -- fetch_typed
-T.assert_type!(
-  params.fetch_typed(:age, TA[Integer].new),
-  Integer,
-)
-T.assert_type!(
-  params.fetch_typed(:name, TA[String].new),
-  String,
-)
-T.assert_type!(
-  params.fetch_typed(:nonexistence, TA[String].new, ''),
-  String,
-)
-T.assert_type!(
-  params.fetch_typed(:nonexistence, TA[T.nilable(String)].new, nil),
-  T.nilable(String),
-)
-T.assert_type!(
-  params.fetch_typed(:nonexistence, TA[T::Array[Integer]].new, []),
-  T::Array[Integer],
-)
-
-
 # -- pluck to tstruct
 class WizardStruct < T::Struct
   const :name, String
@@ -415,23 +394,16 @@ Wizard.all.pluck_to_tstruct(TA[WizardStruct].new).each do |row|
   T.assert_type!(row, WizardStruct)
 end
 
-
 # -- GeneratedUrlHelpers
 class TestHelper
   include GeneratedUrlHelpers
-
-  # need to implement this for the url
-  def default_url_options
-    {
-      protocol: 'http',
-      host: 'localhost',
-      port: 3000,
-    }
-  end
-
-  def test_url_helper
-    T.assert_type!(test_index_path, String)
-    T.assert_type!(test_index_url, String)
-  end
 end
-TestHelper.new.test_url_helper
+
+T.assert_type!(TestHelper.new.test_index_path, String)
+# need to set this config for _url methods
+Rails.application.routes.default_url_options = {
+  protocol: 'http',
+  host: 'localhost',
+  port: 3000,
+}
+T.assert_type!(TestHelper.new.test_index_url, String)

data/spec/test_data/v5.0/expected_active_record_relation.rbi

@@ -3,7 +3,6 @@
 # Please rerun bundle exec rake rails_rbi:active_record to regenerate.
 class ActiveRecord::Relation
   include Enumerable
-  Elem = type_member(fixed: T.untyped)
 
   sig { params(args: T.untyped).returns(Elem) }
   def find(*args); end

data/spec/test_data/v5.0/expected_application_job.rbi

@@ -2,10 +2,10 @@
 # This is an autogenerated file for Rails' jobs.
 # Please rerun bundle exec rake rails_rbi:jobs to regenerate.
 class ApplicationJob
-  sig { params(_: T.untyped).void }
+  sig { params(_: T.untyped).returns(ApplicationJob) }
   def self.perform_later(*_); end
 
-  sig { params(_: T.untyped).void }
+  sig { params(_: T.untyped).returns(ApplicationJob) }
   def self.perform_now(*_); end
 
   sig do

data/spec/test_data/v5.0/expected_award_house_point_hourglasses.rbi

@@ -2,10 +2,10 @@
 # This is an autogenerated file for Rails' jobs.
 # Please rerun bundle exec rake rails_rbi:jobs to regenerate.
 class AwardHousePointHourglasses
-  sig { params(student: Wizard, point: Integer).void }
+  sig { params(student: Wizard, point: Integer).returns(AwardHousePointHourglasses) }
   def self.perform_later(student:, point:); end
 
-  sig { params(student: Wizard, point: Integer).void }
+  sig { params(student: Wizard, point: Integer).returns(AwardHousePointHourglasses) }
   def self.perform_now(student:, point:); end
 
   sig do

data/spec/test_data/v5.0/expected_custom_application_job.rbi

@@ -0,0 +1,21 @@
+# typed: strong
+# == Custom Generator ==
+# This is an autogenerated file for Rails' jobs.
+# Please rerun bundle exec rake rails_rbi:jobs to regenerate.
+class ApplicationJob
+  sig { params(_: T.untyped).returns(ApplicationJob) }
+  def self.perform_later(*_); end
+
+  sig { params(_: T.untyped).returns(ApplicationJob) }
+  def self.perform_now(*_); end
+
+  sig do
+    params(
+      wait: T.nilable(ActiveSupport::Duration),
+      wait_until: T.nilable(T.any(ActiveSupport::TimeWithZone, Date, Time)),
+      queue: T.nilable(T.any(String, Symbol)),
+      priority: T.nilable(Integer)
+    ).returns(T.self_type)
+  end
+  def self.set(wait: nil, wait_until: nil, queue: nil, priority: nil); end
+end

data/spec/test_data/v5.0/expected_custom_application_mailer.rbi

@@ -0,0 +1,6 @@
+# typed: strong
+# == Custom Generator ==
+# This is an autogenerated file for Rails' mailers.
+# Please rerun bundle exec rake rails_rbi:mailers to regenerate.
+class ApplicationMailer
+end

data/spec/test_data/v5.0/expected_custom_award_house_point_hourglasses.rbi

@@ -0,0 +1,21 @@
+# typed: strong
+# == Custom Generator ==
+# This is an autogenerated file for Rails' jobs.
+# Please rerun bundle exec rake rails_rbi:jobs to regenerate.
+class AwardHousePointHourglasses
+  sig { params(student: Wizard, point: Integer).returns(AwardHousePointHourglasses) }
+  def self.perform_later(student:, point:); end
+
+  sig { params(student: Wizard, point: Integer).returns(AwardHousePointHourglasses) }
+  def self.perform_now(student:, point:); end
+
+  sig do
+    params(
+      wait: T.nilable(ActiveSupport::Duration),
+      wait_until: T.nilable(T.any(ActiveSupport::TimeWithZone, Date, Time)),
+      queue: T.nilable(T.any(String, Symbol)),
+      priority: T.nilable(Integer)
+    ).returns(T.self_type)
+  end
+  def self.set(wait: nil, wait_until: nil, queue: nil, priority: nil); end
+end

data/spec/test_data/v5.0/expected_custom_daily_prophet_mailer.rbi

@@ -0,0 +1,8 @@
+# typed: strong
+# == Custom Generator ==
+# This is an autogenerated file for Rails' mailers.
+# Please rerun bundle exec rake rails_rbi:mailers to regenerate.
+class DailyProphetMailer
+  sig { params(wizards: T::Array[Wizard], hotnews_only: T::Boolean).returns(ActionMailer::MessageDelivery) }
+  def self.notify_subscribers(wizards:, hotnews_only:); end
+end

data/spec/test_data/v5.0/expected_custom_hogwarts_acceptance_mailer.rbi

@@ -0,0 +1,21 @@
+# typed: strong
+# == Custom Generator ==
+# This is an autogenerated file for Rails' mailers.
+# Please rerun bundle exec rake rails_rbi:mailers to regenerate.
+class HogwartsAcceptanceMailer
+  sig { params(student: Wizard).returns(ActionMailer::MessageDelivery) }
+  def self.notify(student); end
+
+  sig { params(student: T.untyped).returns(ActionMailer::MessageDelivery) }
+  def self.notify_retry(student); end
+
+  sig do
+    params(
+      teacher: Wizard,
+      note: String,
+      student: Wizard,
+      special: T::Boolean
+    ).returns(ActionMailer::MessageDelivery)
+  end
+  def self.notify_teacher(teacher, note = nil, student:, special: false); end
+end

data/spec/test_data/v5.0/expected_headmaster.rbi

@@ -40,14 +40,38 @@ module Headmaster::GeneratedAssociationMethods
   sig { returns(::School) }
   def school; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::School).void)).returns(::School) }
+  def build_school(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::School).void)).returns(::School) }
+  def create_school(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::School).void)).returns(::School) }
+  def create_school!(*args, &block); end
+
   sig { params(value: ::School).void }
   def school=(value); end
 
+  sig { returns(::School) }
+  def reload_school; end
+
   sig { returns(::Wizard) }
   def wizard; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wizard).void)).returns(::Wizard) }
+  def build_wizard(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wizard).void)).returns(::Wizard) }
+  def create_wizard(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wizard).void)).returns(::Wizard) }
+  def create_wizard!(*args, &block); end
+
   sig { params(value: ::Wizard).void }
   def wizard=(value); end
+
+  sig { returns(::Wizard) }
+  def reload_wizard; end
 end
 
 module Headmaster::CustomFinderMethods

data/spec/test_data/v5.0/expected_potion.rbi

@@ -11,8 +11,20 @@ module Potion::GeneratedAssociationMethods
   sig { returns(T.nilable(::Wizard)) }
   def wizard; end
 
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wizard).void)).returns(::Wizard) }
+  def build_wizard(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wizard).void)).returns(::Wizard) }
+  def create_wizard(*args, &block); end
+
+  sig { params(args: T.untyped, block: T.nilable(T.proc.params(object: ::Wizard).void)).returns(::Wizard) }
+  def create_wizard!(*args, &block); end
+
   sig { params(value: T.nilable(::Wizard)).void }
   def wizard=(value); end
+
+  sig { returns(T.nilable(::Wizard)) }
+  def reload_wizard; end
 end
 
 module Potion::CustomFinderMethods