sorbet-rails 0.6.4 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 662c7c86f998ffbbdef82e035c7d827ef8f3f4192c4829e4e6ecfaaa0c72a131
-  data.tar.gz: 3eb66d37c008b8d8c3ae5b33fe8b645652dac7d2c047195e9773af743c2859c0
+  metadata.gz: ca33522fb17d2e6461e49a4d0a4b851a046193c046ec2460d7ff0f1b5363fd8f
+  data.tar.gz: b59025b18da945ed7c81e2e9dbee17f4994f9aa439b071568aba0161034fd4cb
 SHA512:
-  metadata.gz: fd2212ba2d83e22a540540b71fd9c82e4ec67211c5577166bc99772b957ecb9d38fa2326dbeda9d2f03f399bdde73c542f148834cfe600d4f7b193f210427b74
-  data.tar.gz: c639bb6d3b6785f0b945354d4e034ab48515473d91267d20518a69fe829550611764ce0071d383474e0a2cb1f05db04092276d5b238c2b10a85c3e9113d8839a
+  metadata.gz: a50fdea8e48fabf8da5c5bfc619de8b6cfc72410f17a4011c723fd6f45d8bbd5f1d65057289afcbdec4cb1691afd00385c90c987be753cf04d7d1d28d565190f
+  data.tar.gz: ded509eaa92c25474c8e098269ea85436307f86689c0363c880e08d7100699f64e05cefb0a374dccdef32245d112e4d91c2a44859a0034defb47df7bed9a5d5f

data/.gitattributes

@@ -1,4 +1,3 @@
-lib/sorbet/* linguist-generated
 spec/test_data/* linguist-generated
 spec/support/* linguist-generated
-
+sorbet/* linguist-generated

data/.gitignore

@@ -79,6 +79,7 @@ build-iPhoneSimulator/
 /spec/support/**/config/credentials.yml.enc
 
 # Ignore sorbet generated files
+/sorbet/rbi/hidden-definitions/
 /spec/support/**/sorbet/*
 /spec/support/**/sorbet/**/*
 
@@ -93,7 +94,7 @@ build-iPhoneSimulator/
 *.swl
 *.swk
 
-lib/sorbet/rbi/hidden-definitions/errors.txt
+sorbet/rbi/hidden-definitions/errors.txt
 .vscode
 
 .rake_tasks~

data/.travis.yml

@@ -16,7 +16,7 @@ rvm:
 matrix:
   include:
   - rvm: 2.5
-    env: RAILS_VERSION=5.2 SORBET_VERSION=0.5.5400
+    env: RAILS_VERSION=5.2 SORBET_VERSION=0.5.5737
   exclude:
   - rvm: 2.3
     env: RAILS_VERSION=6.0
@@ -24,6 +24,8 @@ matrix:
     env: RAILS_VERSION=6.0
   allow_failures:
   - rvm: ruby-head
+  - rvm: 2.7
+    env: RAILS_VERSION=6.0
 before_install:
 - gem install bundler -v 2.0.1 --no-doc
 - gem install bundler -v 1.17.3 --no-doc

data/README.md

@@ -9,7 +9,7 @@ This gem adds a few Rake tasks to generate Ruby Interface (RBI) files for dynami
 
 `sorbet-rails` supports Rails 5+ or later.
 
-**Notice**: we no longer supports Rails 4.2. [Version 0.5.6](https://github.com/chanzuckerberg/sorbet-rails/releases/tag/v0.5.6) is the last version supporting Rails 4.2.
+**Notice**: we no longer support Rails 4.2. [Version 0.5.6](https://github.com/chanzuckerberg/sorbet-rails/releases/tag/v0.5.6) is the last version supporting Rails 4.2.
 
 ## Initial Setup
 
@@ -94,6 +94,28 @@ Wizard.pluck_to_tstruct(TA[WizardStruct].new)  # T::Array[WizardStruct]
 Wizard.all.pluck_to_tstruct(TA[WizardStruct].new)  # T::Array[WizardStruct]
 ```
 
+You can also pass a keyword argument called `associations` that represents a mapping of a `T::Struct`'s keys to an associated table's columns.
+```ruby
+# -- API
+Arel.pluck_to_tstruct(TA[ <TStructSubclass> ].new, associations: < Hash<Symbol, String> >)
+
+# -- example
+class WizardWithWandStruct < T::Struct
+  const :name, String
+  const :house, T.nilable(String)
+  const :wand_wood_type, String
+end
+
+Wizard.joins(:wand).pluck_to_tstruct(
+  TA[WizardWithWandStruct].new,
+  associations: { wand_wood_type: "wands.wood_type" }
+)
+Wizard.all.joins(:wand).pluck_to_tstruct(
+  TA[WizardWithWandStruct].new,
+  associations: { wand_wood_type: "wands.wood_type" }
+)
+````
+
 This method is based on [pluck_to_hash](https://github.com/girishso/pluck_to_hash) gem.
 
 #### `typed_enum` instead of `enum`
@@ -114,12 +136,14 @@ ie.
 Will generate this enum:
 
 ```ruby
-class Wizard::House < T::Enum
-  enums do
-    Gryffindor = new('Gryffindor')
-    Hufflepuff = new('Hufflepuff')
-    Ravenclaw = new('Ravenclaw')
-    Slytherin = new('Slytherin')
+class Wizard
+  class House < T::Enum
+    enums do
+      Gryffindor = new('Gryffindor')
+      Hufflepuff = new('Hufflepuff')
+      Ravenclaw = new('Ravenclaw')
+      Slytherin = new('Slytherin')
+    end
   end
 end
 ```
@@ -412,11 +436,13 @@ If you run into the following issue when running rspec, it's likely because you'
        if you're really stuck.
 ```
 
-## Extending Model Generation Task with Custom Plugins
+## Extending RBI Generation logic
+
+### Extending Model Generation Task with Custom Plugins
 
 `sorbet-rails` support a customizable plugin system that you can use to generate additional RBI for each model. This will be useful to generate RBI for methods dynamically added by gems or private concerns. If you write plugins for public gems, please feel free to contribute it to this repo.
 
-### Defining a Custom `ModelPlugin`
+#### Defining a Custom `ModelPlugin`
 
 A custom plugin should be a subclass of `SorbetRails::ModelPlugins::Base`. Each plugin would implement a `generate(root)` method that generate additional rbi for the model.
 
@@ -465,14 +491,14 @@ It is also recommended to check if the generated methods are detected by `sorbet
 
 Check out the [plugins](https://github.com/chanzuckerberg/sorbet-rails/tree/master/lib/sorbet-rails/model_plugins) written for `sorbet-rails`'s own model RBI generation logic for examples.
 
-### Registering new plugins
+#### Registering new plugins
 You can register your plugins in an initializer:
 ```ruby
 # -- config/initializers/sorbet_rails.rb
 SorbetRails::ModelRbiFormatter.register_plugin(MyCustomPlugin)
 ```
 
-### Enabling built-in plugins
+#### Enabling built-in plugins
 
 sorbet-rails comes with a handful of gem plugins that can be enabled in an initializer. You can pass enabled gem plugins to `config.enabled_gem_plugins`, like so:
 
@@ -508,6 +534,29 @@ You can also configure the core model plugins if needed. The default plugins are
 [active_flag]: https://github.com/kenn/active_flag
 [Paperclip]: https://github.com/thoughtbot/paperclip
 
+### Customize Generation Class
+
+For mailer and job rbi generation, you can customize the logic by
+setting the generation class in the config:
+
+```ruby
+SorbetRails.configure do |config|
+  config.job_generator_class = CustomJobRbiGenerator
+  config.mailer_generator_class = CustomMailerRbiGenerator
+end
+```
+
+The custom generator can subclass the [provided generators](lib/bundled_rbi/customizabel_rbi_formatter.rbi) and override the populate_rbi method. For example:
+
+```ruby
+class CustomJobRbiGenerator < SorbetRails::JobRbiFormatter
+  def populate_rbi
+    rbi_generator.root.add_comment("== Custom Generator ==")
+    super
+  end
+end
+```
+
 ## Contributing
 
 Contributions and ideas are welcome! Please see [our contributing guide](CONTRIBUTING.md) and don't hesitate to open an issue or send a pull request to improve the functionality of this gem.

data/Rakefile

@@ -20,9 +20,9 @@ namespace :update_spec do
   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')
-      system("gem install rails -v 6.0.0")
-      system("rails _6.0.0_ -v")
-      system("RAILS_VERSION='6.0' rails _6.0.0_ 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")
+      system("gem install rails -v 6.0.3")
+      system("rails _6.0.3_ -v")
+      system("RAILS_VERSION='6.0' rails _6.0.3_ 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
 

data/lib/bundled_rbi/customizabel_rbi_formatter.rbi

@@ -0,0 +1,29 @@
+# typed: strong
+module SorbetRails
+  class MailerRbiFormatter
+    extend T::Sig
+    Parameter = ::Parlour::RbiGenerator::Parameter
+
+    sig { returns(T.class_of(ActionMailer::Base)) }
+    attr_reader :mailer_class
+
+    sig { returns(Parlour::RbiGenerator) }
+    def rbi_generator; end
+
+    sig { void }
+    def populate_rbi; end
+  end
+
+  class JobRbiFormatter
+    Parameter = ::Parlour::RbiGenerator::Parameter
+
+    sig { returns(Parlour::RbiGenerator) }
+    attr_reader :rbi_generator
+
+    sig { returns(T.class_of(ActiveJob::Base)) }
+    attr_reader :job_class
+
+    sig { void }
+    def populate_rbi; end
+  end
+end

data/lib/bundled_rbi/pluck_to_tstruct.rbi

@@ -6,10 +6,11 @@ module SorbetRails::PluckToTStruct
     type_parameters(:U).
     params(
       ta_struct: ITypeAssert[T.type_parameter(:U)],
+      associations: T::Hash[Symbol, String],
     ).
     returns(T::Array[T.type_parameter(:U)])
   }
-  def pluck_to_tstruct(ta_struct, &blk); end
+  def pluck_to_tstruct(ta_struct, associations: {}); end
 end
 
 class ActiveRecord::Base

data/lib/bundled_rbi/typed_enum.rbi

@@ -0,0 +1,7 @@
+# typed: strong
+module ActiveRecord::Enum
+
+  sig { params(definitions: T::Hash[Symbol, T.untyped]).void }
+  def typed_enum(definitions); end
+
+end

data/lib/sorbet-rails.rb

@@ -1,11 +1,9 @@
-# typed: strong
+# typed: strict
 module SorbetRails
   if defined?(Rails)
     require 'sorbet-rails/railtie'
     require 'sorbet-rails/model_rbi_formatter'
     require 'sorbet-rails/type_assert/type_assert'
-    require 'sorbet-rails/custom_types/integer_string'
-    require 'sorbet-rails/custom_types/boolean_string'
     require 'sorbet-rails/typed_params'
   end
 end

data/lib/sorbet-rails/active_record_rbi_formatter.rb

@@ -12,7 +12,7 @@ class SorbetRails::ActiveRecordRbiFormatter
 
     parlour = T.let(Parlour::RbiGenerator.new, Parlour::RbiGenerator)
 
-    parlour.root.add_comments([
+    parlour.root.add_comment([
       'This is an autogenerated file for Rails\' ActiveRecord.',
       'Please rerun bundle exec rake rails_rbi:active_record to regenerate.'
     ])
@@ -31,7 +31,7 @@ class SorbetRails::ActiveRecordRbiFormatter
 
     parlour = T.let(Parlour::RbiGenerator.new, Parlour::RbiGenerator)
 
-    parlour.root.add_comments([
+    parlour.root.add_comment([
       'This is an autogenerated file for Rails\' ActiveRecord.',
       'Please rerun bundle exec rake rails_rbi:active_record to regenerate.'
     ])
@@ -85,11 +85,18 @@ class SorbetRails::ActiveRecordRbiFormatter
       # parameters than the ones defined by `create_elem_specific_query_methods` so
       # we need to match the signatures in that conflicting rbi.
       build_methods = %w(new build create create!)
+      # This needs to match the generated method signature in activerecord.rbi and
+      # in Rails 5.0 and 5.1 the param is a splat.
+      if Rails.version =~ /^5\./
+        build_param = Parameter.new("*args", type: "T.untyped")
+      else
+        build_param = Parameter.new("attributes", type: "T.untyped", default: 'nil')
+      end
       build_methods.each do |build_method|
         class_rbi.create_method(
           build_method,
           parameters: [
-            Parameter.new("*args", type: "T.untyped"),
+            build_param,
             Parameter.new(
               "&block",
               type: "T.nilable(T.proc.params(object: Elem).void)",
@@ -264,7 +271,6 @@ class SorbetRails::ActiveRecordRbiFormatter
         ],
         return_type: "T::Enumerator[#{inner_type}]",
         class_method: class_method,
-        override: true,
       )
     end
   end

data/lib/sorbet-rails/config.rb

@@ -1,4 +1,7 @@
 # typed: true
+require("sorbet-rails/mailer_rbi_formatter")
+require("sorbet-rails/job_rbi_formatter")
+
 module SorbetRails
   class << self
     extend T::Sig
@@ -37,6 +40,12 @@ module SorbetRails
     sig { returns(T::Array[String]) }
     attr_accessor :extra_helper_includes
 
+    sig { returns(T.class_of(SorbetRails::JobRbiFormatter))}
+    attr_accessor :job_generator_class
+
+    sig { returns(T.class_of(SorbetRails::MailerRbiFormatter))}
+    attr_accessor :mailer_generator_class
+
     sig { void }
     def initialize
       @enabled_gem_plugins = []
@@ -52,6 +61,8 @@ module SorbetRails
       ]
       @enabled_model_plugins << :active_storage_methods if defined?(T.unsafe(ActiveStorage))
       @extra_helper_includes = []
+      @mailer_generator_class = SorbetRails::MailerRbiFormatter
+      @job_generator_class = SorbetRails::JobRbiFormatter
     end
 
     sig { returns(T::Array[Symbol]) }

data/lib/sorbet-rails/deprecation.rb

@@ -1,3 +1,4 @@
+# typed: false
 require 'active_support/deprecation'
 
 module SorbetRails

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

@@ -35,5 +35,13 @@ class KaminariPlugin < SorbetRails::ModelPlugins::Base
         Parameter.new('num', type: 'Integer')
       ],
     )
+
+    # https://github.com/kaminari/kaminari/blob/c5186f5d9b7f23299d115408e62047447fd3189d/kaminari-core/lib/kaminari/models/configuration_methods.rb#L19
+    model_class_rbi = root.create_class(model_class_name)
+    model_class_rbi.create_method(
+      "default_per_page",
+      return_type: "Integer",
+      class_method: true,
+    )
   end
 end

data/lib/sorbet-rails/helper_rbi_formatter.rb

@@ -16,7 +16,7 @@ class SorbetRails::HelperRbiFormatter
   def generate_rbi
     puts "-- Generate sigs for helpers --"
 
-    @parlour.root.add_comments([
+    @parlour.root.add_comment([
       'This is an autogenerated file for Rails helpers.',
       'Please rerun bundle exec rake rails_rbi:helpers to regenerate.'
     ])

data/lib/sorbet-rails/job_rbi_formatter.rb

@@ -2,74 +2,87 @@
 require('parlour')
 require('sorbet-rails/sorbet_utils.rb')
 
-class SorbetRails::JobRbiFormatter
-  extend T::Sig
+module SorbetRails
+  class JobRbiFormatter
+    extend T::Sig
 
-  Parameter = ::Parlour::RbiGenerator::Parameter
+    Parameter = ::Parlour::RbiGenerator::Parameter
 
-  sig { params(job_class: T.class_of(ActiveJob::Base)).void }
-  def initialize(job_class)
-    @job_class = T.let(job_class, T.class_of(ActiveJob::Base))
-    @parlour = T.let(Parlour::RbiGenerator.new, Parlour::RbiGenerator)
-  end
+    sig { returns(Parlour::RbiGenerator) }
+    attr_reader :rbi_generator
+
+    sig { returns(T.class_of(ActiveJob::Base)) }
+    attr_reader :job_class
 
-  sig {returns(String)}
-  def generate_rbi
-    puts "-- Generate sigs for mailer #{@job_class.name} --"
+    sig { params(job_class: T.class_of(ActiveJob::Base)).void }
+    def initialize(job_class)
+      @job_class = T.let(job_class, T.class_of(ActiveJob::Base))
+      @rbi_generator = T.let(Parlour::RbiGenerator.new, Parlour::RbiGenerator)
+    end
 
-    @parlour.root.add_comments([
-      'This is an autogenerated file for Rails\' jobs.',
-      'Please rerun bundle exec rake rails_rbi:jobs to regenerate.'
-    ])
+    sig { void }
+    def populate_rbi
+      @rbi_generator.root.add_comment([
+        'This is an autogenerated file for Rails\' jobs.',
+        'Please rerun bundle exec rake rails_rbi:jobs to regenerate.'
+      ])
 
-    @parlour.root.create_class(@job_class.name) do |job_rbi|
-      method_def = @job_class.instance_method(:perform)
-      parameters = SorbetRails::SorbetUtils.parameters_from_method_def(method_def)
-      job_rbi.create_method(
-        "perform_later",
-        parameters: parameters,
-        class_method: true,
-      )
-      job_rbi.create_method(
-        "perform_now",
-        parameters: parameters,
-        class_method: true,
-      )
-      # Override the signature for "set" so that we can support it
-      # At run-time, this method returns a `ActiveJob::ConfiguredJob` but
-      # we fake the signature to return "T.self_class" so that
-      # sorbet can type-check when `perform_later` is called on it
-      # See: https://guides.rubyonrails.org/active_job_basics.html#enqueue-the-job
-      job_rbi.create_method(
-        "set",
-        # Documentation: https://api.rubyonrails.org/classes/ActiveJob/Core/ClassMethods.html
-        parameters: [
-          Parameter.new(
-            "wait:",
-            type: "T.nilable(ActiveSupport::Duration)",
-            default: "nil",
-          ),
-          Parameter.new(
-            "wait_until:",
-            type: "T.nilable(T.any(ActiveSupport::TimeWithZone, Date, Time))",
-            default: "nil",
-          ),
-          Parameter.new(
-            "queue:",
-            type: "T.nilable(T.any(String, Symbol))",
-            default: "nil",
-          ),
-          Parameter.new(
-            "priority:",
-            type: "T.nilable(Integer)",
-            default: "nil",
-          ),
-        ],
-        return_type: "T.self_type",
-        class_method: true,
-      )
+      @rbi_generator.root.create_class(T.must(@job_class.name)) do |job_rbi|
+        method_def = @job_class.instance_method(:perform)
+        parameters = SorbetRails::SorbetUtils.parameters_from_method_def(method_def)
+        job_rbi.create_method(
+          "perform_later",
+          parameters: parameters,
+          class_method: true,
+          return_type: @job_class.name,
+        )
+        job_rbi.create_method(
+          "perform_now",
+          parameters: parameters,
+          class_method: true,
+          return_type: @job_class.name,
+        )
+        # Override the signature for "set" so that we can support it
+        # At run-time, this method returns a `ActiveJob::ConfiguredJob` but
+        # we fake the signature to return "T.self_class" so that
+        # sorbet can type-check when `perform_later` is called on it
+        # See: https://guides.rubyonrails.org/active_job_basics.html#enqueue-the-job
+        job_rbi.create_method(
+          "set",
+          # Documentation: https://api.rubyonrails.org/classes/ActiveJob/Core/ClassMethods.html
+          parameters: [
+            Parameter.new(
+              "wait:",
+              type: "T.nilable(ActiveSupport::Duration)",
+              default: "nil",
+            ),
+            Parameter.new(
+              "wait_until:",
+              type: "T.nilable(T.any(ActiveSupport::TimeWithZone, Date, Time))",
+              default: "nil",
+            ),
+            Parameter.new(
+              "queue:",
+              type: "T.nilable(T.any(String, Symbol))",
+              default: "nil",
+            ),
+            Parameter.new(
+              "priority:",
+              type: "T.nilable(Integer)",
+              default: "nil",
+            ),
+          ],
+          return_type: "T.self_type",
+          class_method: true,
+        )
+      end
     end
 
-    @parlour.rbi
+    sig { returns(String) }
+    def generate_rbi
+      puts "-- Generate sigs for mailer #{@job_class.name} --"
+      populate_rbi
+      @rbi_generator.rbi
+    end
   end
 end