sorbet-rails 0.5.1 → 0.5.2

data/spec/support/v6.0/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.6.3'
+ruby '2.5.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.0.0.rc2'
+gem 'rails', '~> 6.0.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server
@@ -27,7 +27,6 @@ group :development do
   gem 'web-console', '>= 3.3.0'
 end
 
-
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 

data/spec/support/v6.0/Gemfile.lock

@@ -1,62 +1,62 @@
 PATH
   remote: ../../..
   specs:
-    sorbet-rails (0.5.0)
+    sorbet-rails (0.5.1)
       parlour (~> 0.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.0.rc2)
-      actionpack (= 6.0.0.rc2)
+    actioncable (6.0.0)
+      actionpack (= 6.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0.rc2)
-      actionpack (= 6.0.0.rc2)
-      activejob (= 6.0.0.rc2)
-      activerecord (= 6.0.0.rc2)
-      activestorage (= 6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
+    actionmailbox (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       mail (>= 2.7.1)
-    actionmailer (6.0.0.rc2)
-      actionpack (= 6.0.0.rc2)
-      actionview (= 6.0.0.rc2)
-      activejob (= 6.0.0.rc2)
+    actionmailer (6.0.0)
+      actionpack (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.0.rc2)
-      actionview (= 6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
+    actionpack (6.0.0)
+      actionview (= 6.0.0)
+      activesupport (= 6.0.0)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actiontext (6.0.0.rc2)
-      actionpack (= 6.0.0.rc2)
-      activerecord (= 6.0.0.rc2)
-      activestorage (= 6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.0.0)
+      actionpack (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       nokogiri (>= 1.8.5)
-    actionview (6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
+    actionview (6.0.0)
+      activesupport (= 6.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.0.0)
+      activesupport (= 6.0.0)
       globalid (>= 0.3.6)
-    activemodel (6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
-    activerecord (6.0.0.rc2)
-      activemodel (= 6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
-    activestorage (6.0.0.rc2)
-      actionpack (= 6.0.0.rc2)
-      activejob (= 6.0.0.rc2)
-      activerecord (= 6.0.0.rc2)
+    activemodel (6.0.0)
+      activesupport (= 6.0.0)
+    activerecord (6.0.0)
+      activemodel (= 6.0.0)
+      activesupport (= 6.0.0)
+    activestorage (6.0.0)
+      actionpack (= 6.0.0)
+      activejob (= 6.0.0)
+      activerecord (= 6.0.0)
       marcel (~> 0.3.1)
-    activesupport (6.0.0.rc2)
+    activesupport (6.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -87,7 +87,7 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.11.3)
     nio4r (2.4.0)
-    nokogiri (1.10.3)
+    nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     parlour (0.6.1)
       rainbow (~> 3.0.0)
@@ -96,38 +96,38 @@ GEM
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.0.rc2)
-      actioncable (= 6.0.0.rc2)
-      actionmailbox (= 6.0.0.rc2)
-      actionmailer (= 6.0.0.rc2)
-      actionpack (= 6.0.0.rc2)
-      actiontext (= 6.0.0.rc2)
-      actionview (= 6.0.0.rc2)
-      activejob (= 6.0.0.rc2)
-      activemodel (= 6.0.0.rc2)
-      activerecord (= 6.0.0.rc2)
-      activestorage (= 6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
+    rails (6.0.0)
+      actioncable (= 6.0.0)
+      actionmailbox (= 6.0.0)
+      actionmailer (= 6.0.0)
+      actionpack (= 6.0.0)
+      actiontext (= 6.0.0)
+      actionview (= 6.0.0)
+      activejob (= 6.0.0)
+      activemodel (= 6.0.0)
+      activerecord (= 6.0.0)
+      activestorage (= 6.0.0)
+      activesupport (= 6.0.0)
       bundler (>= 1.3.0)
-      railties (= 6.0.0.rc2)
+      railties (= 6.0.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.2.0)
       loofah (~> 2.2, >= 2.2.2)
-    railties (6.0.0.rc2)
-      actionpack (= 6.0.0.rc2)
-      activesupport (= 6.0.0.rc2)
+    railties (6.0.0)
+      actionpack (= 6.0.0)
+      activesupport (= 6.0.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (12.3.3)
-    sorbet (0.4.4602)
-      sorbet-static (= 0.4.4602)
-    sorbet-runtime (0.4.4602)
-    sorbet-static (0.4.4602-universal-darwin-14)
+    sorbet (0.4.4663)
+      sorbet-static (= 0.4.4663)
+    sorbet-runtime (0.4.4663)
+    sorbet-static (0.4.4663-universal-darwin-14)
     sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -140,11 +140,11 @@ GEM
     thread_safe (0.3.6)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    web-console (4.0.0)
-      actionview (>= 6.0.0.a)
-      activemodel (>= 6.0.0.a)
+    web-console (4.0.1)
+      actionview (>= 6.0.0)
+      activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
-      railties (>= 6.0.0.a)
+      railties (>= 6.0.0)
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
@@ -157,7 +157,7 @@ DEPENDENCIES
   byebug
   jbuilder (~> 2.7)
   puma (~> 3.11)
-  rails (~> 6.0.0.rc2)
+  rails (~> 6.0.0)
   sorbet
   sorbet-rails!
   sorbet-runtime
@@ -166,7 +166,7 @@ DEPENDENCIES
   web-console (>= 3.3.0)
 
 RUBY VERSION
-   ruby 2.6.3p62
+   ruby 2.5.5p157
 
 BUNDLED WITH
    2.0.2

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

@@ -1,5 +1,4 @@
-# typed: strict
+# typed: strong
 class ApplicationRecord < ActiveRecord::Base
   self.abstract_class = true
-  scope :recent, -> { where('created_at > ?', 1.month.ago) }
 end

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

@@ -1,5 +1,11 @@
-# typed: strong
+# typed: strict
 class SpellBook < ApplicationRecord
   validates :name, length: { minimum: 5 }, presence: true
   belongs_to :wizard
+
+  enum book_type: {
+    unclassified: 0,
+    biology: 1,
+    dark_art: 999,
+  }
 end

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

@@ -11,4 +11,6 @@ class Wizard < ApplicationRecord
 
   has_one :wand
   has_many :spell_books
+
+  scope :recent, -> { where('created_at > ?', 1.month.ago) }
 end

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

@@ -17,6 +17,9 @@ port        ENV.fetch("PORT") { 3000 }
 #
 environment ENV.fetch("RAILS_ENV") { "development" }
 
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+
 # Specifies the number of `workers` to boot in clustered mode.
 # Workers are forked web server processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.

data/spec/support/v6.0/db/migrate/20190620000003_create_spell_books.rb

@@ -4,6 +4,7 @@ class CreateSpellBooks < ActiveRecord::Migration[6.0]
     create_table :spell_books do |t|
       t.string :name
       t.references :wizard
+      t.integer :book_type, null: false, default: 0
     end
   end
 end

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

@@ -16,6 +16,7 @@ ActiveRecord::Schema.define(version: 2019_06_20_000004) do
   create_table "spell_books", force: :cascade do |t|
     t.string "name"
     t.integer "wizard_id"
+    t.integer "book_type", default: 0, null: false
     t.index ["wizard_id"], name: "index_spell_books_on_wizard_id"
   end
 

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

@@ -11,37 +11,30 @@ T.assert_type!(wizard.name, T.nilable(String))
 T.assert_type!(wizard.wand, T.nilable(Wand))
 T.assert_type!(T.must(wizard.wand).wizard, Wizard)
 
-T.assert_type!(wizard.spell_books, ActiveRecord::Associations::CollectionProxy)
-T.reveal_type(wizard.spell_books) # SpellBook::CollectionProxy
+# need the exact type to works! they aren't subclass of each other
+# T.assert_type!(wizard.spell_books, SpellBook::ActiveRecord_Relation)
+# T.assert_type!(wizard.spell_books, SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(wizard.spell_books, SpellBook::ActiveRecord_Associations_CollectionProxy)
 
 # -- model relation
 # default
-T.assert_type!(Wizard.all, ActiveRecord::Relation)
-T.reveal_type(Wizard.all) # Wizard::ActiveRecord_Relation
+T.assert_type!(Wizard.all, Wizard::ActiveRecord_Relation)
 
 # custom scope
-T.assert_type!(Wizard.recent, ActiveRecord::Relation)
-T.reveal_type(Wizard.recent)
+T.assert_type!(Wizard.recent, Wizard::ActiveRecord_Relation)
 
 # enum scope
-T.assert_type!(Wizard.Gryffindor, ActiveRecord::Relation)
-T.reveal_type(Wizard.Gryffindor)
-
-# chained scopes
-T.assert_type!(Wizard.Gryffindor.recent, ActiveRecord::Relation)
-T.reveal_type(Wizard.Gryffindor.recent)
-T.assert_type!(Wizard.Gryffindor.recent.unscoped, ActiveRecord::Relation)
-T.reveal_type(Wizard.Gryffindor.recent.unscoped)
+T.assert_type!(Wizard.Gryffindor, Wizard::ActiveRecord_Relation)
 
 # ActiveRecord Querying
-T.assert_type!(Wizard.where(id: 1), ActiveRecord::Relation)
-T.reveal_type(Wizard.where(id: 1)) # Wizard::Relation
-T.assert_type!(Wizard.preload(:spell_books), ActiveRecord::Relation)
-T.reveal_type(Wizard.preload(:spell_books)) # Wizard::Relation
-T.assert_type!(Wizard.eager_load(:spell_books), ActiveRecord::Relation)
-T.reveal_type(Wizard.eager_load(:spell_books)) # Wizard::Relation
-T.assert_type!(Wizard.order(:id), ActiveRecord::Relation)
-T.reveal_type(Wizard.order(:id)) # Wizard::Relation
+T.assert_type!(Wizard.Gryffindor.recent, Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.Gryffindor.recent.unscoped, Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.where(id: 1), Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.where(id: 1).recent, Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.where.not(id: 1), Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.preload(:spell_books), Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.eager_load(:spell_books), Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.order(:id), Wizard::ActiveRecord_Relation)
 
 # Finder methods -- Model
 T.assert_type!(Wizard.exists?(name: 'Test'), T::Boolean)
@@ -73,51 +66,96 @@ T.assert_type!(Wizard.all.find_by_id!(wizard.id), Wizard)
 
 # Finder methods -- CollectionProxy
 spell_book = wizard.spell_books.first!
-T.assert_type!(wizard.spell_books.exists?(name: 'Fantastic Beasts'), T::Boolean)
-T.assert_type!(wizard.spell_books.find(spell_book.id), SpellBook)
-T.assert_type!(wizard.spell_books.first!, SpellBook)
-# T.assert_type!(wizard.spell_books.first, T.nilable(SpellBook)) # TODO fix sig for 4.2 and 5.0
-T.assert_type!(wizard.spell_books.last!, SpellBook)
-# T.assert_type!(wizard.spell_books.last, T.nilable(SpellBook)) # TODO fix sig for 4.2 and 5.0
-T.assert_type!(wizard.spell_books.first_n(5), T::Array[SpellBook])
-T.assert_type!(wizard.spell_books.last_n(5), T::Array[SpellBook])
-T.assert_type!(wizard.spell_books.find_by(name: 'Fantastic Beasts'), T.nilable(SpellBook))
-T.assert_type!(wizard.spell_books.find_by!(name: 'Fantastic Beasts'), SpellBook)
-T.assert_type!(wizard.spell_books.find_by_id(spell_book.id), T.nilable(SpellBook))
-T.assert_type!(wizard.spell_books.find_by_id!(spell_book.id), SpellBook)
-
-# Enumerable
+spell_books = wizard.spell_books
+T.assert_type!(spell_books.exists?(name: 'Fantastic Beasts'), T::Boolean)
+T.assert_type!(spell_books.find(spell_book.id), SpellBook)
+T.assert_type!(spell_books.first!, SpellBook)
+# T.assert_type!(spell_books.first, T.nilable(SpellBook)) # TODO fix sig for 4.2 and 5.0
+T.assert_type!(spell_books.last!, SpellBook)
+# T.assert_type!(spell_books.last, T.nilable(SpellBook)) # TODO fix sig for 4.2 and 5.0
+T.assert_type!(spell_books.first_n(5), T::Array[SpellBook])
+T.assert_type!(spell_books.last_n(5), T::Array[SpellBook])
+T.assert_type!(spell_books.find_by(name: 'Fantastic Beasts'), T.nilable(SpellBook))
+T.assert_type!(spell_books.find_by!(name: 'Fantastic Beasts'), SpellBook)
+T.assert_type!(spell_books.find_by_id(spell_book.id), T.nilable(SpellBook))
+T.assert_type!(spell_books.find_by_id!(spell_book.id), SpellBook)
+# CollectionProxy query also typed correctly!
+T.assert_type!(spell_books.where(id: 1), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books.preload(:wizard), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books.eager_load(:wizard), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books.order(:id), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books.where.not(id: 1), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books.biology, SpellBook::ActiveRecord_AssociationRelation)
+
+# finder methods -- AssociationRelation
+spell_books_query = spell_books.where(id: 1)
+T.assert_type!(spell_books_query.exists?(name: 'Fantastic Beasts'), T::Boolean)
+T.assert_type!(spell_books_query.find(spell_book.id), SpellBook)
+T.assert_type!(spell_books_query.first!, SpellBook)
+# T.assert_type!(spell_books_query.first, T.nilable(SpellBook)) # TODO fix sig for 4.2 and 5.0
+T.assert_type!(spell_books_query.last!, SpellBook)
+# T.assert_type!(spell_books_query.last, T.nilable(SpellBook)) # TODO fix sig for 4.2 and 5.0
+T.assert_type!(spell_books_query.first_n(5), T::Array[SpellBook])
+T.assert_type!(spell_books_query.last_n(5), T::Array[SpellBook])
+T.assert_type!(spell_books_query.find_by(name: 'Fantastic Beasts'), T.nilable(SpellBook))
+T.assert_type!(spell_books_query.find_by!(name: 'Fantastic Beasts'), SpellBook)
+T.assert_type!(spell_books_query.find_by_id(spell_book.id), T.nilable(SpellBook))
+T.assert_type!(spell_books_query.find_by_id!(spell_book.id), SpellBook)
+# Query chaining
+T.assert_type!(spell_books_query.preload(:wizard), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books_query.eager_load(:wizard), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books_query.order(:id), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books_query.where.not(id: 1), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books_query.biology, SpellBook::ActiveRecord_AssociationRelation)
+
+# Enumerable on activerecord relation
 T.assert_type!(Wizard.all.to_a, T::Array[Wizard])
 Wizard.all.each do |w|
   T.assert_type!(w, Wizard)
 end
 Wizard.all.map do |w|
-  T.assert_type!(w, Wizard) # TODO this doesn't work on Rails 4.2 or 5.0
+  T.assert_type!(w, Wizard)
 end
 Wizard.all.to_a.map do |w|
   T.assert_type!(w, Wizard)
 end
 
+# enum on association collection proxy
 T.assert_type!(wizard.spell_books.to_a, T::Array[SpellBook])
 wizard.spell_books.each do |sp|
   T.assert_type!(sp, SpellBook)
 end
 wizard.spell_books.map do |sp|
-  T.assert_type!(sp, SpellBook) # TODO this doesn't work on Rails 4.2 or 5.0
+  T.assert_type!(sp, SpellBook)
 end
 wizard.spell_books.to_a.map do |sp|
-  T.assert_type!(sp, SpellBook) # This works on Rails 4.2
+  T.assert_type!(sp, SpellBook)
+end
+
+# enum on association relation
+T.assert_type!(wizard.spell_books.where(id: 1).to_a, T::Array[SpellBook])
+wizard.spell_books.where(id: 1).each do |sp|
+  T.assert_type!(sp, SpellBook)
+end
+wizard.spell_books.where(id: 1).map do |sp|
+  T.assert_type!(sp, SpellBook)
+end
+wizard.spell_books.where(id: 1).to_a.map do |sp|
+  T.assert_type!(sp, SpellBook)
 end
 
 # Model columns
 T.assert_type!(wizard.id, Integer)
 T.assert_type!(wizard.id?, T::Boolean)
 T.assert_type!(wizard.notes, T.nilable(String))
-T.assert_type!(wizard.house, T.nilable(String))
 
 # Model enum
 T.assert_type!(wizard.Gryffindor?, T::Boolean)
+T.assert_type!(wizard.house, T.nilable(String))
 T.assert_type!(Wizard.houses, T::Hash[T.any(String, Symbol), Integer])
+T.assert_type!(spell_book.biology?, T::Boolean)
+T.assert_type!(spell_book.book_type, String)
+T.assert_type!(SpellBook.book_types, T::Hash[T.any(String, Symbol), Integer])
 
 # Mythical plugin
 T.assert_type!(Wand.mythicals, T::Array[Wand])

data/spec/test_data/v4.2/expected_no_routes.rbi

@@ -1,11 +1,4 @@
-# This is an autogenerated file for routes helper methods
-
 # typed: strong
-class ActionController::Base
-  extend T::Sig
-
-  # You do not have any routes defined!
-  # Please add some routes in config/routes.rb.
-  # For more information about routes, see the Rails guide: https://guides.rubyonrails.org/routing.html.
-
-end
+# You do not have any routes defined!
+# Please add some routes in config/routes.rb.
+# For more information about routes, see the Rails guide: https://guides.rubyonrails.org/routing.html.