sorbet-rails 0.6.0 → 0.6.1

data/sorbet-rails.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = %q{sorbet-rails}
-  s.version       = "0.6.0"
+  s.version       = "0.6.1"
   s.date          = %q{2019-04-18}
   s.summary       = %q{Set of tools to make Sorbet work with Rails seamlessly.}
   s.authors       = ["Chan Zuckerberg Initiative"]
@@ -16,8 +16,10 @@ Gem::Specification.new do |s|
   end
 
   s.add_dependency 'parlour', '~> 2.0'
-  s.add_dependency 'sorbet', '>= 0.5'
-  s.add_dependency 'sorbet-coerce', '>= 0.2.3'
+  s.add_dependency 'sorbet-runtime', '>= 0.5'
+  s.add_dependency 'sorbet-coerce', '>= 0.2.4'
+  s.add_dependency 'method_source', '>= 0.9.2'
+  s.add_dependency 'parser', '>= 2.7'
 
   # Development
   s.add_development_dependency 'rspec', '~> 3.8', '>= 3.8'

data/spec/generators/rails-template.rb

@@ -340,6 +340,22 @@ def create_mailers
         # TODO: mail acceptance letter to student
       end
 
+      sig {
+        params(
+          teacher: Wizard,
+          note: String,
+          student: Wizard,
+          special: T::Boolean,
+        ).void
+      }
+      def notify_teacher(
+        teacher,
+        note=nil,
+        student:,
+        special: false
+      ) # TODO: let the teacher know when a students accepted offer
+      end
+
       def notify_retry(student)
         # TODO: send more owls!!
       end

data/spec/model_rbi_formatter_spec.rb

@@ -53,4 +53,11 @@ RSpec.describe SorbetRails::ModelRbiFormatter do
       )
     end
   end
+
+  it 'creates Model::RelationType alias at runtime' do
+    ActiveRecord::Base.descendants.each do |model|
+      expect(model.const_defined?("RelationType")).to be(true)
+      expect(model.const_get("RelationType")).to be_a(T::Private::Types::TypeAlias)
+    end
+  end
 end

data/spec/sorbet_utils_spec.rb

@@ -34,8 +34,10 @@ class SorbetUtilsExampleClass
 
   def method_without_sig(p1, p2, *p3, p4:, **p5, &p6); end
 
-  sig { params(p1: String, p2: String, p3: Integer).void }
-  def method_with_default(p1, p2='abc', p3: 123); end
+  sig { params(p1: String, p2: String, p3: Integer, p4: Integer).void }
+  def method_with_default_with_sig(p1, p2='abc', p3:, p4: 123); end
+
+  def method_with_default(p1, p2='abc', p3:, p4: 123); end
 
   def method_with_missing_args_name(p1, *); end
 
@@ -131,17 +133,27 @@ RSpec.describe SorbetRails::SorbetUtils do
     ])
   end
 
-  # TODO it doesn't know how to extract default values from method yet
-  # Would have to rely on reading & parsing the source code :(
-  # it 'works when method arguments have default' do
-  #   method_def = SorbetUtilsExampleClass.instance_method(:method_with_default)
-  #   parameters = SorbetRails::SorbetUtils.parameters_from_method_def(method_def)
-  #   expect(parameters).to match_array([
-  #     Parameter.new('p1', type: 'T.untyped'),
-  #     Parameter.new('p2', type: 'T.untyped', default: '"abc"'),
-  #     Parameter.new('p3:', type: 'T.untyped', default: '123'),
-  #   ])
-  # end
+  it 'works when method arguments have default' do
+    method_def = SorbetUtilsExampleClass.instance_method(:method_with_default)
+    parameters = SorbetRails::SorbetUtils.parameters_from_method_def(method_def)
+    expect(parameters).to match_array([
+      Parameter.new('p1', type: 'T.untyped'),
+      Parameter.new('p2', type: 'T.untyped', default: "'abc'"),
+      Parameter.new('p3:', type: 'T.untyped'),
+      Parameter.new('p4:', type: 'T.untyped', default: '123'),
+    ])
+  end
+
+  it 'works when method arguments have default and method has sig' do
+    method_def = SorbetUtilsExampleClass.instance_method(:method_with_default_with_sig)
+    parameters = SorbetRails::SorbetUtils.parameters_from_method_def(method_def)
+    expect(parameters).to match_array([
+      Parameter.new('p1', type: 'String'),
+      Parameter.new('p2', type: 'String', default: "'abc'"),
+      Parameter.new('p3:', type: 'Integer'),
+      Parameter.new('p4:', type: 'Integer', default: '123'),
+    ])
+  end
 
   it 'works when method args doesnt have name' do
     method_def = SorbetUtilsExampleClass.instance_method(:method_with_missing_args_name)

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

@@ -1,10 +1,12 @@
 PATH
   remote: ../../..
   specs:
-    sorbet-rails (0.6.0)
+    sorbet-rails (0.6.1)
+      method_source (>= 0.9.2)
       parlour (~> 2.0)
-      sorbet (>= 0.5)
-      sorbet-coerce (>= 0.2.3)
+      parser (>= 2.7)
+      sorbet-coerce (>= 0.2.4)
+      sorbet-runtime (>= 0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -50,7 +52,7 @@ GEM
     ast (2.4.0)
     builder (3.2.4)
     byebug (11.1.1)
-    commander (4.5.0)
+    commander (4.5.2)
       highline (~> 2.0.0)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
@@ -72,14 +74,14 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parlour (2.0.0)
       commander (~> 4.5)
       parser
       rainbow (~> 3.0)
       sorbet-runtime (>= 0.5)
-    parser (2.7.0.3)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     polyfill (1.8.0)
     puma (3.12.4)
@@ -112,15 +114,15 @@ GEM
     rainbow (3.0.0)
     rake (13.0.1)
     safe_type (1.1.1)
-    sorbet (0.5.5406)
-      sorbet-static (= 0.5.5406)
-    sorbet-coerce (0.2.3)
+    sorbet (0.5.5420)
+      sorbet-static (= 0.5.5420)
+    sorbet-coerce (0.2.4)
       polyfill (~> 1.8)
       safe_type (~> 1.1, >= 1.1.1)
       sorbet (>= 0.4.4704)
       sorbet-runtime (>= 0.4.4704)
-    sorbet-runtime (0.5.5406)
-    sorbet-static (0.5.5406-universal-darwin-14)
+    sorbet-runtime (0.5.5420)
+    sorbet-static (0.5.5420-universal-darwin-14)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

data/spec/support/v5.0/app/mailers/hogwarts_acceptance_mailer.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: false
 class HogwartsAcceptanceMailer < ApplicationMailer
   extend T::Sig
 
@@ -7,6 +7,22 @@ class HogwartsAcceptanceMailer < ApplicationMailer
     # TODO: mail acceptance letter to student
   end
 
+  sig {
+    params(
+      teacher: Wizard,
+      note: String,
+      student: Wizard,
+      special: T::Boolean,
+    ).void
+  }
+  def notify_teacher(
+    teacher,
+    note=nil,
+    student:,
+    special: false
+  ) # TODO: let the teacher know when a students accepted offer
+  end
+
   def notify_retry(student)
     # TODO: send more owls!!
   end

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

@@ -1,10 +1,12 @@
 PATH
   remote: ../../..
   specs:
-    sorbet-rails (0.6.0)
+    sorbet-rails (0.6.1)
+      method_source (>= 0.9.2)
       parlour (~> 2.0)
-      sorbet (>= 0.5)
-      sorbet-coerce (>= 0.2.3)
+      parser (>= 2.7)
+      sorbet-coerce (>= 0.2.4)
+      sorbet-runtime (>= 0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -51,7 +53,7 @@ GEM
     bindex (0.8.1)
     builder (3.2.4)
     byebug (11.1.1)
-    commander (4.5.0)
+    commander (4.5.2)
       highline (~> 2.0.0)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
@@ -73,14 +75,14 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parlour (2.0.0)
       commander (~> 4.5)
       parser
       rainbow (~> 3.0)
       sorbet-runtime (>= 0.5)
-    parser (2.7.0.3)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     polyfill (1.8.0)
     puma (3.12.4)
@@ -113,15 +115,15 @@ GEM
     rainbow (3.0.0)
     rake (13.0.1)
     safe_type (1.1.1)
-    sorbet (0.5.5406)
-      sorbet-static (= 0.5.5406)
-    sorbet-coerce (0.2.3)
+    sorbet (0.5.5420)
+      sorbet-static (= 0.5.5420)
+    sorbet-coerce (0.2.4)
       polyfill (~> 1.8)
       safe_type (~> 1.1, >= 1.1.1)
       sorbet (>= 0.4.4704)
       sorbet-runtime (>= 0.4.4704)
-    sorbet-runtime (0.5.5406)
-    sorbet-static (0.5.5406-universal-darwin-14)
+    sorbet-runtime (0.5.5420)
+    sorbet-static (0.5.5420-universal-darwin-14)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

data/spec/support/v5.1/app/mailers/hogwarts_acceptance_mailer.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: false
 class HogwartsAcceptanceMailer < ApplicationMailer
   extend T::Sig
 
@@ -7,6 +7,22 @@ class HogwartsAcceptanceMailer < ApplicationMailer
     # TODO: mail acceptance letter to student
   end
 
+  sig {
+    params(
+      teacher: Wizard,
+      note: String,
+      student: Wizard,
+      special: T::Boolean,
+    ).void
+  }
+  def notify_teacher(
+    teacher,
+    note=nil,
+    student:,
+    special: false
+  ) # TODO: let the teacher know when a students accepted offer
+  end
+
   def notify_retry(student)
     # TODO: send more owls!!
   end

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

@@ -1,10 +1,12 @@
 PATH
   remote: ../../..
   specs:
-    sorbet-rails (0.6.0)
+    sorbet-rails (0.6.1)
+      method_source (>= 0.9.2)
       parlour (~> 2.0)
-      sorbet (>= 0.5)
-      sorbet-coerce (>= 0.2.3)
+      parser (>= 2.7)
+      sorbet-coerce (>= 0.2.4)
+      sorbet-runtime (>= 0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -55,7 +57,7 @@ GEM
     bindex (0.8.1)
     builder (3.2.4)
     byebug (11.1.1)
-    commander (4.5.0)
+    commander (4.5.2)
       highline (~> 2.0.0)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
@@ -80,14 +82,14 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parlour (2.0.0)
       commander (~> 4.5)
       parser
       rainbow (~> 3.0)
       sorbet-runtime (>= 0.5)
-    parser (2.7.0.3)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     polyfill (1.8.0)
     puma (3.12.4)
@@ -121,15 +123,15 @@ GEM
     rainbow (3.0.0)
     rake (13.0.1)
     safe_type (1.1.1)
-    sorbet (0.5.5406)
-      sorbet-static (= 0.5.5406)
-    sorbet-coerce (0.2.3)
+    sorbet (0.5.5420)
+      sorbet-static (= 0.5.5420)
+    sorbet-coerce (0.2.4)
       polyfill (~> 1.8)
       safe_type (~> 1.1, >= 1.1.1)
       sorbet (>= 0.4.4704)
       sorbet-runtime (>= 0.4.4704)
-    sorbet-runtime (0.5.5406)
-    sorbet-static (0.5.5406-universal-darwin-14)
+    sorbet-runtime (0.5.5420)
+    sorbet-static (0.5.5420-universal-darwin-14)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)

data/spec/support/v5.2/app/mailers/hogwarts_acceptance_mailer.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: false
 class HogwartsAcceptanceMailer < ApplicationMailer
   extend T::Sig
 
@@ -7,6 +7,22 @@ class HogwartsAcceptanceMailer < ApplicationMailer
     # TODO: mail acceptance letter to student
   end
 
+  sig {
+    params(
+      teacher: Wizard,
+      note: String,
+      student: Wizard,
+      special: T::Boolean,
+    ).void
+  }
+  def notify_teacher(
+    teacher,
+    note=nil,
+    student:,
+    special: false
+  ) # TODO: let the teacher know when a students accepted offer
+  end
+
   def notify_retry(student)
     # TODO: send more owls!!
   end

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

@@ -1,10 +1,12 @@
 PATH
   remote: ../../..
   specs:
-    sorbet-rails (0.6.0)
+    sorbet-rails (0.6.1)
+      method_source (>= 0.9.2)
       parlour (~> 2.0)
-      sorbet (>= 0.5)
-      sorbet-coerce (>= 0.2.3)
+      parser (>= 2.7)
+      sorbet-coerce (>= 0.2.4)
+      sorbet-runtime (>= 0.5)
 
 GEM
   remote: https://rubygems.org/
@@ -68,7 +70,7 @@ GEM
     bindex (0.8.1)
     builder (3.2.4)
     byebug (11.1.1)
-    commander (4.5.0)
+    commander (4.5.2)
       highline (~> 2.0.0)
     concurrent-ruby (1.1.6)
     crass (1.0.6)
@@ -93,14 +95,14 @@ GEM
     mini_portile2 (2.4.0)
     minitest (5.14.0)
     nio4r (2.5.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parlour (2.0.0)
       commander (~> 4.5)
       parser
       rainbow (~> 3.0)
       sorbet-runtime (>= 0.5)
-    parser (2.7.0.3)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     polyfill (1.8.0)
     puma (3.12.4)
@@ -136,15 +138,15 @@ GEM
     rainbow (3.0.0)
     rake (13.0.1)
     safe_type (1.1.1)
-    sorbet (0.5.5406)
-      sorbet-static (= 0.5.5406)
-    sorbet-coerce (0.2.3)
+    sorbet (0.5.5420)
+      sorbet-static (= 0.5.5420)
+    sorbet-coerce (0.2.4)
       polyfill (~> 1.8)
       safe_type (~> 1.1, >= 1.1.1)
       sorbet (>= 0.4.4704)
       sorbet-runtime (>= 0.4.4704)
-    sorbet-runtime (0.5.5406)
-    sorbet-static (0.5.5406-universal-darwin-14)
+    sorbet-runtime (0.5.5420)
+    sorbet-static (0.5.5420-universal-darwin-14)
     sprockets (4.0.0)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -165,7 +167,7 @@ GEM
     websocket-driver (0.7.1)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.4)
-    zeitwerk (2.2.2)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby