sorbet-rails 0.6.5.1 → 0.7.4

data/spec/rake_rails_rbi_jobs_spec.rb

@@ -3,6 +3,13 @@ require 'rails_helper'
 RSpec.describe 'rake rails_rbi:jobs', type: :task do
   let!(:generated_dir_path) { Rails.root.join("sorbet", "rails-rbi", "jobs") }
 
+  class CustomJobRbiGenerator < SorbetRails::JobRbiFormatter
+    def populate_rbi
+      rbi_generator.root.add_comment("== Custom Generator ==")
+      super
+    end
+  end
+
   it "preloads the Rails environment" do
     expect(task.prerequisites).to include("environment")
   end
@@ -17,4 +24,17 @@ RSpec.describe 'rake rails_rbi:jobs', type: :task do
       ],
     )
   end
+
+  it "generates custom jobs rbi correctly" do
+    ::SorbetRails.config.job_generator_class = CustomJobRbiGenerator
+    task.invoke
+    expect_files(
+      base_dir: generated_dir_path,
+      files: [
+        "application_job.rbi",
+        "award_house_point_hourglasses.rbi",
+      ],
+      expected_file_prefix: "expected_custom",
+    )
+  end
 end

data/spec/rake_rails_rbi_mailers_spec.rb

@@ -3,6 +3,13 @@ require 'rails_helper'
 RSpec.describe 'rake rails_rbi:mailers', type: :task do
   let!(:generated_dir_path) { Rails.root.join("sorbet", "rails-rbi", "mailers") }
 
+  class CustomMailerRbiGenerator < SorbetRails::MailerRbiFormatter
+    def populate_rbi
+      rbi_generator.root.add_comment("== Custom Generator ==")
+      super
+    end
+  end
+
   it "preloads the Rails environment" do
     expect(task.prerequisites).to include("environment")
   end
@@ -18,4 +25,18 @@ RSpec.describe 'rake rails_rbi:mailers', type: :task do
       ],
     )
   end
+
+  it "generates custom mailers rbi correctly" do
+    ::SorbetRails.config.mailer_generator_class = CustomMailerRbiGenerator
+    task.invoke
+    expect_files(
+      base_dir: generated_dir_path,
+      files: [
+        "application_mailer.rbi",
+        "daily_prophet_mailer.rbi",
+        "hogwarts_acceptance_mailer.rbi",
+      ],
+      expected_file_prefix: "expected_custom",
+    )
+  end
 end

data/spec/sorbet_spec.rb

@@ -42,11 +42,6 @@ RSpec.describe 'sorbet' do
       chdir: Rails.root.to_path,
     )
 
-    stdout, stderr, status = Open3.capture3(
-      'bundle', 'exec', 'srb', 'tc',
-      chdir: Rails.root.to_path,
-    )
-
     if status != 0
       puts "================================="
       puts "stdout #{stdout}"
@@ -55,6 +50,11 @@ RSpec.describe 'sorbet' do
       puts "================================="
     end
 
+    stdout, stderr, status = Open3.capture3(
+      'bundle', 'exec', 'srb', 'tc',
+      chdir: Rails.root.to_path,
+    )
+
     # Ensure sorbet_test_cases.rb is set to `typed: true` since srb init may
     # set it to false.
     sorbet_test_cases_path = Rails.root.join('sorbet_test_cases.rb')

data/spec/support/v5.0/Gemfile

@@ -11,7 +11,7 @@ gem 'rails', '~> 5.0.7'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.3.6'
 # Use Puma as the app server
-gem 'puma', '~> 3.0'
+gem 'puma', '~> 3.12'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.5'
 # Use ActiveModel has_secure_password

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

@@ -1,9 +1,9 @@
 PATH
   remote: ../../..
   specs:
-    sorbet-rails (0.6.5.1)
+    sorbet-rails (0.7.4)
       method_source (>= 0.9.2)
-      parlour (~> 2.0)
+      parlour (>= 4.0.1)
       parser (>= 2.7)
       sorbet-coerce (>= 0.2.6)
       sorbet-runtime (>= 0.5)
@@ -49,10 +49,10 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (7.1.4)
-    ast (2.4.0)
+    ast (2.4.2)
     builder (3.2.4)
     byebug (11.1.1)
-    commander (4.5.2)
+    commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
@@ -71,21 +71,25 @@ GEM
       mini_mime (>= 0.1.1)
     method_source (1.0.0)
     mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
+    mini_portile2 (2.5.0)
     minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    parlour (2.1.0)
+    nokogiri (1.11.1)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.1-x86_64-darwin)
+      racc (~> 1.4)
+    parlour (6.0.0)
       commander (~> 4.5)
       parser
       rainbow (~> 3.0)
       sorbet-runtime (>= 0.5)
-    parser (2.7.1.2)
-      ast (~> 2.4.0)
-    polyfill (1.8.0)
-    puma (3.12.4)
-    rack (2.2.2)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    polyfill (1.9.0)
+    puma (3.12.6)
+    racc (1.5.2)
+    rack (2.2.3)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (5.0.7.2)
@@ -116,13 +120,12 @@ GEM
     safe_type (1.1.1)
     sorbet (0.5.5480)
       sorbet-static (= 0.5.5480)
-    sorbet-coerce (0.2.7)
+    sorbet-coerce (0.4.0)
       polyfill (~> 1.8)
       safe_type (~> 1.1, >= 1.1.1)
-      sorbet (>= 0.4.4704)
       sorbet-runtime (>= 0.4.4704)
     sorbet-runtime (0.5.5480)
-    sorbet-static (0.5.5480-universal-darwin-14)
+    sorbet-static (0.5.5480-universal-darwin-19)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -137,15 +140,16 @@ GEM
       thread_safe (~> 0.1)
     websocket-driver (0.6.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   byebug
   jbuilder (~> 2.5)
-  puma (~> 3.0)
+  puma (~> 3.12)
   rails (~> 5.0.7)
   sorbet
   sorbet-rails!
@@ -154,4 +158,4 @@ DEPENDENCIES
   tzinfo-data
 
 BUNDLED WITH
-   2.0.2
+   2.2.0

data/spec/support/v5.0/app/controllers/application_controller.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: strict
 class ApplicationController < ActionController::Base
   protect_from_forgery with: :exception
 end

data/spec/support/v5.0/app/models/headmaster.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: strict
 class Headmaster < ApplicationRecord
   belongs_to :school, required: false
   belongs_to :wizard, optional: true

data/spec/support/v5.0/app/models/potion.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: strict
 # an abstract class that has no table
 class Potion < ApplicationRecord
   self.abstract_class = true

data/spec/support/v5.0/app/models/robe.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: strict
 class Robe < ApplicationRecord
   belongs_to :wizard, required: false
 end

data/spec/support/v5.0/app/models/school.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: strict
 class School < ApplicationRecord
   has_one :headmaster
   validates :headmaster, presence: true

data/spec/support/v5.0/app/models/spell.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: strict
 class Spell < ApplicationRecord
   # habtm enforced at the DB level
   has_and_belongs_to_many :spell_books

data/spec/support/v5.0/app/models/subject.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: strict
 class Subject < ApplicationRecord
   # habtm which is optional at the db level
   has_and_belongs_to_many :wizards

data/spec/support/v5.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/v5.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/v5.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/v5.0/config/environments/test.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/v5.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 http://guides.rubyonrails.org/routing.html

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

@@ -0,0 +1,9 @@
+# typed: false
+class AddSerializedToWizards < ActiveRecord::Migration[5.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/v5.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: 20190620000014) do
+ActiveRecord::Schema.define(version: 20190620000015) do
 
   create_table "headmasters", force: :cascade do |t|
     t.integer "school_id"
@@ -78,15 +78,19 @@ ActiveRecord::Schema.define(version: 20190620000014) do
     t.integer  "professor"
     t.string   "parent_email"
     t.text     "notes"
-    t.datetime "created_at",                            null: false
-    t.datetime "updated_at",                            null: false
+    t.datetime "created_at",                                  null: false
+    t.datetime "updated_at",                                  null: false
     t.string   "broom"
     t.integer  "quidditch_position"
     t.integer  "hair_color"
     t.integer  "eye_color"
     t.integer  "hair_length"
-    t.string   "type",               default: "Wizard", null: false
+    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
 
 end

data/spec/support/v5.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)